Commit 37d0f988 authored by Jeremy Elder's avatar Jeremy Elder Committed by Fatih Acet

Resolve "Admin Area's "Account and limit" fields could be improved"

parent 1897f18f
......@@ -8,20 +8,20 @@
= f.label :gravatar_enabled, class: 'form-check-label' do
= _('Gravatar enabled')
.form-group
= f.label :default_projects_limit, class: 'label-bold'
= f.number_field :default_projects_limit, class: 'form-control'
= f.label :default_projects_limit, _('Default projects limit'), class: 'label-bold'
= f.number_field :default_projects_limit, class: 'form-control', title: _('Maximum number of projects.'), data: { toggle: 'tooltip', container: 'body' }
.form-group
= f.label :max_attachment_size, _('Maximum attachment size (MB)'), class: 'label-bold'
= f.number_field :max_attachment_size, class: 'form-control'
= f.number_field :max_attachment_size, class: 'form-control', title: _('Maximum size of individual attachments in comments.'), data: { toggle: 'tooltip', container: 'body' }
= render_if_exists 'admin/application_settings/repository_size_limit_setting', form: f
.form-group
= f.label :receive_max_input_size, _('Maximum push size (MB)'), class: 'label-light'
= f.number_field :receive_max_input_size, class: 'form-control qa-receive-max-input-size-field'
= f.number_field :receive_max_input_size, class: 'form-control qa-receive-max-input-size-field', title: _('Maximum size limit for a single commit.'), data: { toggle: 'tooltip', container: 'body' }
.form-group
= f.label :session_expire_delay, _('Session duration (minutes)'), class: 'label-light'
= f.number_field :session_expire_delay, class: 'form-control'
= f.number_field :session_expire_delay, class: 'form-control', title: _('Maximum duration of a session.'), data: { toggle: 'tooltip', container: 'body' }
%span.form-text.text-muted#session_expire_delay_help_block= _('GitLab restart is required to apply changes.')
= render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f
......
......@@ -20,7 +20,7 @@
%button.btn.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand')
%p
= _('Session expiration, projects limit and attachment size.')
= _('Set projects and maximum size limits, session duration, user options, and check feature availability for namespace plan.')
.settings-content
= render 'account_and_limit'
......
---
title: Add clarifying content to account fields
merge_request:
author:
type: other
......@@ -5,7 +5,7 @@
.form-group
= form.label :repository_size_limit, class: 'label-bold' do
= _('Size limit per repository (MB)')
= form.number_field :repository_size_limit, value: form.object.repository_size_limit.try(:to_mb), class: 'form-control', min: 0
= form.number_field :repository_size_limit, value: form.object.repository_size_limit.try(:to_mb), class: 'form-control', min: 0, title: _('Maximum size limit for each repository.'), data: { toggle: 'tooltip', container: 'body' }
%span.form-text.text-muted#repository_size_limit_help_block
= _('Includes LFS objects. It can be overridden per group, or per project. 0 for unlimited.')
= link_to icon('question-circle'), help_page_path("user/admin_area/settings/account_and_limit_settings")
......@@ -6011,6 +6011,9 @@ msgstr ""
msgid "Default project deletion protection"
msgstr ""
msgid "Default projects limit"
msgstr ""
msgid "Default: Directly import the Google Code email address or username"
msgstr ""
......@@ -11565,6 +11568,9 @@ msgstr ""
msgid "Maximum delay (Minutes)"
msgstr ""
msgid "Maximum duration of a session."
msgstr ""
msgid "Maximum job timeout"
msgstr ""
......@@ -11583,12 +11589,24 @@ msgstr ""
msgid "Maximum number of mirrors that can be synchronizing at the same time."
msgstr ""
msgid "Maximum number of projects."
msgstr ""
msgid "Maximum page reached"
msgstr ""
msgid "Maximum push size (MB)"
msgstr ""
msgid "Maximum size limit for a single commit."
msgstr ""
msgid "Maximum size limit for each repository."
msgstr ""
msgid "Maximum size of individual attachments in comments."
msgstr ""
msgid "Maximum time between updates that a mirror can have when scheduled to synchronize."
msgstr ""
......@@ -16949,9 +16967,6 @@ msgstr ""
msgid "Session duration (minutes)"
msgstr ""
msgid "Session expiration, projects limit and attachment size."
msgstr ""
msgid "Set %{epic_ref} as the parent epic."
msgstr ""
......@@ -16991,6 +17006,9 @@ msgstr ""
msgid "Set parent epic to an epic"
msgstr ""
msgid "Set projects and maximum size limits, session duration, user options, and check feature availability for namespace plan."
msgstr ""
msgid "Set requirements for a user to sign-in. Enable mandatory two-factor authentication."
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