diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-08-30 11:17:10 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-08-30 11:17:10 +0000 |
| commit | 8274e0fe3cafdc0a314ac92734f491f6751156bc (patch) | |
| tree | ad58563db84616b7b6793224ad50ae8144052455 /app/models | |
| parent | 978b4b9cc0374c9cb5680612fe4154f393bbba9c (diff) | |
| parent | 12633b46b6884dda4ffd87b14b4b52725acd6ec1 (diff) | |
| download | gitlab-ce-8274e0fe3cafdc0a314ac92734f491f6751156bc.tar.gz | |
Merge branch 'improve-autocomplete-user-performance' into 'master'
Improve AutocompleteController#users.json performance
Closes #36879
See merge request !13754
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index fbd08bc4d0a..70787de4b40 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -5,6 +5,7 @@ class User < ActiveRecord::Base include Gitlab::ConfigHelper include Gitlab::CurrentSettings + include Gitlab::SQL::Pattern include Avatarable include Referable include Sortable @@ -303,7 +304,7 @@ class User < ActiveRecord::Base # Returns an ActiveRecord::Relation. def search(query) table = arel_table - pattern = "%#{query}%" + pattern = User.to_pattern(query) order = <<~SQL CASE |