diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-12-21 17:20:43 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-12-21 17:20:43 -0600 |
| commit | aa1874fbf8795677e53797205cb65b6f4fb83d4c (patch) | |
| tree | 85a5cfb6bdac803258df8e2df09a50169468996a /app/models/user.rb | |
| parent | 3895d54c6bfbd37ac65624496c0fd7b4973944e7 (diff) | |
| parent | 82e31ee46784cc4a0b987511ce7506dd01a3f004 (diff) | |
| download | gitlab-ce-move-gl-dropdown.tar.gz | |
Merge branch 'master' into move-gl-dropdownmove-gl-dropdown
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 |