Merge branch '330183-aqualls-diff-limits-ui' into 'master'

Update Diff UI settings to match style guides

See merge request gitlab-org/gitlab!62500

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

@@ -3,13 +3,11 @@
 
   %fieldset
     .form-group
-      = f.label :diff_max_patch_bytes, 'Maximum diff patch size (Bytes)', class: 'label-light'
+      = f.label :diff_max_patch_bytes, 'Maximum diff patch size in bytes', class: 'label-light'
       = f.number_field :diff_max_patch_bytes, class: 'form-control gl-form-input'
       %span.form-text.text-muted
-        Diff files surpassing this limit will be presented as 'too large'
-        and won't be expandable.
+        Collapse diffs larger than this size, and show a 'too large' message instead.
 
         = link_to sprite_icon('question-o'),
-          help_page_path('user/admin_area/diff_limits',
-          anchor: 'maximum-diff-patch-size')
+          help_page_path('user/admin_area/diff_limits')
   = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'

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

@@ -31,7 +31,7 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Diff content limits')
+      = _('Set size limits for displaying diffs in the browser.')
   .settings-content
     = render 'diff_limits'
 

locale/gitlab.pot

@@ -11402,9 +11402,6 @@ msgstr ""
 msgid "Didn't receive unlock instructions?"
 msgstr ""
 
-msgid "Diff content limits"
-msgstr ""
-
 msgid "Diff limits"
 msgstr ""
 
@@ -29645,6 +29642,9 @@ msgstr ""
 msgid "Set requirements for a user to sign-in. Enable mandatory two-factor authentication."
 msgstr ""
 
+msgid "Set size limits for displaying diffs in the browser."
+msgstr ""
+
 msgid "Set target branch"
 msgstr ""