about summary refs log tree commit diff
path: root/app/models/concerns/account_interactions.rb
diff options
context:
space:
mode:
authorabcang <abcang1015@gmail.com>2018-05-02 23:14:51 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-05-02 16:14:51 +0200
commit71a7cea73fdfb45d06986e108b2ce1dbf7e32579 (patch)
tree29c2193e8dbb97f6adea550e71a3cb565de76da5 /app/models/concerns/account_interactions.rb
parentd0cdd5cf94ff479e4037dc47539f7f9c408831b3 (diff)
Keep notification when muting_notifications is true (#7311)
* Keep notification when muting_notifications is true

* Retrun mute object

* Fix test
Diffstat (limited to 'app/models/concerns/account_interactions.rb')
-rw-r--r--app/models/concerns/account_interactions.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index fdf35a4e3..2dbd2590d 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -93,6 +93,7 @@ module AccountInteractions
     if mute.hide_notifications? != notifications
       mute.update!(hide_notifications: notifications)
     end
+    mute
   end
 
   def mute_conversation!(conversation)