Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.

1 files changed, 4 insertions, 3 deletions

diff --git a/.prettierignore b/.prettierignore
index ab68ba16d..af0411e9c 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -69,13 +69,14 @@ app/javascript/styles/mastodon/reset.scss
 
 # Ignore Javascript pending https://github.com/mastodon/mastodon/pull/23631
 *.js
-
-# Ignore Markdownlint pending https://github.com/mastodon/mastodon/pull/21972
-*.md
+*.jsx
 
 # Ignore HTML till cleaned and included in CI
 *.html
 
+# Ignore the generated AUTHORS.md
+AUTHORS.md
+
 # Ignore glitch-soc emoji map file
 /app/javascript/flavours/glitch/features/emoji/emoji_map.json