Merge pull request #32170 from koic/deprecate_safe_level_of_erb_new_i…

…n_ruby_2_6

Deprecate safe_level of `ERB.new` in Ruby 2.6

railties/lib/rails/generators/migration.rb

@@ -63,7 +63,12 @@ def migration_template(source, destination, config = {})
         numbered_destination = File.join(dir, ["%migration_number%", base].join("_"))
 
         create_migration numbered_destination, nil, config do
-          ERB.new(::File.binread(source), nil, "-", "@output_buffer").result(context)
+          match = ERB.version.match(/\Aerb\.rb \[(?<version>[^ ]+) /)
+          if match && match[:version] >= "2.2.0" # 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)
+          end
         end
       end
     end

tasks/release.rb

@@ -247,6 +247,12 @@ def rc?
 
     require "erb"
     template = File.read("../tasks/release_announcement_draft.erb")
-    puts ERB.new(template, nil, "<>").result(binding)
+
+    match = ERB.version.match(/\Aerb\.rb \[(?<version>[^ ]+) /)
+    if match && match[:version] >= "2.2.0" # Ruby 2.6+
+      puts ERB.new(template, trim_mode: "<>").result(binding)
+    else
+      puts ERB.new(template, nil, "<>").result(binding)
+    end
   end
 end