From d89b82481b3ee5a226bab905555dd9c6a4708521 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 21 Apr 2021 09:09:15 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 doc/api/graphql/reference/index.md       |  9 +++++++++
 doc/development/fe_guide/icons.md        |  7 +++++++
 doc/development/rake_tasks.md            |  4 ++++
 doc/development/usage_ping/dictionary.md | 12 ++++++++++++
 4 files changed, 32 insertions(+)

(limited to 'doc')

diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index e353346b0b1..85f9c53075c 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -8756,6 +8756,15 @@ The state of the vulnerability.
 | `DISMISSED` |  |
 | `RESOLVED` |  |
 
+### `WeightWildcardId`
+
+Weight ID wildcard values.
+
+| Value | Description |
+| ----- | ----------- |
+| `ANY` | Weight is assigned. |
+| `NONE` | No weight is assigned. |
+
 ## Scalar types
 
 Scalar values are atomic values, and do not have fields of their own.
diff --git a/doc/development/fe_guide/icons.md b/doc/development/fe_guide/icons.md
index ad344c00efd..3f7490b0221 100644
--- a/doc/development/fe_guide/icons.md
+++ b/doc/development/fe_guide/icons.md
@@ -198,3 +198,10 @@ export default {
   <img :src="svgIllustrationPath" />
 </template>
 ```
+
+### Minimize SVGs
+
+When you develop or export a new SVG illustration, minimize it with an [SVGO](https://github.com/svg/svgo) powered tool, like
+[SVGOMG](https://jakearchibald.github.io/svgomg/), to save space. Illustrations
+added to [GitLab SVG](https://gitlab.com/gitlab-org/gitlab-svgs) are automatically
+minimized, so no manual action is needed.
diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md
index f88424287b1..c6c3d39c57f 100644
--- a/doc/development/rake_tasks.md
+++ b/doc/development/rake_tasks.md
@@ -362,3 +362,7 @@ This uses GraphQL Ruby's built-in Rake tasks to generate files in both [IDL](htt
 ### Update documentation and schema definitions
 
 The following command combines the intent of [Update GraphQL documentation and schema definitions](#update-graphql-documentation-and-schema-definitions) and [Update machine-readable schema files](#update-machine-readable-schema-files):
+
+```shell
+bundle exec rake gitlab:graphql:update_all
+```
diff --git a/doc/development/usage_ping/dictionary.md b/doc/development/usage_ping/dictionary.md
index 16cb15882eb..1f1e5225804 100644
--- a/doc/development/usage_ping/dictionary.md
+++ b/doc/development/usage_ping/dictionary.md
@@ -14360,6 +14360,18 @@ Status: `data_available`
 
 Tiers: `free`, `premium`, `ultimate`
 
+### `settings.gitaly_apdex`
+
+Gitaly application performance
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210321224827_gitaly_apdex.yml)
+
+Group: `group::gitaly`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
 ### `settings.ldap_encrypted_secrets_enabled`
 
 Is encrypted LDAP secrets configured?
-- 
cgit v1.2.3