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
..
chewy	Revert reverting "Change algorithm of tootctl search deploy to improve performance (#18463)".	2022-05-26 20:58:16 +02:00
controllers	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
helpers	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2023-05-08 19:28:21 +02:00
javascript	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
lib	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
mailers	Add user handle to notification mail recipient address (#24240)	2023-04-17 11:06:06 +02:00
models	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
policies	Add missing authorization to ReactService	2023-05-07 22:05:44 +02:00
presenters	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
serializers	Merge remote-tracking branch 'upstream/main' into develop	2023-04-23 20:49:47 +02:00
services	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
validators	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
views	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
workers	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00