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: URL option for Data fieldtype (backport #12898) #13138

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 6, 2021

This is an automatic backport of pull request #12898 done by Mergify.
Cherry-pick of 9d4ee23 has failed:

On branch mergify/bp/version-13-pre-release/pr-12898
Your branch is ahead of 'origin/version-13-pre-release' by 15 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9d4ee238d7.
  (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/utils/__init__.py

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

Cherry-pick of 024e759 has failed:

On branch mergify/bp/version-13-pre-release/pr-12898
Your branch is ahead of 'origin/version-13-pre-release' by 18 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 024e759a70.
  (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/tests/test_utils.py
	modified:   frappe/utils/__init__.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/event_streaming/doctype/event_producer/event_producer.py
	both modified:   frappe/oauth.py

Cherry-pick of f4e4fc9 has failed:

On branch mergify/bp/version-13-pre-release/pr-12898
Your branch is ahead of 'origin/version-13-pre-release' by 19 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f4e4fc98f9.
  (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/tests/test_utils.py
	modified:   frappe/utils/__init__.py

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

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

NagariaHussain and others added 21 commits May 6, 2021 11:02
(cherry picked from commit ce2dabe)
(cherry picked from commit 4d91f31)
(cherry picked from commit ea38895)
(cherry picked from commit f2079f6)
- Use utility function instead

(cherry picked from commit 94c7541)
- Also, remove one depracated $ method

(cherry picked from commit 794308c)
(cherry picked from commit 472b21c)
(cherry picked from commit 6975e89)
(cherry picked from commit ddc4dc8)
(cherry picked from commit ee2e4e2)
(cherry picked from commit 81047bb)
(cherry picked from commit 9d4ee23)

# Conflicts:
#	frappe/event_streaming/doctype/event_producer/event_producer.py
(cherry picked from commit b965ceb)
(cherry picked from commit 024e759)

# Conflicts:
#	frappe/event_streaming/doctype/event_producer/event_producer.py
#	frappe/oauth.py
(cherry picked from commit f4e4fc9)

# Conflicts:
#	frappe/event_streaming/doctype/event_producer/event_producer.py
(cherry picked from commit 098b68f)
@mergify mergify bot requested review from ruchamahabal and a team as code owners May 6, 2021 11:02
@mergify mergify bot requested review from leela and removed request for a team May 6, 2021 11:02
@mergify mergify bot added the conflicts label May 6, 2021
@leela
Copy link
Contributor

leela commented May 7, 2021

@NagariaHussain , Can you please resolve the merge conflicts and re-open if this need to be back ported.

@leela leela closed this May 7, 2021
@mergify mergify bot deleted the mergify/bp/version-13-pre-release/pr-12898 branch May 7, 2021 01:41
@NagariaHussain NagariaHussain restored the mergify/bp/version-13-pre-release/pr-12898 branch May 10, 2021 07:33
@NagariaHussain NagariaHussain deleted the mergify/bp/version-13-pre-release/pr-12898 branch May 10, 2021 07:57
@NagariaHussain NagariaHussain restored the mergify/bp/version-13-pre-release/pr-12898 branch May 10, 2021 08:12
@mergify mergify bot deleted the mergify/bp/version-13-pre-release/pr-12898 branch May 10, 2021 08:15
@ankush ankush restored the mergify/bp/version-13-pre-release/pr-12898 branch May 10, 2021 08:22
@ankush ankush reopened this May 10, 2021
@ankush ankush closed this May 10, 2021
@mergify mergify bot deleted the mergify/bp/version-13-pre-release/pr-12898 branch May 10, 2021 08:28
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 25, 2022
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

5 participants