Commit 0c956618 authored by Amy Qualls's avatar Amy Qualls Committed by Jacques Erasmus

Update Diff UI settings to match style guides

Small revisions to the Diff UI setting (Admin Area →  Settings →
General) to bring it up to GitLab tone and style. Did not change
style of help link, but removed the anchor. (Linking to full pages
is a bit more future-proof -- subheading names change over time.)

Changelog: changed
parent f3841248
...@@ -3,13 +3,11 @@ ...@@ -3,13 +3,11 @@
%fieldset %fieldset
.form-group .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' = f.number_field :diff_max_patch_bytes, class: 'form-control gl-form-input'
%span.form-text.text-muted %span.form-text.text-muted
Diff files surpassing this limit will be presented as 'too large' Collapse diffs larger than this size, and show a 'too large' message instead.
and won't be expandable.
= link_to sprite_icon('question-o'), = link_to sprite_icon('question-o'),
help_page_path('user/admin_area/diff_limits', help_page_path('user/admin_area/diff_limits')
anchor: 'maximum-diff-patch-size')
= f.submit _('Save changes'), class: 'gl-button btn btn-confirm' = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
%button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Diff content limits') = _('Set size limits for displaying diffs in the browser.')
.settings-content .settings-content
= render 'diff_limits' = render 'diff_limits'
......
...@@ -11402,9 +11402,6 @@ msgstr "" ...@@ -11402,9 +11402,6 @@ msgstr ""
msgid "Didn't receive unlock instructions?" msgid "Didn't receive unlock instructions?"
msgstr "" msgstr ""
msgid "Diff content limits"
msgstr ""
msgid "Diff limits" msgid "Diff limits"
msgstr "" msgstr ""
...@@ -29645,6 +29642,9 @@ msgstr "" ...@@ -29645,6 +29642,9 @@ msgstr ""
msgid "Set requirements for a user to sign-in. Enable mandatory two-factor authentication." msgid "Set requirements for a user to sign-in. Enable mandatory two-factor authentication."
msgstr "" msgstr ""
msgid "Set size limits for displaying diffs in the browser."
msgstr ""
msgid "Set target branch" msgid "Set target branch"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment