Ur periodic upstream merge #58
Merged
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]>
…n#31073) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Port 784e088 to glitch-soc Signed-off-by: Claire <[email protected]>
Port e768b23 to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to 0397df9
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>
…oc/merge-upstream Conflicts: - `app/services/backup_service.rb`: Conflict due to glitch-soc's local-only posts. Ported upstream's changes while keeping glitch-soc's feature.
…e-upstream Merge upstream changes up to 80d9bff
…oc/merge-upstream
Port 03dea64 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 9cb9427 to glitch-soc Signed-off-by: Claire <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…mastodon#31309) Co-authored-by: Renaud Chaput <[email protected]>
…oc/merge-upstream
…ders Port 664bef3 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 389549e to glitch-soc Signed-off-by: Claire <[email protected]>
Port 2095d0f to glitch-soc Signed-off-by: Claire <[email protected]>
…notification type Port 6ca731e to glitch-soc Signed-off-by: Claire <[email protected]>
Port 9538d9c to glitch-soc Signed-off-by: Claire <[email protected]>
…face Port 1701575 to glitch-soc Signed-off-by: Claire <[email protected]>
…ests list Port 658addc to glitch-soc Co-authored-by: Renaud Chaput <[email protected]> Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
…ayed Port bcec8f5 to glitch-soc Signed-off-by: Claire <[email protected]>
…king Port 28411ac to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to 28411ac
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.
makin a PR so we have some easily found record, but ya just a straightforward merge from upstream :)