diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-14 16:41:11 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-14 16:41:11 +0000 |
| commit | 0f393724e7de8d764577b6622ccf43964539cb2b (patch) | |
| tree | f192f64badd0ab5b662c50a2ace3b49f349da5b9 /app/controllers | |
| parent | e318afbed70da9780c5deeb735f6acc8ab9327a1 (diff) | |
| parent | 574b3efd6bfe7df64ec704844f2619c547731aa6 (diff) | |
| download | gitlab-ce-0f393724e7de8d764577b6622ccf43964539cb2b.tar.gz | |
Merge branch 'fix-exact-matches-of-username-and-email-on-top-of-the-user-search' into 'master'
Fixes the user order being overriden in the autocomplete controller
See merge request !12868
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index fe331a883c1..3120916c5bb 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -5,10 +5,10 @@ class AutocompleteController < ApplicationController def users @users ||= User.none - @users = @users.search(params[:search]) if params[:search].present? - @users = @users.where.not(id: params[:skip_users]) if params[:skip_users].present? @users = @users.active @users = @users.reorder(:name) + @users = @users.search(params[:search]) if params[:search].present? + @users = @users.where.not(id: params[:skip_users]) if params[:skip_users].present? @users = @users.page(params[:page]).per(params[:per_page]) if params[:todo_filter].present? && current_user |