summaryrefslogtreecommitdiff
path: root/config/initializers/1_settings.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-22 09:10:32 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:57 -0600
commit5c7f9d69e3db27921acf6d8259245f2b4babcc2b (patch)
treeb90334ce234ddd3921e0f1780cf3bb0848adff7b /config/initializers/1_settings.rb
parent02494f7ce86fbf1276b384f45f58558c427eff63 (diff)
downloadgitlab-ce-5c7f9d69e3db27921acf6d8259245f2b4babcc2b.tar.gz
Fix code for cops
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb44
1 files changed, 23 insertions, 21 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index ecae5453736..ac89fb9e9cf 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -14,16 +14,17 @@ class Settings < Settingslogic
end
def build_gitlab_ci_url
- custom_port = if on_standard_port?(gitlab)
- nil
- else
- ":#{gitlab.port}"
- end
+ custom_port =
+ if on_standard_port?(gitlab)
+ nil
+ else
+ ":#{gitlab.port}"
+ end
[gitlab.protocol,
- "://",
- gitlab.host,
- custom_port,
- gitlab.relative_url_root
+ "://",
+ gitlab.host,
+ custom_port,
+ gitlab.relative_url_root
].join('')
end
@@ -81,9 +82,9 @@ class Settings < Settingslogic
def base_url(config)
custom_port = on_standard_port?(config) ? nil : ":#{config.port}"
[config.protocol,
- "://",
- config.host,
- custom_port
+ "://",
+ config.host,
+ custom_port
]
end
@@ -160,15 +161,16 @@ if github_settings
github_settings["args"] ||= Settingslogic.new({})
- github_settings["args"]["client_options"] = if github_settings["url"].include?(github_default_url)
- OmniAuth::Strategies::GitHub.default_options[:client_options]
- else
- {
- "site" => File.join(github_settings["url"], "api/v3"),
- "authorize_url" => File.join(github_settings["url"], "login/oauth/authorize"),
- "token_url" => File.join(github_settings["url"], "login/oauth/access_token")
- }
- end
+ github_settings["args"]["client_options"] =
+ if github_settings["url"].include?(github_default_url)
+ OmniAuth::Strategies::GitHub.default_options[:client_options]
+ else
+ {
+ "site" => File.join(github_settings["url"], "api/v3"),
+ "authorize_url" => File.join(github_settings["url"], "login/oauth/authorize"),
+ "token_url" => File.join(github_settings["url"], "login/oauth/access_token")
+ }
+ end
end
Settings['shared'] ||= Settingslogic.new({})