[pull] main from glitch-soc:main #523
Open
+45,736
−28,876
Conversation
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
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>
…37039) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream Conflicts: - `app/helpers/theme_helper.rb`: Upstream removed the feature flag and refactored, while we have a slightly different theming system. Updated accordingly. - `stylelint.config.js`: Upstream removed overrides for the temporary themes. Did the same.
Merge upstream changes up to 9227879
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>
Port 71af094 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port dbc5af6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port c4a760d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 3d55dcd to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.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>
…oc/merge-upstream Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream changed a field that was moved to another page due to glitch-soc's theming system. Ignored this one change.
…cations Port a8109e5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream
Port ba4710d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Merge upstream changes up to ff20ab7
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>
…oc/merge-upstream
Merge upstream changes up to 0231b6d
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
9 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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )