[pull] main from glitch-soc:main#523
Open
pull[bot] wants to merge 1382 commits intoCompostInTraining:mainfrom
Open
[pull] main from glitch-soc:main#523pull[bot] wants to merge 1382 commits intoCompostInTraining:mainfrom
pull[bot] wants to merge 1382 commits intoCompostInTraining:mainfrom
Conversation
… 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
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
Merge upstream changes up to ad77ee7
* Re-add `data-user-flavour` attribute * Add data-user-flavour to embed/error pages * Use actual flavor for embeds/error pages
Co-authored-by: GitHub Actions <noreply@github.com>
* Add limit on inbox payload size The 1MB limit is consistent with the limit we use when fetching remote resources * Add limit to number of options from federated polls * Add a limit to the number of federated profile fields * Add limit on federated username length * Add hard limits for federated display name and account bio * Add hard limits for `alsoKnownAs` and `attributionDomains` * Add hard limit on federated custom emoji shortcode * Highlight most destructive limits and expand on their reasoning
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/services/backup_service.rb`: Upstream refactored activity serialization while glitch-soc passed an extra argument. Followed upstream's refactor, keeping our extra argument.
Co-authored-by: Your Name <you@example.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Port d2dca82 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to acdd0b3
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
…oc/merge-upstream
Port 7a4945c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 96de28d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 2768ab7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 7e27ba9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 2e30044 to glitch-soc Co-authored-by: diondiondion <mail@diondiondion.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 2e30044
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 : )