Automatic merge of gitlab-org/gitlab-ce master

lib/gitlab/push_options.rb

@@ -56,6 +56,13 @@ module Gitlab
 
         next if [namespace, key].any?(&:nil?)
 
+        store_option_info(options, namespace, key, value)
+      end
+
+      options
+    end
+
+    def store_option_info(options, namespace, key, value)
       options[namespace] ||= HashWithIndifferentAccess.new
 
       if option_multi_value?(namespace, key)
@@ -66,9 +73,6 @@ module Gitlab
       end
     end
 
-      options
-    end
-
     def option_multi_value?(namespace, key)
       MULTI_VALUE_OPTIONS.any? { |arr| arr == [namespace, key] }
     end