Add latest changes from gitlab-org/gitlab@master

3 files changed, 25 insertions, 20 deletions

diff --git a/doc/ci/quick_start/index.md b/doc/ci/quick_start/index.md
index 8d800d49be3..257e170b0a5 100644
--- a/doc/ci/quick_start/index.md
+++ b/doc/ci/quick_start/index.md
@@ -165,8 +165,3 @@ To view your pipeline:
   ![Job details](img/job_details_v13_6.png)
 
 If the job status is `stuck`, check to ensure a runner is properly configured for the project.
-
-> To learn more about GitLab CI/CD, check out these video walkthroughs:
->
-> - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>&nbsp;Watch [First time GitLab & CI/CD](https://www.youtube.com/watch?v=kTNfi5z6Uvk&t=150s).
-> - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>&nbsp;Watch [Intro to GitLab CI](https://www.youtube.com/watch?v=l5705U8s_nQ&t=358s).
diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md
index 3bc6d104e04..34dde9df59d 100644
--- a/doc/development/documentation/styleguide/word_list.md
+++ b/doc/development/documentation/styleguide/word_list.md
@@ -347,11 +347,13 @@ Use instead of **sub-group**.
 
 ## that
 
-Do not use. For example:
+Do not use when describing a noun. For example:
 
-- Avoid: The file that you save...
+- Avoid: The file **that** you save...
 - Use instead: The file you save...
 
+See also [this, these, that, those](#this-these-that-those).
+
 ## there is, there are
 
 Try to avoid. These phrases hide the subject.
@@ -365,6 +367,22 @@ Avoid the use of gender-specific pronouns, unless referring to a specific person
 Use a singular [they](https://developers.google.com/style/pronouns#gender-neutral-pronouns) as
 a gender-neutral pronoun.
 
+## this, these, that, those
+
+Always follow these words with a noun. For example:
+
+- Avoid: **This** improves performance.
+- Use instead: **This setting** improves performance.
+
+- Avoid: **These** are the best.
+- Use instead: **These pants** are the best.
+
+- Avoid: **That** is the one you are looking for.
+- Use instead: **That Jedi** is the one you are looking for.
+
+- Avoid: **Those** need to be configured.
+- Use instead: **Those settings** need to be configured. (Or even better, **Configure those settings.**)
+
 ## to-do item
 
 Use lowercase. ([Vale](../testing.md#vale) rule: [`ToDo.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/ToDo.yml))
diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index bc5655cb1c7..02545607c9c 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -636,25 +636,17 @@ include:
   - template: Dependency-Scanning.gitlab-ci.yml
 
 stages:
-  - .pre
   - test
 
 variables:
   PIP_REQUIREMENTS_FILE: "requirements-converted.txt"
 
-convert-poetry:
-  stage: .pre
-  image: python:3-slim
-  script:
+gemnasium-python-dependency_scanning:
+  # Work around https://gitlab.com/gitlab-org/gitlab/-/issues/7006
+  before_script:
     - pip install poetry  # Or via another method: https://python-poetry.org/docs/#installation
-    - poetry export --output "$PIP_REQUIREMENTS_FILE"
-  artifacts:
-    paths:
-      - "$PIP_REQUIREMENTS_FILE"
-
-dependency_scanning:
-  stage: test
-  dependencies: ["convert-poetry"]
+    - poetry export --output="$PIP_REQUIREMENTS_FILE"
+    - rm poetry.lock pyproject.toml
 ```
 
 ### `Error response from daemon: error processing tar file: docker-tar: relocation error`