summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-01 18:06:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-01 18:06:00 +0000
commit77a73903aa803869d0ab7fe544cc2d8b1a6aa1e0 (patch)
tree0773f62090b7a896b29b8b08152565ba976716a8 /.gitlab
parentded8ee5a09a1a02209adf179ac7d6e456703726a (diff)
downloadgitlab-ce-77a73903aa803869d0ab7fe544cc2d8b1a6aa1e0.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 05e974ccfb5..a790dd3e02f 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -150,7 +150,10 @@ schedule:review-deploy:
needs: ["schedule:review-build-cng"]
.base-review-stop:
- extends: .review-workflow-base
+ extends:
+ - .review-workflow-base
+ - .only-review
+ - .only:changes-code-qa
environment:
action: stop
variables:
@@ -164,7 +167,7 @@ schedule:review-deploy:
- source utils.sh
- source review-apps.sh
-review-cleanup-failed-deployment:
+review-stop-failed-deployment:
extends: .base-review-stop
stage: prepare
script:
@@ -172,6 +175,7 @@ review-cleanup-failed-deployment:
review-stop:
extends: .base-review-stop
+ stage: review
when: manual
allow_failure: true
script: