diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-31 21:16:33 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-31 21:16:33 -0700 |
| commit | ad83233eee3a5beb48919a91b4c109ff8c145f6b (patch) | |
| tree | 2aef8dd1b83a5729118fe829836207ff91fb3045 /actionview/lib | |
| parent | f6160cf0506fb49d4340f0e9b7bfe0430a9750d3 (diff) | |
| parent | ce8efcf296479b506ff36695398f6c88ea3c9e72 (diff) | |
| download | rails-ad83233eee3a5beb48919a91b4c109ff8c145f6b.tar.gz rails-ad83233eee3a5beb48919a91b4c109ff8c145f6b.tar.bz2 rails-ad83233eee3a5beb48919a91b4c109ff8c145f6b.zip | |
Merge pull request #18767 from robertomiranda/ruby-2.2
Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/railtie.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/test_case.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index 81f9c40b85..ee3dce24b7 100644 --- a/actionview/lib/action_view/railtie.rb +++ b/actionview/lib/action_view/railtie.rb @@ -38,7 +38,7 @@ module ActionView initializer "action_view.setup_action_pack" do |app| ActiveSupport.on_load(:action_controller) do - ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor) + ActionView::RoutingUrlFor.include(ActionDispatch::Routing::UrlFor) end end diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb index 812b011bd7..06810ad14d 100644 --- a/actionview/lib/action_view/test_case.rb +++ b/actionview/lib/action_view/test_case.rb @@ -204,7 +204,7 @@ module ActionView def view @view ||= begin view = @controller.view_context - view.singleton_class.send :include, _helpers + view.singleton_class.include(_helpers) view.extend(Locals) view.rendered_views = self.rendered_views view.output_buffer = self.output_buffer |