mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #34109 from bogdanvlviv/follow-up-34064 

Follow up #34064
This commit is contained in:
Eileen M. Uchitelle 2018-10-10 09:42:03 -04:00 committed by GitHub
parent 8ecb75e405 9c2a87ab0e
commit 8a1cc51ed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
actionpack/lib/action_dispatch/routing/route_set.rb
View File

@ -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) }