diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-09 11:21:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-09 11:21:23 +0000 |
| commit | 2e4a1b3b78a76103198180acf873de8470d7cecf (patch) | |
| tree | da0c62bfc0eb8fbc1960330d6f8b3be91d986639 /app/models | |
| parent | 639cfdc221617f13ee08e673e0b5e51efc344744 (diff) | |
| parent | 9edd9a5ea21a1b95ffc7b399c5c11bc9a7c4c318 (diff) | |
| download | gitlab-ce-2e4a1b3b78a76103198180acf873de8470d7cecf.tar.gz | |
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
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'], |