Add latest changes from gitlab-org/gitlab@master

2 files changed, 40 insertions, 10 deletions

diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md
index b6fc0743ce7..6d75c4059d9 100644
--- a/doc/development/documentation/styleguide/word_list.md
+++ b/doc/development/documentation/styleguide/word_list.md
@@ -534,9 +534,12 @@ Use title case for **Geo**.
 
 Do not make **GitLab** possessive (GitLab's). This guidance follows [GitLab Trademark Guidelines](https://about.gitlab.com/handbook/marketing/brand-and-product-marketing/brand/brand-activation/trademark-guidelines/).
 
-## GitLab.com
+## GitLab Flavored Markdown
 
-**GitLab.com** refers to the GitLab instance managed by GitLab itself.
+When possible, spell out [**GitLab Flavored Markdown**](../../../user/markdown.md).
+([Vale](../testing.md#vale) rule: [`GLFM.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/SubstitutionSuggestions.yml))
+
+If you must abbreviate, do not use **GFM**. Use **GLFM** instead.
 
 ## GitLab Helm chart, GitLab chart
 
@@ -549,26 +552,30 @@ Do not use **the `gitlab` chart**, **the GitLab Chart**, or **the cloud-native c
 
 You use the **GitLab Helm chart** to deploy **cloud-native GitLab** in a Kubernetes cluster.
 
-## GitLab Flavored Markdown
+## GitLab Pages
 
-When possible, spell out [**GitLab Flavored Markdown**](../../../user/markdown.md).
-([Vale](../testing.md#vale) rule: [`GLFM.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/SubstitutionSuggestions.yml))
+For consistency and branding, use **GitLab Pages** rather than **Pages**.
 
-If you must abbreviate, do not use **GFM**. Use **GLFM** instead.
+However, if you use **GitLab Pages** for the first mention on a page or in the UI,
+you can use **Pages** thereafter.
+
+## GitLab Runner
+
+Use title case for **GitLab Runner**. This is the product you install. See also [runners](#runner-runners) and [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/233529).
 
 ## GitLab SaaS
 
 **GitLab SaaS** refers to the product license that provides access to GitLab.com. It does not refer to the
 GitLab instance managed by GitLab itself.
 
-## GitLab Runner
-
-Use title case for **GitLab Runner**. This is the product you install. See also [runners](#runner-runners) and [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/233529).
-
 ## GitLab self-managed
 
 Use **GitLab self-managed** to refer to the product license for GitLab instances managed by customers themselves.
 
+## GitLab.com
+
+**GitLab.com** refers to the GitLab instance managed by GitLab itself.
+
 ## guide
 
 We want to speak directly to users. On `docs.gitlab.com`, do not use **guide** as part of a page title.
diff --git a/doc/development/labels/index.md b/doc/development/labels/index.md
index 703a0f3fb95..2b18cefa123 100644
--- a/doc/development/labels/index.md
+++ b/doc/development/labels/index.md
@@ -158,6 +158,29 @@ Examples of feature labels are `~wiki`, `~ldap`, `~api`, `~issues`, and `~"merge
 
 Feature labels are all-lowercase.
 
+## Workflow labels
+
+Issues use the following workflow labels to specify the current issue status:
+
+- `~"workflow::awaiting security release"`
+- `~"workflow::blocked"`
+- `~"workflow::complete"`
+- `~"workflow::design"`
+- `~"workflow::feature-flagged"`
+- `~"workflow::in dev"`
+- `~"workflow::in review"`
+- `~"workflow::planning breakdown"`
+- `~"workflow::problem validation"`
+- `~"workflow::production"`
+- `~"workflow::ready for design"`
+- `~"workflow::ready for development"`
+- `~"workflow::refinement"`
+- `~"workflow::scheduling"`
+- `~"workflow::solution validation"`
+- `~"workflow::start"`
+- `~"workflow::validation backlog"`
+- `~"workflow::verification"`
+
 ## Facet labels
 
 To track additional information or context about created issues, developers may