diff options
| author | Jeremy Kemper <jeremykemper@gmail.com> | 2015-03-20 08:14:11 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremykemper@gmail.com> | 2015-03-20 08:14:11 -0700 |
| commit | 5154089c181e9b36753b193bd7ffb141e88232f1 (patch) | |
| tree | e72783fd1351026a4bd8847127abba222f44d118 /actionview/test | |
| parent | a4e7a6f9d63b93fff4ba78a32a930d1f5f97da29 (diff) | |
| download | rails-5154089c181e9b36753b193bd7ffb141e88232f1.tar.gz rails-5154089c181e9b36753b193bd7ffb141e88232f1.tar.bz2 rails-5154089c181e9b36753b193bd7ffb141e88232f1.zip | |
Revert "Merge pull request #19404 from dmathieu/remove_rack_env"
Preserving RACK_ENV behavior.
This reverts commit 7bdc7635b885e473f6a577264fd8efad1c02174f, reversing
changes made to 45786be516e13d55a1fca9a4abaddd5781209103.
Diffstat (limited to 'actionview/test')
| -rw-r--r-- | actionview/test/abstract_unit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index 382bd72f20..4635c645d0 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -28,7 +28,7 @@ require 'pp' # require 'pp' early to prevent hidden_methods from not picking up module Rails class << self def env - @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || "test") + @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "test") end end end |