Conflicts: - `app/serializers/activitypub/note_serializer.rb`: Conflict because upstream added context extensions where glitch-soc had its own. Added upstream's new context extension while keeping ours.
Import
Style/OptionalBooleanParameter
reorder(nil)
Style/GuardClause
rubocop
OpenSSL::SSL::SSLError
UnfilterNotificationsWorker