Skip to content
Browse files

Simplify path expansions

  • Loading branch information...
1 parent 6c581f5 commit 248d84f2e6d5948cc88a5735c6685e7ed81abb6b @jeremy jeremy committed Oct 19, 2009
View
2 railties/lib/rails/generators/rails/app/templates/Rakefile
@@ -1,7 +1,7 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-require File.expand_path(File.join(File.dirname(__FILE__), 'config', 'application'))
+require File.expand_path('../config/application', __FILE__)
require 'rake'
require 'rake/testtask'
View
2 railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'boot'))
+require File.expand_path('../boot', __FILE__)
Rails::Initializer.run do |config|
# Settings in config/environments/* take precedence over those specified here.
View
2 railties/lib/rails/generators/rails/app/templates/config/environment.rb
@@ -1,5 +1,5 @@
# Load the rails application
-require File.expand_path(File.join(File.dirname(__FILE__), 'application'))
+require File.expand_path('../application', __FILE__)
# Initialize the rails application
Rails.initialize!

0 comments on commit 248d84f

Please sign in to comment.
Something went wrong with that request. Please try again.