diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-06 08:55:35 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-06 08:55:35 +0100 |
| commit | 449ecd6c68150a7d6d97c3070ffbc3f8b1e372dd (patch) | |
| tree | 0b77d366e22d52703fd7e6907f6d95f7dbbe7995 /app/controllers/groups_controller.rb | |
| parent | b3aae422a6adbc0e46901a0c9dde5b75b791e060 (diff) | |
| parent | 9f908cfc8ed3acf2fd6692f098ed1bd526631a0d (diff) | |
| download | gitlab-ce-449ecd6c68150a7d6d97c3070ffbc3f8b1e372dd.tar.gz | |
Merge branch 'master' into zj-create-mattermost-team
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 59b25b33e27..4663b6e7fc6 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -114,7 +114,7 @@ class GroupsController < Groups::ApplicationController @projects = @projects.sorted_by_activity @projects = filter_projects(@projects) @projects = @projects.sort(@sort = params[:sort]) - @projects = @projects.page(params[:page]) if params[:filter_projects].blank? + @projects = @projects.page(params[:page]) if params[:name].blank? end def authorize_create_group! |