diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-24 12:15:46 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-24 12:15:46 +0100 |
| commit | b92608770e20618ab6a6c67099dd19ae4533689e (patch) | |
| tree | 205b1303668555a31f3d228a58c84a10ac53093d /railties/lib/rails/application.rb | |
| parent | 37e4deb2606557e5340b48169ffc1435bb331439 (diff) | |
| download | rails-b92608770e20618ab6a6c67099dd19ae4533689e.tar.gz rails-b92608770e20618ab6a6c67099dd19ae4533689e.tar.bz2 rails-b92608770e20618ab6a6c67099dd19ae4533689e.zip | |
Ensure environment config has higher priority than application ones.
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 90118c8cfc..e14719c758 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -11,7 +11,6 @@ module Rails autoload :Railties, 'rails/application/railties' autoload :RoutesReloader, 'rails/application/routes_reloader' - # TODO Ensure production settings are read properly class << self private :new alias :configure :class_eval @@ -24,7 +23,6 @@ module Rails raise "You cannot have more than one Rails::Application" if Rails.application super Rails.application = base.instance - base.require_environment! end protected |