diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-10-10 09:42:03 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-10 09:42:03 -0400 |
commit | 8a1cc51ed045af5cfb750385961ffb58d9242673 (patch) | |
tree | 68626c645c1dc485c40db988e7b9a8df5fc5cd57 /actionpack/lib/action_dispatch | |
parent | 8ecb75e40510dd79cef173326a67fe93b274b2b7 (diff) | |
parent | 9c2a87ab0e10f0fa1ae97346ec75c8508070b526 (diff) | |
download | rails-8a1cc51ed045af5cfb750385961ffb58d9242673.tar.gz rails-8a1cc51ed045af5cfb750385961ffb58d9242673.tar.bz2 rails-8a1cc51ed045af5cfb750385961ffb58d9242673.zip |
Merge pull request #34109 from bogdanvlviv/follow-up-34064
Follow up #34064
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index fedf622e90..2ae75b0da8 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -378,8 +378,6 @@ module ActionDispatch @disable_clear_and_finalize = false @finalized = false @env_key = "ROUTES_#{object_id}_SCRIPT_NAME" - @url_helpers = nil - @deferred_classes = [] @set = Journey::Routes.new @router = Journey::Router.new @set @@ -435,25 +433,6 @@ module ActionDispatch end private :eval_block - def include_helpers(klass, include_path_helpers) - if @finalized - include_helpers_now klass, include_path_helpers - else - @deferred_classes << [klass, include_path_helpers] - end - end - - def include_helpers_now(klass, include_path_helpers) - namespace = klass.module_parents.detect { |m| m.respond_to?(:railtie_include_helpers) } - - if namespace && namespace.railtie_namespace.routes != self - namespace.railtie_include_helpers(klass, include_path_helpers) - else - klass.include(url_helpers(include_path_helpers)) - end - end - private :include_helpers_now - def finalize! return if @finalized @append.each { |blk| eval_block(blk) } |