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>2017-09-21 10:20:37 +0300
committerBob Van Landuyt <bob@vanlanduyt.co>2017-10-04 23:49:41 +0300
commite13753fcaa4901a840f6b33bf9e1a06185c3ba10 (patch)
tree9060e690420ca99fd413056e6b9ec90eb63cd59a /app/finders
parent29df1ce84198801863fd1890b14099d13c6ec7fb (diff)
Only take unarchived projects into account
When finding children for a group
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/group_descendants_finder.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/finders/group_descendants_finder.rb b/app/finders/group_descendants_finder.rb
index 3b891effd0c..33fb1bf0359 100644
--- a/app/finders/group_descendants_finder.rb
+++ b/app/finders/group_descendants_finder.rb
@@ -6,7 +6,7 @@ class GroupDescendantsFinder
def initialize(current_user: nil, parent_group:, params: {})
@current_user = current_user
@parent_group = parent_group
- @params = params
+ @params = params.reverse_merge(non_archived: true)
end
def execute
@@ -74,7 +74,7 @@ class GroupDescendantsFinder
end
def projects_matching_filter
- ProjectsFinder.new(current_user: current_user).execute
+ ProjectsFinder.new(current_user: current_user, params: params).execute
.search(params[:filter])
.where(namespace: all_descendant_groups)
end