diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-03-19 07:46:57 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-03-19 07:46:57 -0700 |
| commit | 7bdc7635b885e473f6a577264fd8efad1c02174f (patch) | |
| tree | d5a1331c223888514488113dfbb2358229422921 /activerecord/lib | |
| parent | 45786be516e13d55a1fca9a4abaddd5781209103 (diff) | |
| parent | d578cbfb5c9fa353ce041bc826e13905910e2d2a (diff) | |
| download | rails-7bdc7635b885e473f6a577264fd8efad1c02174f.tar.gz rails-7bdc7635b885e473f6a577264fd8efad1c02174f.tar.bz2 rails-7bdc7635b885e473f6a577264fd8efad1c02174f.zip | |
Merge pull request #19404 from dmathieu/remove_rack_env
Don't fallback to RACK_ENV when RAILS_ENV is not present
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_handling.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_handling.rb b/activerecord/lib/active_record/connection_handling.rb index 24f5849e45..d0deb7751c 100644 --- a/activerecord/lib/active_record/connection_handling.rb +++ b/activerecord/lib/active_record/connection_handling.rb @@ -1,6 +1,6 @@ module ActiveRecord module ConnectionHandling - RAILS_ENV = -> { (Rails.env if defined?(Rails.env)) || ENV["RAILS_ENV"] || ENV["RACK_ENV"] } + RAILS_ENV = -> { (Rails.env if defined?(Rails.env)) || ENV["RAILS_ENV"] } DEFAULT_ENV = -> { RAILS_ENV.call || "default_env" } # Establishes the connection to the database. Accepts a hash as input where |