[pull] main from glitch-soc:main#523
Open
pull[bot] wants to merge 3222 commits into
Open
Conversation
…oc/merge-upstream Conflicts: - `app/helpers/settings_helper.rb`: Upstream added a new helper. Conflict caused by the fact there is a glitch-soc specific helper. Added upstream's new helper in addition to glitch-soc's.
Port ea5b613 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 87024b9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…ading Port bcafd7d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 51a956b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 5553448 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 1bfdfca to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port c4ea89d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 4ee21a6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 9c493c2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream issues up to b48f907
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… as sensitive" is enabled (mastodon#39339)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream Conflicts: - `lib/mastodon/version.rb`: Upstream bumped the Mastodon API version. Did it as well.
Port 27a253b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 34bbb47
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
…b interface Port c60fa47 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port f1b0832 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…ave loaded Port 8c0b777 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 1dc2abb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 724cac9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to f440615
…oc/merge-upstream
Port f2e10fd to glitch-soc Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port e4e19ba to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 3f98bee to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 3f98bee
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.
19 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 : )