[pull] main from glitch-soc:main #523
Open
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: 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: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
…oc/merge-upstream Conflicts: - `app/views/wrapstodon/show.html.haml`: Conflict caused by glitch-soc's theming system. Updated upstream changes.
Port a9e2283 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 5fa7654 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…hile logged out Port 807e125 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port cbe1352 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to cbe1352
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/layouts/application.html.haml`: Upstream changed how theming works, and in particular changed the set of HTML attributes. Adapted upstream's change.
Port c09fbeb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port bc2f8a3 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port f2fb232 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to bc2f8a3
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>
…oc/merge-upstream Conflicts: - `app/helpers/theme_helper.rb`: Upstream modified `theme_color_tags` to work on color scheme rather than theme. Updated it as well. - `app/views/layouts/embedded.html.haml`: Upstream changed the embed theme from `mastodon-light` to `system`. Glitch-soc doesn't use a hardcoded value, so ignore the change. - `spec/helpers/theme_helper_spec.rb`: Accomodate `theme_color_tags` changes.
… exist Port 93f5ed0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 9185637
…oc/merge-upstream Conflicts: - `app/helpers/theme_helper.rb`: Upstream simplified `theme_style_tags`. Our version is different because of the different theming system. Adapted upstream's changes. - `app/views/layouts/error.html.haml`: Theming system.
Port e715bb5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 5727b86 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 047338e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to cc3c7ba
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
14 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 : )