diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-30 11:43:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-30 11:43:55 +0000 |
| commit | f11adf549084bda61fbbb8e3e6a84504173d3739 (patch) | |
| tree | 1b530dff697604982ad58b1bfacd76965a731f30 | |
| parent | a0094541f8725b2f9852086033be08d20caa4f01 (diff) | |
| download | gitlab-ce-f11adf549084bda61fbbb8e3e6a84504173d3739.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-6-stable-ee
| -rw-r--r-- | .gitlab/ci/releases.gitlab-ci.yml | 9 | ||||
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | VERSION | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/.gitlab/ci/releases.gitlab-ci.yml b/.gitlab/ci/releases.gitlab-ci.yml index 17bfaf5cc89..d4e0236f3a8 100644 --- a/.gitlab/ci/releases.gitlab-ci.yml +++ b/.gitlab/ci/releases.gitlab-ci.yml @@ -25,3 +25,12 @@ sync-stable-branch: only: refs: - /^[\d-]+-stable-ee$/@gitlab-org/gitlab + +sync-security-branch: + extends: .merge-train-sync + variables: + SOURCE_PROJECT: gitlab-org/security/gitlab + TARGET_PROJECT: gitlab-org/security/gitlab-foss + only: + refs: + - /^[\d-]+-stable-ee$/@gitlab-org/security/gitlab diff --git a/CHANGELOG.md b/CHANGELOG.md index c15baafe742..2336cddc352 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ entry. ## 12.6.1 -- No changes. ### Fixed (2 changes) - Handle forbidden error when checking for knative. !22170 @@ -1 +1 @@ -12.6.1 +12.6.1-ee |