From 9b20b1cc0fe6bc2e327bcf791c5d824655585ec5 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 24 Aug 2015 14:05:54 -0700
Subject: pull up dispatcher allocation

the dispatcher class isn't configurable anymore, so pull up allocation
to the method that needs it.
---
 actionpack/lib/action_dispatch/routing/mapper.rb    | 2 +-
 actionpack/lib/action_dispatch/routing/route_set.rb | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 51bafb539f..c3a9422ceb 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -368,7 +368,7 @@ module ActionDispatch
           end
 
           def dispatcher(raise_on_name_error)
-            @set.dispatcher raise_on_name_error
+            Routing::RouteSet::Dispatcher.new raise_on_name_error
           end
       end
 
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 654eabaa96..4e29476117 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -385,10 +385,6 @@ module ActionDispatch
         @prepend.each { |blk| eval_block(blk) }
       end
 
-      def dispatcher(raise_on_name_error)
-        Routing::RouteSet::Dispatcher.new raise_on_name_error
-      end
-
       module MountedHelpers
         extend ActiveSupport::Concern
         include UrlFor
-- 
cgit v1.2.3