diff options
author | Rémy Coutable <remy@rymai.me> | 2019-09-02 11:43:21 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-09-02 11:43:21 +0300 |
commit | b7398bc1fdad6c721cfa35ff17cebc2cb00c8240 (patch) | |
tree | 48592d3a9f6d495b8b47b31c60dfa6eb17a00bb2 /lib/gitlab/performance_bar | |
parent | d6de7c65500b73f2e7f899e0c0a224aafca3d4d1 (diff) | |
parent | c2452db59cf045f01244b8d72e14cb0144d19722 (diff) |
Merge branch 'fix-peek-on-puma' into 'master'
Fix Peek on Puma
Closes #66528
See merge request gitlab-org/gitlab-ce!32213
Diffstat (limited to 'lib/gitlab/performance_bar')
-rw-r--r-- | lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb b/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb index 2d997760c46..cddd4f18cc3 100644 --- a/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb +++ b/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb @@ -4,8 +4,8 @@ module Gitlab module PerformanceBar module RedisAdapterWhenPeekEnabled - def save - super unless ::Peek.request_id.blank? + def save(request_id) + super if ::Gitlab::PerformanceBar.enabled_for_request? && request_id.present? end end end |