Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-30 18:34:06 +0300
committerRémy Coutable <remy@rymai.me>2017-07-06 12:18:25 +0300
commit19b8d8af2c74e0ff241356d5ccb5890baa6fb7c8 (patch)
treeda51ca7dcc7e8340627390c714aed36bfc35835c /lib/gitlab/performance_bar.rb
parentc8ce1f0d5d5908351fd8a0e60c00e67c1be25ed9 (diff)
Hide 'peek' by using 'performance bar' instead
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/gitlab/performance_bar.rb')
-rw-r--r--lib/gitlab/performance_bar.rb13
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/gitlab/performance_bar.rb b/lib/gitlab/performance_bar.rb
index 53812633888..af73cae3c9f 100644
--- a/lib/gitlab/performance_bar.rb
+++ b/lib/gitlab/performance_bar.rb
@@ -4,15 +4,15 @@ module Gitlab
Feature.enabled?(:gitlab_performance_bar, current_user)
end
- def self.allowed_actor?(actor)
- return false unless actor.thing&.is_a?(User) && allowed_group
+ def self.allowed_user?(user)
+ return false unless allowed_group
if RequestStore.active?
RequestStore.fetch('performance_bar:user_member_of_allowed_group') do
- user_member_of_allowed_group?(actor.thing)
+ user_member_of_allowed_group?(user)
end
else
- user_member_of_allowed_group?(actor.thing)
+ user_member_of_allowed_group?(user)
end
end
@@ -29,10 +29,7 @@ module Gitlab
end
def self.user_member_of_allowed_group?(user)
- GroupMembersFinder.new(allowed_group)
- .execute
- .where(user_id: user.id)
- .any?
+ GroupMembersFinder.new(allowed_group).execute.exists?(user_id: user.id)
end
end
end