diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-29 13:49:01 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-29 13:49:01 +0000 |
| commit | 2fbaf49595090f864b582bcc46aea9f3da2cabfb (patch) | |
| tree | 32cbb1301f39aed113a82df196f789cda7d83058 /app | |
| parent | 7faa8fbbf3cb2ebc58a3c7f96d9991feb38605dc (diff) | |
| parent | 2339bef1bcf77da258b2e07528122ad7a3a48407 (diff) | |
| download | gitlab-ce-2fbaf49595090f864b582bcc46aea9f3da2cabfb.tar.gz | |
Merge branch '32977-user-autocomplete-per_page-does-not-work' into 'master'
Resolve "User autocomplete per_page does not work"
Closes #32977
See merge request !11742
Diffstat (limited to 'app')
| -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 e2f5aa8508e..907717dcb96 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -9,7 +9,7 @@ class AutocompleteController < ApplicationController @users = @users.where.not(id: params[:skip_users]) if params[:skip_users].present? @users = @users.active @users = @users.reorder(:name) - @users = @users.page(params[:page]) + @users = @users.page(params[:page]).per(params[:per_page]) if params[:todo_filter].present? && current_user @users = @users.todo_authors(current_user.id, params[:todo_state_filter]) |