diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-03 23:51:25 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-05-10 11:10:07 +0200 |
| commit | e61bfba769e41bf1028016d3e0a87ad23207ec0f (patch) | |
| tree | 25def021dc09ddef4ad32a46d177d432c5020bfd /app/controllers/explore | |
| parent | 39eee5babd279d0c8f46a173a47f98d2fe1a0cbc (diff) | |
| download | gitlab-ce-e61bfba769e41bf1028016d3e0a87ad23207ec0f.tar.gz | |
Merge branch 'tc-fix-private-subgroups-shown' into 'security'
Use GroupsFinder to find subgroups the user has access to
See merge request !2096
Diffstat (limited to 'app/controllers/explore')
| -rw-r--r-- | app/controllers/explore/groups_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/explore/groups_controller.rb b/app/controllers/explore/groups_controller.rb index 68228c095da..81883c543ba 100644 --- a/app/controllers/explore/groups_controller.rb +++ b/app/controllers/explore/groups_controller.rb @@ -1,6 +1,6 @@ class Explore::GroupsController < Explore::ApplicationController def index - @groups = GroupsFinder.new.execute(current_user) + @groups = GroupsFinder.new(current_user).execute @groups = @groups.search(params[:filter_groups]) if params[:filter_groups].present? @groups = @groups.sort(@sort = params[:sort]) @groups = @groups.page(params[:page]) |