diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-06-26 20:42:12 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-06-26 21:17:44 +0300 |
| commit | 9f867546cb083f91436228ad2669377c8d39a5f7 (patch) | |
| tree | fb222d654b5b72e9fd5f00708d337eed69babe23 /app/views | |
| parent | 9188a7625a92f6c730076d012a443942b440e381 (diff) | |
Revert "Merge branch 'mk-toggle-writing-to-auth-keys-1631' into 'master'"
This reverts commit e5669cb26f73024385d40dcf1c365cc9baaf529f, reversing
changes made to 3f42b5d809809655b958866294d30348972ea119.
# Conflicts:
# doc/administration/operations/speed_up_ssh.md
# Conflicts:
# doc/administration/operations/speed_up_ssh.md
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index befb1c67747..2d6cf92d0ce 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -671,22 +671,6 @@ installations. Set to 0 to completely disable polling. = link_to icon('question-circle'), help_page_path('administration/polling') - %fieldset - %legend Performance optimization - .form-group - .col-sm-offset-2.col-sm-10 - .checkbox - = f.label :authorized_keys_enabled do - = f.check_box :authorized_keys_enabled - Write to "authorized_keys" file - .help-block - By default, we write to the "authorized_keys" file to support Git - over SSH without additional configuration. GitLab can be optimized - to authenticate SSH keys via the database file. Only uncheck this - if you have configured your OpenSSH server to use the - AuthorizedKeysCommand. Click on the help icon for more details. - = link_to icon('question-circle'), help_page_path('administration/operations/speed_up_ssh', anchor: 'the-solution') - - if Gitlab::Geo.license_allows? %fieldset %legend GitLab Geo |