Revert "Don't include projects shared as group-descendants"
This reverts commit 2c3c5b3554
.
Revisit this after https://gitlab.com/gitlab-org/gitlab-ce/issues/45441
This commit is contained in:
parent
1b0156204d
commit
2a9a2b22e6
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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' } }
|
||||
|
||||
|
|
Loading…
Reference in New Issue