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: webhook timeout (backport #21410) #22978

Merged
merged 2 commits into from
Oct 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 30, 2023

This is an automatic backport of pull request #21410 done by Mergify.
Cherry-pick of 62a3a70 has failed:

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

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

Changes to be committed:
	modified:   frappe/integrations/doctype/webhook/webhook.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/integrations/doctype/webhook/webhook.json

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

* feat: webhook timeout

* fix: ensure default timeout 5 seconds

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 62a3a70)

# Conflicts:
#	frappe/integrations/doctype/webhook/webhook.json
@mergify mergify bot requested a review from a team October 30, 2023 10:25
@mergify mergify bot added the conflicts label Oct 30, 2023
@mergify mergify bot requested review from shariquerik and removed request for a team October 30, 2023 10:25
@ankush ankush removed the conflicts label Oct 30, 2023
@ankush ankush merged commit dbbfa17 into version-14-hotfix Oct 30, 2023
7 of 11 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-21410 branch October 30, 2023 11:16
frappe-pr-bot pushed a commit that referenced this pull request Oct 31, 2023
# [14.54.0](v14.53.2...v14.54.0) (2023-10-31)

### Bug Fixes

* check label for fields ([4fbda9b](4fbda9b))
* child rows for cancelled docs in getdiff ([d79e0b9](d79e0b9))
* developer mode in website theme ([#22958](#22958)) ([#22997](#22997)) ([62841eb](62841eb))
* fetch prev docs from last amended doc ([9b12aa6](9b12aa6))
* Footer should show up once at end if not repeating header/footer ([#22902](#22902)) ([#22909](#22909)) ([11e5c00](11e5c00))
* group by didn't work for the frappe.client.get_value ([#22969](#22969)) ([#22972](#22972)) ([1cc4ce3](1cc4ce3))
* ignore stale custom fields while checking back-links ([#22940](#22940)) ([#22942](#22942)) ([b4ebde7](b4ebde7))
* ignore workspace links on delete ([#22895](#22895)) ([#22896](#22896)) ([4ac08b8](4ac08b8))
* improve label and description for `fetch_if_empty` ([b0e7479](b0e7479))
* list view formatting logic (backport [#22646](#22646)) ([#22848](#22848)) ([91b87da](91b87da))
* **migrate:** raise exception even if db is not available ([#22922](#22922)) ([#22999](#22999)) ([0f03ddd](0f03ddd))
* multiple rows changed in each table ([e7a3264](e7a3264))
* **query_doctypes:** Allow search in translated name (backport [#22590](#22590)) ([#22748](#22748)) ([254d2e5](254d2e5))
* remove indicator ([4b8d6e8](4b8d6e8))
* rename doctype ([56da0ba](56da0ba))
* rename imports ([fbb663d](fbb663d))
* return df label only when not none ([3d692d5](3d692d5))
* revert unintentional quick entry default for Address ([#22974](#22974)) ([70745b2](70745b2))
* skip invalid numbers on SMS `receiver_list` (backport [#22879](#22879)) ([#23002](#23002)) ([48ffb1f](48ffb1f))
* use latest doc name for test ([d146132](d146132))
* **UX:** Improve search relevance for link field (backport [#22729](#22729)) ([#22966](#22966)) ([abc3cca](abc3cca))

### Features

* add collapsible sections for row additions and deletions ([4267339](4267339))
* add html template for additions and deletions ([902c168](902c168))
* add html template for comparator ([b4fd381](b4fd381))
* add js for rendering html grids ([56d8911](56d8911))
* add logic for addition and deletion grids ([38dbb93](38dbb93))
* add logic for changed values and rows ([9c7fa7c](9c7fa7c))
* add validation for mandatory fields ([53b3783](53b3783))
* create single doctype for comparator ([5acecf1](5acecf1))
* webhook timeout (backport [#21410](#21410)) ([#22978](#22978)) ([dbbfa17](dbbfa17))

### Performance Improvements

* query fields only once ([#22982](#22982)) ([#22987](#22987)) ([8e92894](8e92894))

### Reverts

* Revert "refactor: force ipv4 localhost (#22394) (#22396)" (#22946) ([cb10eb0](cb10eb0)), closes [#22394](#22394) [#22396](#22396) [#22946](#22946)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.54.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 15, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants