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
..
migrate	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02:00
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-31 21:30:27 +02:00
seeds	Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)	2023-01-18 16:33:03 +01:00
views	Fix some old migration scripts (#17394)	2022-01-30 21:38:54 +01:00
schema.rb	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02:00
seeds.rb	Wrap db:setup with Chewy.strategy(:mastodon) (#24302)	2023-03-29 09:58:27 +02:00