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 /railties/lib/rails/commands/console.rb | |
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 'railties/lib/rails/commands/console.rb')
-rw-r--r-- | railties/lib/rails/commands/console.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb index 5d37a2b699..48b1ad884b 100644 --- a/railties/lib/rails/commands/console.rb +++ b/railties/lib/rails/commands/console.rb @@ -57,7 +57,7 @@ module Rails end def environment - options[:environment] ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development' + options[:environment] ||= ENV['RAILS_ENV'] || 'development' end def environment? |