diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 16:10:43 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 16:10:51 -0800 |
| commit | eeb1f472a5561e769b7e6df923f4c91a7d72379d (patch) | |
| tree | b08aba6b7d517c60908d8527289d6306a423ec13 /railties | |
| parent | 0ddba7cf667a7cc832ae8b0327d5786b56e50df4 (diff) | |
| download | rails-eeb1f472a5561e769b7e6df923f4c91a7d72379d.tar.gz rails-eeb1f472a5561e769b7e6df923f4c91a7d72379d.tar.bz2 rails-eeb1f472a5561e769b7e6df923f4c91a7d72379d.zip | |
RAILS_ENV falls back to RACK_ENV
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/initializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/initializer.rb b/railties/lib/rails/initializer.rb index 44d04688c8..44101dcc94 100644 --- a/railties/lib/rails/initializer.rb +++ b/railties/lib/rails/initializer.rb @@ -1,6 +1,6 @@ require "rails" # In case people require this file directly -RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV) +RAILS_ENV = (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development').dup unless defined?(RAILS_ENV) module Rails class Initializer @@ -14,4 +14,4 @@ module Rails end end end -end
\ No newline at end of file +end |