Add latest changes from gitlab-org/gitlab@master

2 files changed, 20 insertions, 5 deletions

diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 3686b9b39e1..6764c44546c 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -986,6 +986,10 @@ The above script will:
 > - Blocking manual actions were introduced in GitLab 9.0.
 > - Protected actions were introduced in GitLab 9.2.
 
+NOTE: **Note:**
+Using `when:manual` and `trigger` together will result in the error `jobs:#{job-name} when should be on_success, on_failure or always`.
+This is because `when:manual` will prevent any trigger from being used.
+
 Manual actions are a special type of job that are not executed automatically,
 they need to be explicitly started by a user. An example usage of manual actions
 would be a deployment to a production environment. Manual actions can be started
@@ -2064,6 +2068,10 @@ job split into three separate jobs.
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/8997) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.8.
 
+NOTE: **Note:**
+Using a `trigger` with `when:manual` together it will result in the error `jobs:#{job-name} when should be on_success, on_failure or always`.
+This is because `when:manual` will prevent any trigger from being used.
+
 `trigger` allows you to define downstream pipeline trigger. When a job created
 from `trigger` definition is started by GitLab, a downstream pipeline gets
 created.
diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md
index 286fedd5f61..4877ff4db87 100644
--- a/doc/development/documentation/styleguide.md
+++ b/doc/development/documentation/styleguide.md
@@ -216,11 +216,18 @@ Do not include the same information in multiple places. [Link to a SSOT instead.
 - Be clear, concise, and stick to the goal of the doc.
 - Write in US English.
 - Capitalize "G" and "L" in GitLab.
-- Use title case when referring to [features](https://about.gitlab.com/features/) or
-  [products](https://about.gitlab.com/pricing/) (e.g., GitLab Runner, Geo,
-  Issue Boards, GitLab Core, Git, Prometheus, Kubernetes, etc), and methods or methodologies
-  (e.g., Continuous Integration, Continuous Deployment, Scrum, Agile, etc). Note that
-  some features are also objects (e.g. "GitLab's Merge Requests support X." and "Create a new merge request for Z.").
+- Use title case when referring to:
+  - [GitLab Features](https://about.gitlab.com/features/). For example, Issue Board,
+    Geo, and Runner.
+  - GitLab [product tiers](https://about.gitlab.com/pricing/). For example, GitLab Core
+    and GitLab Ultimate.
+  - Third-party products. For example, Prometheus, Kubernetes, and Git.
+  - Methods or methodologies. For example, Continuous Integration, Continuous
+    Deployment, Scrum, and Agile.
+
+NOTE: **Note:**
+Some features are also objects. For example, "GitLab's Merge Requests support X." and
+"Create a new merge request for Z.".
 
 ## Text