Jeremy Kescher 7318b74ebf Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/models/notification.rb # config/locales/simple_form.de.yml		2023-03-05 12:34:16 +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-03-05 12:34:16 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
javascript	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00
lib	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00
mailers	Autofix Rubocop Style/ExplicitBlockArgument (#23704)	2023-02-20 11:18:08 +09:00
models	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
serializers	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00
services	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00
validators	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00
views	Merge remote-tracking branch 'upstream/main' into develop	2023-02-21 00:40:08 +01:00
workers	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00