Add latest changes from gitlab-org/gitlab@master

14 files changed, 93 insertions, 34 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 7335b35f432..8c9b7fda260 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -17066,7 +17066,7 @@ type ProjectPermissions {
 
 type ProjectStatistics {
   """
-  Build artifacts size of the project
+  Build artifacts size of the project in bytes
   """
   buildArtifactsSize: Float!
 
@@ -17076,32 +17076,37 @@ type ProjectStatistics {
   commitCount: Float!
 
   """
-  Large File Storage (LFS) object size of the project
+  Large File Storage (LFS) object size of the project in bytes
   """
   lfsObjectsSize: Float!
 
   """
-  Packages size of the project
+  Packages size of the project in bytes
   """
   packagesSize: Float!
 
   """
-  Repository size of the project
+  Repository size of the project in bytes
   """
   repositorySize: Float!
 
   """
-  Snippets size of the project
+  Snippets size of the project in bytes
   """
   snippetsSize: Float
 
   """
-  Storage size of the project
+  Storage size of the project in bytes
   """
   storageSize: Float!
 
   """
-  Wiki size of the project
+  Uploads size of the project in bytes
+  """
+  uploadsSize: Float
+
+  """
+  Wiki size of the project in bytes
   """
   wikiSize: Float
 }
@@ -18886,6 +18891,11 @@ type RootStorageStatistics {
   storageSize: Float!
 
   """
+  The uploads size in bytes
+  """
+  uploadsSize: Float!
+
+  """
   The wiki size in bytes
   """
   wikiSize: Float!
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 4539c6806e1..7fdf1c2baec 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -49615,7 +49615,7 @@
           "fields": [
             {
               "name": "buildArtifactsSize",
-              "description": "Build artifacts size of the project",
+              "description": "Build artifacts size of the project in bytes",
               "args": [
 
               ],
@@ -49651,7 +49651,7 @@
             },
             {
               "name": "lfsObjectsSize",
-              "description": "Large File Storage (LFS) object size of the project",
+              "description": "Large File Storage (LFS) object size of the project in bytes",
               "args": [
 
               ],
@@ -49669,7 +49669,7 @@
             },
             {
               "name": "packagesSize",
-              "description": "Packages size of the project",
+              "description": "Packages size of the project in bytes",
               "args": [
 
               ],
@@ -49687,7 +49687,7 @@
             },
             {
               "name": "repositorySize",
-              "description": "Repository size of the project",
+              "description": "Repository size of the project in bytes",
               "args": [
 
               ],
@@ -49705,7 +49705,7 @@
             },
             {
               "name": "snippetsSize",
-              "description": "Snippets size of the project",
+              "description": "Snippets size of the project in bytes",
               "args": [
 
               ],
@@ -49719,7 +49719,7 @@
             },
             {
               "name": "storageSize",
-              "description": "Storage size of the project",
+              "description": "Storage size of the project in bytes",
               "args": [
 
               ],
@@ -49736,8 +49736,22 @@
               "deprecationReason": null
             },
             {
+              "name": "uploadsSize",
+              "description": "Uploads size of the project in bytes",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Float",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "wikiSize",
-              "description": "Wiki size of the project",
+              "description": "Wiki size of the project in bytes",
               "args": [
 
               ],
@@ -54534,6 +54548,24 @@
               "deprecationReason": null
             },
             {
+              "name": "uploadsSize",
+              "description": "The uploads size in bytes",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Float",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "wikiSize",
               "description": "The wiki size in bytes",
               "args": [
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index f0e0d56d47d..aee92a019c3 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -2435,14 +2435,15 @@ Represents a Project Membership.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `buildArtifactsSize` | Float! | Build artifacts size of the project |
+| `buildArtifactsSize` | Float! | Build artifacts size of the project in bytes |
 | `commitCount` | Float! | Commit count of the project |
-| `lfsObjectsSize` | Float! | Large File Storage (LFS) object size of the project |
-| `packagesSize` | Float! | Packages size of the project |
-| `repositorySize` | Float! | Repository size of the project |
-| `snippetsSize` | Float | Snippets size of the project |
-| `storageSize` | Float! | Storage size of the project |
-| `wikiSize` | Float | Wiki size of the project |
+| `lfsObjectsSize` | Float! | Large File Storage (LFS) object size of the project in bytes |
+| `packagesSize` | Float! | Packages size of the project in bytes |
+| `repositorySize` | Float! | Repository size of the project in bytes |
+| `snippetsSize` | Float | Snippets size of the project in bytes |
+| `storageSize` | Float! | Storage size of the project in bytes |
+| `uploadsSize` | Float | Uploads size of the project in bytes |
+| `wikiSize` | Float | Wiki size of the project in bytes |
 
 ### PrometheusAlert
 
@@ -2682,6 +2683,7 @@ Autogenerated return type of RevertVulnerabilityToDetected.
 | `repositorySize` | Float! | The Git repository size in bytes |
 | `snippetsSize` | Float! | The snippets size in bytes |
 | `storageSize` | Float! | The total storage in bytes |
+| `uploadsSize` | Float! | The uploads size in bytes |
 | `wikiSize` | Float! | The wiki size in bytes |
 
 ### RunDASTScanPayload
diff --git a/doc/development/testing_guide/flaky_tests.md b/doc/development/testing_guide/flaky_tests.md
index 60fdf3447bd..47ed11d76a2 100644
--- a/doc/development/testing_guide/flaky_tests.md
+++ b/doc/development/testing_guide/flaky_tests.md
@@ -18,7 +18,13 @@ When a test frequently fails in `master`,
 should be created.
 If the test cannot be fixed in a timely fashion, there is an impact on the
 productivity of all the developers, so it should be placed in quarantine by
-assigning the `:quarantine` metadata.
+assigning the `:quarantine` metadata with the issue URL.
+
+```ruby
+it 'should succeed', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/12345' do
+  expect(response).to have_gitlab_http_status(:ok)
+end
+```
 
 This means it will be skipped unless run with `--tag quarantine`:
 
diff --git a/doc/user/application_security/secret_detection/index.md b/doc/user/application_security/secret_detection/index.md
index 60dea15475d..9904862a787 100644
--- a/doc/user/application_security/secret_detection/index.md
+++ b/doc/user/application_security/secret_detection/index.md
@@ -126,6 +126,18 @@ The results are saved as a
 that you can later download and analyze. Due to implementation limitations, we
 always take the latest Secret Detection artifact available.
 
+### Post-processing
+
+> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/46390) in GitLab 13.6.
+
+Upon detection of a secret, GitLab supports post processing hooks. These can be used to take actions like notifying the cloud service who issued the secret. The cloud provider can confirm the credentials and take remediation actions like revoking or reissuing a new secret and notifying the creator of the secret. Post-processing workflows vary by supported cloud providers. 
+
+GitLab currently supports post-processing for following service providers:
+
+- Amazon Web Services (AWS)
+
+Third party cloud and SaaS providers can [express integration interest by filling out this form](https://forms.gle/wWpvrtLRK21Q2WJL9). Learn more about the [techincal details of post-processing secrets](https://gitlab.com/groups/gitlab-org/-/epics/4639). 
+
 ### Customizing settings
 
 The Secret Detection scan settings can be changed through [environment variables](#available-variables)
diff --git a/doc/user/compliance/license_compliance/img/license_compliance_decision_v13_0.png b/doc/user/compliance/license_compliance/img/license_compliance_decision_v13_0.png
deleted file mode 100644
index 42bf8bd1ed5..00000000000
--- a/doc/user/compliance/license_compliance/img/license_compliance_decision_v13_0.png
+++ /dev/null
diff --git a/doc/user/compliance/license_compliance/index.md b/doc/user/compliance/license_compliance/index.md
index d7b97f97449..65c009f947f 100644
--- a/doc/user/compliance/license_compliance/index.md
+++ b/doc/user/compliance/license_compliance/index.md
@@ -37,10 +37,7 @@ compliance report will be shown properly.
 
 ![License Compliance Widget](img/license_compliance_v13_0.png)
 
-If you are a project or group Maintainer, you can click on a license to be given
-the choice to allow it or deny it.
-
-![License approval decision](img/license_compliance_decision_v13_0.png)
+You can click on a license to see more information.
 
 When GitLab detects a **Denied** license, you can view it in the [license list](#license-list).
 
diff --git a/doc/user/project/milestones/burndown_and_burnup_charts.md b/doc/user/project/milestones/burndown_and_burnup_charts.md
index 0390ab83c23..ae03be5fa0f 100644
--- a/doc/user/project/milestones/burndown_and_burnup_charts.md
+++ b/doc/user/project/milestones/burndown_and_burnup_charts.md
@@ -9,18 +9,18 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 [Burndown](#burndown-charts) and [burnup](#burnup-charts) charts show the progress of completing a milestone.
 
-![burndown and burnup chart](img/burndown_and_burnup_charts_v13_5.png)
+![burndown and burnup chart](img/burndown_and_burnup_charts_v13_6.png)
 
 ## Burndown charts
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1540) in [GitLab Starter](https://about.gitlab.com/pricing/) 9.1 for project milestones.
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5354) in [GitLab Premium](https://about.gitlab.com/pricing/) 10.8 for group milestones.
 > - [Added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/6495) to [GitLab Starter](https://about.gitlab.com/pricing/) 11.2 for group milestones.
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6903) [fixed burndown charts](#fixed-burndown-charts) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.5.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6903) [fixed burndown charts](#fixed-burndown-charts) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.6.
 
 Burndown charts show the number of issues over the course of a milestone.
 
-![burndown chart](img/burndown_chart_v13_5.png)
+![burndown chart](img/burndown_chart_v13_6.png)
 
 At a glance, you see the current state for the completion a given milestone.
 Without them, you would have to organize the data from the milestone and plot it
@@ -81,12 +81,12 @@ cumulative value.
 
 ### Fixed burndown charts
 
-For milestones created before GitLab 13.5, burndown charts have an additional toggle to
+For milestones created before GitLab 13.6, burndown charts have an additional toggle to
 switch between Legacy and Fixed views.
 
 | Legacy | Fixed |
 | ----- | ----- |
-| ![Legacy burndown chart, ](img/burndown_chart_legacy_v13_5.png) | ![Fixed burndown chart, showing a jump when a lot of issues were added to the milestone](img/burndown_chart_fixed_v13_5.png) |
+| ![Legacy burndown chart](img/burndown_chart_legacy_v13_6.png) | ![Fixed burndown chart, showing a jump when a lot of issues were added to the milestone](img/burndown_chart_fixed_v13_6.png) |
 
 **Fixed burndown** charts track the full history of milestone activity, from its creation until the
 milestone expires. After the milestone due date passes, issues removed from the milestone no longer
@@ -103,7 +103,7 @@ Reopened issues are considered as having been opened on the day after they were
 
 ## Burnup charts
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6903) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.5.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6903) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.6.
 > - It's [deployed behind a feature flag](../../feature_flags.md), enabled by default.
 > - It's enabled on GitLab.com.
 > - It's recommended for production use.
@@ -114,7 +114,7 @@ This feature might not be available to you. Check the **version history** note a
 
 Burnup charts show the assigned and completed work for a milestone.
 
-![burnup chart](img/burnup_chart_v13_5.png)
+![burnup chart](img/burnup_chart_v13_6.png)
 
 To view a project's burnup chart:
 
diff --git a/doc/user/project/milestones/img/burndown_and_burnup_charts_v13_5.png b/doc/user/project/milestones/img/burndown_and_burnup_charts_v13_6.png
index 8d6ba1d4fa7..8d6ba1d4fa7 100644
--- a/doc/user/project/milestones/img/burndown_and_burnup_charts_v13_5.png
+++ b/doc/user/project/milestones/img/burndown_and_burnup_charts_v13_6.png
diff --git a/doc/user/project/milestones/img/burndown_chart_fixed_v13_5.png b/doc/user/project/milestones/img/burndown_chart_fixed_v13_6.png
index a532bfeeca0..a532bfeeca0 100644
--- a/doc/user/project/milestones/img/burndown_chart_fixed_v13_5.png
+++ b/doc/user/project/milestones/img/burndown_chart_fixed_v13_6.png
diff --git a/doc/user/project/milestones/img/burndown_chart_legacy_v13_5.png b/doc/user/project/milestones/img/burndown_chart_legacy_v13_6.png
index 5824fc59ce5..5824fc59ce5 100644
--- a/doc/user/project/milestones/img/burndown_chart_legacy_v13_5.png
+++ b/doc/user/project/milestones/img/burndown_chart_legacy_v13_6.png
diff --git a/doc/user/project/milestones/img/burndown_chart_v13_5.png b/doc/user/project/milestones/img/burndown_chart_v13_6.png
index e06b24f9907..e06b24f9907 100644
--- a/doc/user/project/milestones/img/burndown_chart_v13_5.png
+++ b/doc/user/project/milestones/img/burndown_chart_v13_6.png
diff --git a/doc/user/project/milestones/img/burnup_chart_v13_5.png b/doc/user/project/milestones/img/burnup_chart_v13_6.png
index a850caba348..a850caba348 100644
--- a/doc/user/project/milestones/img/burnup_chart_v13_5.png
+++ b/doc/user/project/milestones/img/burnup_chart_v13_6.png
diff --git a/doc/user/project/milestones/index.md b/doc/user/project/milestones/index.md
index 8cbed3de1c6..9c47f15cb8f 100644
--- a/doc/user/project/milestones/index.md
+++ b/doc/user/project/milestones/index.md
@@ -150,7 +150,7 @@ There are also tabs below these that show the following:
 
 For project milestones in [GitLab Starter](https://about.gitlab.com/pricing/), a [burndown chart](burndown_charts.md) is in the milestone view, showing the progress of completing a milestone.
 
-![burndown chart](img/burndown_chart_v13_5.png)
+![burndown chart](img/burndown_chart_v13_6.png)
 
 ### Group Burndown Charts **(STARTER)**