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

0.10.x into main #1350

Merged
merged 2 commits into from Mar 16, 2024
Merged

0.10.x into main #1350

merged 2 commits into from Mar 16, 2024

Conversation

benjaoming
Copy link
Member

No description provided.

* ReDos: Apply `re.escape` to unsafe variable `keyword` before passing to `re.compile`

* Replace ReDos-vulnerable regex with the one from upstream Python-Markdown

* ReDos backtracking fix for macro plugin

* Add release note for GHSA-wj85-w4f4-xh8h

* Bump release date

* Bump version
Copy link

codecov bot commented Mar 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.52%. Comparing base (f7739d0) to head (298f06d).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1350   +/-   ##
=======================================
  Coverage   79.52%   79.52%           
=======================================
  Files         114      114           
  Lines        4737     4738    +1     
  Branches      638      638           
=======================================
+ Hits         3767     3768    +1     
  Misses        759      759           
  Partials      211      211           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@benjaoming benjaoming merged commit 8e280fd into django-wiki:main Mar 16, 2024
17 checks passed
@benjaoming benjaoming deleted the 0.10.x-into-main branch March 16, 2024 13:20
@benjaoming
Copy link
Member Author

Garh, should have merged this, not used "squash merge"... means that the origin branch still doesn't merge cleanly into main.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant