From 2675ba9ef4ae1839f721aff77c255ee1cb8ac7ac Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Mon, 16 Nov 2009 12:37:43 -0800 Subject: Require action_dispatch, not action_controller --- railties/lib/rails/commands/server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/commands') diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 29359e49a4..37dfa3b9bb 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -1,4 +1,4 @@ -require 'action_controller' +require 'action_dispatch' require 'fileutils' require 'optparse' -- cgit v1.2.3 From c2997017f79321a8d90af84b1de35f87e3dd2445 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Mon, 16 Nov 2009 13:58:08 -0800 Subject: Make script/server work with correct application.rb --- railties/lib/rails/commands/server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/commands') diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 37dfa3b9bb..2c90851fb2 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -42,7 +42,7 @@ unless server end puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}" -puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}}" +puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}" if options[:detach] Process.daemon -- cgit v1.2.3 From 520b8b59110dd130c89b317b6bd65d8644c7836f Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Wed, 18 Nov 2009 16:28:12 -0800 Subject: Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working --- railties/lib/rails/commands/server.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails/commands') diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 2c90851fb2..450970e4f5 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -3,11 +3,13 @@ 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 => "#{Rails.root}/config.ru", + :config => $config_ru, :detach => false, :debugger => false } -- cgit v1.2.3 From c7c39f52dcce4ea6de2051ee7816c0cb9d583f8f Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 19 Nov 2009 15:24:00 -0800 Subject: Revert "Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working" Broke stuff. This reverts commit 520b8b59110dd130c89b317b6bd65d8644c7836f. --- railties/lib/rails/commands/server.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'railties/lib/rails/commands') 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 } -- cgit v1.2.3