8000 chore(deps): bump cryptography (backport #24778) by mergify[bot] · Pull Request #24781 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

chore(deps): bump cryptography (backport #24778) #24781

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

Merged

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Feb 6, 2024

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

On branch mergify/bp/version-15-hotfix/pr-24778
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit ddcf654423.
  (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:   pyproject.toml

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/pull-requests/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

GHSA-3ww4-gg4f-jr7f

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit ddcf654)

# Conflicts:
#	pyproject.toml
@mergify mergify bot requested a review from a team February 6, 2024 05:30
@mergify mergify bot added the conflicts label Feb 6, 2024
@mergify mergify bot requested review from shariquerik and removed request for a team February 6, 2024 05:30
@ankush ankush marked this pull request as draft February 6, 2024 06:05
@ankush
Copy link
Member
ankush commented Feb 6, 2024

@akhilnarang push this in next week's release by merging after release. Not really critical issue IMO.

(cherry picked from commit 679287a)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
@akhilnarang akhilnarang force-pushed the mergify/bp/version-15-hotfix/pr-24778 branch from b91b7c8 to bfb13c5 Compare February 6, 2024 09:52
@ankush ankush marked this pull request as ready for review February 6, 2024 10:12
@akhilnarang akhilnarang merged commit 41857b6 into version-15-hotfix Feb 6, 2024
@akhilnarang akhilnarang deleted the mergify/bp/version-15-hotfix/pr-24778 branch February 6, 2024 11:43
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.14.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0