diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-09 14:21:23 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-01-17 18:24:22 +0300 |
| commit | ee92903fa6c89912610f6204daddc56b2907ae00 (patch) | |
| tree | 8fca1c17fabf1d58ce997f62fce19430ec70c833 /app/views | |
| parent | 370a4654de51091ed671beb189e5b295f3b0a2ed (diff) | |
Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'
Backport authorized_keys
Closes gitlab-ee#3953
See merge request gitlab-org/gitlab-ce!16014
(cherry picked from commit 2e4a1b3b78a76103198180acf873de8470d7cecf)
ac86b204 Backport authorized_keys branch 'find-key-by-fingerprint'
255a0f85 Backport option to disable writing to `authorized_keys` file
07bd79cd Combine ssh docs and rename the doc
bcffeade Use ApplicationSetting.current in Admin::ApplicationSettingsController
797fe0a6 Backport authorized_keys_enabled defaults to true'
d2f4e8f9 Avoid adding index if already exists
01319e59 Make Gitlab::CurrentSettings available when getting settings
d9557e43 Backport spec fixes in spec/lib/gitlab/shell_spec.rb
40e3d9f3 Fix typo in spec/requests/api/internal_spec.rb
bd9ead68 Fix spec in shell_spec.rb
9edd9a5e Adds changelog for backport of authorized_keys DB lookup from EE
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 3e2dbb07a6c..ba4ca88a8a9 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -775,6 +775,22 @@ = 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/fast_ssh_key_lookup') + + %fieldset %legend User and IP Rate Limits .form-group .col-sm-offset-2.col-sm-10 |