Merge upstream changes up to edeae945c0c9d6318d489ab720587621545063d0 #2819
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: GitHub Actions <[email protected]>
… confirmation modal (mastodon#31524)
…oc/merge-upstream Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Upstream added a test for a new attribute, next to a line we modified in glitch-soc because of a different default value. Updated as upstream's did, keeping glitch-soc's default value.
Port b06c7b6 to glitch-soc Signed-off-by: Claire <[email protected]>
…have full context Port 8c7642c to glitch-soc Signed-off-by: Claire <[email protected]>
… in boost confirmation modal Port e48a64d to glitch-soc Signed-off-by: Claire <[email protected]>
…ccount Port 01a757d to glitch-soc Signed-off-by: Claire <[email protected]>
Port d67e117 to glitch-soc Signed-off-by: Claire <[email protected]>
Port edeae94 to glitch-soc Signed-off-by: Claire <[email protected]>
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.
Conflicts
spec/requests/api/v2/instance_spec.rb:Upstream added a test for a new attribute, next to a line we modified in glitch-soc because of a different default value.
Updated as upstream's did, keeping glitch-soc's default value.
Ported changes