Conversation
Merge Develop to the main branch
Pull request to merge develop to main
There was a problem hiding this comment.
Pull Request Overview
This PR upgrades Django from version 4.2.22 to 4.2.24 to address security issue #941. This is a security patch update that maintains compatibility within the Django 4.2.x series.
- Django version upgrade from 4.2.22 to 4.2.24
- Security vulnerability remediation
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Contributor
Author
|
Also updated documentation on how to upgrade Django https://github.com/CDLUC3/ezid-docs-internal/pull/30 |
sfisher
approved these changes
Sep 10, 2025
Contributor
sfisher
left a comment
There was a problem hiding this comment.
Thanks for updating this. It looks good to me, Jing.
I think the merge of main to develop or develop to main will be fine. :-)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@sfisher Hi Scott,
This is to upgrade Django 4.2.24 to address security issue #941. The branch was created from the main branch which contains two merge related commits that the develop branch does not have. I was trying to merge the main branch to the develop branch to have it in sync with main. However the new branch protection rule "no merge without pull request" blocked it. I hope the 2 merge related commits will not cause issue when we merge the develop branch to the main for production deployment.
UI and functional tests all look good on ezid-stg with a testing tag
test-django-4.2.24.Please take a look and let me know if you have questions.
Jing