Add latest changes from gitlab-org/gitlab@master

4 files changed, 9 insertions, 24 deletions

diff --git a/doc/api/labels.md b/doc/api/labels.md
index eb8ec906ec1..3ced7da8ed5 100644
--- a/doc/api/labels.md
+++ b/doc/api/labels.md
@@ -7,6 +7,8 @@ The `description_html` - was added to response JSON in [GitLab 12.7](https://git
 
 Get all labels for a given project.
 
+By default, this request returns 20 results at a time because the API results [are paginated](README.md#pagination).
+
 ```plaintext
 GET /projects/:id/labels
 ```
diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md
index 12267b4ab9f..16cabae353e 100644
--- a/doc/ci/caching/index.md
+++ b/doc/ci/caching/index.md
@@ -39,8 +39,9 @@ runtime dependencies needed to compile the project:
 - `artifacts`: **Use for stage results that will be passed between stages.**
 
   Artifacts are files generated by a job which are stored and uploaded, and can then
-  be fetched and used by jobs in later stages of the **same pipeline**. This data
-  will not be available in different pipelines, but is available to be downloaded
+  be fetched and used by jobs in later stages of the **same pipeline**. In other words,
+  [you can't create an artifact in job-A in stage-1, and then use this artifact in job-B in stage-1](https://gitlab.com/gitlab-org/gitlab/-/issues/25837).
+  This data will not be available in different pipelines, but is available to be downloaded
   from the UI.
 
 The name `artifacts` sounds like it's only useful outside of the job, like for downloading
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index f23f1858883..e54063e3eed 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -403,7 +403,9 @@ instance and project. In addition, all admins can use the admin interface under
 | See events in the system              |                 |             |          | ✓      |
 | Admin interface                       |                 |             |          | ✓      |
 
-1. Only if the job was triggered by the user
+1. Only if the job was:
+   - Triggered by the user
+   - [Since GitLab 13.0](https://gitlab.com/gitlab-org/gitlab/-/issues/35069), not run for a protected branch
 
 ### Job permissions
 
diff --git a/doc/user/project/merge_requests/versions.md b/doc/user/project/merge_requests/versions.md
index 2f51af24a95..84934148bdc 100644
--- a/doc/user/project/merge_requests/versions.md
+++ b/doc/user/project/merge_requests/versions.md
@@ -57,7 +57,7 @@ source and target branch can be shown mixed together making it hard to
 understand which changes are being added and which already exist in the
 target branch.
 
-In GitLab 12.10, we added an **experimental** comparison mode, which
+In GitLab 12.10, we added a comparison mode, which
 shows a diff calculated by simulating how it would look like once merged - a more accurate
 representation of the changes rather than using the base of the two
 branches. The new mode is available from the comparison target drop down
@@ -67,26 +67,6 @@ current default comparison.
 
 ![Merge request versions compare HEAD](img/versions_compare_head_v12_10.png)
 
-### Enable or disable `HEAD` comparison mode **(CORE ONLY)**
-
-`HEAD` comparison mode is under development and not ready for production use. It is
-deployed behind a feature flag that is **disabled by default**.
-[GitLab administrators with access to the GitLab Rails console](../../../administration/troubleshooting/navigating_gitlab_via_rails_console.md#starting-a-rails-console-session)
-can enable it for your instance. You're welcome to test it, but use it at your
-own risk.
-
-To enable it:
-
-```ruby
-Feature.enable(:diff_compare_with_head)
-```
-
-To disable it:
-
-```ruby
-Feature.disable(:diff_compare_with_head)
-```
-
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues