diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-05-30 16:24:45 -0700 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-01-08 20:34:19 +0000 |
| commit | 255a0f85e3b62845b58f5a4aa189e57f36992c77 (patch) | |
| tree | 339d54b2cf3a9408fa3014ab84a2ad426f65cb3c /app/models | |
| parent | ac86b2043dea8f15cb0670db98c2bf21e1843d4b (diff) | |
| download | gitlab-ce-255a0f85e3b62845b58f5a4aa189e57f36992c77.tar.gz | |
Backport option to disable writing to `authorized_keys` file
Originally branch 'mk-toggle-writing-to-auth-keys-1631'
See merge request !2004
Squashed commits:
Add authorized_keys_enabled to Application Settings
Ensure default settings are exposed in UI
Without this change, `authorized_keys_enabled` is unchecked when it is nil, even if it should be checked by default.
Add “Speed up SSH operations” documentation
Clarify the reasons for disabling writes
Add "How to go back" section
Tweak copy
Update Application Setting screenshot
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 253e213af81..8ab338d873d 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -261,6 +261,7 @@ class ApplicationSetting < ActiveRecord::Base { after_sign_up_text: nil, akismet_enabled: false, + authorized_keys_enabled: true, # TODO default to false if the instance is configured to use AuthorizedKeysCommand container_registry_token_expire_delay: 5, default_artifacts_expire_in: '30 days', default_branch_protection: Settings.gitlab['default_branch_protection'], |