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: Skip letter heads if no permission (backport #26689) #26691

Merged
merged 3 commits into from
Jun 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 5, 2024

#26563 This cases boot to fail for users if they don't have letterhead access.


This is an automatic backport of pull request #26689 done by Mergify.

(cherry picked from commit 63a13d0)

# Conflicts:
#	frappe/boot.py
@mergify mergify bot requested review from a team and ankush and removed request for a team June 5, 2024 15:58
@mergify mergify bot added the conflicts label Jun 5, 2024
@mergify mergify bot assigned ankush Jun 5, 2024
Copy link
Contributor Author

mergify bot commented Jun 5, 2024

Cherry-pick of 63a13d0 has failed:

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

You are currently cherry-picking commit 63a13d0aff.
  (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/boot.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ankush ankush enabled auto-merge (squash) June 5, 2024 16:53
@ankush ankush merged commit 7a1dc7d into version-14-hotfix Jun 5, 2024
9 of 10 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-26689 branch June 5, 2024 17:10
frappe-pr-bot pushed a commit that referenced this pull request Jun 11, 2024
## [14.76.2](v14.76.1...v14.76.2) (2024-06-11)

### Bug Fixes

* apply perms on letter head selection (backport [#26563](#26563)) ([#26582](#26582)) ([06854e5](06854e5))
* Email tracking without "use_ssl" (backport [#26718](#26718)) ([#26734](#26734)) ([478f84e](478f84e))
* **package_release:** set path to tarball ([b48037a](b48037a))
* recursive fetch from causes infinite loop ([#26695](#26695)) ([#26696](#26696)) ([2f9f4bc](2f9f4bc))
* Skip letter heads if no permission (backport [#26689](#26689)) ([#26691](#26691)) ([7a1dc7d](7a1dc7d))
* Skip virtual fields in all select queries (backport [#26700](#26700)) ([#26701](#26701)) ([cdab21f](cdab21f))
* **UX:** Disable number card filters on standard ([#26676](#26676)) ([#26679](#26679)) ([5810549](5810549))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.76.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

akhilnarang added a commit that referenced this pull request Jun 19, 2024
…-25050

* version-14-hotfix: (29 commits)
  refactor(web list): use CSS class `d-none` instead of `hidden`
  fix: auto filter publish field (#26151)
  fix(desk): Don't trigger minimized dialog action on Ctrl-S
  fix(query_report): don't follow reference report for `prepared_report` field
  fix: avoid popping from empty list
  feat: set the only email address as primary
  fix: shorten_number
  fix: Email tracking without "use_ssl" (backport #26718) (#26734)
  fix(package_release): set path to tarball
  chore: Reword "Recursive Fetch From" message (#26706) (#26707)
  fix: Skip virtual fields in all select queries (backport #26700) (#26701)
  fix: recursive fetch from causes infinite loop (#26695) (#26696)
  fix: Skip letter heads if no permission (backport #26689) (#26691)
  fix: apply perms on letter head selection (backport #26563) (#26582)
  fix(UX): Disable number card filters on standard (#26676) (#26679)
  test: pin cypress
  fix: fail on cypress install failure
  fix: Auto Email Report not working when Add Total Row is enabled (#26667)
  perf: use base32 space for random names instead of base16 (backport #25497) (#26655)
  fix(make_request): don't blindly try to check the content-type
  ...

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 27, 2024
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.

None yet

2 participants