Jeremy Kescher 2379efb52f Merge remote-tracking branch 'upstream/main' into reactions ... # Conflicts: # app/javascript/flavours/glitch/locales/de.js # app/javascript/flavours/glitch/locales/en.js # app/javascript/flavours/glitch/locales/fr.js # app/javascript/mastodon/actions/interactions.js # app/javascript/mastodon/locales/fr.json # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml		2022-12-21 23:45:28 +01:00
..
chewy	Change algorithm of tootctl search deploy to improve performance (#18463)	2022-05-22 22:16:43 +02:00
controllers	change reaction api to match other interactions	2022-12-20 18:27:52 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
javascript	Merge remote-tracking branch 'upstream/main' into reactions	2022-12-21 23:45:28 +01:00
lib	handle incoming custom emoji reactions properly	2022-12-20 18:27:54 +01:00
mailers	Add single splat to callback method definitions to avoid ArgumentError (#22246)	2022-12-13 20:03:16 +01:00
models	delete reaction notifications when deleting status	2022-12-20 18:27:56 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Add follow request banner on account header (#20785)	2022-12-15 18:50:11 +01:00
serializers	support reacting with foreign custom emojis	2022-12-20 18:27:56 +01:00
services	Merge remote-tracking branch 'upstream/main' into reactions	2022-12-21 23:45:28 +01:00
validators	bypass reaction limit for foreign accounts	2022-12-20 18:27:57 +01:00
views	sanitize setting for number of visible reactions	2022-12-20 18:27:54 +01:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00