Merge upstream changes up to d8c428472356abd70aaf1f514b99114464ee7f61

[ClearlyClaire]

Merge upstream changes up to 5cd13ee

Conflicts

• app/helpers/application_helper.rb:
  Not a real conflict, upstream added helpers right next to glitch-soc only helpers.
  Added upstream's helpers.
• spec/models/status_spec.rb:
  Not a real conflict, upstream added specs right next to glitch-soc only specs.
  Added upstream's tests.

Merge upstream changes up to 5cd13ee

No conflicts nor anything to port.

Merge upstream changes up to d8c4284

No conflicts nor anything to port.

[codecov-commenter]

Codecov Report

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

Project coverage is 85.13%. Comparing base (25ac55e) to head (016d194).
Report is 970 commits behind head on main.

Files	Patch %	Lines
app/controllers/api/v1/accounts_controller.rb	93.75%	0 Missing and 1 partial ⚠️
app/controllers/api/v1/statuses_controller.rb	93.75%	0 Missing and 1 partial ⚠️
app/presenters/oauth_metadata_presenter.rb	96.66%	0 Missing and 1 partial ⚠️
app/serializers/manifest_serializer.rb	80.00%	0 Missing and 1 partial ⚠️

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

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2704      +/-   ##
==========================================
+ Coverage   84.87%   85.13%   +0.25%     
==========================================
  Files        1066     1094      +28     
  Lines       28921    29127     +206     
  Branches     4656     4669      +13     
==========================================
+ Hits        24548    24798     +250     
+ Misses       3170     3125      -45     
- Partials     1203     1204       +1     

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