Jeremy Kescher 68101baae1 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/controllers/settings/preferences_controller.rb # app/javascript/mastodon/utils/resize_image.js # app/lib/user_settings_decorator.rb # app/models/media_attachment.rb # app/models/user.rb # app/views/settings/preferences/appearance/show.html.haml # app/workers/scheduler/indexing_scheduler.rb # config/settings.yml # db/schema.rb		2023-04-03 21:50:15 +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-04-03 21:50:15 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-01 14:31:05 +02:00
javascript	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02:00
lib	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02:00
mailers	Add mail headers to avoid auto-replies (#23597)	2023-03-03 20:44:46 +01:00
models	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Remove unused InstancePresenter methods (#24206)	2023-03-22 14:15:22 +01:00
serializers	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02:00
services	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02:00
validators	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
views	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-01 14:31:05 +02:00