diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 13:26:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 13:26:31 +0000 |
commit | b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch) | |
tree | 5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /config | |
parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff) | |
download | gitlab-ce-b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/1_settings.rb | 1 | ||||
-rw-r--r-- | config/initializers/rack_attack_global.rb | 2 | ||||
-rw-r--r-- | config/initializers/workhorse_multipart.rb | 3 | ||||
-rw-r--r-- | config/pseudonymizer.yml | 1 | ||||
-rw-r--r-- | config/routes.rb | 2 |
5 files changed, 8 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index dbbb7ba1b60..fbe6c21e53d 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -78,6 +78,7 @@ Gitlab.ee do Settings.smartcard['enabled'] = false if Settings.smartcard['enabled'].nil? Settings.smartcard['client_certificate_required_port'] = 3444 if Settings.smartcard['client_certificate_required_port'].nil? Settings.smartcard['required_for_git_access'] = false if Settings.smartcard['required_for_git_access'].nil? + Settings.smartcard['san_extensions'] = false if Settings.smartcard['san_extensions'].nil? end Settings['omniauth'] ||= Settingslogic.new({}) diff --git a/config/initializers/rack_attack_global.rb b/config/initializers/rack_attack_global.rb index 86cb930eca9..7f0439ef9bf 100644 --- a/config/initializers/rack_attack_global.rb +++ b/config/initializers/rack_attack_global.rb @@ -68,3 +68,5 @@ class Rack::Attack end end end + +::Rack::Attack::Request.prepend_if_ee('::EE::Gitlab::Rack::Attack::Request') diff --git a/config/initializers/workhorse_multipart.rb b/config/initializers/workhorse_multipart.rb index 4196e3a8f61..9c170d1adfa 100644 --- a/config/initializers/workhorse_multipart.rb +++ b/config/initializers/workhorse_multipart.rb @@ -1,5 +1,6 @@ Rails.application.configure do |config| - config.middleware.use(Gitlab::Middleware::Multipart) + # ApolloUploadServer::Middleware expects to find uploaded files ready to use + config.middleware.insert_before(ApolloUploadServer::Middleware, Gitlab::Middleware::Multipart) end # The Gitlab::Middleware::Multipart middleware inserts instances of our diff --git a/config/pseudonymizer.yml b/config/pseudonymizer.yml index 1d85ac1db45..8bbc69dca7d 100644 --- a/config/pseudonymizer.yml +++ b/config/pseudonymizer.yml @@ -98,6 +98,7 @@ tables: - weight - due_date - moved_to_id + - duplicated_to_id - lock_version - time_estimate - last_edited_at diff --git a/config/routes.rb b/config/routes.rb index 7d091576e8f..9dbcd7fffa2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -111,6 +111,7 @@ Rails.application.routes.draw do draw :smartcard draw :jira_connect draw :username + draw :trial draw :trial_registration draw :country end @@ -142,6 +143,7 @@ Rails.application.routes.draw do member do Gitlab.ee do get :metrics, format: :json + get '/prometheus/api/v1/*proxy_path', to: 'clusters#prometheus_proxy', as: :prometheus_api end scope :applications do |