Add latest changes from gitlab-org/gitlab@master

6 files changed, 19 insertions, 19 deletions

diff --git a/doc/.vale/gitlab/CurrentStatus.yml b/doc/.vale/gitlab/CurrentStatus.yml
index 57b95dcf4ac..9972573b406 100644
--- a/doc/.vale/gitlab/CurrentStatus.yml
+++ b/doc/.vale/gitlab/CurrentStatus.yml
@@ -1,14 +1,13 @@
 ---
-# Suggestion: gitlab.CurrentStatus
+# Warning: gitlab.CurrentStatus
 #
 # Checks for words that indicate a product or feature may change in the future.
 #
 # For a list of all options, see https://vale.sh/docs/topics/styles/
 extends: existence
 message: "Remove '%s'. The documentation reflects the current state of the product."
-level: suggestion
+level: warning
 ignorecase: true
 link: https://docs.gitlab.com/ee/development/documentation/versions.html#promising-features-in-future-versions
 tokens:
   - currently
-  - yet
diff --git a/doc/.vale/gitlab/ElementDescriptors.yml b/doc/.vale/gitlab/ElementDescriptors.yml
index f3573f5ce65..f806f5878e1 100644
--- a/doc/.vale/gitlab/ElementDescriptors.yml
+++ b/doc/.vale/gitlab/ElementDescriptors.yml
@@ -1,13 +1,14 @@
 ---
-# Suggestion: gitlab.ElementDescriptors
+# Warning: gitlab.ElementDescriptors
 #
-# Suggests the correct way to describe elements in a form.
+# Suggests the correct way to describe a button.
 #
 # For a list of all options, see https://vale.sh/docs/topics/styles/
-extends: substitution
-message: "When describing elements, %s '%s'."
-link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#language
-level: suggestion
+extends: existence
+message: "If possible, rewrite to remove 'button'."
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html#button
+level: warning
 ignorecase: true
-swap:
-  button: 'if possible, rewrite to remove'
+scope: raw
+raw:
+  - \*\*.+?\*\* button
diff --git a/doc/.vale/gitlab/InclusionAbleism.yml b/doc/.vale/gitlab/InclusionAbleism.yml
index 7419430c8a2..3ee356155cd 100644
--- a/doc/.vale/gitlab/InclusionAbleism.yml
+++ b/doc/.vale/gitlab/InclusionAbleism.yml
@@ -1,5 +1,5 @@
 ---
-# Suggestion: gitlab.InclusionAbleism
+# Warning: gitlab.InclusionAbleism
 #
 # Suggests alternatives for words that foster ableism.
 #
@@ -7,7 +7,7 @@
 extends: substitution
 message: "Use inclusive language. Consider '%s' instead of '%s'."
 link: https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html
-level: suggestion
+level: warning
 ignorecase: true
 swap:
   sanity (?:check|test): check for completeness
diff --git a/doc/.vale/gitlab/InclusionGender.yml b/doc/.vale/gitlab/InclusionGender.yml
index ce8861b6a09..dcf8c1930ec 100644
--- a/doc/.vale/gitlab/InclusionGender.yml
+++ b/doc/.vale/gitlab/InclusionGender.yml
@@ -1,5 +1,5 @@
 ---
-# Suggestion: gitlab.InclusionGender
+# Warning: gitlab.InclusionGender
 #
 # Suggests alternatives for words that are gender-specific.
 #
@@ -7,7 +7,7 @@
 extends: substitution
 message: "Use inclusive language. Consider '%s' instead of '%s'."
 link: https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html
-level: suggestion
+level: warning
 ignorecase: true
 swap:
   mankind: humanity, people
diff --git a/doc/.vale/gitlab/Simplicity.yml b/doc/.vale/gitlab/Simplicity.yml
index 89169c1aa46..fd9b1c5e5a6 100644
--- a/doc/.vale/gitlab/Simplicity.yml
+++ b/doc/.vale/gitlab/Simplicity.yml
@@ -1,12 +1,12 @@
 ---
-# Suggestion: gitlab.Simplicity
+# Warning: gitlab.Simplicity
 #
 # Checks for words implying ease of use, to avoid cognitive dissonance for frustrated users.
 #
 # For a list of all options, see https://vale.sh/docs/topics/styles/
 extends: existence
 message: "Remove '%s'. Be precise instead of subjective."
-level: suggestion
+level: warning
 ignorecase: true
 link: https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html
 tokens:
diff --git a/doc/.vale/gitlab/Units.yml b/doc/.vale/gitlab/Units.yml
index 4211fdee38b..e6263ad66b4 100644
--- a/doc/.vale/gitlab/Units.yml
+++ b/doc/.vale/gitlab/Units.yml
@@ -1,5 +1,5 @@
 ---
-# Suggestion: gitlab.Units
+# Warning: gitlab.Units
 #
 # Recommends a space between a number and a unit of measure.
 #
@@ -8,7 +8,7 @@ extends: existence
 message: "Add a space between the number and the unit in '%s'."
 link: 'https://docs.gitlab.com/ee/development/documentation/styleguide/'
 nonword: true
-level: suggestion
+level: warning
 ignorecase: true
 tokens:
   - \d+(?:B|kB|KiB|MB|MiB|GB|GiB|TB|TiB)