summaryrefslogtreecommitdiffstats
path: root/lib/plugins
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-01-23 15:42:50 +0000
committerGo MAEDA <maeda@farend.jp>2020-01-23 15:42:50 +0000
commitba7d4745e2a6489ddd33cdc827a2a095ab97fcb7 (patch)
tree3020b481610dc3537c2cdf05775d50c3dd8e2cb7 /lib/plugins
parent0aaf07ac6d4cfbf0a81c3570668c8b4fa21dce38 (diff)
downloadredmine-ba7d4745e2a6489ddd33cdc827a2a095ab97fcb7.tar.gz
redmine-ba7d4745e2a6489ddd33cdc827a2a095ab97fcb7.zip
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
Diffstat (limited to 'lib/plugins')
-rw-r--r--lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb2
1 files changed, 1 insertions, 1 deletions
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