summaryrefslogtreecommitdiff
path: root/config/initializers/tracing.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-19 08:27:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-19 08:27:35 +0000
commit7e9c479f7de77702622631cff2628a9c8dcbc627 (patch)
treec8f718a08e110ad7e1894510980d2155a6549197 /config/initializers/tracing.rb
parente852b0ae16db4052c1c567d9efa4facc81146e88 (diff)
downloadgitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'config/initializers/tracing.rb')
-rw-r--r--config/initializers/tracing.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/tracing.rb b/config/initializers/tracing.rb
index f26fb18f3ea..3058bdeb84e 100644
--- a/config/initializers/tracing.rb
+++ b/config/initializers/tracing.rb
@@ -2,7 +2,8 @@
if Labkit::Tracing.enabled?
Rails.application.configure do |config|
- config.middleware.insert_after Labkit::Middleware::Rack, ::Labkit::Tracing::RackMiddleware
+ # Rack needs to parse multipart messages before ActionDispatch can filter parameters
+ config.middleware.insert_after Rack::MethodOverride, ::Labkit::Tracing::RackMiddleware
end
# Instrument Redis