summaryrefslogtreecommitdiff
path: root/config/initializers/1_settings.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-12-16 13:43:01 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-12-17 10:32:06 +0100
commitc9610e0a052526adb3138dccf6114d710979a0b7 (patch)
tree2c9c722e8a989e38b36e9e9c9eef12cc9b0e2e76 /config/initializers/1_settings.rb
parente663725961de66ac838d0a5a85978656938e74f4 (diff)
downloadgitlab-ce-c9610e0a052526adb3138dccf6114d710979a0b7.tar.gz
Fix rubocop failureszj-mattermost-session
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 45404e579ae..ddea325c6ca 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -265,8 +265,8 @@ Settings.lfs['storage_path'] = File.expand_path(Settings.lfs['storage_path'] ||
# Mattermost
#
Settings['mattermost'] ||= Settingslogic.new({})
-Settings.mattermost['enabled'] = false if Settings.mattermost['enabled'].nil?
-Settings.mattermost['host'] = nil unless Settings.mattermost.enabled
+Settings.mattermost['enabled'] = false if Settings.mattermost['enabled'].nil?
+Settings.mattermost['host'] = nil unless Settings.mattermost.enabled
#
# Gravatar