diff options
author | Nick Thomas <nick@gitlab.com> | 2019-04-09 12:53:07 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-04-09 12:53:07 +0000 |
commit | d95889b8a41037aa68250137b09b22b092776dfe (patch) | |
tree | 846932b5b0f86ec5edec5c9ebf2ac5bf8a9731f7 /lib/gitlab/ci | |
parent | 41adfde8ffa34eb45bd1d6f15ad6e80c8ef0f8a9 (diff) | |
parent | b5bcf80c9a7470ac36bdbefcb8056beff67712ae (diff) | |
download | gitlab-ce-d95889b8a41037aa68250137b09b22b092776dfe.tar.gz |
Merge branch '43263-git-push-option-to-create-mr' into 'master'
Git push options to create a merge request, set target_branch and set merge when pipeline succeeds
Closes #53198 and #43263
See merge request gitlab-org/gitlab-ce!26752
Diffstat (limited to 'lib/gitlab/ci')
-rw-r--r-- | lib/gitlab/ci/pipeline/chain/skip.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ci/pipeline/chain/skip.rb b/lib/gitlab/ci/pipeline/chain/skip.rb index 79bbcc1ed1e..7d6e0704d4a 100644 --- a/lib/gitlab/ci/pipeline/chain/skip.rb +++ b/lib/gitlab/ci/pipeline/chain/skip.rb @@ -8,7 +8,6 @@ module Gitlab include ::Gitlab::Utils::StrongMemoize SKIP_PATTERN = /\[(ci[ _-]skip|skip[ _-]ci)\]/i - SKIP_PUSH_OPTION = 'ci.skip' def perform! if skipped? @@ -35,7 +34,8 @@ module Gitlab end def push_option_skips_ci? - !!(@command.push_options&.include?(SKIP_PUSH_OPTION)) + @command.push_options.present? && + @command.push_options.deep_symbolize_keys.dig(:ci, :skip).present? end end end |