Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.		2023-02-03 19:23:27 +01:00
..
exports	Add ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
preferences	Remove unused filtered_languages column (#18533)	2022-05-27 20:05:22 +02:00
two_factor_authentication	Fix typo in source setted->set (#18385)	2022-05-10 04:58:04 +02:00
applications_controller_spec.rb	Change POST /settings/applications/:id to regenerate token on scopes change (#23359)	2023-02-02 12:03:49 +01:00
deletes_controller_spec.rb	Remove setting that disables account deletes (#17683)	2022-10-06 10:16:47 +02:00
exports_controller_spec.rb
featured_tags_controller_spec.rb
flavours_controller_spec.rb
imports_controller_spec.rb
migrations_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
profiles_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
sessions_controller_spec.rb
two_factor_authentication_methods_controller_spec.rb