Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3

Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream

Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.

Allow reports with long comments from remote instances, but truncate (#25028)

Fix minor typos in comments and spec names (#21831)

Fix reports not being closed when performing batch suspensions (#24988)

Merge pull request #2215 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Fix rubocop issues in glitch-soc-specific code

Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.

Merge pull request #2213 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.

Fix RSpec/InferredSpecType cop (#24736)

Fix RSpec/ContextWording cop (#24739)

Fix own posts not getting delivered to own lists (#24810)

Fix Lint/ConstantDefinitionInBlock cop (#24763)

Fix Performance/MethodObjectAsBlock cop (#24798)

Fix Performance/TimesMap cop (#24789)

Change lists to be able to include accounts with pending follow requests (#19727)

Rewrite import feature (#21054)

Merge pull request #2198 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes