diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 21:09:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 21:09:21 +0000 |
| commit | 87af6f2e0590af0ed1bb3e5de1bb5d21855a94d2 (patch) | |
| tree | 2abe2661b10cf6281bc03855b3053a072c64fbbf /.gitlab | |
| parent | c43ba2677f41ad0b5fc6f3af6baf4266c70dfcb3 (diff) | |
| download | gitlab-ce-87af6f2e0590af0ed1bb3e5de1bb5d21855a94d2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/CODEOWNERS | 1 | ||||
| -rw-r--r-- | .gitlab/issue_templates/Security Release.md | 20 |
2 files changed, 5 insertions, 16 deletions
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 06b32856e0e..28ad2b41921 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -56,6 +56,7 @@ Dangerfile @gl-quality/eng-prod /lib/gitlab/danger/ @gl-quality/eng-prod /scripts/ @gl-quality/eng-prod /scripts/frontend/ @gl-quality/eng-prod @gitlab-org/maintainers/frontend +.editorconfig @gl-quality/eng-prod # Telemetry owner files /ee/lib/gitlab/usage_data_counters/ @gitlab-org/growth/telemetry diff --git a/.gitlab/issue_templates/Security Release.md b/.gitlab/issue_templates/Security Release.md index a3689bff450..b06f31f0e9a 100644 --- a/.gitlab/issue_templates/Security Release.md +++ b/.gitlab/issue_templates/Security Release.md @@ -4,6 +4,10 @@ Set the title to: `Security Release: 12.2.X, 12.1.X, and 12.0.X` --> +:warning: **Only Release Managers and members of the AppSec team can edit the description of this issue** + +------- + ## Releases tasks - https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/release-manager.md @@ -24,22 +28,6 @@ in the "Linked issues" section below this issue description. tracking issue, their merge requests may not be included in the security release. -## Issues in Omnibus-GitLab - -Omnibus security fixes need to be added manually to this issue description -using and below the following template: - -```markdown -* {https://gitlab.com/gitlab-org/security/gitlab/issues/ link} - -| Version | MR | -|---------|----| -| 12.2 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | -| 12.1 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | -| 12.0 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | -| master | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | -``` - ## QA {QA issue link} |