diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-09-15 16:41:15 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-09-15 16:41:15 -0700 |
| commit | c61b6eeb2fd5d206525fda5d37942b8b7c30adaf (patch) | |
| tree | 54932d9cc34fdd8c339c36c187c2d0f698f797e0 | |
| parent | db6658299ebc255bd62783a010fa0f665add3529 (diff) | |
| parent | c9389d0e7450850423c8c87062f6c26422b78422 (diff) | |
| download | gitlab-ce-c61b6eeb2fd5d206525fda5d37942b8b7c30adaf.tar.gz | |
Merge pull request #9634 from allistera/users-autocomplete-sort-order
Sorted autocomplete users list by name
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 007e47f7446..eb4c59d6205 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -48,6 +48,7 @@ v 8.0.0 (unreleased) - Fix highlighting of deleted lines in diffs. - Added service API endpoint to retrieve service parameters (Petheő Bence) - Add FogBugz project import (Jared Szechy) + - Sort users autocomplete lists by user (Allister Antosik) v 7.14.3 - No changes diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 904d26a39f4..202e9da9eee 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -32,6 +32,7 @@ class AutocompleteController < ApplicationController @users ||= User.none @users = @users.search(params[:search]) if params[:search].present? @users = @users.active + @users = @users.reorder(:name) @users = @users.page(params[:page]).per(PER_PAGE) unless params[:search].present? |