diff options
author | Rémy Coutable <remy@rymai.me> | 2017-06-30 17:34:06 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-07-06 11:18:25 +0200 |
commit | 19b8d8af2c74e0ff241356d5ccb5890baa6fb7c8 (patch) | |
tree | da51ca7dcc7e8340627390c714aed36bfc35835c /lib | |
parent | c8ce1f0d5d5908351fd8a0e60c00e67c1be25ed9 (diff) | |
download | gitlab-ce-19b8d8af2c74e0ff241356d5ccb5890baa6fb7c8.tar.gz |
Hide 'peek' by using 'performance bar' instead
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/feature.rb | 6 | ||||
-rw-r--r-- | lib/gitlab/performance_bar.rb | 13 |
2 files changed, 7 insertions, 12 deletions
diff --git a/lib/feature.rb b/lib/feature.rb index 853a00c75a4..5470c2802d5 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -54,15 +54,13 @@ class Feature adapter = Flipper::Adapters::ActiveRecord.new( feature_class: FlipperFeature, gate_class: FlipperGate) - Flipper.new(adapter).tap do - register_feature_groups - end + Flipper.new(adapter) end end def register_feature_groups Flipper.register(:performance_team) do |actor| - Gitlab::PerformanceBar.allowed_actor?(actor) + actor.thing&.is_a?(User) && Gitlab::PerformanceBar.allowed_user?(actor.thing) end end end 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 |