Merge upstream changes up to 958a810553aac6b6cf21d9d107a47b6f68b2a401 #2656
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: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Port 4185f37 to glitch-soc Signed-off-by: Claire <[email protected]>
…e external link button Port f24c62a to glitch-soc Signed-off-by: Claire <[email protected]>
Port edd6aa7 to glitch-soc Signed-off-by: Claire <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## main #2656 +/- ##
==========================================
+ Coverage 84.87% 84.99% +0.11%
==========================================
Files 1066 1069 +3
Lines 28921 28846 -75
Branches 4656 4657 +1
==========================================
- Hits 24548 24517 -31
+ Misses 3170 3131 -39
+ Partials 1203 1198 -5 ☔ View full report in Codecov by Sentry. |
…oc/merge-upstream Conflicts: - `app/javascript/packs/admin.jsx`: This file was split between `app/javascript/core/admin.js`, `app/javascript/pack/admin.jsx`, and `app/javascript/flavours/glitch/packs/admin.jsx`. Ported upstream's change, splitting the new file to `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`, and `app/javascript/flavours/glitch/packs/admin.tsx`
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
c75dbeb to
f6654e0
Compare
ClearlyClaire
changed the title
|
Note: 958a810 uses wrong types for |
|
Thanks for pointing this out! Should be addressed by mastodon#29469 upstream |
|
Can confirm! |
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 6dfe318
Ported changes
Merge upstream changes up to 958a810
Conflicts
app/javascript/packs/admin.jsx:This file was split between
app/javascript/core/admin.js,app/javascript/pack/admin.jsx, andapp/javascript/flavours/glitch/packs/admin.jsx.Ported upstream's change, splitting the new file to
app/javascript/core/admin.ts,app/javascript/packs/admin.tsx, andapp/javascript/flavours/glitch/packs/admin.tsx