diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-04 23:04:47 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-05 11:10:57 +0200 |
| commit | ec8a7a36c09f44c44a21444f632389e7d08166cf (patch) | |
| tree | 38c37bde375339d0e9dccd6e26769d327db39989 /app/controllers/concerns/group_tree.rb | |
| parent | dda023d66d09b8a3a43a5599bde42ac52eb6fd06 (diff) | |
| download | gitlab-ce-ec8a7a36c09f44c44a21444f632389e7d08166cf.tar.gz | |
Make sure all ancestors are loaded when searching groups
Diffstat (limited to 'app/controllers/concerns/group_tree.rb')
| -rw-r--r-- | app/controllers/concerns/group_tree.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/group_tree.rb b/app/controllers/concerns/group_tree.rb index c5cf336463a..9104d4a32cf 100644 --- a/app/controllers/concerns/group_tree.rb +++ b/app/controllers/concerns/group_tree.rb @@ -2,7 +2,7 @@ module GroupTree def render_group_tree(groups) if params[:filter].present? @groups = Gitlab::GroupHierarchy.new(groups).all_groups - @groups = @groups.search(params[:filter]) + @groups = Gitlab::GroupHierarchy.new(@groups.search(params[:filter])).base_and_ancestors else # Only show root groups if no parent-id is given @groups = groups.where(parent_id: params[:parent_id]) |