Merge upstream changes up to 0b4a3a04378ce43f2f314b9446b5053f6b374c6d

[ClearlyClaire]

⚠️ This splits the docker images

Merge upstream changes up to 85662a5

Conflicts

• config/initializers/content_security_policy.rb:
  Upstream reworked the CSP, we kept our version for now.
• spec/requests/content_security_policy_spec.rb:
  Upstream reworked the CSP, we kept our version for now.

Ported changes

• 7faa27e

Postponed changes

• 1142f4c (see Convert utils and hashtags to Typescript #2531)
• 3a7f10c (see Convert utils and hashtags to Typescript #2531)

Merge upstream changes up to 0530ce5

Ported changes

• b20af17

Merge upstream changes up to 272592d

Conflicts

• .rubocop_todo.yml:
  Upstream fixed a bunch lint issues, and changed the Max parameter of the Metrics/AbcSize cop.
  Glitch-soc has different code and slightly higher AbcSize complexity, modified the .rubocop_todo.yml file accordingly.
• app/policies/status_policy.rb:
  Upstream changed account.suspended? to account.unavailable? to prepare for delete flags. Glitch-soc has additional local-only conditions.
  Ported upstream's refactor while keeping glitch-soc's additional condition.
• app/serializers/initial_state_serializer.rb:
  Upstream refactored a bunch of stuff while glitch-soc has more settings.
  Refactored as upstream did while keeping glitch-soc's settings.

Merge upstream changes up to 0b4a3a0

Conflicts

• Gemfile.lock:
  Conflict caused by the json gem thing once again.
  Updated as upstream did, but keeping the most recent json version.
• spec/helpers/application_helper_spec.rb:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.

Ported changes

• ee83d5c

Additional changes

• b2961da
• 9ac13bb

[codecov-commenter]

Codecov Report

Attention: 34 lines in your changes are missing coverage. Please review.

Comparison is base (f425a1e) 82.62% compared to head (b41af99) 82.64%.

Files	Patch %	Lines
lib/mastodon/cli/federation.rb	29.41%	24 Missing ⚠️
app/models/admin/action_log_filter.rb	50.00%	3 Missing ⚠️
app/controllers/filters_controller.rb	0.00%	2 Missing ⚠️
app/helpers/admin/settings/discovery_helper.rb	71.42%	0 Missing and 2 partials ⚠️
app/controllers/disputes/appeals_controller.rb	0.00%	1 Missing ⚠️
app/controllers/statuses_cleanup_controller.rb	0.00%	1 Missing ⚠️
app/helpers/filters_helper.rb	66.66%	1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2532      +/-   ##
==========================================
+ Coverage   82.62%   82.64%   +0.01%     
==========================================
  Files        1038     1045       +7     
  Lines       28653    28696      +43     
  Branches     4661     4664       +3     
==========================================
+ Hits        23675    23716      +41     
  Misses       3856     3856              
- Partials     1122     1124       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.