diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-03 22:52:01 +0200 |
|---|---|---|
| committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-08 17:28:27 +0200 |
| commit | b6ba8cc696a45e58bde24a592a9c315a0eb16744 (patch) | |
| tree | 1e04dca8822b719f94a459292cccb5bc699ed696 /app/views/admin/application_settings | |
| parent | 6f21652f0b79a614ad809dc028aaa28aee16732e (diff) | |
| download | gitlab-ce-b6ba8cc696a45e58bde24a592a9c315a0eb16744.tar.gz | |
Add ability suppress the global "You won't be able [use] SSH" message
This fixes gitlab-org/gitlab-ce#49953, as noted in the documentation
this feature is intended to be used when SSH certificates are
enabled. Then this warning becomes not only pointless, but also
misleading.
This builds on top of gitlab-org/gitlab-ce!21009 since both need to
modify the same documentation, which avoids a merge conflict.
See also the gitlab-org/gitlab-ce#49218 issue and associated merge
request.
Diffstat (limited to 'app/views/admin/application_settings')
| -rw-r--r-- | app/views/admin/application_settings/_account_and_limit.html.haml | 6 |
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 7c8243a7a90..622cb11010e 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -29,5 +29,11 @@ = 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 + .form-group + = f.label :user_show_add_ssh_key_message, 'Prompt users to upload SSH keys', class: 'label-bold' + .form-check + = 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 = f.submit 'Save changes', class: 'btn btn-success' |