Add latest changes from gitlab-org/gitlab@master

5 files changed, 9 insertions, 6 deletions

diff --git a/doc/user/project/clusters/protect/container_host_security/quick_start_guide.md b/doc/user/project/clusters/protect/container_host_security/quick_start_guide.md
index d64ebfd9385..fa4a5fb61d0 100644
--- a/doc/user/project/clusters/protect/container_host_security/quick_start_guide.md
+++ b/doc/user/project/clusters/protect/container_host_security/quick_start_guide.md
@@ -77,5 +77,5 @@ necessary components with GMAv2 and the cluster management project.
 
 **Related documentation links:**
 
-- [GitLab Managed Apps v1 (GMAv1)](../../../../clusters/applications.md#install-with-one-click)
+- [GitLab Managed Apps v1 (GMAv1)](../../../../clusters/applications.md#install-with-one-click-deprecated)
 - [GitLab Managed Apps v2 (GMAv2)](../../../../clusters/management_project.md)
diff --git a/doc/user/project/clusters/protect/container_network_security/quick_start_guide.md b/doc/user/project/clusters/protect/container_network_security/quick_start_guide.md
index 1bfdf54ee51..bf419c69885 100644
--- a/doc/user/project/clusters/protect/container_network_security/quick_start_guide.md
+++ b/doc/user/project/clusters/protect/container_network_security/quick_start_guide.md
@@ -149,5 +149,5 @@ necessary components with GMAv2 and the cluster management project.
 
 **Related documentation links:**
 
-- [GitLab Managed Apps v1 (GMAv1)](../../../../clusters/applications.md#install-with-one-click)
+- [GitLab Managed Apps v1 (GMAv1)](../../../../clusters/applications.md#install-with-one-click-deprecated)
 - [GitLab Managed Apps v2 (GMAv2)](../../../../clusters/management_project.md)
diff --git a/doc/user/project/merge_requests/code_quality.md b/doc/user/project/merge_requests/code_quality.md
index 3f5823916a4..284d66dd591 100644
--- a/doc/user/project/merge_requests/code_quality.md
+++ b/doc/user/project/merge_requests/code_quality.md
@@ -53,20 +53,21 @@ See also the Code Climate list of [Supported Languages for Maintainability](http
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/267612) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.11.
 > - [Deployed behind a feature flag](../../../user/feature_flags.md), disabled by default.
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/284140) in GitLab 13.12.
 
 Changes to files in merge requests can cause Code Quality to fall if merged. In these cases,
 an indicator is displayed (**{information-o}** **Code Quality**) on the file in the merge request's diff view. For example:
 
 ![Code Quality MR diff report](img/code_quality_mr_diff_report_v13_11.png)
 
-To enable this feature, a GitLab administrator can run the following in a
+To disable this feature, a GitLab administrator can run the following in a
 [Rails console](../../../administration/operations/rails_console.md):
 
 ```ruby
 # For the instance
-Feature.enable(:codequality_mr_diff)
+Feature.disable(:codequality_mr_diff)
 # For a single project
-Feature.enable(:codequality_mr_diff, Project.find(<project id>))
+Feature.disable(:codequality_mr_diff, Project.find(<project id>))
 ```
 
 ## Use cases
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index 7c45fc26bf9..f5fa6e37d1c 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -39,7 +39,7 @@ Note the following:
   The Importing GitLab version must be greater than or equal to the Exporting GitLab version.
 - Imports fail unless the import and export GitLab instances are
   compatible as described in the [Version history](#version-history).
-- Exports are generated in your configured `shared_path`, a temporary [shared directory](../../../development/shared_files.md)
+- Exports are generated in your configured `shared_path`, a temporary shared directory,
   and are moved to your configured `uploads_directory`. Every 24 hours, a specific worker deletes these export files.
 - Group members are exported as project members, as long as the user has
   maintainer or administrator access to the group where the exported project lives.
diff --git a/doc/user/project/wiki/index.md b/doc/user/project/wiki/index.md
index a69141ac04d..22915efef94 100644
--- a/doc/user/project/wiki/index.md
+++ b/doc/user/project/wiki/index.md
@@ -182,6 +182,8 @@ GitLab tracks wiki creation, deletion, and update events. These events are displ
 [group](../../group/index.md#view-group-activity),
 and [project](../working_with_projects.md#project-activity) activity pages.
 
+Commits to wikis are not counted in [repository analytics](../../analytics/repository_analytics.md).
+
 ## Customize sidebar
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23109) in GitLab 13.8, the sidebar can be customized by selecting the **Edit sidebar** button.