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 /railties/lib/rails/generators | |
| 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 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/resource_helpers.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 4c53248762..057c8b0aec 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -127,7 +127,7 @@ module Rails def builder @builder ||= begin builder_class = get_builder_class - builder_class.send(:include, ActionMethods) + builder_class.include(ActionMethods) builder_class.new(self) end end diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb index 3f84d76ae0..9c2037783e 100644 --- a/railties/lib/rails/generators/resource_helpers.rb +++ b/railties/lib/rails/generators/resource_helpers.rb @@ -8,7 +8,7 @@ module Rails module ResourceHelpers # :nodoc: def self.included(base) #:nodoc: - base.send :include, Rails::Generators::ModelHelpers + base.include(Rails::Generators::ModelHelpers) base.class_option :model_name, type: :string, desc: "ModelName to be used" end |