[pull] main from glitch-soc:main#523
Open
pull[bot] wants to merge 2396 commits intoCompostInTraining:mainfrom
Open
[pull] main from glitch-soc:main#523pull[bot] wants to merge 2396 commits intoCompostInTraining:mainfrom
pull[bot] wants to merge 2396 commits intoCompostInTraining:mainfrom
Conversation
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Port b1bb3ba to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 30275cd
…oc/merge-upstream - `CODE_OF_CONDUCT.md`: Adopt upstream's new Code of Conduct
Port 0d20f23 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 8733d09 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 1f7d6cd to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port e8f4896 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 36d85f8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 93dcca7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port ca5c0a1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Even if it's not a perfect match for the context, it's not likely to change.
Merge upstream changes up to ca5c0a1
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
Port badda51 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream
Port 543db6d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 5a38246 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…ype-dependent `key` Port 0e6180a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…nts editor Port a40b071 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…on menu Port e571994 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 570f2ef to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 05a1c17 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to b15d234
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>
…oc/merge-upstream Conflicts: - `app/helpers/theme_helper.rb`: Upstream added fallback behavior for when the admin-set theme does not exist. Glitch-soc has a different theming system, but already had similar fallback, so not changing glitch-soc code. - `spec/helpers/theme_helper_spec.rb`: Upstream adapted existing tests for the new fallback behavior, and added some tests accordingly. Glitch-soc has a different theming system, adapted the new tests accordingly.
Merge upstream changes up to 28e5c3b
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
11 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 : )