Jeremy Kescher 9fe04326ea Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # config/routes.rb # db/schema.rb # lib/mastodon/version.rb		2023-05-09 23:26:00 +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 remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +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
emoji_react.rb	Rubocop fixes	2023-05-08 19:37:56 +02:00
flag.rb	Remove instance variables from helper usage (#24203)	2023-04-23 22:35:54 +02:00
follow.rb	Fix duplicate notifications being possible after poll expiration (#17697)	2022-03-04 01:06:33 +01:00
like.rb	Rubocop fixes	2023-05-08 19:37:56 +02: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	support Undo action for EmojiReaction	2022-12-09 23:08:43 +01:00
update.rb	Remove instance variables from helper usage (#24203)	2023-04-23 22:35:54 +02:00