summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2017-10-04 21:01:27 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2017-10-04 21:01:27 +0200
commitd5486807ba979172e35b81a6b74243225473b69f (patch)
tree9864c84eb8ad81dfab912f250585d9ec9adb41ba /config
parent8640b294faa1f2f99e72ec46d36ba4873d8d3f5b (diff)
downloadgitlab-ce-d5486807ba979172e35b81a6b74243225473b69f.tar.gz
Incorporate feedback
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 13d38515354..a4b7c1a3919 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -325,7 +325,7 @@ Settings.pages['protocol'] ||= Settings.pages.https ? "https" : "http"
Settings.pages['url'] ||= Settings.__send__(:build_pages_url)
Settings.pages['external_http'] ||= false unless Settings.pages['external_http'].present?
Settings.pages['external_https'] ||= false unless Settings.pages['external_https'].present?
-Settings.pages['artifacts_server'] ||= Settings.pages['enabled']
+Settings.pages['artifacts_server'] ||= Settings.pages['enabled'] if Settings.pages['artifacts_server'].nil?
#
# Git LFS