summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-10-24 05:33:23 +0000
committerGo MAEDA <maeda@farend.jp>2020-10-24 05:33:23 +0000
commitb46953247da61845d7cd4600435c21012409aafb (patch)
tree8d08d093f1a45904940d99eca649c21a233db867 /lib
parent52cc3fdc24dbb3814b6924323c032051ddac941e (diff)
downloadredmine-b46953247da61845d7cd4600435c21012409aafb.tar.gz
redmine-b46953247da61845d7cd4600435c21012409aafb.zip
Replace Hash#merge! with Hash#[]= (#34160).
git-svn-id: http://svn.redmine.org/redmine/trunk@20175 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/access_control.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/access_control.rb b/lib/redmine/access_control.rb
index 727e60c27..46b3bc048 100644
--- a/lib/redmine/access_control.rb
+++ b/lib/redmine/access_control.rb
@@ -84,7 +84,7 @@ module Redmine
def permission(name, hash, options={})
@permissions ||= []
- options.merge!(:project_module => @project_module)
+ options[:project_module] = @project_module
@permissions << Permission.new(name, hash, options)
end