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.rb
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
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
like.rb
move.rb
reject.rb
remove.rb
undo.rb
update.rb	Remove instance variables from helper usage (#24203)	2023-04-23 22:35:54 +02:00