-
Notifications
You must be signed in to change notification settings - Fork 916
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Manual Backport 1.x] [CVE-2020-36632] Bump flat from 4.1.1 to 5.0.2 #3539
Conversation
Signed-off-by: Josh Romero <[email protected]>
Signed-off-by: Josh Romero <[email protected]>
Codecov Report
📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more @@ Coverage Diff @@
## 1.x #3539 +/- ##
==========================================
- Coverage 67.45% 67.44% -0.01%
==========================================
Files 3044 3044
Lines 58696 58696
Branches 8902 8902
==========================================
- Hits 39591 39587 -4
- Misses 16952 16954 +2
- Partials 2153 2155 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
@joshuarrrr seems like there is a conflict |
ignoring whitesource failure |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-3539-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3a51afda8e8d8c82cf30cea7344b1e8c278f1977
# Push it to GitHub
git push --set-upstream origin backport/backport-3539-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.3 Then, create a pull request where the |
this doesn't need backporting, of course - already in #3520 |
Description
manual backport of #3520
Issues Resolved
Resolves #3167
Check List
yarn test:jest
yarn test:jest_integration
yarn test:ftr