Merge branch 'remove-duplicated-include' into 'master'

Remove duplicated include IgnorableColumn in user model

See merge request gitlab-org/gitlab-ce!20710
This commit is contained in:
Rémy Coutable 2018-07-19 12:08:14 +00:00
commit 66f5be832b

View file

@ -14,7 +14,6 @@ class User < ActiveRecord::Base
include IgnorableColumn
include FeatureGate
include CreatedAtFilterable
include IgnorableColumn
include BulkMemberAccessLoad
include BlocksJsonSerialization
include WithUploads