diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-07-14 12:16:20 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-07-14 16:31:45 +0100 |
| commit | 574b3efd6bfe7df64ec704844f2619c547731aa6 (patch) | |
| tree | 4561b1d84dff79e8561fe42c9afa198f46db4c83 /app/controllers/autocomplete_controller.rb | |
| parent | 60b91b46f289b1e4ac72827cf01370b2604622ac (diff) | |
| download | gitlab-ce-574b3efd6bfe7df64ec704844f2619c547731aa6.tar.gz | |
Fixes the user order being overriden in the autocomplete controllerfix-exact-matches-of-username-and-email-on-top-of-the-user-search
Diffstat (limited to 'app/controllers/autocomplete_controller.rb')
| -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 |