summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-13 06:08:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-13 06:08:10 +0000
commit6ede90f5dd63d4a1f5ba243b4ed5097bb1a0acab (patch)
tree6bb9e934cdd90d62e672a1d6c4a5a63995bfbb00 /app/views/admin
parentb8e30b446d9cb91b94d2b55e5c81303c8f2d1b25 (diff)
downloadgitlab-ce-6ede90f5dd63d4a1f5ba243b4ed5097bb1a0acab.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/application_settings/_account_and_limit.html.haml6
1 files changed, 6 insertions, 0 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 6b95c0f40c5..60130f9b5ef 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -51,6 +51,12 @@
= 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/availability_on_namespace_setting', form: f