diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-16 14:34:58 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-16 14:34:58 +0300 |
| commit | ac8d2eb065e9522679d4eae4649c6815daa5460c (patch) | |
| tree | 2947658dfff44a3873f7d350f0353dbdb7b9b541 /app/controllers | |
| parent | 0859ba75a873ce78f77587369b9e761a2cc782db (diff) | |
| parent | 7d59ba00b9aa1a8be28f1b7ccaa1c628be90aabb (diff) | |
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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? |