Merge upstream changes up to cfa71a4d16e71b04a42dda564ed8e188bd1badd9

[ClearlyClaire]

Registrations are now closed by default! Also, removed max_toot_chars from the initial state rendering, but that should not affect anything.

Merge upstream changes up to 805dba7

Ported changes

• 805dba7

Additional changes

• 47b5105 (remove max_toot_chars from initial state)

Merge upstream changes up to 87ad398

No conflicts nor anything to port.

Merge upstream changes up to 0b0ca6f

Conflicts

• spec/controllers/api/v1/timelines/direct_controller_spec.rb:
  spec/controllers/api/v1/timelines has been renamed, but we had an extra spec here for a glitch-soc-only endpoint.
  Kept glitch-soc's file unchanged (will port to a request spec later).

Additional changes

• 73de363 (move direct timeline spec to request spec)

Merge upstream changes up to 1467f1e

Ported changes

• 1467f1e

Merge upstream changes up to fa0ba67

Ported changes

• b3075a9

Merge upstream changes up to aaa58d4

Conflicts

• .github/workflows/build-security.yml:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
• Gemfile.lock:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
• lib/mastodon/version.rb:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.

Ported changes

• 9cdc60e
• 3c315a6
• 9ce914c

Merge upstream changes up to c645490

Conflicts

• Gemfile.lock:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
• README.md:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
• app/models/account.rb:
  Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines.
  Ported upstream's changes.

Ported changes

• 67ec192
• 476a043
• 7ee93b7
• 63f4ea0
• c645490

Merge upstream changes up to 08342ad

No conflicts, nothing to port.

Merge upstream changes up to 491dd97

Conflicts

• app/workers/scheduler/auto_close_registrations_scheduler.rb:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.

Merge upstream changes up to 9d8dfeb

Conflicts

• app/javascript/packs/admin.jsx:
  Changes applied to app/javascript/core/admin.js instead.

Merge upstream changes up to cfa71a4

Ported changes

• 25ffe0a
• ca8fbda

[codecov-commenter]

Codecov Report

Attention: Patch coverage is 81.25000% with 24 lines in your changes are missing coverage. Please review.

Project coverage is 84.97%. Comparing base (25ac55e) to head (3ffb81e).

Files	Patch %	Lines
app/services/tag_search_service.rb	20.00%	12 Missing ⚠️
...pp/services/activitypub/process_account_service.rb	16.66%	2 Missing and 3 partials ⚠️
app/models/concerns/database_view_record.rb	75.00%	2 Missing ⚠️
app/controllers/api/v1/statuses_controller.rb	87.50%	0 Missing and 1 partial ⚠️
app/controllers/auth/sessions_controller.rb	50.00%	0 Missing and 1 partial ⚠️
app/lib/signature_parser.rb	93.75%	0 Missing and 1 partial ⚠️
app/models/concerns/account/finder_concern.rb	50.00%	1 Missing ⚠️
app/models/user_role.rb	87.50%	1 Missing ⚠️

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

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2647      +/-   ##
==========================================
+ Coverage   84.87%   84.97%   +0.09%     
==========================================
  Files        1066     1068       +2     
  Lines       28921    28836      -85     
  Branches     4656     4657       +1     
==========================================
- Hits        24548    24502      -46     
+ Misses       3170     3135      -35     
+ Partials     1203     1199       -4     

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