aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-11-25 13:26:38 -0600
committerJoshua Peek <josh@joshpeek.com>2008-11-25 13:26:38 -0600
commite126e1aac07d353e10fe9871fc3fc3f040cc8911 (patch)
tree37ff58487a79375e689ba4e13e3f85bfe8600f64 /railties
parent3dd3ffde06931d47e3052260efba26b1cc5bd7c9 (diff)
downloadrails-e126e1aac07d353e10fe9871fc3fc3f040cc8911.tar.gz
rails-e126e1aac07d353e10fe9871fc3fc3f040cc8911.tar.bz2
rails-e126e1aac07d353e10fe9871fc3fc3f040cc8911.zip
don't try to require vendored rack in script/server
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/commands/server.rb3
1 files changed, 2 insertions, 1 deletions
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