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

fix(patch): Remove obviously invalid fetch from expressions (backport #25284) #25302

Merged
merged 2 commits into from
Mar 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 10, 2024

This is an automatic backport of pull request #25284 done by Mergify.
Cherry-pick of 4f4a387 has failed:

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

You are currently cherry-picking commit 4f4a387b7e.
  (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:
	new file:   frappe/custom/doctype/property_setter/patches/__init__.py
	new file:   frappe/custom/doctype/property_setter/patches/remove_invalid_fetch_from_expressions.py

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


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 4f4a387)

# Conflicts:
#	frappe/patches.txt
@mergify mergify bot requested a review from a team March 10, 2024 07:37
@mergify mergify bot added the conflicts label Mar 10, 2024
@mergify mergify bot requested review from ankush and removed request for a team March 10, 2024 07:37
@mergify mergify bot assigned ankush Mar 10, 2024
Copy link
Contributor Author

mergify bot commented Mar 10, 2024

Cherry-pick of 4f4a387 has failed:

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

You are currently cherry-picking commit 4f4a387b7e.
  (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:
	new file:   frappe/custom/doctype/property_setter/patches/__init__.py
	new file:   frappe/custom/doctype/property_setter/patches/remove_invalid_fetch_from_expressions.py

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

@github-actions github-actions bot added the add-test-cases Add test case to validate fix or enhancement label Mar 10, 2024
@ankush ankush enabled auto-merge (squash) March 11, 2024 09:00
@ankush ankush merged commit 0ec4bc8 into version-15-hotfix Mar 11, 2024
15 of 18 checks passed
@ankush ankush deleted the mergify/bp/version-15-hotfix/pr-25284 branch March 11, 2024 09:16
frappe-pr-bot pushed a commit that referenced this pull request Mar 12, 2024
## [15.17.2](v15.17.1...v15.17.2) (2024-03-12)

### Bug Fixes

* Add `is_virtual` in bootstrap schema ([cf8078d](cf8078d))
* **auto_email_report:** check if column (docfield) parent is a child table ([#25335](#25335)) ([#25342](#25342)) ([a870b5a](a870b5a))
* commit before ddl ([092bd0e](092bd0e))
* commit regardless of framework's transaction_writes count ([#25322](#25322)) ([#25328](#25328)) ([c7c726e](c7c726e))
* delete doctype cache before starting migration ([74a8d87](74a8d87))
* Delete EPS logs before deleting user ([1f47f7a](1f47f7a))
* do not mark custom field as translatable by default ([#25330](#25330)) ([841d885](841d885))
* dont set fetch from if partial ([800298d](800298d))
* formatting ([7f147b1](7f147b1))
* ignore route history and access log from link check ([5061a08](5061a08))
* list view click and drag select rows ([24d713e](24d713e))
* loosen validation on fetch from columns ([#25247](#25247)) ([0c934de](0c934de))
* MacOS shortcuts (backport [#25272](#25272)) ([#25280](#25280)) ([785b5c2](785b5c2))
* missing timeline timestamp for comments ([27357fb](27357fb)), closes [/github.com//pull/24884/files#r1519195726](https://github.com//github.com/frappe/frappe/pull/24884/files/issues/r1519195726)
* **ModuleDef:** Add list view filter options to app_name Select ([7357c5e](7357c5e))
* **patch:** Remove obviously invalid fetch from expressions (backport [#25284](#25284)) ([#25302](#25302)) ([0ec4bc8](0ec4bc8))
* rollback invalid customize form changes ([#25198](#25198)) ([d6bff86](d6bff86))
* Setup fail if fail function exists ([4d5e453](4d5e453))
* Skip virtual doctypes in link field checks ([#24759](#24759)) ([#25333](#25333)) ([45499c2](45499c2))
* **uninstall:** don't allow uninstalling an app if we have other apps dependent on it ([b631112](b631112))
* Use debug log to log DB queries (backport [#25265](#25265)) ([#25301](#25301)) ([24479ca](24479ca))
* **UX:** Nudge to disable user instead of deleting ([1da957f](1da957f))

### Performance Improvements

* Add optional socketio native packages ([160cf29](160cf29))

### Reverts

* fetch validations (backport [#25343](#25343)) ([#25344](#25344)) ([f729817](f729817))
* fetch validations (backport [#25343](#25343)) ([#25345](#25345)) ([7cc3686](7cc3686))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.17.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
add-test-cases Add test case to validate fix or enhancement conflicts released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants