Replace Hash#merge! with Hash#[]= (#34160).

git-svn-id: http://svn.redmine.org/redmine/trunk@20175 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 8 insertions, 8 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9f6317f42..2e54fbefe 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1401,16 +1401,16 @@ module ApplicationHelper
     args << {} unless args.last.is_a?(Hash)
     options = args.last
     if args.first.is_a?(Symbol)
-      options.merge!(:as => args.shift)
+      options[:as] = args.shift
     end
-    options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
+    options[:builder] = Redmine::Views::LabelledFormBuilder
     form_for(*args, &proc)
   end
 
   def labelled_fields_for(*args, &proc)
     args << {} unless args.last.is_a?(Hash)
     options = args.last
-    options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
+    options[:builder] = Redmine::Views::LabelledFormBuilder
     fields_for(*args, &proc)
   end
 
diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index eb3f01138..c37082587 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -23,14 +23,14 @@ module AvatarsHelper
   def assignee_avatar(user, options={})
     return '' unless user
 
-    options.merge!(:title => l(:field_assigned_to) + ": " + user.name)
+    options[:title] = l(:field_assigned_to) + ": " + user.name
     avatar(user, options).to_s.html_safe
   end
 
   def author_avatar(user, options={})
     return '' unless user
 
-    options.merge!(:title => l(:field_author) + ": " + user.name)
+    options[:title] = l(:field_author) + ": " + user.name
     avatar(user, options).to_s.html_safe
   end
 
@@ -38,7 +38,7 @@ module AvatarsHelper
   # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
   def avatar(user, options = { })
     if Setting.gravatar_enabled?
-      options.merge!(:default => Setting.gravatar_default)
+      options[:default] = Setting.gravatar_default
       options[:class] = GravatarHelper::DEFAULT_OPTIONS[:class] + " " + options[:class] if options[:class]
       email = nil
       if user.respond_to?(:mail)
diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index be908562b..1e0c1b07e 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -190,7 +190,7 @@ module CustomFieldsHelper
     api.array :custom_fields do
       custom_values.each do |custom_value|
         attrs = {:id => custom_value.custom_field_id, :name => custom_value.custom_field.name}
-        attrs.merge!(:multiple => true) if custom_value.custom_field.multiple?
+        attrs[:multiple] = true if custom_value.custom_field.multiple?
         api.custom_field attrs do
           if custom_value.value.is_a?(Array)
             api.array :value do
diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index 21ee21d49..5cfe93a86 100644
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -35,7 +35,7 @@ module WorkflowsHelper
     end
     all_tag_options = {:value => 'all', :selected => (selected == 'all')}
     if multiple
-      all_tag_options.merge!(:style => "display:none;")
+      all_tag_options[:style] = "display:none;"
     end
     option_tags << content_tag('option', l(:label_all), all_tag_options)
     option_tags << options_from_collection_for_select(objects, "id", "name", selected)