Add latest changes from gitlab-org/gitlab@master

17 files changed, 54 insertions, 12 deletions

diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index d04688dab7a..ae4fa086e3f 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -1001,7 +1001,7 @@ to using that.
 
 ### Migrate Pages deployments to object storage
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/325285) in GitLab 13.11
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/325285) in GitLab 13.11.
 
 Existing Pages deployments objects (which store [ZIP archives](#zip-storage)) can similarly be
 migrated to [object storage](#using-object-storage), if
@@ -1010,7 +1010,7 @@ you've been having them stored locally.
 Migrate your existing Pages deployments from local storage to object storage:
 
 ```shell
-sudo gitlab-rails gitlab:pages:deployments:migrate_to_object_storage
+sudo gitlab-rake gitlab:pages:deployments:migrate_to_object_storage
 ```
 
 ### Rolling Pages deployments back to local storage
@@ -1018,7 +1018,7 @@ sudo gitlab-rails gitlab:pages:deployments:migrate_to_object_storage
 After the migration to object storage is performed, you can choose to revert your Pages deployments back to local storage:
 
 ```shell
-sudo gitlab-rails gitlab:pages:deployments:migrate_to_local
+sudo gitlab-rake gitlab:pages:deployments:migrate_to_local
 ```
 
 ## Backup
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 50c1356dfd8..d9aabfbc337 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -2016,6 +2016,41 @@ The returned `url` is relative to the project path. The returned `full_path` is
 the absolute path to the file. In Markdown contexts, the link is expanded when
 the format in `markdown` is used.
 
+### Max attachment size enforcement
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57250) in GitLab 13.11.
+
+GitLab 13.11 added enforcement of the [maximum attachment size limit](../user/admin_area/settings/account_and_limit_settings.md#max-attachment-size) behind the `enforce_max_attachment_size_upload_api` feature flag. GitLab 14.0 will enable this by default.
+
+**In Omnibus installations:**
+
+1. Enter the Rails console:
+
+   ```shell
+   sudo gitlab-rails console
+   ```
+
+1. Enable the feature flag:
+
+   ```ruby
+   Feature.enable(:enforce_max_attachment_size_upload_api)
+   ```
+
+**In installations from source:**
+
+1. Enter the Rails console:
+
+   ```shell
+   cd /home/git/gitlab
+   sudo -u git -H bundle exec rails console -e production
+   ```
+
+1. Enable the feature flag to disable the validation:
+
+   ```ruby
+   Feature.enable(:enforce_max_attachment_size_upload_api)
+   ```
+
 ## Upload a project avatar
 
 Uploads an avatar to the specified project.
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index ee80d998c14..eef18d6850d 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -48,7 +48,6 @@ the `author` field. GitLab team members **should not**.
 - Any client-facing change to our REST and GraphQL APIs **must** have a changelog entry. See the [complete list what comprises a GraphQL breaking change](api_graphql_styleguide.md#breaking-changes).
 - Any change that introduces an [Advanced Search migration](elasticsearch.md#creating-a-new-advanced-search-migration) **must** have a changelog entry.
 - Performance improvements **should** have a changelog entry.
-  also require a changelog entry.
 - _Any_ contribution from a community member, no matter how small, **may** have
   a changelog entry regardless of these guidelines if the contributor wants one.
   Example: "Fixed a typo on the search results page."
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index 731fec98933..e42180c2fc2 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -299,8 +299,10 @@ first time.
   of your shiny new branch, read through the entire diff. Does it make sense?
   Did you include something unrelated to the overall purpose of the changes? Did
   you forget to remove any debugging code?
-- Consider providing instructions on how to test the merge request. This can be
-  helpful for reviewers not familiar with the product feature or area of the codebase.
+- Write a detailed description as outlined in the [merge request guidelines](contributing/merge_request_workflow.md#merge-request-guidelines).
+  Some reviewers may not be familiar with the product feature or area of the
+  codebase. Thorough descriptions help all reviewers understand your request
+  and test effectively.
 - If you know your change depends on another being merged first, note it in the
   description and set an [merge request dependency](../user/project/merge_requests/merge_request_dependencies.md).
 - Be grateful for the reviewer's suggestions. (`Good call. I'll make that change.`)
diff --git a/doc/development/performance.md b/doc/development/performance.md
index e93dc26e4fc..889b803b934 100644
--- a/doc/development/performance.md
+++ b/doc/development/performance.md
@@ -257,8 +257,8 @@ The following configuration options can be configured:
   Defaults to `cpu`.
 - `STACKPROF_INTERVAL`: Sampling interval. Unit semantics depend on `STACKPROF_MODE`.
   For `object` mode this is a per-event interval (every `nth` event is sampled)
-  and defaults to `1000`.
-  For other modes such as `cpu` this is a frequency and defaults to `10000` μs (100hz).
+  and defaults to `100`.
+  For other modes such as `cpu` this is a frequency interval and defaults to `10100` μs (99hz).
 - `STACKPROF_FILE_PREFIX`: File path prefix where profiles are stored. Defaults
   to `$TMPDIR` (often corresponds to `/tmp`).
 - `STACKPROF_TIMEOUT_S`: Profiling timeout in seconds. Profiling will
diff --git a/doc/development/policies.md b/doc/development/policies.md
index c1a87990bc9..315878e19d9 100644
--- a/doc/development/policies.md
+++ b/doc/development/policies.md
@@ -68,7 +68,7 @@ Within the rule DSL, you can use:
 - `can?(:other_ability)` delegates to the rules that apply to `:other_ability`. Note that this is distinct from the instance method `can?`, which can check dynamically - this only configures a delegation to another ability.
 
 `~`, `&` and `|` operators are overridden methods in
-[`DeclarativePolicy::Rule::Base`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/declarative_policy/rule.rb).
+[`DeclarativePolicy::Rule::Base`](https://gitlab.com/gitlab-org/declarative-policy/-/blob/main/lib/declarative_policy/rule.rb).
 
 Do not use boolean operators such as `&&` and `||` within the rule DSL,
 as conditions within rule blocks are objects, not booleans. The same
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 7fde3915bf5..70ec349399a 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -838,3 +838,9 @@ You may have to set a password on the `root` user to prevent automatic redirects
 ### "The change you requested was rejected (422)"
 
 If you see this page when trying to set a password via the web interface, make sure `external_url` in `gitlab.rb` matches the domain you are making a request from, and run `sudo gitlab-ctl reconfigure` after making any changes to it.
+
+### Some job logs are not uploaded to object storage
+
+When the GitLab deployment is scaled up to more than one node, some job logs may not be uploaded to [object storage](../../administration/object_storage.md) properly. [Incremental logging is required](../../administration/object_storage.md#incremental-logging-is-required-for-ci-to-use-object-storage) for CI to use object storage. 
+
+Enable [incremental logging](../../administration/job_logs.md#enabling-incremental-logging) if it has not already been enabled. 
diff --git a/doc/update/mysql_to_postgresql.md b/doc/update/mysql_to_postgresql.md
index 9a367d218f0..cbe2381e8db 100644
--- a/doc/update/mysql_to_postgresql.md
+++ b/doc/update/mysql_to_postgresql.md
@@ -4,7 +4,7 @@ group: Database
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Migrating from MySQL to PostgreSQL
+# Migrating from MySQL to PostgreSQL **(FREE SELF)**
 
 This guide documents how to take a working GitLab instance that uses MySQL and
 migrate it to a PostgreSQL database.
diff --git a/doc/update/upgrading_postgresql_using_slony.md b/doc/update/upgrading_postgresql_using_slony.md
index c9f8f83749c..2cddaa5da8b 100644
--- a/doc/update/upgrading_postgresql_using_slony.md
+++ b/doc/update/upgrading_postgresql_using_slony.md
@@ -4,7 +4,7 @@ group: Database
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Upgrading PostgreSQL Using Slony
+# Upgrading PostgreSQL Using Slony **(FREE SELF)**
 
 This guide describes the steps one can take to upgrade their PostgreSQL database
 to the latest version without the need for hours of downtime. This guide assumes
diff --git a/doc/user/admin_area/img/abuse_reports_page_v13_11.png b/doc/user/admin_area/img/abuse_reports_page_v13_11.png
index bcb2aec9e64..ef57f45ab77 100644
--- a/doc/user/admin_area/img/abuse_reports_page_v13_11.png
+++ b/doc/user/admin_area/img/abuse_reports_page_v13_11.png
diff --git a/doc/user/analytics/img/code_review_analytics_v13_11.png b/doc/user/analytics/img/code_review_analytics_v13_11.png
index e337afa3ace..b559b934a89 100644
--- a/doc/user/analytics/img/code_review_analytics_v13_11.png
+++ b/doc/user/analytics/img/code_review_analytics_v13_11.png
diff --git a/doc/user/analytics/img/issues_created_per_month_v13_11.png b/doc/user/analytics/img/issues_created_per_month_v13_11.png
index 01ebde5a54d..da3340bfdc2 100644
--- a/doc/user/analytics/img/issues_created_per_month_v13_11.png
+++ b/doc/user/analytics/img/issues_created_per_month_v13_11.png
diff --git a/doc/user/compliance/compliance_dashboard/img/compliance_dashboard_v13_11.png b/doc/user/compliance/compliance_dashboard/img/compliance_dashboard_v13_11.png
index 95e176b71b8..73a5c92670a 100644
--- a/doc/user/compliance/compliance_dashboard/img/compliance_dashboard_v13_11.png
+++ b/doc/user/compliance/compliance_dashboard/img/compliance_dashboard_v13_11.png
diff --git a/doc/user/group/insights/img/insights_example_stacked_bar_chart_v13_11.png b/doc/user/group/insights/img/insights_example_stacked_bar_chart_v13_11.png
index 1ef49191a13..ff18a3e86a5 100644
--- a/doc/user/group/insights/img/insights_example_stacked_bar_chart_v13_11.png
+++ b/doc/user/group/insights/img/insights_example_stacked_bar_chart_v13_11.png
diff --git a/doc/user/group/roadmap/img/roadmap_filters_v13_11.png b/doc/user/group/roadmap/img/roadmap_filters_v13_11.png
index d2a76b4edce..e45c7b2b5dd 100644
--- a/doc/user/group/roadmap/img/roadmap_filters_v13_11.png
+++ b/doc/user/group/roadmap/img/roadmap_filters_v13_11.png
diff --git a/doc/user/img/snippet_intro_v13_11.png b/doc/user/img/snippet_intro_v13_11.png
index aa2ad5fd43a..4b6818341b7 100644
--- a/doc/user/img/snippet_intro_v13_11.png
+++ b/doc/user/img/snippet_intro_v13_11.png
diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md
index 980c5417da6..f6857623bc4 100644
--- a/doc/user/project/repository/repository_mirroring.md
+++ b/doc/user/project/repository/repository_mirroring.md
@@ -22,7 +22,7 @@ There are two kinds of repository mirroring supported by GitLab:
 When the mirror repository is updated, all new branches, tags, and commits are visible in the
 project's activity feed.
 
-Users with at least [Developer access](../../permissions.md) to the project can also force an
+Users with [Maintainer access](../../permissions.md) to the project can also force an
 immediate update, unless:
 
 - The mirror is already being updated.