diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-07-19 17:48:39 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-19 17:48:39 +0800 |
| commit | f93a14801d4543c52e4128db1ba1bf801f3b6ef1 (patch) | |
| tree | dbab1363d450bc668cb34a393876b269fcb0f6e9 | |
| parent | 80ae65cd087d3a24a9a453588ef69295b6313d14 (diff) | |
| download | gitlab-ce-f93a14801d4543c52e4128db1ba1bf801f3b6ef1.tar.gz | |
Remove duplicated include IgnorableColumn
It's probably duplicated during resolving a conflict?
| -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 |