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

build: bump gunicorn (backport #30928) #30941

Merged
merged 2 commits into from
Jan 31, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 30, 2025

fast shutdown/restart fix: frappe/gunicorn@4f74f4a


This is an automatic backport of pull request #30928 done by [Mergify](https://mergify.com).

fast shutdown/restart fix: frappe/gunicorn@4f74f4a

(cherry picked from commit 7a7b318)

# Conflicts:
#	pyproject.toml
@mergify mergify bot added the conflicts label Jan 30, 2025
@mergify mergify bot assigned ankush Jan 30, 2025
Copy link
Contributor Author

mergify bot commented Jan 30, 2025

Cherry-pick of 7a7b318 has failed:

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

You are currently cherry-picking commit 7a7b318662.
  (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

@ankush ankush enabled auto-merge (squash) January 31, 2025 13:30
@ankush ankush merged commit 93a22d2 into version-14-hotfix Jan 31, 2025
10 of 11 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-30928 branch January 31, 2025 13:49
ankush added a commit that referenced this pull request Feb 3, 2025
akhilnarang added a commit that referenced this pull request Feb 4, 2025
…n-14

* upstream/version-14-hotfix:
  fix: move child table checks to within `set_input()`
  perf: Throttle UX features aggresively on large tables (backport #30938) (#31081)
  Revert "build: bump gunicorn (backport #30928) (#30941)"
  fix: datepicker ui issue
  build: bump gunicorn (backport #30928) (#30941)
  fix(sanitize_column): add newlines to the regex check
  chore: resolve conflicts
  fix: reorder session initialization in HTTPRequest class
  fix(attach): fix crash on web page builder
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.93.2 🎉

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 19, 2025
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.

2 participants