diff options
author | Xavier Noria <fxn@hashref.com> | 2014-07-30 23:08:59 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2014-07-30 23:08:59 +0200 |
commit | bd944e078d0f40e26d66b03da1449ff9cdcc101b (patch) | |
tree | 23d3b309dd1ac152047fb38d0d3107177b7c6c8a /actionpack/lib/abstract_controller/railties | |
parent | 30194a5b475ea91f9709f64a08e6645cedbe4cb5 (diff) | |
parent | 2bbcca004cc232cef868cd0e301f274ce5638df0 (diff) | |
download | rails-bd944e078d0f40e26d66b03da1449ff9cdcc101b.tar.gz rails-bd944e078d0f40e26d66b03da1449ff9cdcc101b.tar.bz2 rails-bd944e078d0f40e26d66b03da1449ff9cdcc101b.zip |
Merge pull request #15840 from schneems/schneems/deprecate-mailer_path_methods
Deprecate `*_path` methods in mailers
Diffstat (limited to 'actionpack/lib/abstract_controller/railties')
-rw-r--r-- | actionpack/lib/abstract_controller/railties/routes_helpers.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/abstract_controller/railties/routes_helpers.rb b/actionpack/lib/abstract_controller/railties/routes_helpers.rb index 6684f46f64..568c47e43a 100644 --- a/actionpack/lib/abstract_controller/railties/routes_helpers.rb +++ b/actionpack/lib/abstract_controller/railties/routes_helpers.rb @@ -1,14 +1,14 @@ module AbstractController module Railties module RoutesHelpers - def self.with(routes) + def self.with(routes, include_path_helpers = true) Module.new do define_method(:inherited) do |klass| super(klass) if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_routes_url_helpers) } - klass.send(:include, namespace.railtie_routes_url_helpers) + klass.send(:include, namespace.railtie_routes_url_helpers(include_path_helpers)) else - klass.send(:include, routes.url_helpers) + klass.send(:include, routes.url_helpers(include_path_helpers)) end end end |