diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-01-28 09:00:19 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-01-28 09:00:19 +0000 |
| commit | 49c12f9b0fec9a0153f866a0f6f27ed5eb336bf0 (patch) | |
| tree | 56efd08d2213c87b5a4132a216cddbe30f3ee39b /app/models/user.rb | |
| parent | 91e97c803d902f89f831f739d765e7ecf9821d7d (diff) | |
| parent | d253440ed16118d9bae78773fe96ea53aa6537a4 (diff) | |
| download | gitlab-ce-49c12f9b0fec9a0153f866a0f6f27ed5eb336bf0.tar.gz | |
Merge branch 'ce-1979-2-1' into 'master'
Add query method for id
See merge request gitlab-org/gitlab-ce!24386
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 4ef5bdc2d12..f8ac230852f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,7 +2,7 @@ require 'carrierwave/orm/activerecord' -class User < ActiveRecord::Base +class User < ApplicationRecord extend Gitlab::ConfigHelper include Gitlab::ConfigHelper |