diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 12:06:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 12:06:09 +0300 |
| commit | 77a7772c3bdb03d92cbc154f6b1a762953cc7c19 (patch) | |
| tree | b841c2233afb01d1b6cc7dd4023f2b677ec19eb3 /config/initializers/1_settings.rb | |
| parent | f7234a0894db99c7ade3cf29c1b467aa4807cc41 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 4e66aff8c17..b22391e3e63 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -290,9 +290,6 @@ 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? - -Settings.pages['admin'] ||= Settingslogic.new({}) -Settings.pages.admin['certificate'] ||= '' Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_shared_secret') # |