Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2018-01-20 14:21:49 +0300
committerBob Van Landuyt <bob@vanlanduyt.co>2018-01-22 19:02:04 +0300
commit2c3c5b35549185080296670cfe6710aa80f99944 (patch)
tree86e718db224300ca248a524f1dd061bdda56376e /app/finders
parentc56326fc3ef75767abf324f614a4be46153efbb3 (diff)
Don't include projects shared as group-descendants
When a project is shared with a group, it should not be included as a descendant on the group dashboard.
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/group_descendants_finder.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/finders/group_descendants_finder.rb b/app/finders/group_descendants_finder.rb
index 58570a580f1..c77d1fd6019 100644
--- a/app/finders/group_descendants_finder.rb
+++ b/app/finders/group_descendants_finder.rb
@@ -121,8 +121,10 @@ class GroupDescendantsFinder
end
def direct_child_projects
- GroupProjectsFinder.new(group: parent_group, current_user: current_user, params: params)
- .execute
+ GroupProjectsFinder.new(group: parent_group,
+ current_user: current_user,
+ options: { only_owned: true },
+ params: params).execute
end
# Finds all projects nested under `parent_group` or any of its descendant