Merge branch 'eread/improve-repo-storage-ui-and-docs' into 'master'

Improve repository storage-related UI and documentation

See merge request gitlab-org/gitlab!65424

app/views/admin/application_settings/_repository_storage.html.haml

@@ -3,20 +3,24 @@
 
   %fieldset
     .sub-section
-      %h4= _("Hashed repository storage paths")
+      %h4= _('Hashed repository storage paths')
       .form-group
         .form-check
           = f.check_box :hashed_storage_enabled, class: 'form-check-input qa-hashed-storage-checkbox', disabled: @application_setting.hashed_storage_enabled?
-          = f.label :hashed_storage_enabled, _("Use hashed storage"), class: 'label-bold form-check-label'
+          = f.label :hashed_storage_enabled, _('Use hashed storage'), class: 'label-bold form-check-label'
           .form-text.text-muted
-            = _("Use hashed storage paths for newly created and renamed repositories. Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents repositories from having to be moved or renamed when the Repository URL changes and may improve disk I/O performance. (Always enabled since 13.0)")
+            = _('Use hashed storage paths for newly created and renamed repositories. Always enabled since 13.0.')
+            = link_to s_('Learn more.'), help_page_path('administration/repository_storage_types.md', anchor: 'hashed-storage'), target: '_blank', rel: 'noopener noreferrer'
+
     .sub-section
       %h4= _("Storage nodes for new repositories")
       .form-group
         .form-text
           %p.text-secondary
-            = _('Enter weights for storages for new repositories.')
-            = link_to sprite_icon('question-o'), help_page_path('administration/repository_storage_paths')
+            - weights_link_url = help_page_path('administration/repository_storage_paths.md', anchor: 'configure-where-new-repositories-are-stored')
+            - weights_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: weights_link_url }
+            = html_escape(s_('Enter %{weights_link_start}weights%{weights_link_end} for storages for new repositories. Configured storages appear below.')) % { weights_link_start: weights_link_start, weights_link_end: '</a>'.html_safe }
+            = link_to s_('Learn more.'), help_page_path('administration/repository_storage_paths.md'), target: '_blank', rel: 'noopener noreferrer'
         .form-check
           = f.fields_for :repository_storages_weighted, storage_weights do |storage_form|
             - Gitlab.config.repositories.storages.keys.each do |storage|

app/views/admin/application_settings/repository.html.haml

@@ -31,7 +31,8 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Configure storage path settings.')
+      = _('Configure repository storage.')
+      = link_to s_('Learn more.'), help_page_path('administration/repository_storage_paths.md'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
     = render 'repository_storage'
 

doc/administration/repository_storage_paths.md

@@ -147,11 +147,11 @@ can choose where new repositories are stored:
 1. Select **Save changes**.
 
 Each repository storage path can be assigned a weight from 0-100. When a new project is created,
-these weights are used to determine the storage location the repository is created on. The higher
-the weight of a given repository storage path relative to other repository storages paths, the more
-often it is chosen. That is, `(storage weight) / (sum of all weights) * 100 = chance %`.
+these weights are used to determine the storage location the repository is created on.
 
-![Choose repository storage path in Admin Area](img/repository_storages_admin_ui_v13_1.png)
+The higher the weight of a given repository storage path relative to other repository storages
+paths, the more often it is chosen. That is,
+`(storage weight) / (sum of all weights) * 100 = chance %`.
 
 ## Move repositories
 

locale/gitlab.pot

@@ -8291,13 +8291,13 @@ msgstr ""
 msgid "Configure repository mirroring."
 msgstr ""
 
-msgid "Configure settings for Advanced Search with Elasticsearch."
+msgid "Configure repository storage."
 msgstr ""
 
-msgid "Configure specific limits for Packages API requests that supersede the general user and IP rate limits."
+msgid "Configure settings for Advanced Search with Elasticsearch."
 msgstr ""
 
-msgid "Configure storage path settings."
+msgid "Configure specific limits for Packages API requests that supersede the general user and IP rate limits."
 msgstr ""
 
 msgid "Configure the %{link} integration."
@@ -12276,6 +12276,9 @@ msgstr ""
 msgid "Ensure your %{linkStart}environment is part of the deploy stage%{linkEnd} of your CI pipeline to track deployments to your cluster."
 msgstr ""
 
+msgid "Enter %{weights_link_start}weights%{weights_link_end} for storages for new repositories. Configured storages appear below."
+msgstr ""
+
 msgid "Enter 2FA for Admin Mode"
 msgstr ""
 
@@ -12333,9 +12336,6 @@ msgstr ""
 msgid "Enter the number of seconds, or other human-readable input, like \"1 hour\". This timeout takes precedence over lower timeouts set for the project."
 msgstr ""
 
-msgid "Enter weights for storages for new repositories."
-msgstr ""
-
 msgid "Enter your password to approve"
 msgstr ""
 
@@ -35441,7 +35441,7 @@ msgstr ""
 msgid "Use hashed storage"
 msgstr ""
 
-msgid "Use hashed storage paths for newly created and renamed repositories. Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents repositories from having to be moved or renamed when the Repository URL changes and may improve disk I/O performance. (Always enabled since 13.0)"
+msgid "Use hashed storage paths for newly created and renamed repositories. Always enabled since 13.0."
 msgstr ""
 
 msgid "Use one line per URI"