aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-01-03 23:37:37 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-01-03 23:37:37 -0500
commit50cb1b697c9409e28e5e515029d6292335a24a17 (patch)
tree9537b258eb33a536dedf5fbcd86128c1dfdb2964 /railties/lib
parenta2b4df5b0bc2c1494665e07104cd2d8ceee08878 (diff)
parent498370c05b56ae02189466420da117b32304ddf9 (diff)
downloadrails-50cb1b697c9409e28e5e515029d6292335a24a17.tar.gz
rails-50cb1b697c9409e28e5e515029d6292335a24a17.tar.bz2
rails-50cb1b697c9409e28e5e515029d6292335a24a17.zip
Merge pull request #27399 from sinogermany/rails-env-for-empty-string-env-vars
Rails env for empty string env vars
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index ee48043a50..00add5829d 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -7,6 +7,7 @@ require "active_support/dependencies/autoload"
require "active_support/core_ext/kernel/reporting"
require "active_support/core_ext/module/delegation"
require "active_support/core_ext/array/extract_options"
+require "active_support/core_ext/object/blank"
require "rails/application"
require "rails/version"
@@ -67,7 +68,7 @@ module Rails
# Rails.env.development? # => true
# Rails.env.production? # => false
def env
- @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
+ @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"].presence || ENV["RACK_ENV"].presence || "development")
end
# Sets the Rails environment.