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 /actionmailer/test | |
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 'actionmailer/test')
-rw-r--r-- | actionmailer/test/abstract_unit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 7681679dc7..c4d5cb8c33 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -15,7 +15,7 @@ require 'mail' # Emulate AV railtie require 'action_view' -ActionMailer::Base.send(:include, ActionView::Layouts) +ActionMailer::Base.include(ActionView::Layouts) # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true |