diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 12:08:18 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 12:08:18 +0000 |
commit | 684d65316ac77c62f47d68b9926eea8af30db227 (patch) | |
tree | d1f4c4eec399d7772ab4ad6294f98e7505c1cee5 /app/finders | |
parent | ade18c9d68d5a2e6c6e28ef7e9d3add3b3491ace (diff) | |
download | gitlab-ce-684d65316ac77c62f47d68b9926eea8af30db227.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
-rw-r--r-- | app/finders/group_members_finder.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/finders/group_members_finder.rb b/app/finders/group_members_finder.rb index bee18017cf3..a56d4ebb368 100644 --- a/app/finders/group_members_finder.rb +++ b/app/finders/group_members_finder.rb @@ -10,13 +10,16 @@ class GroupMembersFinder < UnionFinder # created_after: datetime # created_before: datetime - def initialize(group, user = nil) + attr_reader :params + + def initialize(group, user = nil, params: {}) @group = group @user = user + @params = params end # rubocop: disable CodeReuse/ActiveRecord - def execute(include_relations: [:inherited, :direct], params: {}) + def execute(include_relations: [:inherited, :direct]) group_members = group.members relations = [] @params = params @@ -50,7 +53,7 @@ class GroupMembersFinder < UnionFinder private - attr_reader :user, :group, :params + attr_reader :user, :group def filter_members(members) members = members.search(params[:search]) if params[:search].present? |