diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /lib/gitlab/performance_bar.rb | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'lib/gitlab/performance_bar.rb')
| -rw-r--r-- | lib/gitlab/performance_bar.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/performance_bar.rb b/lib/gitlab/performance_bar.rb index e26309b5dfd..10b13e7f55f 100644 --- a/lib/gitlab/performance_bar.rb +++ b/lib/gitlab/performance_bar.rb @@ -7,10 +7,10 @@ module Gitlab EXPIRY_TIME_L2_CACHE = 5.minutes def self.enabled_for_request? - Gitlab::SafeRequestStore[:peek_enabled] + !Gitlab::SafeRequestStore[:capturing_flamegraph] && Gitlab::SafeRequestStore[:peek_enabled] end - def self.enabled_for_user?(user = nil) + def self.allowed_for_user?(user = nil) return true if Rails.env.development? return true if user&.admin? return false unless user && allowed_group_id |