Jeremy Kescher 8de39432a9 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock # app/javascript/flavours/glitch/actions/interactions.js # config/initializers/rack_attack.rb # config/locales/en_GB.yml		2023-02-17 00:26:21 +01: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-02-17 00:26:21 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-09 12:46:12 +01:00
javascript	Merge remote-tracking branch 'upstream/main' into develop	2023-02-17 00:26:21 +01:00
lib	Merge remote-tracking branch 'upstream/main' into develop	2023-02-17 00:26:21 +01:00
mailers	Add single splat to callback method definitions to avoid ArgumentError (#22246)	2022-12-13 20:03:16 +01:00
models	Merge remote-tracking branch 'upstream/main' into develop	2023-02-17 00:26:21 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Add setting for status page URL (#23390)	2023-02-04 04:56:06 +01:00
serializers	Merge remote-tracking branch 'upstream/main' into develop	2023-02-17 00:26:21 +01:00
services	Merge remote-tracking branch 'upstream/main' into develop	2023-02-17 00:26:21 +01:00
validators	Merge remote-tracking branch 'upstream/main' into develop	2023-01-26 17:27:01 +01:00
views	Merge remote-tracking branch 'upstream/main' into develop	2023-02-17 00:26:21 +01:00
workers	Merge remote-tracking branch 'upstream/main' into develop	2023-02-17 00:26:21 +01:00