Merge upstream - January 2026 edition#84
Merged
Conversation
…oc/merge-upstream
…hotkey `0` to scroll to top Port 9334bd9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port edfbcfb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port f5d6f60 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port c5c8100 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 100b20f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 9aec693 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 234990c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port e5e3a64 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…e-upstream Merge upstream changes up to b3b5bf2
…oc/merge-upstream
Port 498e88f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 31c392b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 0dac31d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…e-upstream Merge upstream changes up to 0dac31d
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>
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>
…astodon#37289) Co-authored-by: Chan Nyein Tun <29679269+channyeintun@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>
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>
…lations New Crowdin Translations (automated)
…oc/merge-upstream Conflicts: - `app/controllers/application_controller.rb`: Upstream added an experimental color and contrast theme control. Conflicts because of glitch-soc's different theming system. Adapted upstream's changes. - `app/views/layouts/application.html.haml`: Upstream added an experimental color and contrast theme control. Conflicts because of glitch-soc's different theming system. Adapted upstream's changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream added an experimental color and contrast theme control. Conflicts because of glitch-soc's different theming system. Adapted upstream's changes.
Port a0ce776 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…e-upstream Merge upstream changes up to a0ce776
…oc/merge-upstream Conflicts: - `yarn.lock`: Conflict because of an extra dependency in glitch-soc. Updated upstream's dependencies as upstream did.
Port 4bae3da to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…d post Port 54bc97c to glitch-soc Co-authored-by: Chan Nyein Tun <29679269+channyeintun@users.noreply.github.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…e-upstream Merge upstream changes up to e89acc2
Collaborator
Author
|
end to end errors seem to come from upstream: https://github.com/glitch-soc/mastodon/actions/runs/20678957944/job/59370503358 |
Collaborator
Author
|
merging despite test failures because they aren't from us and still pass on most recent ruby version (which we use) |
This was referenced Jan 5, 2026
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
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.
who even knows what versions are in a fork of a fork. we're just pulling 'whatever comes from upstream'