Add latest changes from gitlab-org/gitlab@master

11 files changed, 58 insertions, 18 deletions

diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md
index 21e32d145bd..22159b6e9db 100644
--- a/doc/administration/environment_variables.md
+++ b/doc/administration/environment_variables.md
@@ -31,6 +31,7 @@ You can use the following environment variables to override certain values:
 | `GITLAB_EMAIL_REPLY_TO`                    | string  | The email address used in the **Reply-To** field in emails sent by GitLab.                              |
 | `GITLAB_EMAIL_SUBJECT_SUFFIX`              | string  | The email subject suffix used in emails sent by GitLab.                                                 |
 | `GITLAB_HOST`                              | string  | The full URL of the GitLab server (including `http://` or `https://`).                                  |
+| `GITLAB_MARKUP_TIMEOUT`                    | string  | Timeout, in seconds, for `rest2html` and `pod2html` commands executed by the [`gitlab-markup` gem](https://gitlab.com/gitlab-org/gitlab-markup/). Default is `10`. |
 | `GITLAB_ROOT_PASSWORD`                     | string  | Sets the password for the `root` user on installation.                                                  |
 | `GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN` | string  | Sets the initial registration token used for runners.                                                   |
 | `RAILS_ENV`                                | string  | The Rails environment; can be one of `production`, `development`, `staging`, or `test`.                 |
diff --git a/doc/administration/operations/extra_sidekiq_processes.md b/doc/administration/operations/extra_sidekiq_processes.md
index 02cb7ad0bca..1c9b98041dc 100644
--- a/doc/administration/operations/extra_sidekiq_processes.md
+++ b/doc/administration/operations/extra_sidekiq_processes.md
@@ -263,9 +263,9 @@ This sets the concurrency (number of threads) for the Sidekiq process.
 
 ## Modify the check interval
 
-To modify the check interval for the additional Sidekiq processes:
+To modify `sidekiq-cluster`'s health check interval for the additional Sidekiq processes:
 
-1. Edit `/etc/gitlab/gitlab.rb` and add:
+1. Edit `/etc/gitlab/gitlab.rb` and add (the value can be any integer number of seconds):
 
    ```ruby
    sidekiq['interval'] = 5
@@ -273,8 +273,6 @@ To modify the check interval for the additional Sidekiq processes:
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
-This tells the additional processes how often to check for enqueued jobs.
-
 ## Troubleshoot using the CLI
 
 WARNING:
diff --git a/doc/api/personal_access_tokens.md b/doc/api/personal_access_tokens.md
index 9c9551a5103..b51866fe9b1 100644
--- a/doc/api/personal_access_tokens.md
+++ b/doc/api/personal_access_tokens.md
@@ -40,8 +40,9 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/a
         "scopes": [
             "api"
         ],
-        "active": true,
         "user_id": 24,
+        "last_used_at": "2021-10-06T17:58:37.550Z",
+        "active": true,
         "expires_at": null
     }
 ]
@@ -61,8 +62,9 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/a
         "scopes": [
             "api"
         ],
-        "active": true,
         "user_id": 3,
+        "last_used_at": "2021-10-06T17:58:37.550Z",
+        "active": true,
         "expires_at": null
     }
 ]
diff --git a/doc/development/documentation/styleguide/index.md b/doc/development/documentation/styleguide/index.md
index 1382ec263f2..745e8f456ec 100644
--- a/doc/development/documentation/styleguide/index.md
+++ b/doc/development/documentation/styleguide/index.md
@@ -1053,7 +1053,9 @@ Guidance for each individual UI element is in [the word list](word_list.md).
 
 ### How to write navigation task steps
 
-To be consistent, use this format when you write navigation steps in a task topic.
+To be consistent, use these templates when you write navigation steps in a task topic.
+
+To open project settings:
 
 ```markdown
 1. On the top bar, select **Menu > Projects** and find your project.
@@ -1061,7 +1063,7 @@ To be consistent, use this format when you write navigation steps in a task topi
 1. Expand **General pipelines**.
 ```
 
-Another example:
+To open group settings:
 
 ```markdown
 1. On the top bar, select **Menu > Groups** and find your group.
@@ -1069,7 +1071,7 @@ Another example:
 1. Expand **General pipelines**.
 ```
 
-An Admin Area example:
+To open the Admin Area:
 
 ```markdown
 1. On the top bar, select **Menu > Admin**.
@@ -1081,6 +1083,15 @@ To select your avatar:
 1. On the top bar, in the top right corner, select your avatar.
 ```
 
+To save the selection in some dropdown lists:
+
+```markdown
+1. Go to your issue.
+1. On the right sidebar, in the **Iteration** section, select **Edit**.
+1. From the dropdown list, select the iteration to associate this issue with.
+1. Select any area outside the dropdown list.
+```
+
 ### Optional steps
 
 If a step is optional, start the step with the word `Optional` followed by a period.
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index 2f1447358c1..404f1a75204 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -389,7 +389,9 @@ locked. Projects can only be unlocked by purchasing more storage subscription un
 
 ### Purchase more storage
 
-To purchase more storage for either a personal or group namespace:
+You can purchase storage for your personal or group namespace.
+
+#### For your personal namespace
 
 1. Sign in to GitLab SaaS.
 1. From either your personal homepage or the group's page, go to **Settings > Usage Quotas**.
@@ -409,6 +411,32 @@ To purchase more storage for either a personal or group namespace:
 The **Purchased storage available** total is incremented by the amount purchased. All locked
 projects are unlocked and their excess usage is deducted from the additional storage.
 
+#### For your group namespace
+
+> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5789) in GitLab 14.6.
+
+If you're using GitLab SaaS, you can purchase additional storage so your
+pipelines aren't blocked after you have used all your storage from your
+main quota. You can find pricing for additional storage on the
+[GitLab Pricing page](https://about.gitlab.com/pricing/).
+
+To purchase additional storage for your group on GitLab SaaS:
+
+1. On the top bar, select **Menu > Groups** and find your group.
+1. On the left sidebar, select **Settings > Usage Quotas**.
+1. Select **Storage** tab.
+1. Select **Purchase more storage**.
+1. Complete the details.
+
+After your payment is processed, the extra storage is available for your group
+namespace.
+
+To confirm the available storage, go to your group, and then select
+**Settings > Usage Quotas** and select the **Storage** tab.
+
+The **Purchased storage available** total is incremented by the amount purchased. All locked
+projects are unlocked and their excess usage is deducted from the additional storage.
+
 ## Contact Support
 
 Learn more about:
diff --git a/doc/user/admin_area/analytics/dev_ops_report.md b/doc/user/admin_area/analytics/dev_ops_report.md
index b28789cfd5b..62fea3c266a 100644
--- a/doc/user/admin_area/analytics/dev_ops_report.md
+++ b/doc/user/admin_area/analytics/dev_ops_report.md
@@ -37,7 +37,7 @@ information is **not sent** to any other GitLab instances.
 If you have just started using GitLab, it might take a few weeks for data to be collected before this
 feature is available.
 
-## DevOps Adoption **(ULTIMATE)**
+## DevOps Adoption **(ULTIMATE SELF)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/247112) in GitLab 13.7 as a [Beta feature](https://about.gitlab.com/handbook/product/gitlab-the-product/#beta).
 > - The Overview tab [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/330401) in GitLab 14.1.
diff --git a/doc/user/group/iterations/index.md b/doc/user/group/iterations/index.md
index a35c1cd8ab1..8a79effba15 100644
--- a/doc/user/group/iterations/index.md
+++ b/doc/user/group/iterations/index.md
@@ -165,7 +165,7 @@ To group issues by label:
 1. Select the **Filter by label** dropdown.
 1. Select the labels you want to group by in the labels dropdown.
    You can also search for labels by typing in the search input.
-1. Select or tap outside of the label dropdown. The page is now grouped by the selected labels.
+1. Select any area outside the label dropdown list. The page is now grouped by the selected labels.
 
 ### Enable or disable iteration cadences **(PREMIUM SELF)**
 
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index b6c8bc19b64..0a51020dbe0 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -11,7 +11,7 @@ GitLab automatically renders Markdown content. For example, when you add a comme
 you type the text in the Markdown language. When you save the issue, the text is rendered
 with a set of styles. These styles are described on this page.
 
-For example, in Markdown, an ordered list looks like this:
+For example, in Markdown, an unordered list looks like this:
 
 ```markdown
 - Cat
diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md
index b46672c9399..d357f45b1e7 100644
--- a/doc/user/project/issues/managing_issues.md
+++ b/doc/user/project/issues/managing_issues.md
@@ -393,7 +393,7 @@ To add an issue to an [iteration](../../group/iterations/index.md):
 1. Go to your issue.
 1. On the right sidebar, in the **Iteration** section, select **Edit**.
 1. From the dropdown list, select the iteration to associate this issue with.
-1. Click or tap anywhere outside of the dropdown.
+1. Select any area outside the dropdown list.
 
 You can also use the `/iteration`
 [quick action](../quick_actions.md#issues-merge-requests-and-epics)
@@ -457,7 +457,7 @@ To change the assignee on an issue:
 1. Go to your issue.
 1. On the right sidebar, in the **Assignee** section, select **Edit**.
 1. From the dropdown list, select the user to add as an assignee.
-1. Click or tap anywhere outside of the dropdown list.
+1. Select any area outside the dropdown list.
 
 ## Similar issues
 
diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md
index e9cbe012110..91f12a36070 100644
--- a/doc/user/project/labels.md
+++ b/doc/user/project/labels.md
@@ -42,8 +42,8 @@ To assign or unassign a label:
    You can search repeatedly to add more labels.
    The selected labels are marked with a checkmark.
 1. Click the labels you want to assign or unassign.
-1. To apply your changes to labels, click **X** next to **Assign labels** or anywhere outside the
-   label section.
+1. To apply your changes to labels, select **X** next to **Assign labels** or select any area
+   outside the label section.
 
 Alternatively, to unassign a label, click the **X** on the label you want to unassign.
 
diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md
index d75a180492e..40c9ae8bd59 100644
--- a/doc/user/project/web_ide/index.md
+++ b/doc/user/project/web_ide/index.md
@@ -456,7 +456,7 @@ when:
 
 - <kbd>Control</kbd> + <kbd>S</kbd> (or <kbd>Command</kbd> + <kbd>S</kbd> on Mac)
   is pressed while editing a file.
-- Anything outside the file editor is clicked after editing a file.
+- You select any area outside the file editor after editing a file.
 - A file or folder is created, deleted, or renamed.
 
 ### Limitations