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

Merged
merged 23 commits into from Jun 24, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 8, 2021

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

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

You are currently cherry-picking commit 82b98330fd.
  (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/model/__init__.py
	modified:   frappe/model/base_document.py
	modified:   frappe/public/js/frappe/form/controls/data.js
	modified:   frappe/public/js/frappe/utils/datatype.js

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

Cherry-pick of 9d4ee23 has failed:

On branch mergify/bp/version-13-hotfix/pr-12898
Your branch is ahead of 'origin/version-13-hotfix' 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/event_streaming/doctype/event_producer/event_producer.py

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

Cherry-pick of 024e759 has failed:

On branch mergify/bp/version-13-hotfix/pr-12898
Your branch is ahead of 'origin/version-13-hotfix' 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/event_streaming/doctype/event_producer/event_producer.py
	modified:   frappe/oauth.py
	modified:   frappe/tests/test_utils.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/utils/__init__.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/

no-docs

NagariaHussain and others added 21 commits June 8, 2021 07:25
(cherry picked from commit 82b9833)

# Conflicts:
#	frappe/utils/__init__.py
(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/utils/__init__.py
(cherry picked from commit b965ceb)
(cherry picked from commit 024e759)

# Conflicts:
#	frappe/utils/__init__.py
(cherry picked from commit 098b68f)
@mergify mergify bot requested review from ruchamahabal and a team as code owners June 8, 2021 07:26
@mergify mergify bot requested review from hasnain2808 and removed request for a team June 8, 2021 07:26
@mergify mergify bot added the conflicts label Jun 8, 2021
@stale

This comment has been minimized.

@stale stale bot added the inactive label Jun 16, 2021
@ankush ankush removed the inactive label Jun 16, 2021
@NagariaHussain NagariaHussain requested review from abhishekbalam and removed request for ruchamahabal and hasnain2808 June 22, 2021 09:07
@gavindsouza gavindsouza removed the request for review from abhishekbalam June 24, 2021 06:44
@gavindsouza gavindsouza merged commit c2091dc into version-13-hotfix Jun 24, 2021
@gavindsouza gavindsouza deleted the mergify/bp/version-13-hotfix/pr-12898 branch June 24, 2021 06:45
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants