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: improved update notifications (backport #26314) #26320

Merged
merged 10 commits into from May 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 4, 2024

image

This broke since #15102

TODO:

  • fix app update notifications
  • Reduce frequency from daily to weekly/monhly.
  • Make it work with FC (where git repo information isn't present at all)
  • Point to FC dashboard
  • Fetch security disclosures too?
  • handle major/minor updates separately

image


This is an automatic backport of pull request #26314 done by [Mergify](https://mergify.com).

ankush added 7 commits May 4, 2024 11:27
(cherry picked from commit 330a1b2)

# Conflicts:
#	frappe/utils/change_log.py
(cherry picked from commit 56233f3)
(cherry picked from commit 5ca14bb)

# Conflicts:
#	frappe/tests/test_utils.py
#	frappe/utils/change_log.py
#	pyproject.toml
chore: conflicts
(cherry picked from commit e0c171b)
- Move sys setting check to server side
- tomli import handling

(cherry picked from commit a234e79)
Major versions will be shown when minor updates are exhausted only.

(cherry picked from commit 45026ae)

# Conflicts:
#	frappe/utils/change_log.py
@mergify mergify bot requested a review from a team as a code owner May 4, 2024 11:28
@mergify mergify bot added the conflicts label May 4, 2024
@mergify mergify bot requested review from akhilnarang and removed request for a team May 4, 2024 11:28
@mergify mergify bot assigned ankush May 4, 2024
Copy link
Contributor Author

mergify bot commented May 4, 2024

Cherry-pick of 330a1b2 has failed:

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

You are currently cherry-picking commit 330a1b2044.
  (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/boot.py
	modified:   frappe/hooks.py
	modified:   frappe/public/js/frappe/desk.js

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

Cherry-pick of 5ca14bb has failed:

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

You are currently cherry-picking commit 5ca14bb171.
  (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/boot.py
	new file:   frappe/utils/frappecloud.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/tests/test_utils.py
	both modified:   frappe/utils/change_log.py
	both modified:   pyproject.toml

Cherry-pick of 45026ae has failed:

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

You are currently cherry-picking commit 45026aed37.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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) May 4, 2024 11:35
@ankush ankush merged commit 24be120 into version-15-hotfix May 4, 2024
18 checks passed
@ankush ankush deleted the mergify/bp/version-15-hotfix/pr-26314 branch May 4, 2024 12:48
frappe-pr-bot pushed a commit that referenced this pull request May 7, 2024
# [15.26.0](v15.25.0...v15.26.0) (2024-05-07)

### Bug Fixes

* allow accessing reports without roles ([b2950d2](b2950d2))
* Apply configured perms on address list ([#26334](#26334)) ([#26336](#26336)) ([e2c8436](e2c8436))
* args is a stringified JSON ([5f25ae6](5f25ae6))
* automatic logo width ([#26273](#26273)) ([#26278](#26278)) ([f60be3c](f60be3c))
* changes for scheduler reliability (backport [#26292](#26292)) ([#26294](#26294)) ([d72c6ec](d72c6ec))
* **Data Import:** don't rely on permission for Data Import Log (backport [#26228](#26228)) ([#26251](#26251)) ([113de20](113de20))
* **Data Import:** scheduler not needed in dev mode (backport [#24667](#24667)) ([#26265](#26265)) ([9ce789e](9ce789e))
* disabled user login from login via link feature ([#26134](#26134)) ([#26141](#26141)) ([3ac1eda](3ac1eda))
* don't add creation index if one exists ([#26295](#26295)) ([f183a31](f183a31))
* **Geo:** change Canadian dates to ISO 8601 format ([9dec74b](9dec74b))
* init db conn for unbuffered cursor if not set ([#26220](#26220)) ([#26257](#26257)) ([1fac55d](1fac55d))
* like filter from meta filters ([#26311](#26311)) ([#26313](#26313)) ([13535a6](13535a6))
* lstrip for query writes detection ([#26180](#26180)) ([#26253](#26253)) ([97355f9](97355f9))
* misc sys health report fixes (backport [#26262](#26262)) ([#26290](#26290)) ([889eb9a](889eb9a))
* **Navbar Settings:** reload page after save ([#26274](#26274)) ([#26276](#26276)) ([20b3643](20b3643))
* **oauth2:** refresh token is optional ([#26266](#26266)) ([#26272](#26272)) ([e3f15d0](e3f15d0)), closes [/www.rfc-editor.org/rfc/rfc6749#section-5](https://github.com//www.rfc-editor.org/rfc/rfc6749/issues/section-5)
* only redirect to same domain ([#26304](#26304)) ([#26306](#26306)) ([475189c](475189c))
* QB name in error message ([#26345](#26345)) ([#26348](#26348)) ([6e8de81](6e8de81))
* reportview average of ints should be float ([#26284](#26284)) ([#26288](#26288)) ([11f041b](11f041b))
* Treeview DB lookup should perform the same preperation operations as method update_nsm in file nestedset.py ([#26199](#26199)) ([7d25aed](7d25aed))

### Features

* improved update notifications (backport [#26314](#26314)) ([#26320](#26320)) ([24be120](24be120))
* link field filter backport v15 ([#25966](#25966)) ([9a15191](9a15191)), closes [#22844](#22844)
* workspace extraction improvements ([#26169](#26169)) ([7d6a40a](7d6a40a))

### Performance Improvements

* Avoid caching `module_app` ([#26349](#26349)) ([#26351](#26351)) ([8961a96](8961a96))
* avoid two layer cache of timezone (backport [#26340](#26340)) ([#26342](#26342)) ([d802eb6](d802eb6))
* Reduce 1 redis call while dumping monitor logs ([#26337](#26337)) ([#26339](#26339)) ([32dbc5a](32dbc5a))
* Reuse cached user for `get_user_lang` ([#26350](#26350)) ([#26355](#26355)) ([e1048a8](e1048a8))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.26.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 May 22, 2024
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

2 participants