🚨 Hotfix merge conflicts #6295
🚨 Hotfix merge conflicts #6295
Conversation
![live-github-bot[bot]](https://avatars.githubusercontent.com/in/198164?s=60&v=4){kind=small}
[LIVE-10878] App Store Developer Name Display
* btc doc * btc doc * btc doc * btc doc * btc doc * btc doc * add changeset * btc doc * fix: update btc doc * fix: update btc doc
* Draft simpleHash usage * Remove spread * commit pnpm * Reorg hook 🪝 * Fixed Types * Fix loading and type issue * remove fake color * WIP * Improvment * test: add useNftGalleryFilter test * Add FF * Fix unimported in lib * [FEAT]: use simpleHash for LLD Gallery (#6042) * Add changeset * chore: move the api endpoint into its env * Review * Try new SPAM_FILTER_THRESHOLD * FIX e2E tests * fix test --------- Co-authored-by: Gaëtan Renaudeau <renaudeau.gaetan@gmail.com>
…for Portfolio ContentCards
… card in Carousel
Remove playwright replay on macOS and Windows
[LLD] - [LIVE-10488] - Add Portfolio Content Card
* fix(deps): update dependency @dfinity/agent to v0.21.4 * fix: bot --------- Co-authored-by: live-github-bot[bot] <105061298+live-github-bot[bot]@users.noreply.github.com> Co-authored-by: Gaëtan Renaudeau <renaudeau.gaetan@gmail.com>
live-github-bot
bot
added
tools
live-github-bot
bot
removed
tools
Mobile Bundle Checks
Desktop Bundle Checks |
jdabbech-ledger
force-pushed
the
support/hotfix-merge-conflicts
branch
from
510ce05
to
a24eef8
Compare
jdabbech-ledger
force-pushed
the
support/hotfix-merge-conflicts
branch
from
de1345b
to
c32435e
Compare
|
🚨 Potential security issues detected. Learn more about Socket for GitHub ↗︎ To accept the risk, merge this PR and you will not be notified again.
Next stepsWhat's wrong with native code?Contains native code which could be a vector to obscure malicious code, and generally decrease the likelihood of reproducible or reliable installs. Ensure that native code bindings are expected. Consumers may consider pure JS and functionally similar alternatives to avoid the challenges and risks associated with native code bindings. What is an install script?Install scripts are run when the package is installed. The majority of malware in npm is hidden in install scripts. Packages should not be running non-essential scripts during install and there are often solutions to problems people solve with install scripts that can be run at publish time instead. Take a deeper look at the dependencyTake a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev. Remove the packageIf you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency. Mark a package as acceptable riskTo ignore an alert, reply with a comment starting with
|
The hotfix had some merge conflicts 🚨
This pull request was created in order to resolve the merge conflicts between the hotfix and develop branches.
git checkout develop && git pull git checkout support/hotfix-merge-conflicts git merge developChecklist
To be ready to be merged, we must comply with all theses checks: