summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-22 11:35:20 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:32:22 -0600
commit99a34a52d7e329f41bf43dd4d1d3ada3aca641b2 (patch)
treec433e3a0f13c3b8b1447893b07ebc87530ae7bf3 /config/initializers
parent6023fbfd0fc6fb4ea22dfb6f5d89e83189861784 (diff)
downloadgitlab-ce-99a34a52d7e329f41bf43dd4d1d3ada3aca641b2.tar.gz
Enable Style/MultilineArrayBraceLayout
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/1_settings.rb20
1 files changed, 11 insertions, 9 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index ac89fb9e9cf..21cc03113ae 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -20,11 +20,12 @@ class Settings < Settingslogic
else
":#{gitlab.port}"
end
- [gitlab.protocol,
- "://",
- gitlab.host,
- custom_port,
- gitlab.relative_url_root
+ [
+ gitlab.protocol,
+ "://",
+ gitlab.host,
+ custom_port,
+ gitlab.relative_url_root
].join('')
end
@@ -81,10 +82,11 @@ class Settings < Settingslogic
def base_url(config)
custom_port = on_standard_port?(config) ? nil : ":#{config.port}"
- [config.protocol,
- "://",
- config.host,
- custom_port
+ [
+ config.protocol,
+ "://",
+ config.host,
+ custom_port
]
end