Merge branch '28872-admin-area-s-account-and-limit-fields-could-be-improved' into 'master'

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

Closes #28872

See merge request gitlab-org/gitlab!19691

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

@@ -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

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

@@ -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'
 

changelogs/unreleased/28872-admin-area-s-account-and-limit-fields-could-be-improved.yml

+---
+title: Add clarifying content to account fields
+merge_request:
+author:
+type: other

ee/app/views/admin/application_settings/_repository_size_limit_setting.html.haml

@@ -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")

locale/gitlab.pot

@@ -6035,6 +6035,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 ""
 
@@ -11631,6 +11634,9 @@ msgstr ""
 msgid "Maximum delay (Minutes)"
 msgstr ""
 
+msgid "Maximum duration of a session."
+msgstr ""
+
 msgid "Maximum job timeout"
 msgstr ""
 
@@ -11649,12 +11655,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 ""
 
@@ -17027,9 +17045,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 ""
 
@@ -17069,6 +17084,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 ""