glitch-soc / mastodon

A glitchy but lovable microblogging server
https://glitch-soc.github.io/docs/
GNU Affero General Public License v3.0
708 stars 182 forks source link

Merge upstream changes up to b716248fc5bde4dc47b8104d092d092d87c50f1a #2837

Closed ClearlyClaire closed 2 months ago

ClearlyClaire commented 2 months ago

Merge upstream changes up to 7335a43b6dac0e82c305ce4dec9db4da114c769e

Conflicts

Additional changes

Merge upstream changes up to b716248fc5bde4dc47b8104d092d092d87c50f1a

No conflict nor anything to port

codecov-commenter commented 2 months ago

:warning: Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 91.66667% with 2 lines in your changes missing coverage. Please review.

Project coverage is 88.08%. Comparing base (dff29c8) to head (5c97ccf). Report is 349 commits behind head on main.

Files with missing lines Patch % Lines
app/models/admin/account_action.rb 60.00% 2 Missing :warning:

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

Additional details and impacted files ```diff @@ Coverage Diff @@ ## main #2837 +/- ## ========================================== + Coverage 87.73% 88.08% +0.34% ========================================== Files 1117 1119 +2 Lines 29724 29782 +58 Branches 4779 4790 +11 ========================================== + Hits 26078 26233 +155 + Misses 3644 3547 -97 Partials 2 2 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.