Add latest changes from gitlab-org/gitlab@master

23 files changed, 56 insertions, 20 deletions

diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml
index 60025c244f1..ea3e3ac450b 100644
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -44,7 +44,7 @@ docs-lint markdown:
     - .default-retry
     - .docs:rules:docs-lint
   # When updating the image version here, update it in /scripts/lint-doc.sh too.
-  image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.13-vale-2.10.2-markdownlint-0.26.0
+  image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.14-vale-2.10.4-markdownlint-0.28.1
   stage: test
   needs: []
   script:
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 2604e2ed5d7..e71f1e1b028 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -761,13 +761,6 @@ Settings.gitlab_kas['internal_url'] ||= 'grpc://localhost:8153'
 #
 Settings['repositories'] ||= Settingslogic.new({})
 Settings.repositories['storages'] ||= {}
-unless Settings.repositories.storages['default']
-  Settings.repositories.storages['default'] ||= {}
-  # We set the path only if the default storage doesn't exist, in case it exists
-  # but follows the pre-9.0 configuration structure. `6_validations.rb` initializer
-  # will validate all storages and throw a relevant error to the user if necessary.
-  Settings.repositories.storages['default']['path'] ||= Settings.gitlab['user_home'] + '/repositories/'
-end
 
 Settings.repositories.storages.each do |key, storage|
   Settings.repositories.storages[key] = Gitlab::GitalyClient::StorageSettings.new(storage)
diff --git a/doc/README.md b/doc/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/administration/repository_storage_paths.md b/doc/administration/repository_storage_paths.md
index be1a3a56e4f..f4aed0f6a0f 100644
--- a/doc/administration/repository_storage_paths.md
+++ b/doc/administration/repository_storage_paths.md
@@ -120,17 +120,23 @@ For compatibility reasons `gitlab.yml` has a different structure than Omnibus Gi
 
 1. [Restart GitLab](restart_gitlab.md#installations-from-source) for the changes to take effect.
 
+1. [Configure where new repositories are stored](#configure-where-new-repositories-are-stored).
+
 **For Omnibus installations**
 
-Edit `/etc/gitlab/gitlab.rb` by appending the rest of the paths to the default one:
+1. Edit `/etc/gitlab/gitlab.rb` by appending the rest of the paths to the default one:
+
+   ```ruby
+   git_data_dirs({
+    "default" => { "path" => "/var/opt/gitlab/git-data" },
+    "storage1" => { "path" => "/mnt/storage1/git-data" },
+    "storage2" => { "path" => "/mnt/storage2/git-data" }
+   })
+   ```
+
+1. [Restart GitLab](restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
-```ruby
-git_data_dirs({
- "default" => { "path" => "/var/opt/gitlab/git-data" },
- "storage1" => { "path" => "/mnt/storage1/git-data" },
- "storage2" => { "path" => "/mnt/storage2/git-data" }
-})
-```
+1. [Configure where new repositories are stored](#configure-where-new-repositories-are-stored).
 
 NOTE:
 Omnibus stores the repositories in a `repositories` subdirectory of the `git-data` directory.
@@ -153,6 +159,17 @@ The higher the weight of a given repository storage path relative to other repos
 paths, the more often it is chosen. That is,
 `(storage weight) / (sum of all weights) * 100 = chance %`.
 
+By default, if repository weights have not been configured earlier:
+
+- `default` is weighted `100`.
+- All other storages are weighted `0`.
+
+NOTE:
+If all storage weights are `0` (for example, when `default` does not exist), GitLab attempts to
+create new repositories on `default`, regardless of the configuration or if `default` exists.
+See [the tracking issue](https://gitlab.com/gitlab-org/gitlab/-/issues/36175) for more information.
+information.
+
 ## Move repositories
 
 To move a repository to a different repository storage (for example, from `default` to `storage2`), use the
diff --git a/doc/api/README.md b/doc/api/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/ci/README.md b/doc/ci/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/ci/README.md
+++ b/doc/ci/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/ci/examples/README.md b/doc/ci/examples/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/ci/examples/README.md
+++ b/doc/ci/examples/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/ci/examples/deployment/README.md b/doc/ci/examples/deployment/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/ci/examples/deployment/README.md
+++ b/doc/ci/examples/deployment/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md
index c852800d0a9..13f4ca428c6 100644
--- a/doc/ci/merge_request_pipelines/index.md
+++ b/doc/ci/merge_request_pipelines/index.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: '../pipelines/merge_request_pipelines.md'
+remove_date: '2021-09-29'
 ---
 
 This document was moved to [another location](../pipelines/merge_request_pipelines.md).
diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
index 76a79ba1356..5b68c4ca931 100644
--- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
+++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: '../../pipelines/pipelines_for_merged_results.md'
+remove_date: '2021-09-29'
 ---
 
 This document was moved to [another location](../../pipelines/pipelines_for_merged_results.md).
diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md
index 8b2316fd340..c8e8dffbdcd 100644
--- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md
+++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: '../../../pipelines/merge_trains.md'
+remove_date: '2021-09-29'
 ---
 
 This document was moved to [another location](../../../pipelines/merge_trains.md).
diff --git a/doc/ci/multi_project_pipelines.md b/doc/ci/multi_project_pipelines.md
index 06cbf63e512..93e04bf8a0e 100644
--- a/doc/ci/multi_project_pipelines.md
+++ b/doc/ci/multi_project_pipelines.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'pipelines/multi_project_pipelines.md'
+remove_date: '2021-09-29'
 ---
 
 This document was moved to [another location](pipelines/multi_project_pipelines.md).
diff --git a/doc/ci/parent_child_pipelines.md b/doc/ci/parent_child_pipelines.md
index 0b8df2e9f4c..f2edc263397 100644
--- a/doc/ci/parent_child_pipelines.md
+++ b/doc/ci/parent_child_pipelines.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'pipelines/parent_child_pipelines.md'
+remove_date: '2021-09-29'
 ---
 
 This document was moved to [another location](pipelines/parent_child_pipelines.md).
diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/ci/runners/README.md
+++ b/doc/ci/runners/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/ci/triggers/README.md b/doc/ci/triggers/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/ci/triggers/README.md
+++ b/doc/ci/triggers/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/development/README.md b/doc/development/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/development/documentation/styleguide/index.md b/doc/development/documentation/styleguide/index.md
index de1fd382c9b..91e61100fcb 100644
--- a/doc/development/documentation/styleguide/index.md
+++ b/doc/development/documentation/styleguide/index.md
@@ -489,6 +489,14 @@ When the docs are generated, the output is:
 
 To stop the command, press <kbd>Control</kbd>+<kbd>C</kbd>.
 
+### Text entered in the UI
+
+If you want the user to type something in the UI, use backticks. For example:
+
+```plaintext
+In the **Commit message** box, type `This is my merge request`.
+```
+
 ### Spaces between words
 
 Use only standard spaces between words. The search engine for the documentation
diff --git a/doc/development/testing_guide/end_to_end/environment_selection.md b/doc/development/testing_guide/end_to_end/environment_selection.md
index 2192d9c4ed4..e03966d754b 100644
--- a/doc/development/testing_guide/end_to_end/environment_selection.md
+++ b/doc/development/testing_guide/end_to_end/environment_selection.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'execution_context_selection.md'
+remove_date: '2021-08-14'
 ---
 
 This file was moved to [another location](execution_context_selection.md).
diff --git a/doc/security/README.md b/doc/security/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/security/README.md
+++ b/doc/security/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/ssh/README.md b/doc/ssh/README.md
index 5ab8653dc35..0e6c2f63f9e 100644
--- a/doc/ssh/README.md
+++ b/doc/ssh/README.md
@@ -1,5 +1,6 @@
 ---
 redirect_to: 'index.md'
+remove_date: '2021-09-28'
 ---
 
 This document was moved to [another location](index.md).
diff --git a/doc/ssh/index.md b/doc/ssh/index.md
index 920117116e5..c4e651a0072 100644
--- a/doc/ssh/index.md
+++ b/doc/ssh/index.md
@@ -205,14 +205,14 @@ To use SSH with GitLab, copy your public key to your GitLab account.
    Replace `id_ed25519.pub` with your filename. For example, use `id_rsa.pub` for RSA.
 
 1. Sign in to GitLab.
-1. In the top right corner, select your avatar.
+1. On the top bar, in the top right corner, select your avatar.
 1. Select **Preferences**.
-1. From the left sidebar, select **SSH Keys**.
+1. On the left sidebar, select **SSH Keys**.
 1. In the **Key** box, paste the contents of your public key.
    If you manually copied the key, make sure you copy the entire key,
    which starts with `ssh-ed25519` or `ssh-rsa`, and may end with a comment.
-1. In the **Title** text box, type a description, like _Work Laptop_ or
-   _Home Workstation_.
+1. In the **Title** box, type a description, like `Work Laptop` or
+   `Home Workstation`.
 1. Optional. In the **Expires at** box, select an expiration date. (Introduced in [GitLab 12.9](https://gitlab.com/gitlab-org/gitlab/-/issues/36243).)
    In:
    - GitLab 13.12 and earlier, the expiration date is informational only. It doesn't prevent