aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-19 15:24:00 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-19 15:24:00 -0800
commitc7c39f52dcce4ea6de2051ee7816c0cb9d583f8f (patch)
tree2ea73ce578cb72a70c86a744c76615890535161b /railties/lib/rails/commands
parent5df26dd7a91bb6d248b96c4308242a51ab59aa5c (diff)
downloadrails-c7c39f52dcce4ea6de2051ee7816c0cb9d583f8f.tar.gz
rails-c7c39f52dcce4ea6de2051ee7816c0cb9d583f8f.tar.bz2
rails-c7c39f52dcce4ea6de2051ee7816c0cb9d583f8f.zip
Revert "Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working"
Broke stuff. This reverts commit 520b8b59110dd130c89b317b6bd65d8644c7836f.
Diffstat (limited to 'railties/lib/rails/commands')
-rw-r--r--railties/lib/rails/commands/server.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 450970e4f5..2c90851fb2 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -3,13 +3,11 @@ require 'action_dispatch'
require 'fileutils'
require 'optparse'
-# Waiting for Rack::Server patch
-
options = {
:Port => 3000,
:Host => "0.0.0.0",
:environment => (ENV['RAILS_ENV'] || "development").dup,
- :config => $config_ru,
+ :config => "#{Rails.root}/config.ru",
:detach => false,
:debugger => false
}