diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-05 13:25:33 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-05 13:25:33 -0700 |
| commit | e7f1556d0e75c635212273cc5e3cfd113456ff29 (patch) | |
| tree | 39e81a1fa01bacb18eb2c396d845ebcd815055b9 /railties/lib | |
| parent | 53bcbfbdc1eed45cc6615e59d36baf018ab43d96 (diff) | |
| parent | df8154c845f8fb251c58f1fd882cc221cfdcbbc2 (diff) | |
| download | rails-e7f1556d0e75c635212273cc5e3cfd113456ff29.tar.gz rails-e7f1556d0e75c635212273cc5e3cfd113456ff29.tar.bz2 rails-e7f1556d0e75c635212273cc5e3cfd113456ff29.zip | |
Merge branch 'master' into erbout
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/initializer.rb | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/rails.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index dd6a0c66f5..f0b5e3f257 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -37,7 +37,7 @@ module Rails end def env - StringQuestioneer.new(RAILS_ENV) + ActiveSupport::StringInquirer.new(RAILS_ENV) end def cache diff --git a/railties/lib/tasks/rails.rb b/railties/lib/tasks/rails.rb index bfcf5bc493..8c2b7f9bde 100644 --- a/railties/lib/tasks/rails.rb +++ b/railties/lib/tasks/rails.rb @@ -4,5 +4,5 @@ $VERBOSE = nil Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext } # Load any custom rakefile extensions -Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext } Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext } +Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext } |