diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 09:08:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 09:08:46 +0000 |
| commit | b806264d29b8d52ccb78a41dcc3d67f2b040700c (patch) | |
| tree | af97e9d36b2c82520d6850836dee6ba8d7ed9b17 /app/views/admin/application_settings | |
| parent | 34ab9be97ecf84dd2b7a3b8f3149c0f7d1d7ab5c (diff) | |
| download | gitlab-ce-b806264d29b8d52ccb78a41dcc3d67f2b040700c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin/application_settings')
| -rw-r--r-- | app/views/admin/application_settings/_account_and_limit.html.haml | 7 |
1 files changed, 1 insertions, 6 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 60130f9b5ef..80a53dba2aa 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -51,13 +51,8 @@ = f.check_box :user_show_add_ssh_key_message, class: 'form-check-input' = f.label :user_show_add_ssh_key_message, class: 'form-check-label' do = _("Inform users without uploaded SSH keys that they can't push over SSH until one is added") - .form-group - = f.label :updating_name_disabled_for_users, _('User restrictions'), class: 'label-bold' - .form-check - = f.check_box :updating_name_disabled_for_users, class: 'form-check-input' - = f.label :updating_name_disabled_for_users, class: 'form-check-label' do - = _("Prevent users from changing their profile name") + = 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' |