diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-24 14:05:54 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-24 14:05:54 -0700 |
| commit | 9b20b1cc0fe6bc2e327bcf791c5d824655585ec5 (patch) | |
| tree | c2e4f373742dba47a323544f324e39f8fa22cab9 /actionpack | |
| parent | 59e3b648c3191d3eaf163142f742d05a3616e0b6 (diff) | |
| download | rails-9b20b1cc0fe6bc2e327bcf791c5d824655585ec5.tar.gz rails-9b20b1cc0fe6bc2e327bcf791c5d824655585ec5.tar.bz2 rails-9b20b1cc0fe6bc2e327bcf791c5d824655585ec5.zip | |
pull up dispatcher allocation
the dispatcher class isn't configurable anymore, so pull up allocation
to the method that needs it.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 |
2 files changed, 1 insertions, 5 deletions
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 |