Commit 5d8726bb authored by Yorick Peterse's avatar Yorick Peterse

Merge branch '20473-rails-queue-duration' into 'master'

Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration

See merge request !5592
parents 74d4f3de 2dcfaa19
......@@ -30,6 +30,7 @@ v 8.11.0 (unreleased)
- Make branches sortable without push permission !5462 (winniehell)
- Check for Ci::Build artifacts at database level on pipeline partial
- Make "New issue" button in Issue page less obtrusive !5457 (winniehell)
- Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
- Add the `sprockets-es6` gem
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
......
......@@ -141,10 +141,9 @@ module Gitlab
end
end
# Allow access from other metrics related middlewares
def self.current_transaction
Transaction.current
end
private_class_method :current_transaction
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment