From e126e1aac07d353e10fe9871fc3fc3f040cc8911 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 25 Nov 2008 13:26:38 -0600 Subject: don't try to require vendored rack in script/server --- railties/lib/commands/server.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'railties/lib/commands/server.rb') diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb index f9a444e208..f61c48567f 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/commands/server.rb @@ -1,6 +1,7 @@ require 'active_support' +require 'action_controller' + require 'fileutils' -require 'action_controller/vendor/rack' require 'optparse' # TODO: Push Thin adapter upstream so we don't need worry about requiring it -- cgit v1.2.3