Merge branch 'russell/edit-ui-text-performance-settings' into 'master'

Improve performance settings UI text

See merge request gitlab-org/gitlab!71554

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

@@ -6,29 +6,24 @@
       .form-check
         = f.check_box :authorized_keys_enabled, class: 'form-check-input'
         = f.label :authorized_keys_enabled, class: 'form-check-label' do
-          = _('Write to "authorized_keys" file')
+          = _('Use authorized_keys file to authenticate SSH keys')
         .form-text.text-muted
-          By default, we write to the "authorized_keys" file to support Git
-          over SSH without additional configuration. GitLab can be optimized
-          to authenticate SSH keys via the database file. Only uncheck this
-          if you have configured your OpenSSH server to use the
-          AuthorizedKeysCommand. Click on the help icon for more details.
-          = link_to sprite_icon('question-o'), help_page_path('administration/operations/fast_ssh_key_lookup')
-
+          = _('Authenticate user SSH keys without requiring additional configuration. Performance of GitLab can be improved by using the GitLab database instead.')
+          = link_to _('How do I configure authentication using the GitLab database?'), help_page_path('administration/operations/fast_ssh_key_lookup'), target: '_blank', rel: 'noopener noreferrer'
     .form-group
       = f.label :raw_blob_request_limit, _('Raw blob request rate limit per minute'), class: 'label-bold'
       = f.number_field :raw_blob_request_limit, class: 'form-control gl-form-input'
       .form-text.text-muted
-        = _('Highest number of requests per minute for each raw path, default to 300. To disable throttling set to 0.')
+        = _('Maximum number of requests per minute for each raw path (default is 300). Set to 0 to disable throttling.')
     .form-group
       = f.label :push_event_hooks_limit, class: 'label-bold'
       = f.number_field :push_event_hooks_limit, class: 'form-control gl-form-input'
       .form-text.text-muted
-        = _("Number of changes (branches or tags) in a single push to determine whether webhooks and services will be fired or not. Webhooks and services won't be submitted if it surpasses that value.")
+        = _('Maximum number of changes (branches or tags) in a single push for which webhooks and services trigger (default is 3).')
     .form-group
       = f.label :push_event_activities_limit, class: 'label-bold'
       = f.number_field :push_event_activities_limit, class: 'form-control gl-form-input'
       .form-text.text-muted
-        = _('Number of changes (branches or tags) in a single push to determine whether individual push events or bulk push event will be created. Bulk push event will be created if it surpasses that value.')
+        = _('Threshold number of changes (branches or tags) in a single push above which a bulk push event is created (default is 3).')
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

doc/administration/operations/fast_ssh_key_lookup.md

@@ -104,12 +104,12 @@ In the case of lookup failures (which are common), the `authorized_keys`
 file is still scanned. So Git SSH performance would still be slow for many
 users as long as a large file exists.
 
-To disable any more writes to the `authorized_keys` file:
+To disable writes to the `authorized_keys` file:
 
 1. On the top bar, select **Menu > Admin**.
 1. On the left sidebar, select **Settings > Network**.
 1. Expand **Performance optimization**.
-1. Clear the **Write to "authorized_keys" file** checkbox.
+1. Clear the **Use authorized_keys file to authenticate SSH keys** checkbox.
 1. Select **Save changes**.
 
 Again, confirm that SSH is working by removing your user's SSH key in the UI,
@@ -123,10 +123,14 @@ or for asking users to re-add their keys.
 
 This is a brief overview. Please refer to the above instructions for more context.
 
-1. [Rebuild the `authorized_keys` file](../raketasks/maintenance.md#rebuild-authorized_keys-file)
-1. Enable writes to the `authorized_keys` file in Application Settings
+1. [Rebuild the `authorized_keys` file](../raketasks/maintenance.md#rebuild-authorized_keys-file).
+1. Enable writes to the `authorized_keys` file.
+   1. On the top bar, select **Menu > Admin**.
+   1. On the left sidebar, select **Settings > Network**.
+   1. Expand **Performance optimization**.
+   1. Select the **Use authorized_keys file to authenticate SSH keys** checkbox.
 1. Remove the `AuthorizedKeysCommand` lines from `/etc/ssh/sshd_config` or from `/assets/sshd_config` if you are using Omnibus Docker.
-1. Reload `sshd`: `sudo service sshd reload`
+1. Reload `sshd`: `sudo service sshd reload`.
 
 ## Compiling a custom version of OpenSSH for CentOS 6
 

locale/gitlab.pot

@@ -4780,6 +4780,9 @@ msgstr ""
 msgid "Authenticate"
 msgstr ""
 
+msgid "Authenticate user SSH keys without requiring additional configuration. Performance of GitLab can be improved by using the GitLab database instead."
+msgstr ""
+
 msgid "Authenticate with GitHub"
 msgstr ""
 
@@ -16841,9 +16844,6 @@ msgstr ""
 msgid "High or unknown vulnerabilities present"
 msgstr ""
 
-msgid "Highest number of requests per minute for each raw path, default to 300. To disable throttling set to 0."
-msgstr ""
-
 msgid "Highest role:"
 msgstr ""
 
@@ -16904,6 +16904,9 @@ msgstr ""
 msgid "How do I configure Akismet?"
 msgstr ""
 
+msgid "How do I configure authentication using the GitLab database?"
+msgstr ""
+
 msgid "How do I configure it?"
 msgstr ""
 
@@ -21053,6 +21056,9 @@ msgstr ""
 msgid "Maximum number of %{name} (%{count}) exceeded"
 msgstr ""
 
+msgid "Maximum number of changes (branches or tags) in a single push for which webhooks and services trigger (default is 3)."
+msgstr ""
+
 msgid "Maximum number of comments exceeded"
 msgstr ""
 
@@ -21062,6 +21068,9 @@ msgstr ""
 msgid "Maximum number of projects."
 msgstr ""
 
+msgid "Maximum number of requests per minute for each raw path (default is 300). Set to 0 to disable throttling."
+msgstr ""
+
 msgid "Maximum number of unique IP addresses per user."
 msgstr ""
 
@@ -23441,12 +23450,6 @@ msgstr ""
 msgid "Number of LOCs per commit"
 msgstr ""
 
-msgid "Number of changes (branches or tags) in a single push to determine whether individual push events or bulk push event will be created. Bulk push event will be created if it surpasses that value."
-msgstr ""
-
-msgid "Number of changes (branches or tags) in a single push to determine whether webhooks and services will be fired or not. Webhooks and services won't be submitted if it surpasses that value."
-msgstr ""
-
 msgid "Number of commits"
 msgstr ""
 
@@ -35177,6 +35180,9 @@ msgstr ""
 msgid "Threshold in bytes at which to reject Sidekiq jobs. Set this to 0 to if you don't want to limit Sidekiq jobs."
 msgstr ""
 
+msgid "Threshold number of changes (branches or tags) in a single push above which a bulk push event is created (default is 3)."
+msgstr ""
+
 msgid "Throughput"
 msgstr ""
 
@@ -36881,6 +36887,9 @@ msgstr ""
 msgid "Use an AWS CloudFormation Template (CFT) to install and configure GitLab Runner in AWS."
 msgstr ""
 
+msgid "Use authorized_keys file to authenticate SSH keys"
+msgstr ""
+
 msgid "Use cURL"
 msgstr ""
 
@@ -38596,9 +38605,6 @@ msgstr ""
 msgid "Write milestone description..."
 msgstr ""
 
-msgid "Write to \"authorized_keys\" file"
-msgstr ""
-
 msgid "Write your release notes or drag your files here…"
 msgstr ""