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 | |
| parent | f7234a0894db99c7ade3cf29c1b467aa4807cc41 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 3 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 | ||||
| -rw-r--r-- | config/initializers/pages.rb | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 3b7abdfe17e..f2acfef80e9 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -319,8 +319,7 @@ production: &base artifacts_server: true # Set to false if you want to disable online view of HTML artifacts # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages - admin: - address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) + # File that contains the shared secret key for verifying access for gitlab-pages. # Default is '.gitlab_pages_shared_secret' relative to Rails.root (i.e. root of the GitLab app). # secret_file: /home/git/gitlab/.gitlab_pages_shared_secret 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') # diff --git a/config/initializers/pages.rb b/config/initializers/pages.rb deleted file mode 100644 index 835197557e8..00000000000 --- a/config/initializers/pages.rb +++ /dev/null @@ -1,2 +0,0 @@ -Gitlab::PagesClient.read_or_create_token -Gitlab::PagesClient.load_certificate diff --git a/config/routes/project.rb b/config/routes/project.rb index 5225cd5b054..3675a4600fe 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -387,6 +387,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get :builds get :failures get :status + get :test_report Gitlab.ee do get :security |