[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>
…oc/merge-upstream
…item on load Port 550a6d4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 8c28459 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 9e97ad0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port a9c8452 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port f118d61 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port e6b0cdc to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 53be839
Co-authored-by: GitHub Actions <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 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
…oc/merge-upstream
Port fa9b905 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port a1c17fe to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 400c1f3
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
13 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 : )