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

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

See merge request !5592
This commit is contained in:
Yorick Peterse 2016-08-01 13:00:19 +00:00
commit 5d8726bb68
2 changed files with 2 additions and 2 deletions

View file

@ -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)

View file

@ -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