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

Remove duplicated include IgnorableColumn in user model See merge request gitlab-org/gitlab-ce!20710
2018-07-19 12:08:14 +00:00 · 2018-07-19 12:08:14 +00:00 · 66f5be832b
parent 3b055baf2b f93a14801d
commit 66f5be832b
1 changed files with 0 additions and 1 deletions
--- 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