summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-06-12 18:42:29 +0200
committerRémy Coutable <remy@rymai.me>2019-06-12 18:56:22 +0200
commitfb28f2cc6d7b52f363e13f84941f399c99109ae1 (patch)
tree8f2d588626269465f85bc137ca8acde385ac6066
parent72c6695a3e9e8455dab22d6ef034a802b7c1d7a5 (diff)
downloadgitlab-ce-docs-scope-bug-feature-backstage-security-labels.tar.gz
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--.gitlab/issue_templates/Security Release.md2
-rw-r--r--.gitlab/issue_templates/Security developer workflow.md2
-rw-r--r--.gitlab/merge_request_templates/Security Release.md2
-rw-r--r--doc/development/contributing/issue_workflow.md4
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab/issue_templates/Security Release.md b/.gitlab/issue_templates/Security Release.md
index ae469d3b125..d371f6379f2 100644
--- a/.gitlab/issue_templates/Security Release.md
+++ b/.gitlab/issue_templates/Security Release.md
@@ -65,5 +65,5 @@ gitlab.com: {https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/ link}
## Email notification
{https://gitlab.com/gitlab-com/marketing/general/issues/ link}
-/label ~security
+/label ~"type::security"
/confidential
diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md
index 7857afb66c2..7ffc19657c9 100644
--- a/.gitlab/issue_templates/Security developer workflow.md
+++ b/.gitlab/issue_templates/Security developer workflow.md
@@ -67,4 +67,4 @@ Set the title to: `Description of the original issue`
[security process for developers]: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md
[RM list]: https://about.gitlab.com/release-managers/
-/label ~security
+/label ~"type::security"
diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md
index 42314f9b2dd..e5e72287a4d 100644
--- a/.gitlab/merge_request_templates/Security Release.md
+++ b/.gitlab/merge_request_templates/Security Release.md
@@ -32,4 +32,4 @@ manually merging CE into EE is no longer required.
- [ ] Correct milestone is applied and the title is matching across all backports
- [ ] Assigned to `@gitlab-release-tools-bot` with passing CI pipelines
-/label ~security
+/label ~"type::security"
diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md
index e59215ad868..06f9cc3dbab 100644
--- a/doc/development/contributing/issue_workflow.md
+++ b/doc/development/contributing/issue_workflow.md
@@ -27,7 +27,7 @@ labels, you can _always_ add the team and type, and often also the subject.
Type labels are very important. They define what kind of issue this is. Every
issue should have one or more.
-Examples of type labels are ~"type::feature", ~"type::bug", ~security,
+Examples of type labels are ~"type::feature", ~"type::bug", ~"type::security",
and ~direction.
A number of type labels have a priority assigned to them, which automatically
@@ -165,7 +165,7 @@ Priority labels help us define the time a ~"type::bug" fix should be completed.
If there are multiple defects, the priority decides which defect has to be fixed immediately versus later.
This label documents the planned timeline & urgency which is used to measure against our actual SLA on delivering ~"type::bug" fixes.
-| Label | Meaning | Defect SLA (applies only to ~"type::bug" and ~security defects) |
+| Label | Meaning | Defect SLA (applies only to ~"type::bug" and ~"type::security" defects) |
|-------|-----------------|----------------------------------------------------------------------------|
| ~P1 | Urgent Priority | The current release + potentially immediate hotfix to GitLab.com (30 days) |
| ~P2 | High Priority | The next release (60 days) |