Merge upstream changes up to 75ecc6df068ec2c21b26f05692eb5dfdc35671fa #2910
Conversation
This file contains 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
mastodon#29883) Co-authored-by: Claire <[email protected]>
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 <[email protected]>
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 <[email protected]>
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: Eugen Rochko <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. - `spec/helpers/application_helper_spec.rb`: Minor conflict due to glitch-soc's theming system.
Port 9ebed5d to glitch-soc Signed-off-by: Claire <[email protected]>
Port 0ad5c21 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 27e79da to glitch-soc Signed-off-by: Claire <[email protected]>
… in moderation interface Port 1be83c6 to glitch-soc Signed-off-by: Claire <[email protected]>
… web UI Port 1a88c05 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Conflict due to upstream adding fallback support for MathML Core while glitch-soc supported slightly more tags than upstream. Added the MathML Core fallback code to glitch-soc. - `spec/lib/sanitize/config_spec.rb`: Ditto.
Port 429e08e to glitch-soc Signed-off-by: Claire <[email protected]>
Port 7a3dea3 to glitch-soc Signed-off-by: Claire <[email protected]>
Port eef8d2c to glitch-soc Co-authored-by: Eugen Rochko <[email protected]> Signed-off-by: Claire <[email protected]>
Port 7f2cfcc to glitch-soc Signed-off-by: Claire <[email protected]>
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
017e2ff to
64fc79c
Compare
…oc/merge-upstream
Port 986a367 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 4de108e to glitch-soc Signed-off-by: Claire <[email protected]>
ClearlyClaire
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge upstream changes up to a27bafa
Conflicts
app/controllers/application_controller.rb:Minor conflict due to glitch-soc's theming system.
spec/helpers/application_helper_spec.rb:Minor conflict due to glitch-soc's theming system.
Ported changes
Merge upstream changes up to c58967c
Conflicts
lib/sanitize_ext/sanitize_config.rb:Conflict due to upstream adding fallback support for MathML Core while glitch-soc supported slightly more tags than upstream.
Added the MathML Core fallback code to glitch-soc.
spec/lib/sanitize/config_spec.rb:Ditto.
Ported changes
Postponed changes
Merge upstream changes up to 75ecc6d
Ported changes