Merge branch 'main' into glitch-soc/merge-upstream

2022-02-12 11:12:41 +01:00
parent 28ec7def58 79b167f01a
commit d9379f5331
18 changed files with 112 additions and 13 deletions
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@ -11,6 +11,6 @@ class REST::NotificationSerializer < ActiveModel::Serializer
  end

  def status_type?
-    [:favourite, :reblog, :status, :mention, :poll].include?(object.type)
+    [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
  end
 end