aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-02-01 14:16:55 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-02-01 14:20:11 +0900
commit7ebfb319ffbfc1f9d3dc5439052ae06019bf4290 (patch)
tree64d61f0307323d11f46e8ca153d3eed8e8355d00 /railties
parent6127b8d9203d7ce852d103ff1686621f9aca292f (diff)
downloadrails-7ebfb319ffbfc1f9d3dc5439052ae06019bf4290.tar.gz
rails-7ebfb319ffbfc1f9d3dc5439052ae06019bf4290.tar.bz2
rails-7ebfb319ffbfc1f9d3dc5439052ae06019bf4290.zip
Enable `Lint/ErbNewArguments` cop to avoid the deprecated arguments warning
Related 5754a29a974d31cab2b4392716b9825a3d910a69. And follows Ruby standard library style https://github.com/ruby/ruby/commit/3406c5d.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/migration.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/migration.rb b/railties/lib/rails/generators/migration.rb
index 5081060895..b6ec0160cf 100644
--- a/railties/lib/rails/generators/migration.rb
+++ b/railties/lib/rails/generators/migration.rb
@@ -63,8 +63,7 @@ module Rails
numbered_destination = File.join(dir, ["%migration_number%", base].join("_"))
create_migration numbered_destination, nil, config do
- match = ERB.version.match(/\Aerb\.rb \[(?<version>[^ ]+) /)
- if match && match[:version] >= "2.2.0" # Ruby 2.6+
+ if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
ERB.new(::File.binread(source), trim_mode: "-", eoutvar: "@output_buffer").result(context)
else
ERB.new(::File.binread(source), nil, "-", "@output_buffer").result(context)