diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 20:58:55 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 21:00:22 -0700 |
| commit | 248d84f2e6d5948cc88a5735c6685e7ed81abb6b (patch) | |
| tree | 17c9fdcb04f0196795b7c32fa82ada16bc67c21d | |
| parent | 6c581f5fd57dc1706d5f674b4371c07d040c4151 (diff) | |
| download | rails-248d84f2e6d5948cc88a5735c6685e7ed81abb6b.tar.gz rails-248d84f2e6d5948cc88a5735c6685e7ed81abb6b.tar.bz2 rails-248d84f2e6d5948cc88a5735c6685e7ed81abb6b.zip | |
Simplify path expansions
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Rakefile b/railties/lib/rails/generators/rails/app/templates/Rakefile index 2450a927f0..6b6d07e8cc 100755 --- a/railties/lib/rails/generators/rails/app/templates/Rakefile +++ b/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' diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index bb30136686..8008c6ba07 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/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. diff --git a/railties/lib/rails/generators/rails/app/templates/config/environment.rb b/railties/lib/rails/generators/rails/app/templates/config/environment.rb index e5362b21cc..0bb191f205 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environment.rb +++ b/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! |