diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-19 12:08:14 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-19 12:08:14 +0000 |
| commit | 66f5be832b40355bda2a56af31c112bfddedb7b1 (patch) | |
| tree | a09087786769ac89e5f83ee8991462572ad354d7 | |
| parent | 3b055baf2bed7833847589633181cede47a0f3a0 (diff) | |
| parent | f93a14801d4543c52e4128db1ba1bf801f3b6ef1 (diff) | |
| download | gitlab-ce-66f5be832b40355bda2a56af31c112bfddedb7b1.tar.gz | |
Merge branch 'remove-duplicated-include' into 'master'
Remove duplicated include IgnorableColumn in user model
See merge request gitlab-org/gitlab-ce!20710
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 4987d01aac6..58429f8d607 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -14,7 +14,6 @@ class User < ActiveRecord::Base include IgnorableColumn include FeatureGate include CreatedAtFilterable - include IgnorableColumn include BulkMemberAccessLoad include BlocksJsonSerialization include WithUploads |