Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2023-02-19 10:42:55 +01: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	Fix Mastodon::RaceConditionError that occurs when external status is reblogged (#18424)	2022-05-16 01:00:09 +02:00
block.rb
create.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
delete.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
flag.rb
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
reject.rb
remove.rb	Add featured tag add/remove activity handler (#19408)	2022-10-22 11:49:41 +02:00
undo.rb
update.rb	Fix unbounded recursion in account discovery (#22025)	2022-12-07 00:15:24 +01:00