[pull] main from glitch-soc:main#523
Open
pull[bot] wants to merge 2672 commits into
Open
Conversation
Port 5b1891a 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>
Merge upstream changes up to c4eec63
Co-authored-by: GitHub Actions <noreply@github.com>
…oc/merge-upstream Conflicts: - `config/settings.yml`: Upstream added a new setting textually adjacent to ones modified by glitch-soc's. Added upstream's new setting.
Port 5bc69ea to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 1d1deaa to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 540042d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…ally Port 478dae0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port d7b60a2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 2f0db28 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port e2be688 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 3473b8a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 3473b8a
Port 758db36 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 8bbde18
…ttachment_spec.rb` on latest pre-release yet rolled out runner image (mastodon#39052)
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>
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>
…collections they are in (mastodon#39029) Co-authored-by: diondiondion <mail@diondiondion.com>
…oc/merge-upstream
Port cdf48e8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port bb94f91 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
… list of collections they are in Port 99b72f6 to glitch-soc Co-authored-by: diondiondion <mail@diondiondion.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
… collection page Port dcb6dbb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 28ae61f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 07a05e1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
… collection Port c26003a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to c26003a
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.
16 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 : )