aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2018-10-06 14:03:46 +0300
committerbogdanvlviv <bogdanvlviv@gmail.com>2018-10-06 14:58:14 +0300
commit9c2a87ab0e10f0fa1ae97346ec75c8508070b526 (patch)
treeca50b6c305d559693518404c575f40fc94bc3105 /actionpack/lib
parent6aa9fa482a4392fa128481e42d8a3bd31a370829 (diff)
downloadrails-9c2a87ab0e10f0fa1ae97346ec75c8508070b526.tar.gz
rails-9c2a87ab0e10f0fa1ae97346ec75c8508070b526.tar.bz2
rails-9c2a87ab0e10f0fa1ae97346ec75c8508070b526.zip
Follow up #34064
The removed code was added in 7f870a5ba2aa9177aa4a0e03a9d027928ba60e49, then 7f870a5ba2aa9177aa4a0e03a9d027928ba60e49 was reverted by #34064. But I found that that commit wasn't completely reverted, I guess it was caused by resolving some conflicts during reverting. @schneems could you please confirm that those changes weren't reverted unintentionally, or reject this commit otherwise?
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb21
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) }