summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-05-07 15:49:32 +0200
committerJan Provaznik <jprovaznik@gitlab.com>2018-05-16 08:58:07 +0200
commit32e22468300e3a52c82a855a01fc3983473107e0 (patch)
treebedc55c548a0083183c346efbc5f7d6809af1f48 /app/models/user.rb
parentc81a37c1d3f864cf0a00386dab29da78f222e3a5 (diff)
downloadgitlab-ce-32e22468300e3a52c82a855a01fc3983473107e0.tar.gz
Changed order of include
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 082ec76e86a..b90f5471071 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,7 +3,6 @@ require 'carrierwave/orm/activerecord'
class User < ActiveRecord::Base
extend Gitlab::ConfigHelper
- include WithUploads
include Gitlab::ConfigHelper
include Gitlab::SQL::Pattern
include AfterCommitQueue
@@ -18,6 +17,7 @@ class User < ActiveRecord::Base
include IgnorableColumn
include BulkMemberAccessLoad
include BlocksJsonSerialization
+ include WithUploads
DEFAULT_NOTIFICATION_LEVEL = :participating