Updatemeemu #16
Merged
Updatemeemu #16
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
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Nick Schonning <nschonni@gmail.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>
…oc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file.
Port 44cd88a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream Conflicts: - `package.json`: Upstream changed various script definitions in lines surrounding the one for `i18n:extract`, which had glitch-soc-specific changes. Updated the scripts as upstream did, while keeping our changes to `i18n:extract`.
Port 6905746 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 675672f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream
Port e9385e9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream
Port b3f9a0d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did *not* port the changes as I want to try something a bit different.
Port b0780cf to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port d9a5c1a to glitch-soc Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 6268188 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 000b835 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port b7910bc to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…nsistency Port 54cb679 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 69e124e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…upstream Merge upstream changes
* Tighten allowed HTML in oEmbed-based preview cards * Sanitize preview cards at render time * Add `sandbox` attribute to preview card iframes
* Fix attachments getting processed despite failing content-type validation * Add a restrictive ImageMagick security policy tailored for Mastodon * Fix misdetection of MP3 files with large cover art * Reject unprocessable audio/video files instead of keeping them unchanged
* Fix timeout handling of outbound HTTP requests * Use CLOCK_MONOTONIC instead of Time.now
…upstream Merge upstream changes
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Conflicts: - `.github/workflows/build-image.yml`: Upstream attempted something with tags. Kept our version.
…upstream Merge upstream changes
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.
No description provided.