diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-10-14 02:51:33 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-10-14 02:51:33 +0000 |
| commit | 4b78e5bddbf75a803452fd69f077b6c1ef1c267d (patch) | |
| tree | fcdb56edfdcfea44dc25983be527915e157cc604 /railties/lib/commands/server.rb | |
| parent | cb24c0f14158b392e86b5948c6091398aab0a968 (diff) | |
| download | rails-4b78e5bddbf75a803452fd69f077b6c1ef1c267d.tar.gz rails-4b78e5bddbf75a803452fd69f077b6c1ef1c267d.tar.bz2 rails-4b78e5bddbf75a803452fd69f077b6c1ef1c267d.zip | |
Fix problem with RAILS_ENV being frozen when set from environment variable
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2576 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/commands/server.rb')
| -rw-r--r-- | railties/lib/commands/server.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb index 375fb4df07..db8e8b3d93 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/commands/server.rb @@ -4,7 +4,7 @@ require 'optparse' OPTIONS = { :port => 3000, :ip => "0.0.0.0", - :environment => "development", + :environment => (ENV['RAILS_ENV'] || "development").dup, :server_root => File.expand_path(RAILS_ROOT + "/public/"), :server_type => WEBrick::SimpleServer, :charset => "UTF-8", |