aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/route_set.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-07-15 16:18:25 -0300
committerJeremy Kemper <jeremy@bitsweat.net>2010-07-15 13:18:44 -0700
commit3952268929d72b691c1db925c5e9bf7dff8962ce (patch)
treea62c135ea39b400411c0271b8e885b549edb603a /actionpack/lib/action_dispatch/routing/route_set.rb
parent0c2c8934345ec8a3f2eb7896e252496167fdf652 (diff)
downloadrails-3952268929d72b691c1db925c5e9bf7dff8962ce.tar.gz
rails-3952268929d72b691c1db925c5e9bf7dff8962ce.tar.bz2
rails-3952268929d72b691c1db925c5e9bf7dff8962ce.zip
Bump up to rack-mount 0.6.9 and rack-mount-0.6.6.pre removed from action_dispatch vendor
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 1b1a221c60..36c52eb65a 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -1,10 +1,8 @@
+require 'rack/mount'
require 'forwardable'
require 'active_support/core_ext/object/to_query'
require 'action_dispatch/routing/deprecated_mapper'
-$: << File.expand_path('../../vendor/rack-mount-0.6.6.pre', __FILE__)
-require 'rack/mount'
-
module ActionDispatch
module Routing
class RouteSet #:nodoc: