Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 10 deletions

diff --git a/doc/ci/components/index.md b/doc/ci/components/index.md
index f20f2fd5e3f..e7c286a507b 100644
--- a/doc/ci/components/index.md
+++ b/doc/ci/components/index.md
@@ -68,8 +68,13 @@ The repository must contain:
   - In sub-directories containing `template.yml` files as entry points, for components
     that bundle together multiple related files. For example, `templates/secret-detection/template.yml`.
 
-Configure the project's `.gitlab-ci.yml` to [test the components](#test-the-component)
-and [release new versions](#publish-a-new-release).
+You should also:
+
+- Configure the project's `.gitlab-ci.yml` to [test the components](#test-the-component)
+  and [release new versions](#publish-a-new-release).
+- Add a `LICENSE.md` file with a license of your choice that covers the usage of your component.
+  For example the [MIT](https://opensource.org/license/mit/) or [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0#apply)
+  open source licenses.
 
 For example:
 
@@ -78,6 +83,7 @@ For example:
   ```plaintext
   ├── templates/
   │   └── my-component.yml
+  ├── LICENSE.md
   ├── README.md
   └── .gitlab-ci.yml
   ```
@@ -91,6 +97,7 @@ For example:
   │       ├── template.yml
   │       ├── Dockerfile
   │       └── test.sh
+  ├── LICENSE.md
   ├── README.md
   └── .gitlab-ci.yml
   ```
diff --git a/doc/ci/jobs/job_artifacts.md b/doc/ci/jobs/job_artifacts.md
index 7ad264f5823..6593335b63d 100644
--- a/doc/ci/jobs/job_artifacts.md
+++ b/doc/ci/jobs/job_artifacts.md
@@ -227,17 +227,21 @@ unless the report is added as a regular artifact with `artifacts:paths`.
 You can download the artifacts archive for a specific job with a publicly accessible
 URL for the [job artifacts API](../../api/job_artifacts.md#download-the-artifacts-archive).
 
-For example, to download the latest artifacts of a job named `build` in the `main` branch of a project on GitLab.com:
+For example:
 
-```plaintext
-https://gitlab.com/api/v4/projects/<project-id>/jobs/artifacts/main/download?job=build
-```
+- To download the latest artifacts of a job named `build` in the `main` branch of a project on GitLab.com:
 
-For example, to download the file `review/index.html` from the latest job named `build` in the `main` branch of a project on GitLab.com:
+  ```plaintext
+  https://gitlab.com/api/v4/projects/<project-id>/jobs/artifacts/main/download?job=build
+  ```
 
-```plaintext
-https://gitlab.com/api/v4/projects/<project-id>/jobs/artifacts/main/raw/review/index.html?job=build
-```
+- To download the file `review/index.html` from the latest job named `build` in the `main` branch of a project on GitLab.com:
+
+  ```plaintext
+  https://gitlab.com/api/v4/projects/<project-id>/jobs/artifacts/main/raw/review/index.html?job=build
+  ```
+
+  Files returned by this endpoint always have the `plain/text` content type.
 
 In both examples, replace `<project-id>` with a valid project ID, found at the top of the project details page.