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

Upgrade dompurify to match upstream #598

Merged
merged 1 commit into from
Dec 27, 2022

Conversation

kavilla
Copy link
Member

@kavilla kavilla commented Dec 20, 2022

Description

In this PR:
opensearch-project/OpenSearch-Dashboards#2918

Dom purify was defined to a bug. Due to the version conflict, Dashboards Reports is unable to build. So bumping up version.

Signed-off-by: Kawika Avilla kavilla414@gmail.com

Issues Resolved

n/a

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.

In this PR:
opensearch-project/OpenSearch-Dashboards#2918

Dom purify was defined to a bug. Due to the version conflict,
Dashboards Reports is unable to build. So bumping up version.

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
@kavilla kavilla requested a review from a team as a code owner December 20, 2022 19:10
Copy link
Member

@ananzh ananzh left a comment

Choose a reason for hiding this comment

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

Thanks @kavilla

@joshuarrrr joshuarrrr added v2.5.0 'Issues and PRs related to version v2.5.0' backport 2.x labels Dec 23, 2022
@rupal-bq rupal-bq merged commit f552a6c into opensearch-project:main Dec 27, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-598-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f552a6c1d59bbe1213b8a24a0faba463b385b55b
# Push it to GitHub
git push --set-upstream origin backport/backport-598-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-598-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x v2.5.0 'Issues and PRs related to version v2.5.0'
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants