Add latest changes from gitlab-org/gitlab@master

14 files changed, 75 insertions, 8 deletions

diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index 612ead3d26b..c3d496c7a42 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -366,6 +366,10 @@ Pages access control is disabled by default. To enable it:
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
 1. Users can now configure it in their [projects' settings](../../user/project/pages/pages_access_control.md).
 
+NOTE: **Important:**
+For multi-node setups, in order for this setting to be effective, it has to be applied
+to all the App nodes as well as the Sidekiq nodes.
+
 #### Disabling public access to all Pages websites
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32095) in GitLab 12.7.
diff --git a/doc/api/oauth2.md b/doc/api/oauth2.md
index 0bf7ae399f0..cc8b31ecf17 100644
--- a/doc/api/oauth2.md
+++ b/doc/api/oauth2.md
@@ -173,11 +173,14 @@ the following parameters:
 }
 ```
 
+Also you must use HTTP Basic authentication using the `client_id` and`client_secret`
+values to authenticate the client that performs a request.
+
 Example cURL request:
 
 ```shell
 echo 'grant_type=password&username=<your_username>&password=<your_password>' > auth.txt
-curl --data "@auth.txt" --request POST "https://gitlab.example.com/oauth/token"
+curl --data "@auth.txt" --user client_id:client_secret --request POST "https://gitlab.example.com/oauth/token"
 ```
 
 Then, you'll receive the access token back in the response:
@@ -190,6 +193,8 @@ Then, you'll receive the access token back in the response:
 }
 ```
 
+By default, the scope of the access token is `api`, which provides complete read/write access.
+
 For testing, you can use the `oauth2` Ruby gem:
 
 ```ruby
diff --git a/doc/ci/cloud_deployment/index.md b/doc/ci/cloud_deployment/index.md
index e59846e0f12..a1e722b131e 100644
--- a/doc/ci/cloud_deployment/index.md
+++ b/doc/ci/cloud_deployment/index.md
@@ -7,13 +7,18 @@ type: howto
 
 # Cloud deployment
 
-Interacting with a major cloud provider such as Amazon AWS may have become a much needed task that's
+Interacting with a major cloud provider may have become a much needed task that's
 part of your delivery process. GitLab is making this process less painful by providing Docker images
 that come with the needed libraries and tools pre-installed.
 By referencing them in your CI/CD pipeline, you'll be able to interact with your chosen
 cloud provider more easily.
 
-## Run AWS commands from GitLab CI/CD
+## AWS
+
+GitLab provides Docker images to simplify working with AWS, and a template to make
+it easier to [deploy to AWS](#deploy-your-application-to-the-aws-elastic-container-service-ecs).
+
+### Run AWS commands from GitLab CI/CD
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31167) in GitLab 12.6.
 
@@ -54,7 +59,7 @@ Some credentials are required to be able to run `aws` commands:
    Container Registry](../../user/packages/container_registry/index.md) and is
    ready to use. Alternatively, replace the image with one hosted on AWS ECR.
 
-## Use an AWS Elastic Container Registry (ECR) image in your CI/CD
+### Use an AWS Elastic Container Registry (ECR) image in your CI/CD
 
 Instead of referencing an image hosted on the GitLab Registry, you can
 reference an image hosted on any third-party registry, such as the
@@ -65,7 +70,7 @@ repository](https://docs.aws.amazon.com/AmazonECR/latest/userguide/docker-push-e
 Then reference it in your `.gitlab-ci.yml` file and replace the `image`
 path to point to your ECR image.
 
-## Deploy your application to the AWS Elastic Container Service (ECS)
+### Deploy your application to the AWS Elastic Container Service (ECS)
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207962) in GitLab 12.9.
 
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index 07855a789a6..1cb5af8f74d 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -442,7 +442,7 @@ In addition to this, links to some objects are also recognized and formatted. So
 
 - Comments on issues: `"https://gitlab.com/gitlab-org/gitlab/-/issues/1234#note_101075757"`, which will be rendered as `#1234 (note1)`
 - The issues designs tab: `"https://gitlab.com/gitlab-org/gitlab/-/issues/1234/designs"`, which will be rendered as `#1234 (designs)`.
-  **(PREMIUM)**
+- Links to individual designs: `"https://gitlab.com/gitlab-org/gitlab/-/issues/1234/designs/layout.png"`, which will be rendered as `#1234[layout.png]`.
 
 ### Task lists
 
diff --git a/doc/user/packages/container_registry/img/container_registry_group_repositories_v13_1.png b/doc/user/packages/container_registry/img/container_registry_group_repositories_v13_1.png
index 3ac0407cb2e..bbbba44eb9b 100644
--- a/doc/user/packages/container_registry/img/container_registry_group_repositories_v13_1.png
+++ b/doc/user/packages/container_registry/img/container_registry_group_repositories_v13_1.png
diff --git a/doc/user/packages/container_registry/img/container_registry_repositories_v13_1.png b/doc/user/packages/container_registry/img/container_registry_repositories_v13_1.png
index 2f07db80a2d..13a6d1a4470 100644
--- a/doc/user/packages/container_registry/img/container_registry_repositories_v13_1.png
+++ b/doc/user/packages/container_registry/img/container_registry_repositories_v13_1.png
diff --git a/doc/user/packages/container_registry/img/container_registry_repositories_with_quickstart_v13_1.png b/doc/user/packages/container_registry/img/container_registry_repositories_with_quickstart_v13_1.png
index 0fe575e12aa..35a02182a77 100644
--- a/doc/user/packages/container_registry/img/container_registry_repositories_with_quickstart_v13_1.png
+++ b/doc/user/packages/container_registry/img/container_registry_repositories_with_quickstart_v13_1.png
diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md
index dda1bc35159..ac887e7d988 100644
--- a/doc/user/project/issues/design_management.md
+++ b/doc/user/project/issues/design_management.md
@@ -176,3 +176,44 @@ Different discussions have different pin numbers:
 
 From GitLab 12.5 on, new discussions will be outputted to the issue activity,
 so that everyone involved can participate in the discussion.
+
+## Referring to designs in Markdown
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/217160) in **GitLab 13.1**.
+> - It is deployed behind a feature flag, disabled by default.
+> - It is disabled on GitLab.com.
+> - It is not recommended for production use.
+> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-design-references-core-only). **(CORE ONLY)**
+
+We support referring to designs in [Markdown](../../markdown.md), which is available
+throughout the application, including in merge request and issue descriptions, in discussions and comments, and in wiki pages.
+
+At present, full URL references are supported. For example, if we refer to a design
+somewhere with:
+
+```markdown
+See http://gitlab.com/your-group/your-project/-/issues/123/designs/homescreen.png
+```
+
+This will be rendered as:
+
+> See [#123[homescreen.png]](http://gitlab.com/your-group/your-project/-/issues/123/designs/homescreen.png)
+
+### Enable or disable design references **(CORE ONLY)**
+
+Design reference parsing 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/feature_flags.md)
+can enable it for your instance.
+
+To enable it:
+
+```ruby
+Feature.enable(:design_management_reference_filter_gfm_pipeline)
+```
+
+To disable it:
+
+```ruby
+Feature.disable(:design_management_reference_filter_gfm_pipeline)
+```
diff --git a/doc/user/project/operations/alert_management.md b/doc/user/project/operations/alert_management.md
index 2dcf72aaf01..fae834e589b 100644
--- a/doc/user/project/operations/alert_management.md
+++ b/doc/user/project/operations/alert_management.md
@@ -72,8 +72,20 @@ You will need at least Developer [permissions](../../permissions.md) to view Ale
 
 Navigate to the Alert Management detail view by visiting the [Alert Management list](#alert-management-list) and selecting an Alert from the list.
 
-![Alert Management Detail View](img/alert_detail_v13_0.png)
+![Alert Management Detail Overview](img/alert_detail_overview_v13_1.png)
+
+![Alert Management Full Details](img/alert_detail_full_v13_1.png)
 
 ### Update an Alert's status
 
-The Alert Management detail view allows users to update the Alert Status. See [Alert Management statuses](#alert-management-statuses) for more details.
+The Alert Management detail view enables you to update the Alert Status.
+See [Alert Management statuses](#alert-management-statuses) for more details.
+
+### Create an Issue from an Alert
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/217745) in GitLab 13.1.
+
+The Alert Management detail view enables you to create an issue with a
+description automatically populated from an alert. To create the issue,
+click the **Create Issue** button. You can then view the issue from the
+alert by clicking the **View Issue** button.
diff --git a/doc/user/project/operations/img/alert_detail_full_v13_1.png b/doc/user/project/operations/img/alert_detail_full_v13_1.png
new file mode 100644
index 00000000000..18a6f4fb67b
--- /dev/null
+++ b/doc/user/project/operations/img/alert_detail_full_v13_1.png
diff --git a/doc/user/project/operations/img/alert_detail_overview_v13_1.png b/doc/user/project/operations/img/alert_detail_overview_v13_1.png
new file mode 100644
index 00000000000..10c945d3810
--- /dev/null
+++ b/doc/user/project/operations/img/alert_detail_overview_v13_1.png
diff --git a/doc/user/project/operations/img/alert_detail_v13_0.png b/doc/user/project/operations/img/alert_detail_v13_0.png
deleted file mode 100644
index 7da09407cd5..00000000000
--- a/doc/user/project/operations/img/alert_detail_v13_0.png
+++ /dev/null
diff --git a/doc/user/project/operations/img/alert_issue_v13_1.png b/doc/user/project/operations/img/alert_issue_v13_1.png
new file mode 100644
index 00000000000..da79074aa2f
--- /dev/null
+++ b/doc/user/project/operations/img/alert_issue_v13_1.png
diff --git a/doc/user/project/operations/img/alert_management_1_v13_1.png b/doc/user/project/operations/img/alert_management_1_v13_1.png
index c01b4749eda..3adc5e799eb 100644
--- a/doc/user/project/operations/img/alert_management_1_v13_1.png
+++ b/doc/user/project/operations/img/alert_management_1_v13_1.png