diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2016-12-17 12:27:03 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2016-12-17 12:27:03 +0000 |
| commit | e47989a58b8a9f83855ea9210ba5786fc14fb841 (patch) | |
| tree | 2c9c722e8a989e38b36e9e9c9eef12cc9b0e2e76 /config/initializers | |
| parent | 0a6450094eb13702f6f6f03e468db4fc8f023315 (diff) | |
| parent | c9610e0a052526adb3138dccf6114d710979a0b7 (diff) | |
| download | gitlab-ce-e47989a58b8a9f83855ea9210ba5786fc14fb841.tar.gz | |
Merge branch 'zj-mattermost-session' into 'master'
Mattermost session
This branch is based of tag v8.14.4 so I could test on an instance better.
But stuck on the tests, as setting up the whole doorkeeper stuff doesn't seem to be supported for testing.
See merge request !8033
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 0ee1b1ec634..ddea325c6ca 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -262,6 +262,13 @@ Settings.lfs['enabled'] = true if Settings.lfs['enabled'].nil? Settings.lfs['storage_path'] = File.expand_path(Settings.lfs['storage_path'] || File.join(Settings.shared['path'], "lfs-objects"), Rails.root) # +# Mattermost +# +Settings['mattermost'] ||= Settingslogic.new({}) +Settings.mattermost['enabled'] = false if Settings.mattermost['enabled'].nil? +Settings.mattermost['host'] = nil unless Settings.mattermost.enabled + +# # Gravatar # Settings['gravatar'] ||= Settingslogic.new({}) |