diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-03-08 16:45:59 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-03-08 16:46:02 +0000 |
| commit | 75e78f108f850fe6c70c04a13747d2c40a511774 (patch) | |
| tree | 884aae4d94707a90e81dc95ce329ffda15b832ca /config/initializers/1_settings.rb | |
| parent | d34300e310eca8b02c2b3956cd7c321edb3a5d0d (diff) | |
| download | gitlab-ce-75e78f108f850fe6c70c04a13747d2c40a511774.tar.gz | |
The GitLab Pages external-http and external-https arguments can be specified multiple times
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index b45d0e23080..e5e90031871 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -278,8 +278,8 @@ 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) -Settings.pages['external_http'] ||= false if Settings.pages['external_http'].nil? -Settings.pages['external_https'] ||= false if Settings.pages['external_https'].nil? +Settings.pages['external_http'] ||= false unless Settings.pages['external_http'].present? +Settings.pages['external_https'] ||= false unless Settings.pages['external_https'].present? # # Git LFS |