From 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Aug 2020 18:42:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-3-stable-ee --- app/finders/group_members_finder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/finders/group_members_finder.rb') diff --git a/app/finders/group_members_finder.rb b/app/finders/group_members_finder.rb index 949af103eb3..a4b00588368 100644 --- a/app/finders/group_members_finder.rb +++ b/app/finders/group_members_finder.rb @@ -57,7 +57,7 @@ class GroupMembersFinder < UnionFinder members = members.search(params[:search]) if params[:search].present? members = members.sort_by_attribute(params[:sort]) if params[:sort].present? - if can_manage_members && params[:two_factor].present? + if params[:two_factor].present? && can_manage_members members = members.filter_by_2fa(params[:two_factor]) end -- cgit v1.2.1