diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2017-08-17 10:37:36 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-09-06 12:54:09 -0500 |
| commit | 6c49a628000605d1beb120431003abb329b9fd16 (patch) | |
| tree | 03ede462b30999149411ec70287f6aad2507eb56 /config/initializers/1_settings.rb | |
| parent | 8d1321d66977dc50577cf23f7cb0a6e9caa8283e (diff) | |
| download | gitlab-ce-6c49a628000605d1beb120431003abb329b9fd16.tar.gz | |
Restore some changes from !9199
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 7c1ca05a57b..40fbdd3ef9b 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -232,6 +232,7 @@ Settings['gitlab'] ||= Settingslogic.new({}) Settings.gitlab['default_projects_limit'] ||= 100000 Settings.gitlab['default_branch_protection'] ||= 2 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil? +Settings.gitlab['default_theme'] = Gitlab::Themes::APPLICATION_DEFAULT if Settings.gitlab['default_theme'].nil? Settings.gitlab['host'] ||= ENV['GITLAB_HOST'] || 'localhost' Settings.gitlab['ssh_host'] ||= Settings.gitlab.host Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? |