aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorGannon McGibbon <gannon.mcgibbon@gmail.com>2018-10-02 14:39:44 -0400
committerGannon McGibbon <gannon.mcgibbon@gmail.com>2018-10-02 15:31:29 -0400
commitc401c43850e79a4d994e22dd8d82a69612bb947f (patch)
treec48cf5beea7710c5c75e5fc238f7fb45d8fa2c6c /actionpack/lib
parent004fda35688015350eef6152d0c5dbfa3f26a713 (diff)
downloadrails-c401c43850e79a4d994e22dd8d82a69612bb947f.tar.gz
rails-c401c43850e79a4d994e22dd8d82a69612bb947f.tar.bz2
rails-c401c43850e79a4d994e22dd8d82a69612bb947f.zip
Fix call sites
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/railties/helpers.rb2
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/railties/helpers.rb b/actionpack/lib/action_controller/railties/helpers.rb
index fa746fa9e8..75938108d6 100644
--- a/actionpack/lib/action_controller/railties/helpers.rb
+++ b/actionpack/lib/action_controller/railties/helpers.rb
@@ -7,7 +7,7 @@ module ActionController
super
return unless klass.respond_to?(:helpers_path=)
- if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_helpers_paths) }
+ if namespace = klass.module_parents.detect { |m| m.respond_to?(:railtie_helpers_paths) }
paths = namespace.railtie_helpers_paths
else
paths = ActionController::Helpers.helpers_path
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 3b7611acc0..2c811b5e55 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -444,7 +444,7 @@ module ActionDispatch
end
def include_helpers_now(klass, include_path_helpers)
- namespace = klass.parents.detect { |m| m.respond_to?(:railtie_include_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)