diff --git a/app/finders/group_descendants_finder.rb b/app/finders/group_descendants_finder.rb index e72fd8eb3a514ef614723593adf90d48de667b9d..051ea108e06f3dd621e4495413dbf1ab46f33b7e 100644 --- a/app/finders/group_descendants_finder.rb +++ b/app/finders/group_descendants_finder.rb @@ -134,10 +134,8 @@ class GroupDescendantsFinder end def direct_child_projects - GroupProjectsFinder.new(group: parent_group, - current_user: current_user, - options: { only_owned: true }, - params: params).execute + GroupProjectsFinder.new(group: parent_group, current_user: current_user, params: params) + .execute end # Finds all projects nested under `parent_group` or any of its descendant diff --git a/changelogs/unreleased/bvl-shared-groups-on-group-page.yml b/changelogs/unreleased/bvl-shared-groups-on-group-page.yml index 51bf2233658110aca12cafe0f8c13f0f0cb32d3c..6c0703fd1387269bbbbff7409f46c2b24b2f46e4 100644 --- a/changelogs/unreleased/bvl-shared-groups-on-group-page.yml +++ b/changelogs/unreleased/bvl-shared-groups-on-group-page.yml @@ -1,6 +1,5 @@ --- -title: Show shared projects on group list - list +title: Show shared projects on group page merge_request: 18390 author: type: fixed diff --git a/spec/finders/group_descendants_finder_spec.rb b/spec/finders/group_descendants_finder_spec.rb index 375bcc9087e8bfeb028c0f5b4e664c00eda9bad8..796d40cb625fef795ca982ebbafc99109a1e9044 100644 --- a/spec/finders/group_descendants_finder_spec.rb +++ b/spec/finders/group_descendants_finder_spec.rb @@ -35,15 +35,6 @@ describe GroupDescendantsFinder do expect(finder.execute).to contain_exactly(project) end - it 'does not include projects shared with the group' do - project = create(:project, namespace: group) - other_project = create(:project) - other_project.project_group_links.create(group: group, - group_access: ProjectGroupLink::MASTER) - - expect(finder.execute).to contain_exactly(project) - end - context 'when archived is `true`' do let(:params) { { archived: 'true' } }