github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 12:07:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "FEATURE: allow end users to opt out of getting any private messages"

Browse Source 
This reverts commit 229ecc4f8a834cb14ffa09d7b8202718d405f189.
This commit is contained in:
Sam
2015-03-23 17:21:58 +11:00
parent 229ecc4f8a
commit 1601211617
7 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/serializers/user_serializer.rb
View File

@ -95,8 +95,7 @@ class UserSerializer < BasicUserSerializer
:custom_avatar_upload_id,
:has_title_badges,
:card_image_badge,
:card_image_badge_id,
:allow_private_messages
:card_image_badge_id
untrusted_attributes :bio_raw,
:bio_cooked,
@ -158,10 +157,6 @@ class UserSerializer < BasicUserSerializer
object.user_profile.location
end
def allow_private_messages
object.user_profile.allow_private_messages
end
def can_edit
scope.can_edit?(object)
end