diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 09:45:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 09:45:58 +0000 |
| commit | b320251af02e252bd45ea296ecba6569da541094 (patch) | |
| tree | 45ae67bbc5175f965b17b55179601821c1681f10 | |
| parent | 393a5bdafa26459006982869ee779825aadf4add (diff) | |
| download | gitlab-ce-b320251af02e252bd45ea296ecba6569da541094.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-4-stable-ee
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | CHANGELOG-EE.md | 7 | ||||
| -rw-r--r-- | VERSION | 2 |
3 files changed, 11 insertions, 3 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 diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index 48dc0827d0e..b6156f8d254 100644 --- a/CHANGELOG-EE.md +++ b/CHANGELOG-EE.md @@ -1,5 +1,12 @@ Please view this file on the master branch, on stable branches it's out of date. +## 12.4.2 + +### Fixed (1 change) + +- Fix feature flag check for productivity analytics. !19025 + + ## 12.4.1 ### Security (6 changes) @@ -1 +1 @@ -12.4.2 +12.4.2-ee |