summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorIzaak Alpert <ialpert@blackberry.com>2013-09-22 01:06:22 -0400
committerIzaak Alpert <ialpert@blackberry.com>2013-09-22 01:06:22 -0400
commitfcba0d55f483248022ca6c85faf33c5b4202dd9a (patch)
tree1a4ec4bb5529aef900f5935a1267f1134713a5b6 /config
parent51e6095dd16a02c67966cea5de51a2c2ec81d9d6 (diff)
downloadgitlab-ce-fcba0d55f483248022ca6c85faf33c5b4202dd9a.tar.gz
Defaulted theme to MARS
Change-Id: I02814fb47edcc915309183547cc8dcb165100f4f
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example2
-rw-r--r--config/initializers/1_settings.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 89e9ed681f1..c1cc9f872f3 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -48,7 +48,7 @@ production: &base
## MODERN = 3
## GRAY = 4
## COLOR = 5
- # default_theme: 1 # default: 1
+ # default_theme: 2 # default: 2
## Users management
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 95a32788ea4..1c8758d9420 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -52,7 +52,7 @@ Settings['issues_tracker'] ||= {}
Settings['gitlab'] ||= Settingslogic.new({})
Settings.gitlab['default_projects_limit'] ||= 10
Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil?
-Settings.gitlab['default_theme'] = Gitlab::Theme::BASIC if Settings.gitlab['default_theme'].nil?
+Settings.gitlab['default_theme'] = Gitlab::Theme::MARS if Settings.gitlab['default_theme'].nil?
Settings.gitlab['host'] ||= 'localhost'
Settings.gitlab['https'] = false if Settings.gitlab['https'].nil?
Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80