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

Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them.

db/post_migrate/20220729171123_fix_custom_filter_keywords_id_seq.rb

@@ -5,7 +5,7 @@ class FixCustomFilterKeywordsIdSeq < ActiveRecord::Migration[6.1]
 
   def up
     # 20220613110711 manually inserts items with set `id` in the database, but
-    # we also need to bump the sequence number, otherwise 
+    # we also need to bump the sequence number, otherwise
     safety_assured do
       execute <<-SQL.squish
         BEGIN;