diff options
| author | Richard Schneeman <richard.schneeman+no-recruiters@gmail.com> | 2018-10-04 11:37:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 11:37:32 -0500 |
| commit | cba27402388380d672199a1a46de0a06ef383332 (patch) | |
| tree | 5e940cd280d9b1fce027dbf2bc6390fb24e3a6c8 /actionpack/lib/abstract_controller | |
| parent | 47adad38166fc6cf6bd306ff0c2f20ea922dbae6 (diff) | |
| parent | 235e734e1ea1e8bc1f8dcf2f6a75126a48fccd7a (diff) | |
| download | rails-cba27402388380d672199a1a46de0a06ef383332.tar.gz rails-cba27402388380d672199a1a46de0a06ef383332.tar.bz2 rails-cba27402388380d672199a1a46de0a06ef383332.zip | |
Merge pull request #34064 from schneems/schneems/revert-7f870a5ba2aa9177aa4a0e03a9d027928ba60e49
Revert "Merge pull request #33970 from rails/eager-url-helpers"
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/railties/routes_helpers.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/railties/routes_helpers.rb b/actionpack/lib/abstract_controller/railties/routes_helpers.rb index c97be074c8..b6e5631a4e 100644 --- a/actionpack/lib/abstract_controller/railties/routes_helpers.rb +++ b/actionpack/lib/abstract_controller/railties/routes_helpers.rb @@ -7,8 +7,11 @@ module AbstractController Module.new do define_method(:inherited) do |klass| super(klass) - - routes.include_helpers klass, include_path_helpers + if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_routes_url_helpers) } + klass.include(namespace.railtie_routes_url_helpers(include_path_helpers)) + else + klass.include(routes.url_helpers(include_path_helpers)) + end end end end |