summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-03-28 13:17:42 +0000
committerNick Thomas <nick@gitlab.com>2019-03-28 16:18:23 +0000
commit013f7cd24c4359d5d704b719d85b6df7ca1fdd55 (patch)
tree4bd076e21ec1d094fd23a506fef80350f63fd9f1 /app/models/user.rb
parenta74c3e6c3b418ea585f02ba15af1c7292f895a1a (diff)
downloadgitlab-ce-013f7cd24c4359d5d704b719d85b6df7ca1fdd55.tar.gz
Inherit from ApplicationRecord instead of ActiveRecord::Base
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index d2be26370ff..e0c518a9b75 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -432,7 +432,7 @@ class User < ApplicationRecord
fuzzy_arel_match(:name, query, lower_exact_match: true)
.or(fuzzy_arel_match(:username, query, lower_exact_match: true))
.or(arel_table[:email].eq(query))
- ).reorder(order % { query: ActiveRecord::Base.connection.quote(query) }, :name)
+ ).reorder(order % { query: ApplicationRecord.connection.quote(query) }, :name)
end
# Limits the result set to users _not_ in the given query/list of IDs.