diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-21 02:34:35 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-21 02:34:35 +0100 |
| commit | 8c449310e245083e72513ec3addd0d2355333127 (patch) | |
| tree | a9ca028f0f19cab55e9d3d8afeffd58cc85bf192 /app/models/user.rb | |
| parent | 52b4a74a73cbd0b13d46d0bcd9b063e36b520f05 (diff) | |
| parent | 5d8d72f18e9329978987fcb046467ceacd13c3ab (diff) | |
| download | gitlab-ce-refactor-cluster-show-page.tar.gz | |
Merge branch 'master' into refactor-cluster-show-pagerefactor-cluster-show-page
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 51941f43919..b52f17cd6a8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,6 +18,7 @@ class User < ActiveRecord::Base include CreatedAtFilterable include IgnorableColumn include BulkMemberAccessLoad + include BlocksJsonSerialization DEFAULT_NOTIFICATION_LEVEL = :participating |