diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/views/admin/application_settings/_account_and_limit.html.haml | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/views/admin/application_settings/_account_and_limit.html.haml')
-rw-r--r-- | app/views/admin/application_settings/_account_and_limit.html.haml | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml index 65a2f1d42e1..184249bcaba 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -9,14 +9,6 @@ = _('Gravatar enabled') .form-group - = f.label :namespace_storage_size_limit, class: 'label-bold' do - = _('Maximum namespace storage (MB)') - = f.number_field :namespace_storage_size_limit, class: 'form-control', min: 0 - %span.form-text.text-muted - = _('Includes repository storage, wiki storage, LFS objects, build artifacts and packages. 0 for unlimited.') - = link_to _('More information'), help_page_path('user/admin_area/settings/account_and_limit_settings', anchor: 'maximum-namespace-storage-size'), target: '_blank' - - .form-group = 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 @@ -52,7 +44,7 @@ = f.check_box :user_default_external, class: 'form-check-input' = f.label :user_default_external, class: 'form-check-label' do = _('Newly registered users will by default be external') - .prepend-top-10 + .gl-mt-3 = _('Internal users') = f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-mt-2' .help-block @@ -68,5 +60,5 @@ = render_if_exists 'admin/application_settings/updating_name_disabled_for_users', form: f = render_if_exists 'admin/application_settings/availability_on_namespace_setting', form: f - - = f.submit _('Save changes'), class: 'btn btn-success qa-save-changes-button' + .gl-display-flex.gl-justify-content-end + = f.submit _('Save changes'), class: 'btn btn-success qa-save-changes-button' |