diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-10 18:26:02 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-10 18:26:02 +0000 |
| commit | 180ec7113e358a7f8388e1436dc0670a11ba68df (patch) | |
| tree | fba74833a7e89d6c19160a0d7e02355c5215c8df /app/controllers/explore/groups_controller.rb | |
| parent | 09c4d27ae48ceb181f86657043af2a129c17dabf (diff) | |
| parent | ebd8b7f60f41358df562625a4692f352b86b8c80 (diff) | |
| download | gitlab-ce-180ec7113e358a7f8388e1436dc0670a11ba68df.tar.gz | |
Merge branch 'bvl-security-patches' into 'master'
Security patches -> `master`
See merge request !11230
Diffstat (limited to 'app/controllers/explore/groups_controller.rb')
| -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]) |