summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-16 09:51:15 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-16 09:51:15 -0500
commita26ec8a10660ca6ffcf49abac6ddad57fd99f80d (patch)
tree40972d88422b7d8b845b3ec0a66dada029c37349 /config/initializers
parente60bbdf9d9609fd0624be61dcf8a3a0432040ad1 (diff)
downloadgitlab-ce-a26ec8a10660ca6ffcf49abac6ddad57fd99f80d.tar.gz
Compact host and port
Diffstat (limited to 'config/initializers')
-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 20f920ea854..129fd9b79f2 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -253,7 +253,7 @@ Settings.registry['port'] ||= nil
Settings.registry['api_url'] ||= "http://localhost:5000/"
Settings.registry['key'] ||= nil
Settings.registry['issuer'] ||= nil
-Settings.registry['host_port'] ||= [Settings.registry['host'], Settings.registry['port']].join(':')
+Settings.registry['host_port'] ||= [Settings.registry['host'], Settings.registry['port']].compact.join(':')
#
# Git LFS