summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-10 05:46:43 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-10 05:46:43 +0000
commit2aad2f0504633ac70069bb0e1f8739c140417fa6 (patch)
tree18d41469a41d4fa4dd765e2d986a7d97d083a60d
parent46015c1540f26cdf58f98e078a898d298d1ea5ae (diff)
parent2835688f89728a8b20352e8cb6d0270f451ed16a (diff)
downloadgitlab-ce-2aad2f0504633ac70069bb0e1f8739c140417fa6.tar.gz
Merge branch 'default-label-documentation' into 'master'
Clarify the features for generating default label sets ## What does this MR do? * Split out the information regarding the label set that GitLab can generate * Add information for the labels view in the Admin panel ## Are there points in the code the reviewer needs to double check? * Please ensure that the newly added section relating to the Admin area seems relevant * Please verify adherence to the documentation styleguide ## Why was this MR needed? Documentation regarding default label sets was missing ## What are the relevant issue numbers? Closes #1865 See merge request !5736
-rw-r--r--doc/user/admin_area/img/admin_labels.pngbin0 -> 91459 bytes
-rw-r--r--doc/user/admin_area/labels.md9
-rw-r--r--doc/user/project/labels.md32
3 files changed, 31 insertions, 10 deletions
diff --git a/doc/user/admin_area/img/admin_labels.png b/doc/user/admin_area/img/admin_labels.png
new file mode 100644
index 00000000000..1ee33a534ab
--- /dev/null
+++ b/doc/user/admin_area/img/admin_labels.png
Binary files differ
diff --git a/doc/user/admin_area/labels.md b/doc/user/admin_area/labels.md
new file mode 100644
index 00000000000..9e2a89ebdf6
--- /dev/null
+++ b/doc/user/admin_area/labels.md
@@ -0,0 +1,9 @@
+# Labels
+
+## Default Labels
+
+### Define your own default Label Set
+
+Labels that are created within the Labels view on the Admin Dashboard will be automatically added to each new project.
+
+![Default label set](img/admin_labels.png)
diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md
index 1259a16330b..0f7e9eede19 100644
--- a/doc/user/project/labels.md
+++ b/doc/user/project/labels.md
@@ -22,26 +22,38 @@ created yet.
![Generate new labels](img/labels_generate.png)
+Creating a new label from scratch is as easy as pressing the **New label**
+button. From there on you can choose the name, give it an optional description,
+a color and you are set.
+
+When you are ready press the **Create label** button to create the new label.
+
+![New label](img/labels_new_label.png)
+
---
-You can skip that and create a new label or click that link and GitLab will
-generate a set of predefined labels for you. There 8 default generated labels
+## Default Labels
+
+It's possible to populate the labels for your project from a set of predefined labels.
+
+### Generate GitLab's predefined label set
+
+![Generate new labels](img/labels_generate.png)
+
+Click the link to 'Generate a default set of labels' and GitLab will
+generate a set of predefined labels for you. There are 8 default generated labels
in total and you can see them in the screenshot below.
![Default generated labels](img/labels_default.png)
---
-You can see that from the labels page you can have an overview of the number of
-issues and merge requests assigned to each label.
-
-Creating a new label from scratch is as easy as pressing the **New label**
-button. From there on you can choose the name, give it an optional description,
-a color and you are set.
+## Labels Overview
-When you are ready press the **Create label** button to create the new label.
+![Default generated labels](img/labels_default.png)
-![New label](img/labels_new_label.png)
+You can see that from the labels page you can have an overview of the number of
+issues and merge requests assigned to each label.
## Prioritize labels