You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		1 year ago
..
accept.rb	Add support for private pinned posts (#16954)	3 years ago
add.rb	Add featured tag add/remove activity handler (#19408)	2 years ago
announce.rb	Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741)	2 years ago
block.rb	Fix processing of incoming Block activities (#15546)	4 years ago
create.rb	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2 years ago
delete.rb	Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741)	2 years ago
flag.rb	Add forwarding of reported replies to servers being replied to (#25341)	1 year ago
follow.rb	Fix duplicate notifications being possible after poll expiration (#17697)	3 years ago
like.rb	Fix duplicate notifications being possible after poll expiration (#17697)	3 years ago
move.rb	Fix race conditions on account migration creation (#15597)	4 years ago
reject.rb	Fix handling of Reject Follow when a matching follow relationship exists (#14479)	4 years ago
remove.rb	Add featured tag add/remove activity handler (#19408)	2 years ago
undo.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	4 years ago
update.rb	Remove instance variables from helper usage (#24203)	2 years ago