diff options
author | Izaak Alpert <ialpert@blackberry.com> | 2013-09-16 13:31:22 -0400 |
---|---|---|
committer | Izaak Alpert <ialpert@blackberry.com> | 2013-09-22 01:05:14 -0400 |
commit | 51e6095dd16a02c67966cea5de51a2c2ec81d9d6 (patch) | |
tree | 68c4bb07004ba803e510fa4fd8566c5b9f55a320 /config | |
parent | 5367e42bd663cd8a66b364a2ce08c22a83800feb (diff) | |
download | gitlab-ce-51e6095dd16a02c67966cea5de51a2c2ec81d9d6.tar.gz |
Make users theme configurable
GITLAB-1262
Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a
Conflicts:
app/models/user.rb
config/initializers/1_settings.rb
spec/models/user_spec.rb
Diffstat (limited to 'config')
-rw-r--r-- | config/gitlab.yml.example | 8 | ||||
-rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 0434601cb49..89e9ed681f1 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -42,6 +42,14 @@ production: &base default_projects_limit: 10 # default_can_create_group: false # default: true # username_changing_enabled: false # default: true - User can change her username/namespace + ## Default theme + ## BASIC = 1 + ## MARS = 2 + ## MODERN = 3 + ## GRAY = 4 + ## COLOR = 5 + # default_theme: 1 # default: 1 + ## Users management # signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled. diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index da7a83a62a4..95a32788ea4 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -52,6 +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['host'] ||= 'localhost' Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 |