Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.		2023-07-12 15:27:32 +02:00
..
accept.rb	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
add.rb	Add featured tag add/remove activity handler (#19408)	2022-10-22 11:49:41 +02:00
announce.rb	Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741)	2023-05-02 18:16:07 +02:00
block.rb	Fix processing of incoming Block activities (#15546)	2021-01-12 09:25:01 +01:00
create.rb	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2023-05-08 19:28:21 +02:00
delete.rb	Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741)	2023-05-02 18:16:07 +02:00
flag.rb	Add forwarding of reported replies to servers being replied to (#25341)	2023-07-08 20:00:02 +02:00
follow.rb	Fix duplicate notifications being possible after poll expiration (#17697)	2022-03-04 01:06:33 +01:00
like.rb	Fix duplicate notifications being possible after poll expiration (#17697)	2022-03-04 01:06:33 +01:00
move.rb	Fix race conditions on account migration creation (#15597)	2021-02-02 14:49:57 +01:00
reject.rb	Fix handling of Reject Follow when a matching follow relationship exists (#14479)	2020-08-01 18:20:37 +02:00
remove.rb	Add featured tag add/remove activity handler (#19408)	2022-10-22 11:49:41 +02:00
undo.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	2020-07-22 11:45:35 +02:00
update.rb	Remove instance variables from helper usage (#24203)	2023-04-23 22:35:54 +02:00