Skip to content
Snippets Groups Projects
Commit 66f5be83 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

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

Remove duplicated include IgnorableColumn in user model

See merge request gitlab-org/gitlab-ce!20710
parents 3b055baf f93a1480
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1 deletion
app/models/user.rb
+ 0
− 1
View file @ 66f5be83
@@ -14,7 +14,6 @@ class User < ActiveRecord::Base
include IgnorableColumn
include FeatureGate
include CreatedAtFilterable
include IgnorableColumn
include BulkMemberAccessLoad
include BlocksJsonSerialization
include WithUploads
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment