summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorMike Lewis <mlewis@gitlab.com>2019-01-30 18:29:17 +0000
committerMike Lewis <mlewis@gitlab.com>2019-01-30 18:29:17 +0000
commit8205f1e18b01a6d4d69511340c132f53767ff737 (patch)
tree71e991b355d9ee7eb0395ef0aad7dc682f1127ba /.gitlab
parentad8b8aa98c180fae478984529c0bafdb4cc43a74 (diff)
parentb1336149758929bf9158071570b5274f7911066c (diff)
downloadgitlab-ce-8205f1e18b01a6d4d69511340c132f53767ff737.tar.gz
Merge branch 'master' into 'template-improvements-for-documentation'
# Conflicts: # .gitlab/issue_templates/Feature proposal.md
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/issue_templates/Coding style proposal.md (renamed from .gitlab/issue_templates/Add style proposal.md)0
-rw-r--r--.gitlab/issue_templates/Feature proposal.md26
2 files changed, 24 insertions, 2 deletions
diff --git a/.gitlab/issue_templates/Add style proposal.md b/.gitlab/issue_templates/Coding style proposal.md
index 1a3be44bea0..1a3be44bea0 100644
--- a/.gitlab/issue_templates/Add style proposal.md
+++ b/.gitlab/issue_templates/Coding style proposal.md
diff --git a/.gitlab/issue_templates/Feature proposal.md b/.gitlab/issue_templates/Feature proposal.md
index b0e428ea580..3cd800907a3 100644
--- a/.gitlab/issue_templates/Feature proposal.md
+++ b/.gitlab/issue_templates/Feature proposal.md
@@ -4,8 +4,30 @@
### Target audience
-<!-- For whom are we doing this? Include either a persona from https://design.gitlab.com/research/personas or define a specific company role, e.g. "Release Manager" or "Security Analyst".
-Use the persona labels as well https://gitlab.com/groups/gitlab-org/-/labels?utf8=%E2%9C%93&subscribed=&search=persona%3A -->
+<!--- For whom are we doing this? Include a [persona](https://design.gitlab.com/research/personas)
+listed below, if applicable, along with its [label](https://gitlab.com/groups/gitlab-org/-/labels?utf8=%E2%9C%93&subscribed=&search=persona%3A),
+or define a specific company role, e.g. "Release Manager".
+
+Existing personas are: (copy relevant personas out of this comment, and delete any persona that does not apply)
+
+- Parker, Product Manager, https://design.gitlab.com/research/personas#persona-parker
+/label ~"Persona: Product Manager"
+
+- Delaney, Development Team Lead, https://design.gitlab.com/research/personas#persona-delaney
+/label ~"Persona: Development Team Lead"
+
+- Sasha, Software Developer, https://design.gitlab.com/research/personas#persona-sasha
+/label ~"Persona: Software developer"
+
+- Devon, DevOps Engineer, https://design.gitlab.com/research/personas#persona-devon
+/label ~"Persona: DevOps Engineer"
+
+- Sidney, Systems Administrator, https://design.gitlab.com/research/personas#persona-sidney
+/label ~"Persona: Systems Administrator"
+
+- Sam, Security Analyst, https://design.gitlab.com/research/personas#persona-sam
+/label ~"Persona: Security Analyst"
+-->
### Further details