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) #26690

Closed
wants to merge 1 commit into from

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 a review from a team June 5, 2024 15:57
@mergify mergify bot added the conflicts label Jun 5, 2024
@mergify mergify bot requested review from rutwikhdev and removed request for a team June 5, 2024 15:57
Copy link
Contributor Author

mergify bot commented Jun 5, 2024

Cherry-pick of 63a13d0 has failed:

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

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

@github-actions github-actions bot added the add-test-cases Add test case to validate fix or enhancement label Jun 5, 2024
@ankush ankush closed this Jun 5, 2024
@mergify mergify bot deleted the mergify/bp/version-15/pr-26689 branch June 5, 2024 16:51
@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.
Labels
add-test-cases Add test case to validate fix or enhancement conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant