diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-10-05 15:03:17 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-10-05 15:03:17 +0000 |
| commit | ce87f42dc928377abdd1dd445598afb8150d4521 (patch) | |
| tree | 875d7173db44d05c67b6de45f57359bb550ec62e /config/initializers | |
| parent | cd60a02ad94088ae1444ac9a8b355b4d05fc30a3 (diff) | |
| parent | d1dd115356a06fd20e8b9293cd645bb064b7c56a (diff) | |
| download | gitlab-ce-ce87f42dc928377abdd1dd445598afb8150d4521.tar.gz | |
Merge branch '34102-online-view-of-artifacts-fe' into 'master'
Add external link for online artifacts
Closes #34102
See merge request gitlab-org/gitlab-ce!14399
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index a23b3208dab..a4b7c1a3919 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -316,15 +316,16 @@ Settings.registry['path'] = Settings.absolute(Settings.registry['path # Pages # Settings['pages'] ||= Settingslogic.new({}) -Settings.pages['enabled'] = false if Settings.pages['enabled'].nil? -Settings.pages['path'] = Settings.absolute(Settings.pages['path'] || File.join(Settings.shared['path'], "pages")) -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) -Settings.pages['external_http'] ||= false unless Settings.pages['external_http'].present? -Settings.pages['external_https'] ||= false unless Settings.pages['external_https'].present? +Settings.pages['enabled'] = false if Settings.pages['enabled'].nil? +Settings.pages['path'] = Settings.absolute(Settings.pages['path'] || File.join(Settings.shared['path'], "pages")) +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) +Settings.pages['external_http'] ||= false unless Settings.pages['external_http'].present? +Settings.pages['external_https'] ||= false unless Settings.pages['external_https'].present? +Settings.pages['artifacts_server'] ||= Settings.pages['enabled'] if Settings.pages['artifacts_server'].nil? # # Git LFS |