2024-08-02-2 Merge in upstream changes for testing #29
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: 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 <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…mastodon#31139) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Merge upstream changes up to 4d374cf
…oc/merge-upstream
Co-authored-by: Renaud Chaput <[email protected]>
Merge upstream changes up to 887e64e
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]>
Merge upstream changes up to dd53792
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Port 848a5ca to glitch-soc Signed-off-by: Claire <[email protected]>
Port SCSS changes from c40e481 to glitch-soc Signed-off-by: Claire <[email protected]>
Merge upstream changes up to 1229d29
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream Conflicts: - `config/routes/api.rb`: Upstream added an endpoint, textually close to a glitch-soc-only endpoint. Ported upstream changes.
Merge upstream changes up to 598ae4f
…ob to v0.7.4 (mastodon#31218) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream
Port a50c8e9 to glitch-soc Signed-off-by: Claire <[email protected]>
…ications Port 288961b to glitch-soc Signed-off-by: Claire <[email protected]>
Port front-end changes from 549ab08 to glitch-soc Signed-off-by: Claire <[email protected]>
…pace Port 2c1e757 to glitch-soc Signed-off-by: Claire <[email protected]>
…ange Port a50c8e9 to glitch-soc Signed-off-by: Claire <[email protected]>
Merge upstream changes up to a50c8e9
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.
No description provided.