Add latest changes from gitlab-org/gitlab@master

6 files changed, 34 insertions, 17 deletions

diff --git a/doc/administration/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md
index 758d75ee294..41e71cbac6a 100644
--- a/doc/administration/geo/replication/troubleshooting.md
+++ b/doc/administration/geo/replication/troubleshooting.md
@@ -1747,7 +1747,7 @@ If the above steps are **not successful**, proceed through the next steps:
 
 If different operating systems or different operating system versions are deployed across Geo sites, you should perform a locale data compatibility check before setting up Geo.
 
-Geo uses PostgreSQL and Streaming Replication to replicate data across Geo sites. PostgreSQL uses locale data provided by the operating system's C library for sorting text. If the locale data in the C library is incompatible across Geo sites, erroneous query results that lead to [incorrect behavior on secondary sites](https://gitlab.com/gitlab-org/gitlab/-/issues/360723).
+Geo uses PostgreSQL and Streaming Replication to replicate data across Geo sites. PostgreSQL uses locale data provided by the operating system's C library for sorting text. If the locale data in the C library is incompatible across Geo sites, it can cause erroneous query results that lead to [incorrect behavior on secondary sites](https://gitlab.com/gitlab-org/gitlab/-/issues/360723).
 
 For example, Ubuntu 18.04 (and earlier) and RHEL/Centos7 (and earlier) are incompatible with their later releases.
 See the [PostgreSQL wiki for more details](https://wiki.postgresql.org/wiki/Locale_data_changes).
diff --git a/doc/administration/silent_mode/index.md b/doc/administration/silent_mode/index.md
index d51a06045a5..e6bfe5b58ca 100644
--- a/doc/administration/silent_mode/index.md
+++ b/doc/administration/silent_mode/index.md
@@ -65,9 +65,9 @@ This section documents the current behavior of GitLab when Silent Mode is enable
 
 Incoming emails still raise issues, but the users who sent the emails to [Service Desk](../../user/project/service_desk.md) are not notified of issue creation or comments on their issues.
 
-### Project and group webhooks
+### Webhooks
 
-Project and group webhooks are suppressed. The relevant Sidekiq jobs fail 4 times and then disappear, while Silent Mode is enabled. [Issue 393639](https://gitlab.com/gitlab-org/gitlab/-/issues/393639) discusses preventing the Sidekiq jobs from running in the first place.
+[Project and group webhooks](../../user/project/integrations/webhooks.md), and [system hooks](../system_hooks.md) are suppressed. The relevant Sidekiq jobs fail 4 times and then disappear, while Silent Mode is enabled. [Issue 393639](https://gitlab.com/gitlab-org/gitlab/-/issues/393639) discusses preventing the Sidekiq jobs from running in the first place.
 
 Triggering webhook tests via the UI results in HTTP status 500 responses.
 
diff --git a/doc/api/users.md b/doc/api/users.md
index a69bae1c2cf..a148f780f84 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -2219,13 +2219,14 @@ Returns:
 - `403 Forbidden` if not authenticated as an administrator.
 - `404 User Not Found` if user cannot be found.
 
-## Create a runner **(FREE SELF)**
+## Create a runner **(FREE)**
 
 Creates a runner linked to the current user.
 
 Prerequisites:
 
 - You must be an administrator or have the Owner role of the target namespace or project.
+- For `instance_type`, you must be an administrator of the GitLab instance.
 
 Be sure to copy or save the `token` in the response, the value cannot be retrieved again.
 
diff --git a/doc/development/fe_guide/storybook.md b/doc/development/fe_guide/storybook.md
index 44169f110c7..eaa8f8b4068 100644
--- a/doc/development/fe_guide/storybook.md
+++ b/doc/development/fe_guide/storybook.md
@@ -78,12 +78,29 @@ a starting point.
 
 You can also use the GitLab API Access panel in the Storybook UI to set the GitLab instance URL and access token.
 
-### Using REST API
+### Set up API access in your stories
+
+You should apply the `withGitLabAPIAccess` decorator to the stories that will consume GitLab’s APIs. This decorator
+will display a badge indicating that the story won't work without providing the API access parameters:
+
+```javascript
+import { withGitLabAPIAccess } from 'storybook_addons/gitlab_api_access';
+import Api from '~/api';
+import { ContentEditor } from './index';
+
+export default {
+  component: ContentEditor,
+  title: 'ce/content_editor/content_editor',
+  decorators: [withGitLabAPIAccess],
+};
+```
+
+#### Using REST API
 
 The Storybook sets up `~/lib/utils/axios_utils` in `storybook/config/preview.js`. Components that use the REST API
 should work out of the box as long as you provide a valid GitLab instance URL and access token.
 
-### Using GraphQL
+#### Using GraphQL
 
 To write a story for a component that uses the GraphQL API, use the `createVueApollo` method provided in
 the Story context.
@@ -91,6 +108,7 @@ the Story context.
 ```javascript
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
+import { withGitLabAPIAccess } from 'storybook_addons/gitlab_api_access';
 import WorkspacesList from './list.vue';
 
 Vue.use(VueApollo);
@@ -99,6 +117,9 @@ const Template = (_, { argTypes, createVueApollo }) => {
   return {
     components: { WorkspacesList },
     apolloProvider: createVueApollo(),
+    provide: {
+      emptyStateSvgPath: '',
+    },
     props: Object.keys(argTypes),
     template: '<workspaces-list />',
   };
@@ -107,10 +128,10 @@ const Template = (_, { argTypes, createVueApollo }) => {
 export default {
   component: WorkspacesList,
   title: 'ee/remote_development/workspaces_list',
+  decorators: [withGitLabAPIAccess],
 };
 
 export const Default = Template.bind({});
 
 Default.args = {};
-
 ```
diff --git a/doc/user/application_security/vulnerability_report/img/vulnerability_list_table_v13_9.png b/doc/user/application_security/vulnerability_report/img/vulnerability_list_table_v13_9.png
deleted file mode 100644
index bfde7cd6c80..00000000000
--- a/doc/user/application_security/vulnerability_report/img/vulnerability_list_table_v13_9.png
+++ /dev/null
diff --git a/doc/user/application_security/vulnerability_report/index.md b/doc/user/application_security/vulnerability_report/index.md
index e6c710d1326..9cc723da97d 100644
--- a/doc/user/application_security/vulnerability_report/index.md
+++ b/doc/user/application_security/vulnerability_report/index.md
@@ -31,6 +31,11 @@ in that row:
 - False positive **{false-positive}**: The scanner determined this vulnerability to be a false
   positive.
 
+To open an issue created for a vulnerability, hover over the **Activity** entry, then select the link.
+The issue icon (**{issues}**) indicates the issue's status. If Jira issue support is enabled, the
+issue link found in the **Activity** entry links out to the issue in Jira. Unlike GitLab issues, the
+status of a Jira issue is not shown in the GitLab UI.
+
 ![Example project-level Vulnerability Report](img/project_level_vulnerability_report_v14_5.png)
 
 ## Project-level Vulnerability Report
@@ -57,7 +62,6 @@ From the Vulnerability Report you can:
 - [Filter the list of vulnerabilities](#filter-the-list-of-vulnerabilities).
 - [View more details about a vulnerability](#view-details-of-a-vulnerability).
 - [View vulnerable source location](#view-vulnerable-source-location) (if available).
-- [View an issue raised for a vulnerability](#view-issues-raised-for-a-vulnerability).
 - [Change the status of vulnerabilities](#change-status-of-vulnerabilities).
 - [Export details of vulnerabilities](#export-vulnerability-details).
 - [Sort vulnerabilities by date](#sort-vulnerabilities-by-date-detected).
@@ -151,15 +155,6 @@ in the default branch.
 
 To view the relevant file, select the filename in the vulnerability's details.
 
-## View issues raised for a vulnerability
-
-The **Activity** column indicates the number of issues that have been created for the vulnerability.
-Hover over an **Activity** entry and select a link go to that issue. The status of whether the issue is open or closed also displays in the hover menu.
-
-![Display attached issues](img/vulnerability_list_table_v13_9.png)
-
-If Jira issue support is enabled, the issue link found in the Activity entry links out to the issue in Jira. Unlike GitLab issues, the status of whether a Jira issue is Open or Closed does not display in the GitLab UI.
-
 ## Change status of vulnerabilities
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/292636) in GitLab 13.10, all statuses became selectable.