forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 182
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge upstream changes up to 3205a654caf903002c2db872f802a3332201678b #2585
Merged
ClearlyClaire
merged 29 commits into
glitch-soc:main
from
ClearlyClaire:glitch-soc/merge-upstream
Jan 27, 2024
Merged
Merge upstream changes up to 3205a654caf903002c2db872f802a3332201678b #2585
ClearlyClaire
merged 29 commits into
glitch-soc:main
from
ClearlyClaire:glitch-soc/merge-upstream
Jan 27, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…astodon#27792) Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…n#28858) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…28415) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
… `CLI::Maintenance` task (mastodon#28281)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream
…malink Port SCSS changes from b19ae52 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 5a838ce to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Codecov ReportAttention:
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## main #2585 +/- ##
==========================================
+ Coverage 84.81% 84.85% +0.03%
==========================================
Files 1062 1065 +3
Lines 28826 28872 +46
Branches 4654 4660 +6
==========================================
+ Hits 24450 24499 +49
+ Misses 3179 3173 -6
- Partials 1197 1200 +3 ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Notable changes are the addition of a confirmation screen instead of silently redirecting logged-out users to remote content, and the addition of an “active” variant for boost icons.
One of the last upstream merges before the great compose refactor with terrible string changes.
Conflicts
None
Ported changes
Postponed changes
Additional changes