8000 fix: validate homepage paths (backport #25409) by mergify[bot] · Pull Request #25411 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: validate homepage paths (backport #25409) #25411

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Mar 14, 2024
Merged

fix: validate homepage paths (backport #25409) #25411

merged 2 commits into from
Mar 14, 2024

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Mar 13, 2024
  1. Added check to verify that route entered is correct
  2. Removed misleading description about /desk
    This is an automatic backport of pull request fix: validate homepage paths #25409 done by Mergify.

@ankush @mergify
fix: validate homepage paths
8000
1ec033f 
(cherry picked from commit d9d2943)

# Conflicts:
#	frappe/core/doctype/role/role.json
#	frappe/website/path_resolver.py
@mergify mergify bot requested review from a team and removed request for a team March 13, 2024 18:30
@mergify mergify bot added the conflicts label Mar 13, 2024
@mergify mergify bot requested a review from ankush March 13, 2024 18:30
@mergify mergify bot assigned ankush Mar 13, 2024
@mergify Mergify
Copy link
Contributor Author
mergify bot commented Mar 13, 2024

Cherry-pick of d9d2943 has failed:

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

You are currently cherry-picking commit d9d29430a9.
  (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/core/doctype/role/role.py
	modified:   frappe/website/doctype/portal_settings/portal_settings.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/role/role.json
	both modified:   frappe/website/path_resolver.py

Cherry-pick of d758af5 has failed:

On branch mergify/bp/version-14-hotfix/pr-25409
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 d758af5960.
  (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/core/doctype/role/role.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/tests/test_caching.py
	both modified:   frappe/website/router.py

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

@ankush ankush enabled auto-merge (squash) March 14, 2024 06:52
@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-25409 branch from 351ce6b to 2e80e8a Compare March 14, 2024 06:54
@ankush ankush merged commit ee1c8e3 into version-14-hotfix Mar 14, 2024
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-25409 branch March 14, 2024 07:13
frappe-pr-bot pushed a commit that referenced this pull request Mar 19, 2024
@frappe-bot
chore(release): Bumped to Version 14.68.0
4ea9c50 
# [14.68.0](v14.67.1...v14.68.0) (2024-03-19)

### Bug Fixes

* allow exporting large reports that can't be rendered (backport [#25395](#25395)) ([#25404](#25404)) ([b3f4d5d](b3f4d5d))
* allow transitioning to long text (backport [#25419](#25419)) ([#25474](#25474)) ([60d8c1c](60d8c1c))
* avoid closing filter popover on any date picker interactions ([0784e61](0784e61))
* Avoid setting filter on now/today button ([83766c0](83766c0))
* child table rating fields ([#25433](#25433)) ([#25435](#25435)) ([57cf161](57cf161))
* consider all datepicker elements ([#25426](#25426)) ([ad79301](ad79301))
* debounce filter refresh ([7f65916](7f65916))
* don't allow setting an invalid rating ([#22633](#22633)) ([#25432](#25432)) ([502b907](502b907))
* dont add trailing decimal separator ([#25389](#25389)) ([#25390](#25390)) ([08e8d8c](08e8d8c))
* escape text types before setting disp area ([#25520](#25520)) ([#25522](#25522)) ([e446770](e446770))
* escape value in multiselect pill ([#25516](#25516)) ([#25517](#25517)) ([dbcf783](dbcf783))
* filters can use more than 140 chars ([d04bff9](d04bff9))
* handle distinct for fieldname (backport [#25511](#25511)) ([#25514](#25514)) ([3344df0](3344df0))
* handle parent rename in child workspace ([c3d9e1f](c3d9e1f))
* hide datepicker after picking date ([39796ea](39796ea))
* Log ipython commands (backport [#25364](#25364)) ([#25367](#25367)) ([997628c](997628c))
* log mariadb console usage ([6f4981c](6f4981c))
* show attachments on notifications too ([#25443](#25443)) ([#25448](#25448)) ([3251586](3251586))
* skip virtual doctype in tags ([b2ae437](b2ae437))
* Skip virtual doctype rename for dynamic links ([#25479](#25479)) ([#25480](#25480)) ([f368236](f368236))
* Skip virtual doctypes while renaming ([#25473](#25473)) ([#25477](#25477)) ([c423223](c423223))
* validate homepage paths (backport [#25409](#25409)) ([#25411](#25411)) ([ee1c8e3](ee1c8e3))

### Features

* connect to redis sentinel for redis cache (backport [#25398](#25398)) ([#25449](#25449)) ([6ce4036](6ce4036))
* debug stuck process by sending SIGUSR1 (backport [#25502](#25502)) ([#25526](#25526)) ([95d1224](95d1224))
* move bulk print operation to the background (backport [#25358](#25358)) ([#25396](#25396)) ([4508239](4508239))
* Store printed PDF attachments on communication (backport [#25439](#25439)) ([#25447](#25447)) ([9b7a02f](9b7a02f))

### Performance Improvements

* cap max count on list views (backport [#25348](#25348)) ([#25463](#25463)) ([3bc5d8a](3bc5d8a)), closes [#25361](#25361)
* compact prepared report files ([0aa3c8e](0aa3c8e))

### Reverts

* Revert "feat: move bulk print operation to the background (backport #25358) (#25396)" (#25400) ([490f031](490f031)), closes [#25358](#25358) [#25396](#25396) [#25400](#25400)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.68.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 Apr 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ankush ankush Awaiting requested review from ankush

Assignees

@ankush ankush

Labels
conflicts released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @ankush
0