diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-09 18:06:55 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:53:57 +0000 |
| commit | 5f7257c27dace1dcb9d3eb4732caf68f061a8d68 (patch) | |
| tree | a00cfa51f1aa44ae3592d49c3232795d21d3fae4 /config/initializers/1_settings.rb | |
| parent | c4c8ca04052aaf7d37c2335066381b536df68427 (diff) | |
| download | gitlab-ce-5f7257c27dace1dcb9d3eb4732caf68f061a8d68.tar.gz | |
Initial work on GitLab Pages update
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 860cafad325..239aa662d9f 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -273,6 +273,7 @@ Settings.pages['https'] = false if Settings.pages['https'].nil? Settings.pages['port'] ||= Settings.pages.https ? 443 : 80 Settings.pages['protocol'] ||= Settings.pages.https ? "https" : "http" Settings.pages['url'] ||= Settings.send(:build_pages_url) +Settings.pages['custom_domain'] ||= false if Settings.pages['custom_domain'].nil? # # Git LFS |