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
..
check-i18n.yml	Check for missing i18n strings in CI (#23368)	2023-02-18 12:46:44 +01:00
codeql.yml	Run Prettier on YML files (#22345)	2022-12-16 11:11:52 +09:00
haml-lint-problem-matcher.json	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00
lint-css.yml	Trigger CI build on .nvmrc change (#23627)	2023-02-16 04:59:45 +01:00
lint-haml.yml	Fix stale apt index in github actions (#24319)	2023-03-30 14:19:33 +02:00
lint-js.yml	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
lint-json.yml	Trigger CI build on .nvmrc change (#23627)	2023-02-16 04:59:45 +01:00
lint-md.yml	Fix Markdown files with Prettier and check in CI (#21972)	2023-02-20 07:37:28 +01:00
lint-ruby.yml	Run bundler-audit on PRs (#23514)	2023-02-18 12:49:09 +01:00
lint-yml.yml	Trigger CI build on .nvmrc change (#23627)	2023-02-16 04:59:45 +01:00
rebase-needed.yml	Skip rebase-needed job for i10n branch (#24026)	2023-03-08 19:26:25 +01:00
test-js.yml	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
test-migrations-one-step.yml	Fix stale apt index in github actions (#24319)	2023-03-30 14:19:33 +02:00
test-migrations-two-step.yml	Fix stale apt index in github actions (#24319)	2023-03-30 14:19:33 +02:00
test-ruby.yml	Fix stale apt index in github actions (#24319)	2023-03-30 14:19:33 +02:00