aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands/runner.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremykemper@gmail.com>2015-03-20 08:14:11 -0700
committerJeremy Kemper <jeremykemper@gmail.com>2015-03-20 08:14:11 -0700
commit5154089c181e9b36753b193bd7ffb141e88232f1 (patch)
treee72783fd1351026a4bd8847127abba222f44d118 /railties/lib/rails/commands/runner.rb
parenta4e7a6f9d63b93fff4ba78a32a930d1f5f97da29 (diff)
downloadrails-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 'railties/lib/rails/commands/runner.rb')
-rw-r--r--railties/lib/rails/commands/runner.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index 66a9ebf38c..86bce9b2fe 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -1,6 +1,6 @@
require 'optparse'
-options = { environment: (ENV['RAILS_ENV'] || "development").dup }
+options = { environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup }
code_or_file = nil
if ARGV.first.nil?