Commit 4498fdb9 authored by GitLab Bot's avatar GitLab Bot

Add latest changes from gitlab-org/security/gitlab@12-6-stable-ee

parent a0094541
...@@ -25,3 +25,12 @@ sync-stable-branch: ...@@ -25,3 +25,12 @@ sync-stable-branch:
only: only:
refs: refs:
- /^[\d-]+-stable-ee$/@gitlab-org/gitlab - /^[\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
...@@ -4,7 +4,6 @@ entry. ...@@ -4,7 +4,6 @@ entry.
## 12.6.1 ## 12.6.1
- No changes.
### Fixed (2 changes) ### Fixed (2 changes)
- Handle forbidden error when checking for knative. !22170 - Handle forbidden error when checking for knative. !22170
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment