Merge branch 'add-label-push-opts' into 'master'

Support adding and removing labels w/ push opts

Closes #5942

See merge request gitlab-org/gitlab-ce!31831

1 files changed, 19 insertions, 2 deletions

diff --git a/lib/gitlab/push_options.rb b/lib/gitlab/push_options.rb
index 682edfc4259..a2296d265cd 100644
--- a/lib/gitlab/push_options.rb
+++ b/lib/gitlab/push_options.rb
@@ -7,10 +7,12 @@ module Gitlab
         keys: [
           :create,
           :description,
+          :label,
           :merge_when_pipeline_succeeds,
           :remove_source_branch,
           :target,
-          :title
+          :title,
+          :unlabel
         ]
       },
       ci: {
@@ -18,6 +20,11 @@ module Gitlab
       }
     }).freeze
 
+    MULTI_VALUE_OPTIONS = [
+      %w[merge_request label],
+      %w[merge_request unlabel]
+    ].freeze
+
     NAMESPACE_ALIASES = HashWithIndifferentAccess.new({
       mr: :merge_request
     }).freeze
@@ -50,12 +57,22 @@ module Gitlab
         next if [namespace, key].any?(&:nil?)
 
         options[namespace] ||= HashWithIndifferentAccess.new
-        options[namespace][key] = value
+
+        if option_multi_value?(namespace, key)
+          options[namespace][key] ||= HashWithIndifferentAccess.new(0)
+          options[namespace][key][value] += 1
+        else
+          options[namespace][key] = value
+        end
       end
 
       options
     end
 
+    def option_multi_value?(namespace, key)
+      MULTI_VALUE_OPTIONS.any? { |arr| arr == [namespace, key] }
+    end
+
     def parse_option(option)
       parts = OPTION_MATCHER.match(option)
       return unless parts