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
preferences
two_factor_authentication
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
exports_controller_spec.rb
featured_tags_controller_spec.rb
flavours_controller_spec.rb
imports_controller_spec.rb
migrations_controller_spec.rb
profiles_controller_spec.rb
sessions_controller_spec.rb
two_factor_authentication_methods_controller_spec.rb