summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-07-25 17:46:24 +0000
committerRobert Speicher <robert@gitlab.com>2017-07-25 17:46:24 +0000
commit886b0744949c9d10c21e39e192a0ec48c206fb40 (patch)
treef50fcc40fa18acff720611501a96e128aabd0318
parent3f21d03f26a5c4540adc349b63f9982413f09ee3 (diff)
parent96479cba5ac7d9b6a4b3364a29037e4e83fec25d (diff)
downloadgitlab-ce-886b0744949c9d10c21e39e192a0ec48c206fb40.tar.gz
Merge branch 'docs/remove-outdated-label-from-contributing-guide' into 'master'
Remove outdated ~Frontend label in CONTRIBUTING.md See merge request !13087
-rw-r--r--CONTRIBUTING.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a8499c126aa..12fb34b24be 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -114,8 +114,8 @@ scheduling into milestones. Labelling is a task for everyone.
Most issues will have labels for at least one of the following:
- Type: ~"feature proposal", ~bug, ~customer, etc.
-- Subject: ~wiki, ~"container registry", ~ldap, ~api, etc.
-- Team: ~CI, ~Discussion, ~Edge, ~Frontend, ~Platform, etc.
+- Subject: ~wiki, ~"container registry", ~ldap, ~api, ~frontend, etc.
+- Team: ~CI, ~Discussion, ~Edge, ~Platform, etc.
- Priority: ~Deliverable, ~Stretch
All labels, their meaning and priority are defined on the
@@ -278,7 +278,7 @@ For feature proposals for EE, open an issue on the
In order to help track the feature proposals, we have created a
[`feature proposal`][fpl] label. For the time being, users that are not members
of the project cannot add labels. You can instead ask one of the [core team]
-members to add the label `feature proposal` to the issue or add the following
+members to add the label ~"feature proposal" to the issue or add the following
code snippet right after your description in a new line: `~"feature proposal"`.
Please keep feature proposals as small and simple as possible, complex ones