diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-02 15:56:29 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-02 15:56:29 +0000 |
| commit | 01b14b2d050ed32dd25907cda5a5ea49dc99d6a0 (patch) | |
| tree | 760b4b24ad4e83e0f53a330646fe1d29f34f0aff /config/initializers | |
| parent | e2123de5fca072306f7247931863418864739035 (diff) | |
| download | gitlab-ce-01b14b2d050ed32dd25907cda5a5ea49dc99d6a0.tar.gz | |
Fix rubocop error from pages EE->CE port
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 0015ddf902d..71046d7860e 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -268,8 +268,8 @@ Settings.registry['path'] = File.expand_path(Settings.registry['path' Settings['pages'] ||= Settingslogic.new({}) Settings.pages['enabled'] = false if Settings.pages['enabled'].nil? Settings.pages['path'] = File.expand_path(Settings.pages['path'] || File.join(Settings.shared['path'], "pages"), Rails.root) -Settings.pages['host'] ||= "example.com" Settings.pages['https'] = false if Settings.pages['https'].nil? +Settings.pages['host'] ||= "example.com" Settings.pages['port'] ||= Settings.pages.https ? 443 : 80 Settings.pages['protocol'] ||= Settings.pages.https ? "https" : "http" Settings.pages['url'] ||= Settings.send(:build_pages_url) |