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 | |
| parent | 8d1321d66977dc50577cf23f7cb0a6e9caa8283e (diff) | |
| download | gitlab-ce-6c49a628000605d1beb120431003abb329b9fd16.tar.gz | |
Restore some changes from !9199
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 10 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e9661090844..1ca0f263f13 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -76,6 +76,14 @@ production: &base # default_can_create_group: false # default: true # username_changing_enabled: false # default: true - User can change her username/namespace + ## Default theme ID + ## 1 - Graphite + ## 2 - Charcoal + ## 3 - Green + ## 4 - Gray + ## 5 - Violet + ## 6 - Blue + # default_theme: 2 # default: 2 ## Automatic issue closing # If a commit message matches this regular expression, all issues referenced from the matched text will be closed. @@ -741,4 +749,4 @@ test: admin_group: '' staging: - <<: *base + <<: *base
\ No newline at end of file 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? |