aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-09-14 13:01:44 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-09-14 13:04:43 -0700
commitb8e914709c06fceac51384f7484c002fcb715196 (patch)
tree6dbb4e666c850cc77d52594058cc88e347759986 /actionpack/lib/action_dispatch.rb
parent4b8576a0c69f9d8497bfb47afcfca9f1832ea6a3 (diff)
downloadrails-b8e914709c06fceac51384f7484c002fcb715196.tar.gz
rails-b8e914709c06fceac51384f7484c002fcb715196.tar.bz2
rails-b8e914709c06fceac51384f7484c002fcb715196.zip
Require active_support after autoload setup
Diffstat (limited to 'actionpack/lib/action_dispatch.rb')
-rw-r--r--actionpack/lib/action_dispatch.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 849f268a8c..5bcd2143a3 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -21,10 +21,6 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++
-activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift activesupport_path if File.directory?(activesupport_path)
-require 'active_support'
-
require 'rack'
module Rack
@@ -59,3 +55,7 @@ module ActionDispatch
end
autoload :Mime, 'action_dispatch/http/mime_type'
+
+activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
+$:.unshift activesupport_path if File.directory?(activesupport_path)
+require 'active_support'