Merge upstream changes up to dd5379271410219de0806bb33e7cdfa427ea6988 #2798
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
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…re accepted or dismissed (mastodon#31149)
Co-authored-by: Claire <[email protected]>
…oc/merge-upstream
Port 8818748 to glitch-soc Co-authored-by: Renaud Chaput <[email protected]> Signed-off-by: Claire <[email protected]>
…equests are accepted or dismissed Port dfd4386 to glitch-soc Signed-off-by: Claire <[email protected]>
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
eb534f8 to
0e18e1b
Compare
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.
Note that with the confirmation modal redesign, the “Do not ask again” feature from glitch-soc has not been included for now, as I'd need to find a design that fits.
Conflicts
None
Ported changes