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

feat: Set default SQL statement timeouts (backport #18771) #18800

Merged
merged 1 commit into from Nov 9, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 8, 2022

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

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

You are currently cherry-picking commit ce360b6fce.
  (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:   frappe/database/database.py
	both modified:   frappe/database/mariadb/database.py
	both modified:   frappe/database/postgres/database.py
	both modified:   frappe/tests/test_db.py

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

@mergify mergify bot requested a review from a team as a code owner November 8, 2022 09:50
@mergify mergify bot requested review from phot0n and removed request for a team November 8, 2022 09:50
@mergify mergify bot added the conflicts label Nov 8, 2022
@mergify mergify bot assigned ankush Nov 8, 2022
@ankush ankush marked this pull request as draft November 8, 2022 09:51
@ankush ankush added the Run UI Tests Runs Server CI builds even if frontend changes not detected. label Nov 8, 2022
@ankush
Copy link
Member

ankush commented Nov 8, 2022

More conflicts than ports 😔

@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-18771 branch from cdf5f10 to c497cf9 Compare November 8, 2022 14:28
@ankush ankush removed the conflicts label Nov 8, 2022
@ankush ankush marked this pull request as ready for review November 8, 2022 14:29
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-18771 branch from c497cf9 to 1e1a4cb Compare November 9, 2022 14:22
@ankush ankush merged commit 127763a into version-13-hotfix Nov 9, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-18771 branch November 9, 2022 14:22
frappe-pr-bot pushed a commit that referenced this pull request Nov 15, 2022
# [13.44.0](v13.43.2...v13.44.0) (2022-11-15)

### Bug Fixes

* page has an empty menu button ([637cb45](637cb45))
* reportview permlevel bug (backport [#18822](#18822)) ([#18827](#18827)) ([acb6f57](acb6f57))
* reset workspace ([271c5d0](271c5d0))
* **security:** prevent xss attack in search ([#18847](#18847)) ([#18849](#18849)) ([8b42091](8b42091))

### Features

* Set default SQL statement timeouts (backport [#18771](#18771)) ([#18800](#18800)) ([127763a](127763a))

### Performance Improvements

* **workflow:** get_transitions ([#18834](#18834)) ([9ec557d](9ec557d))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.44.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 Nov 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
released Run UI Tests Runs Server CI builds even if frontend changes not detected.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants