8000 perf: faster generate_hash (backport #18825) by mergify[bot] · Pull Request #18851 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

perf: faster generate_hash (backport #18825) #18851

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

Merged
merged 3 commits into from
Nov 12, 2022

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Nov 11, 2022

This is an automatic backport of pull request #18825 done by Mergify.
Cherry-pick of f34f703 has failed:

On branch mergify/bp/version-14-hotfix/pr-18825
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 f34f7030a3.
  (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/__init__.py
	modified:   frappe/core/doctype/data_export/exporter.py
	modified:   frappe/core/doctype/data_import/test_importer.py
	modified:   frappe/model/naming.py
	modified:   frappe/patches/v11_0/remove_skip_for_doctype.py
	modified:   frappe/patches/v12_0/move_email_and_phone_to_child_table.py
	modified:   frappe/patches/v12_0/setup_tags.py
	modified:   frappe/templates/includes/navbar/navbar_items.html
	modified:   frappe/utils/jinja_globals.py
	modified:   frappe/utils/oauth.py
	modified:   frappe/website/doctype/website_theme/website_theme.py
	modified:   frappe/website/web_template/section_with_collapsible_content/section_with_collapsible_content.html
	modified:   frappe/website/web_template/section_with_tabs/section_with_tabs.html
	modified:   frappe/website/web_template/slideshow/slideshow.html

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   frappe/tests/test_modules.py

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 fcaa16b)
(cherry picked from commit f34f703)

# Conflicts:
#	frappe/tests/test_modules.py
@mergify mergify bot requested a review from a team November 11, 2022 16:17
@mergify mergify bot added the conflicts label Nov 11, 2022
@mergify mergify bot requested review from phot0n and removed request for a team November 11, 2022 16:17
@mergify mergify bot assigned ankush Nov 11, 2022
@ankush ankush removed the conflicts label Nov 11, 2022
@ankush ankush merged commit bb5c7d5 into version-14-hotfix Nov 12, 2022
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-18825 branch November 12, 2022 08:27
frappe-pr-bot pushed a commit that referenced this pull request Nov 15, 2022
# [14.15.0](v14.14.3...v14.15.0) (2022-11-15)

### Bug Fixes

* avoid patching QB if already patched ([a8ba877](a8ba877))
* breadcrumbs is broken ([90ca7b1](90ca7b1))
* check if the doctype exists before adding default logtypes in log settings ([#18867](#18867)) ([#18869](#18869)) ([93fe3e9](93fe3e9))
* dashboard view from workspace (backport [#18779](#18779)) ([#18813](#18813)) ([42f5e04](42f5e04))
* decorator ordering ([2245cc0](2245cc0))
* dont allow reading attributes of unsafe objects (backport [#18706](#18706)) ([#18806](#18806)) ([2b193bd](2b193bd)), closes [#18784](#18784)
* hardcode doctype in google oauth callback ([#18862](#18862)) ([78a337b](78a337b))
* page has an empty menu button ([b2bbcde](b2bbcde))
* raise exception if doc before save is not found ([#18796](#18796)) ([#18820](#18820)) ([7505a0d](7505a0d))
* reportview permlevel bug ([#18822](#18822)) ([#18828](#18828)) ([ec248a9](ec248a9))
* **security:** prevent xss attack in search ([#18847](#18847)) ([#18850](#18850)) ([8807035](8807035))

### Features

* Set default SQL statement timeouts ([8ab95f4](8ab95f4))
* show utilization percent on RQ Worker ([#18868](#18868)) ([#18870](#18870)) ([a7060fa](a7060fa))

### Performance Improvements

* faster as_list and as_dict ([33d6369](33d6369))
* faster generate_hash (backport [#18825](#18825)) ([#18851](#18851)) ([bb5c7d5](bb5c7d5))
* **workflow:** get_transitions ([#18834](#18834)) ([#18839](#18839)) ([3f71181](3f71181))

### Reverts

* async await in breadcrumbs.js ([6a1e619](6a1e619))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.15.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0