diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-02-01 08:42:22 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-02-01 08:42:22 -0800 |
| commit | aa8ade5811db1873a6091f3aa6282e77d22d9d3e (patch) | |
| tree | ae6272f67eddcc6293579542c6e1e8dc993bd30f /actionpack/lib/abstract_controller | |
| parent | 82e710f8471622bd3f3d1640e42ad14f9c9309b9 (diff) | |
| parent | fdeef19833ce47b03bcb792f1850f6233f050b9f (diff) | |
| download | rails-aa8ade5811db1873a6091f3aa6282e77d22d9d3e.tar.gz rails-aa8ade5811db1873a6091f3aa6282e77d22d9d3e.tar.bz2 rails-aa8ade5811db1873a6091f3aa6282e77d22d9d3e.zip | |
Merge branch 'master' into mdluo-master
* master:
Move required error message and changelog to Active Record
Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846
Use Module#include instead of send :include, since now is a public method [ci skip]
:scissors: warning from controller renderer test
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/railties/routes_helpers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/railties/routes_helpers.rb b/actionpack/lib/abstract_controller/railties/routes_helpers.rb index 568c47e43a..14b574e322 100644 --- a/actionpack/lib/abstract_controller/railties/routes_helpers.rb +++ b/actionpack/lib/abstract_controller/railties/routes_helpers.rb @@ -6,9 +6,9 @@ module AbstractController 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(include_path_helpers)) + klass.include(namespace.railtie_routes_url_helpers(include_path_helpers)) else - klass.send(:include, routes.url_helpers(include_path_helpers)) + klass.include(routes.url_helpers(include_path_helpers)) end end end |