diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/finders/members_finder.rb | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
| download | gitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/finders/members_finder.rb')
| -rw-r--r-- | app/finders/members_finder.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/finders/members_finder.rb b/app/finders/members_finder.rb index de6eacbb1e0..de2a4ce3518 100644 --- a/app/finders/members_finder.rb +++ b/app/finders/members_finder.rb @@ -31,7 +31,11 @@ class MembersFinder attr_reader :project, :current_user, :group def find_members(include_relations) - project_members = project.project_members + project_members = if Feature.enabled?(:project_members_index_by_project_namespace, project) + project.namespace_members + else + project.project_members + end if params[:active_without_invites_and_requests].present? project_members = project_members.active_without_invites_and_requests |