Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 2 deletions

diff --git a/doc/ci/components/index.md b/doc/ci/components/index.md
index aeee871612f..a3d6d7224e4 100644
--- a/doc/ci/components/index.md
+++ b/doc/ci/components/index.md
@@ -34,7 +34,7 @@ If a component requires different versioning from other components, the componen
 To create a components repository, you must:
 
 1. [Create a new project](../../user/project/index.md#create-a-blank-project) with a `README.md` file.
-1. Create either a single file or a templates directory according to the [directory structure](#directory-structure).
+1. Add a YAML configuration file for each component, following the [required directory structure](#directory-structure).
 
    For example:
 
diff --git a/doc/ci/secure_files/index.md b/doc/ci/secure_files/index.md
index a666e0aca7b..d2ce98ad048 100644
--- a/doc/ci/secure_files/index.md
+++ b/doc/ci/secure_files/index.md
@@ -56,3 +56,8 @@ test:
   script:
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
 ```
+
+WARNING:
+The content of files loaded with the `download-secure-files` tool are not [masked](../variables/index.md#mask-a-cicd-variable)
+in the job log output. Make sure to avoid outputting secure file contents in the job log,
+especially when logging output that could contain sensitive information.
diff --git a/doc/ci/troubleshooting.md b/doc/ci/troubleshooting.md
index 24e3e6ad315..cc7e5594466 100644
--- a/doc/ci/troubleshooting.md
+++ b/doc/ci/troubleshooting.md
@@ -230,7 +230,7 @@ The configuration can be added to:
   job_name:
     hooks:
       pre_get_sources_script:
-        - git config --local http.version "HTTP/1.1"
+        - git config --global http.version "HTTP/1.1"
   ```
 
 - The [runner's `config.toml`](https://docs.gitlab.com/runner/configuration/advanced-configuration.html)