summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-15 09:45:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-15 09:45:58 +0000
commitb320251af02e252bd45ea296ecba6569da541094 (patch)
tree45ae67bbc5175f965b17b55179601821c1681f10 /.gitlab
parent393a5bdafa26459006982869ee779825aadf4add (diff)
downloadgitlab-ce-b320251af02e252bd45ea296ecba6569da541094.tar.gz
Add latest changes from gitlab-org/gitlab@12-4-stable-ee
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index e041c6a8a5d..c78c6a82815 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -145,7 +145,9 @@ schedule:review-deploy:
needs: ["schedule:review-build-cng"]
review-stop:
- extends: review-deploy
+ extends:
+ - .review-deploy-base
+ - .only-review
when: manual
environment:
action: stop
@@ -168,7 +170,6 @@ review-cleanup-failed-deployment:
extends: review-stop
stage: prepare
when: on_success
- needs: []
allow_failure: false
script:
- delete_failed_release