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

update jinja2 per CVE-2024-22195 (backport #9619) #9630

Merged
merged 2 commits into from
Jan 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 18, 2024

This is an automatic backport of pull request #9619 done by Mergify.
Cherry-pick of f190828 has failed:

On branch mergify/bp/3.10/pr-9619
Your branch is up to date with 'origin/3.10'.

You are currently cherry-picking commit f1908283c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/requirements.in
	both modified:   doc/requirements.txt

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit f190828)

# Conflicts:
#	doc/requirements.in
#	doc/requirements.txt
@mergify mergify bot added the conflicts label Jan 18, 2024
@mergify mergify bot mentioned this pull request Jan 18, 2024
1 task
@mergify mergify bot added the backport label Jan 18, 2024
@geekosaur
Copy link
Collaborator

FWIW I included another security update that hadn't been backported, that was the cause of the merge conflict.

Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

Thank you for taking this on!

@geekosaur
Copy link
Collaborator

Do we need that many reviewers for a backport?

@ulysses4ever
Copy link
Collaborator

Oh, my bad, one should be enough.

@geekosaur geekosaur added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Jan 20, 2024
@mergify mergify bot merged commit 767973d into 3.10 Jan 20, 2024
41 checks passed
@mergify mergify bot deleted the mergify/bp/3.10/pr-9619 branch January 20, 2024 02:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants