Commit 0d8f00a2 authored by Sean McGivern's avatar Sean McGivern Committed by Alejandro Rodríguez

Merge branch 'followup-7899' into 'master'

Use a single query in Projects::ProjectMembersController to fetch members

See merge request !7997
parent 512520f0
......@@ -35,13 +35,12 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@group_links = @project.project_group_links.where(group_id:[:search]).select(:id))
member_ids = @project_members.pluck(:id)
wheres = ["id IN (#{})"]
wheres << "id IN (#{})" if group_members
if group_members
member_ids += group_members.pluck(:id)
@project_members = Member.where(id: member_ids).order(access_level: :desc).page(params[:page])
@project_members = Member.
where(wheres.join(' OR ')).
order(access_level: :desc).page(params[:page])
@requesters =
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment