aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_handling.rb
diff options
context:
space:
mode:
authorDamien Mathieu <damien@heroku.com>2015-03-19 10:06:28 +0100
committerDamien Mathieu <damien@heroku.com>2015-03-19 10:06:28 +0100
commitd578cbfb5c9fa353ce041bc826e13905910e2d2a (patch)
tree825cabca0569e490290923ea8cb0c6f0a86eef2f /activerecord/lib/active_record/connection_handling.rb
parent7f338b9082fe3488f681c171b93c371cfc951f22 (diff)
downloadrails-d578cbfb5c9fa353ce041bc826e13905910e2d2a.tar.gz
rails-d578cbfb5c9fa353ce041bc826e13905910e2d2a.tar.bz2
rails-d578cbfb5c9fa353ce041bc826e13905910e2d2a.zip
don't fallback to RACK_ENV when RAILS_ENV is not present
Diffstat (limited to 'activerecord/lib/active_record/connection_handling.rb')
-rw-r--r--activerecord/lib/active_record/connection_handling.rb2
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