summaryrefslogtreecommitdiff
path: root/lib/gitlab/push_options.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 15:06:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 15:06:17 +0000
commitb5ad06174bb1de39438c90847abb86ac6988e944 (patch)
tree1bb386b92f023fd2a8f776ccc10386675b3b1ef9 /lib/gitlab/push_options.rb
parent0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1 (diff)
downloadgitlab-ce-b5ad06174bb1de39438c90847abb86ac6988e944.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/push_options.rb')
-rw-r--r--lib/gitlab/push_options.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/push_options.rb b/lib/gitlab/push_options.rb
index 93c0f3132d0..333f848df9b 100644
--- a/lib/gitlab/push_options.rb
+++ b/lib/gitlab/push_options.rb
@@ -16,11 +16,12 @@ module Gitlab
]
},
ci: {
- keys: [:skip]
+ keys: [:skip, :variable]
}
}).freeze
MULTI_VALUE_OPTIONS = [
+ %w[ci variable],
%w[merge_request label],
%w[merge_request unlabel]
].freeze