Skip to content
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

[2.18] CVE fix dompurify@3.1.2 #459

Merged
merged 1 commit into from
Oct 28, 2024

Conversation

RyanL1997
Copy link
Contributor

Description

CVE fix dompurify@3.1.2

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

package.json Outdated Show resolved Hide resolved
Signed-off-by: Ryan Liang <jiallian@amazon.com>
Copy link
Member

@ps48 ps48 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 🙌🏽

@rishabh6788 rishabh6788 merged commit 680774d into opensearch-project:2.18 Oct 28, 2024
4 of 10 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 28, 2024
Signed-off-by: Ryan Liang <jiallian@amazon.com>
(cherry picked from commit 680774d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to main failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-reporting/backport-main main
# Navigate to the new working tree
pushd ../.worktrees/dashboards-reporting/backport-main
# Create a new branch
git switch --create backport/backport-459-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 680774d6dcbb3b45ad84b2d57f14a5115bd45a09
# Push it to GitHub
git push --set-upstream origin backport/backport-459-to-main
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-reporting/backport-main

Then, create a pull request where the base branch is main and the compare/head branch is backport/backport-459-to-main.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants