Commit 485ff5f5 authored by Sean McGivern's avatar Sean McGivern

Merge branch '341348-fj-remove-linear-participants-service-ancestors-ff' into 'master'

Enable linear ParticipantsService ancestors queries

See merge request gitlab-org/gitlab!72593
parents aebe8571 e910d9e2
...@@ -36,17 +36,9 @@ module Projects ...@@ -36,17 +36,9 @@ module Projects
private private
def project_members_through_invited_groups def project_members_through_invited_groups
groups_with_ancestors = if ::Feature.enabled?(:linear_participants_service_ancestor_scopes, current_user, default_enabled: :yaml)
visible_groups.self_and_ancestors
else
Gitlab::ObjectHierarchy
.new(visible_groups)
.base_and_ancestors
end
GroupMember GroupMember
.active_without_invites_and_requests .active_without_invites_and_requests
.with_source_id(groups_with_ancestors.pluck_primary_key) .with_source_id(visible_groups.self_and_ancestors.pluck_primary_key)
end end
def visible_groups def visible_groups
......
---
name: linear_participants_service_ancestor_scopes
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70684
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341348
milestone: '14.4'
type: development
group: group::access
default_enabled: false
...@@ -207,13 +207,5 @@ RSpec.describe Projects::ParticipantsService do ...@@ -207,13 +207,5 @@ RSpec.describe Projects::ParticipantsService do
end end
it_behaves_like 'return project members' it_behaves_like 'return project members'
context 'when feature flag :linear_participants_service_ancestor_scopes is disabled' do
before do
stub_feature_flags(linear_participants_service_ancestor_scopes: false)
end
it_behaves_like 'return project members'
end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment