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

fix: stale frappe.local (backport #20695) #20700

Merged
merged 2 commits into from
Apr 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 14, 2023

This is an automatic backport of pull request #20695 done by Mergify.
Cherry-pick of 1e9ede4 has failed:

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

You are currently cherry-picking commit 1e9ede40fa.
  (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/__init__.py
	both modified:   frappe/app.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

* fix: stale `frappe.local`

Co-Authored-By: Aditya Hase <aditya@adityahase.com>

* fix: force re-init in request

To ensure that any one bad request can not completely cause recurring
loop of broken requests due to bad locals, we just force-init locals on
every request.

---------

Co-authored-by: Aditya Hase <aditya@adityahase.com>
(cherry picked from commit 1e9ede4)

# Conflicts:
#	frappe/__init__.py
#	frappe/app.py
@mergify mergify bot requested review from a team and phot0n and removed request for a team April 14, 2023 08:49
@mergify mergify bot added the conflicts label Apr 14, 2023
@mergify mergify bot assigned ankush Apr 14, 2023
@ankush ankush removed the conflicts label Apr 14, 2023
@ankush ankush merged commit bfd9dd0 into version-13-hotfix Apr 14, 2023
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-20695 branch April 14, 2023 09:30
frappe-pr-bot pushed a commit that referenced this pull request Apr 18, 2023
# [13.54.0](v13.53.2...v13.54.0) (2023-04-18)

### Bug Fixes

* allow filter values to be saved in custom report ([2499aba](2499aba))
* allow workflow action master rename ([afc05c4](afc05c4))
* bulk update (backport [#20522](#20522)) ([8e51fb0](8e51fb0))
* clear all filters when in list view (backport [#20342](#20342)) ([#20747](#20747)) ([8fa1580](8fa1580))
* filter with capitalized operator was getting bypassed (backport [#20682](#20682)) ([#20683](#20683)) ([12cd78d](12cd78d))
* group buttons are overlapping (backport [#20671](#20671)) ([#20688](#20688)) ([b0183ed](b0183ed))
* Initialize "r" to avoid UnboundLocalError ([#19630](#19630)) ([#20758](#20758)) ([c852197](c852197))
* prioritize modal over freeze in grid-form ([ed85ea2](ed85ea2))
* remove guest permission from language (backport [#20677](#20677)) ([#20690](#20690)) ([2553a7e](2553a7e))
* Remove unnecessary code to avoid timestamp conflict ([410d976](410d976))
* stale `frappe.local` (backport [#20695](#20695)) ([#20700](#20700)) ([bfd9dd0](bfd9dd0))
* update property if field exist ([8171c65](8171c65))

### Features

* custom info in frappe monitor (backport [#18214](#18214)) ([#20686](#20686)) ([87d52f5](87d52f5)), closes [#18259](#18259)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.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 May 3, 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.

None yet

2 participants