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

Remove duplicated include IgnorableColumn in user model See merge request gitlab-org/gitlab-ce!20710

Merge branch 'remove-duplicated-include' into 'master'
Remove duplicated include IgnorableColumn in user model See merge request gitlab-org/gitlab-ce!20710
66f5be83 · Rémy Coutable · 3b055baf · f93a1480 · 66f5be83
Commit 66f5be83 authored Jul 19, 2018 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

app/models/user.rb app/models/user.rb +0 -1

No files found.
--- 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