8000 fix: misc (backport #24303) by mergify[bot] · Pull Request #24304 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: misc (backport #24303) #24304

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
merged 3 commits into from
Jan 13, 2024

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Jan 13, 2024

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

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

You are currently cherry-picking commit b3eaec4347.
  (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/core/doctype/rq_job/rq_job.json
	modified:   frappe/core/doctype/rq_worker/rq_worker.json
	new file:   frappe/core/doctype/rq_worker/rq_worker_list.js
	modified:   frappe/translate.py
	modified:   frappe/utils/background_jobs.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/rq_job/rq_job.py
	both modified:   frappe/core/doctype/rq_worker/rq_worker.py

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(DX): improve logging in various places

* fix(ux): misc RQ worker and job fixes

(cherry picked from commit b3eaec4)

# Conflicts:
#	frappe/core/doctype/rq_job/rq_job.py
#	frappe/core/doctype/rq_worker/rq_worker.py
@mergify mergify bot requested a review from a team January 13, 2024 05:26
@mergify mergify bot added the conflicts label Jan 13, 2024
@mergify mergify bot requested review from surajshetty3416 and removed request for a team January 13, 2024 05:26
@mergify mergify bot assigned ankush Jan 13, 2024
@ankush ankush merged commit bd3f89b into version-14-hotfix Jan 13, 2024
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-24303 branch January 13, 2024 05:43
@ankush ankush added the Skip CI Doesn't run Ci for this PR. label Jan 13, 2024
frappe-pr-bot pushed a commit that referenced this pull request Jan 16, 2024
## [14.62.3](v14.62.2...v14.62.3) (2024-01-16)

### Bug Fixes

* add a check for `gpg` existing ([db2fb36](db2fb36))
* collapse sidebar on picking workspace ([#24312](#24312)) ([#24313](#24313)) ([898c803](898c803))
* delete existing children first to avoid `UniqueValidationError` (backport [#24140](#24140)) ([0363371](0363371))
* don't update docstatus (backport [#24216](#24216)) ([#24220](#24220)) ([6d4dcf9](6d4dcf9))
* Error when displaying dashboard with number card using average and sum methods ([#24244](#24244)) ([7d75ed3](7d75ed3))
* Handle edge case while searching in current context ([b4d23ed](b4d23ed))
* include workspaces without domain restriction ([90d4734](90d4734))
* **minor:** add optional chaining for this.$input ([#24339](#24339)) ([65a642f](65a642f))
* **minor:** check if markdown_preview exists ([#24335](#24335)) ([8fbda2c](8fbda2c))
* **minor:** increase rate limit for web form ([#24295](#24295)) ([#24296](#24296)) ([49ddaa0](49ddaa0))
* misc (backport [#24303](#24303)) ([#24304](#24304)) ([bd3f89b](bd3f89b))
* mobile sidebar disappearing ([#24316](#24316)) ([#24341](#24341)) ([b5811b5](b5811b5))
* **mobile-ui:** tabs should scroll instead of stack (backport [#24309](#24309)) ([#24310](#24310)) ([5db8d08](5db8d08))
* **MultiCheck:** Use df.sort_options to enable/disable sort ([#24202](#24202)) ([#24290](#24290)) ([1aa1de2](1aa1de2))
* pass parent doctype on dashboard chart ([#24236](#24236)) ([#24237](#24237)) ([e9c10f4](e9c10f4))
* print perm check logs from DB query (backport [#24263](#24263)) ([#24267](#24267)) ([ce9fd66](ce9fd66))
* remove unknown column `indicator_color` ([8f6be35](8f6be35))
* **response:** fixup non-ASCII character filenames ([9dc059b](9dc059b))
* set correct recipient when reply to own email ([#24256](#24256)) ([#24259](#24259)) ([97fea1f](97fea1f))
* strip html instead of escaping when creating/updating workspace (backport [#24284](#24284)) ([8207559](8207559))
* **UX:** show status indicator in moblie view ([#24306](#24306)) ([#24307](#24307)) ([d74b5fc](d74b5fc))

### Reverts

* Revert "fix(Data Import): show failed import logs" ([56c9383](56c9383))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.62.3 🎉

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 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts released Skip CI Doesn't run Ci for this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0