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

feat(External Contact): optimize form (LAN-802) (backport #257) #260

Merged
merged 8 commits into from
Mar 1, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 1, 2024

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


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 331c34b)

# Conflicts:
#	landa/patches.txt
- Last name is no longer mandatory
- Institution or Company Name becomes mandatory

(cherry picked from commit 83a4c16)
(cherry picked from commit 5282a6a)
@mergify mergify bot added the conflicts label Mar 1, 2024
Copy link
Author

mergify bot commented Mar 1, 2024

Cherry-pick of 331c34b has failed:

On branch mergify/bp/version-14-hotfix/pr-257
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 331c34b4.
  (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:   landa/organization_management/doctype/external_contact/external_contact.js
	modified:   landa/organization_management/doctype/external_contact/external_contact.json
	modified:   landa/organization_management/doctype/external_contact/external_contact.py
	new file:   landa/patches/link_external_contact_to_regional_organization.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   landa/patches.txt

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

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…-257
@barredterra barredterra merged commit db1df0d into version-14-hotfix Mar 1, 2024
5 checks passed
@barredterra barredterra deleted the mergify/bp/version-14-hotfix/pr-257 branch March 1, 2024 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant