diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2017-09-08 14:48:44 +0000 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2017-09-08 14:48:44 +0000 |
| commit | 52a2423e373e6552023faaff43ae07dbb7423c00 (patch) | |
| tree | f6855f30c1f0ec08583707d54191e20c2e561e37 /config/initializers/1_settings.rb | |
| parent | af930b83a097f4ab83e6361bc3c210462e507cd9 (diff) | |
| download | gitlab-ce-52a2423e373e6552023faaff43ae07dbb7423c00.tar.gz | |
Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'"revert-f2421b2b
This reverts merge request !13619
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 40fbdd3ef9b..7c1ca05a57b 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -232,7 +232,6 @@ 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? |