From ba7d4745e2a6489ddd33cdc827a2a095ab97fcb7 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Thu, 23 Jan 2020 15:42:50 +0000
Subject: Fix ruby 2.7 warning: The last argument is used as the keyword
 parameter (#32542, #31500).

Patch by Seiei Miyagi.


git-svn-id: http://svn.redmine.org/redmine/trunk@19454 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/import.rb                                     | 2 +-
 lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb | 2 +-
 lib/redmine/i18n.rb                                      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/import.rb b/app/models/import.rb
index 3244b13e2..61b3553f3 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -248,7 +248,7 @@ class Import < ActiveRecord::Base
     wrapper = settings['wrapper'].to_s
     csv_options[:quote_char] = wrapper if wrapper.size == 1
 
-    CSV.foreach(filepath, csv_options) do |row|
+    CSV.foreach(filepath, **csv_options) do |row|
       yield row if block_given?
     end
   end
diff --git a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
index 4df4b6ad4..7a3828042 100644
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -33,7 +33,7 @@ module Redmine
           attachable_options[:delete_permission] = options.delete(:delete_permission) || "edit_#{self.name.pluralize.underscore}".to_sym
 
           has_many :attachments, lambda {order("#{Attachment.table_name}.created_on ASC, #{Attachment.table_name}.id ASC")},
-                                 options.merge(:as => :container, :dependent => :destroy, :inverse_of => :container)
+                                 **options, as: :container, dependent: :destroy, inverse_of: :container
           send :include, Redmine::Acts::Attachable::InstanceMethods
           before_save :attach_saved_attachments
           after_rollback :detach_saved_attachments
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb
index 8343bccb0..c039fe3ec 100644
--- a/lib/redmine/i18n.rb
+++ b/lib/redmine/i18n.rb
@@ -29,7 +29,7 @@ module Redmine
         ::I18n.t(*args)
       when 2
         if args.last.is_a?(Hash)
-          ::I18n.t(*args)
+          ::I18n.t(*args.first, **args.last)
         elsif args.last.is_a?(String)
           ::I18n.t(args.first, :value => args.last)
         else
@@ -57,7 +57,7 @@ module Redmine
     def ll(lang, str, arg=nil)
       options = arg.is_a?(Hash) ? arg : {:value => arg}
       locale = lang.to_s.gsub(%r{(.+)\-(.+)$}) { "#{$1}-#{$2.upcase}" }
-      ::I18n.t(str.to_s, options.merge(:locale => locale))
+      ::I18n.t(str.to_s, **options, locale: locale)
     end
 
     # Localizes the given args with user's language
@@ -70,7 +70,7 @@ module Redmine
       return nil unless date
       options = {}
       options[:format] = Setting.date_format unless Setting.date_format.blank?
-      ::I18n.l(date.to_date, options)
+      ::I18n.l(date.to_date, **options)
     end
 
     def format_time(time, include_date=true, user=nil)
@@ -80,7 +80,7 @@ module Redmine
       options[:format] = (Setting.time_format.blank? ? :time : Setting.time_format)
       time = time.to_time if time.is_a?(String)
       local = user.convert_time_to_user_timezone(time)
-      (include_date ? "#{format_date(local)} " : "") + ::I18n.l(local, options)
+      (include_date ? "#{format_date(local)} " : "") + ::I18n.l(local, **options)
     end
 
     def format_hours(hours)
-- 
cgit v1.2.3