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: show pointer only if section is collapsible (backport #23462) #23466

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 28, 2023

This is an automatic backport of pull request #23462 done by Mergify.
Cherry-pick of 0cd7ee0 has failed:

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

You are currently cherry-picking commit 0cd7ee091f.
  (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/public/scss/desk/form.scss

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   frappe/public/js/frappe/form/section.js

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

(cherry picked from commit 0cd7ee0)

# Conflicts:
#	frappe/public/js/frappe/form/section.js
@mergify mergify bot requested a review from a team as a code owner November 28, 2023 02:06
@mergify mergify bot added the conflicts label Nov 28, 2023
@mergify mergify bot requested review from ankush and removed request for a team November 28, 2023 02:06
@ankush ankush closed this Nov 28, 2023
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-23462 branch November 28, 2023 02:07
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 14, 2023
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