diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 21:06:41 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 21:06:41 +0000 |
commit | 08f4ce10c04d705148a7e14556443b9e3aee6821 (patch) | |
tree | ba58b29874803db12ebec690fb4416b6208ee750 /.gitlab | |
parent | b4cdff15ca53312ccbbafe4effac85b1ee4420ae (diff) | |
download | gitlab-ce-08f4ce10c04d705148a7e14556443b9e3aee6821.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 50b29db6e8f..ce34cfb39a8 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -19,6 +19,7 @@ package-and-qa-manual: except: refs: - master + - /^\d+-\d+-auto-deploy-\d+$/ when: manual needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] @@ -29,6 +30,7 @@ package-and-qa: except: refs: - master + - /^\d+-\d+-auto-deploy-\d+$/ needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true |