Merge upstream changes up to abe5413638043a52e4fcbb5f16aefd14e76bf96c#3164
Merged
ClearlyClaire merged 28 commits intoglitch-soc:mainfrom Aug 24, 2025
Merged
Conversation
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>
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>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <[email protected]> Co-authored-by: diondiondion <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Glitch-soc had different overrides, but upstream simply disabled the rules. Disabled them as well. - `app/serializers/initial_state_serializer.rb`: Not really a conflict, again because of a rubocop comment.
Port 8268323 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 45ec4c9 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port f85f0ee to glitch-soc Co-authored-by: Claire <[email protected]> Co-authored-by: diondiondion <[email protected]> Signed-off-by: Claire <[email protected]>
…ools Port 4f49478 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 511e10d to glitch-soc Signed-off-by: Claire <[email protected]>
Port 118c30f to glitch-soc Signed-off-by: Claire <[email protected]>
Port a1c7b85 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 4df50b9 to glitch-soc Signed-off-by: Claire <[email protected]>
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
5 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.
Conflicts
.rubocop_todo.yml:Glitch-soc had different overrides, but upstream simply disabled the rules.
Disabled them as well.
app/serializers/initial_state_serializer.rb:Not really a conflict, again because of a rubocop comment.
Ported changes