diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-29 18:26:59 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-29 18:26:59 +0300 |
| commit | 3339513ca67c50a231b8906a33eccc0d209270a5 (patch) | |
| tree | e9dbe77b814abd59062ba5dcdd3f454011d758cc /app/controllers/autocomplete_controller.rb | |
| parent | 15a6633999c81387245cabf129dd2fbb04650c95 (diff) | |
| parent | 54957d6932c2b159e01b60ee1d4e191cfdf5b713 (diff) | |
Merge branch 'master' into assign-to-issuable-opener
Diffstat (limited to 'app/controllers/autocomplete_controller.rb')
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 1e4fc612a3c..e595b233e30 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -7,7 +7,7 @@ class AutocompleteController < ApplicationController @users = @users.search(params[:search]) if params[:search].present? @users = @users.active @users = @users.reorder(:name) - @users = @users.page(params[:page]).per(PER_PAGE) + @users = @users.page(params[:page]) if params[:search].blank? # Include current user if available to filter by "Me" |