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

Merge 2.8 release into master to be up to date #4725

Merged
merged 16 commits into from
Oct 2, 2024

Conversation

sergei-maertens
Copy link
Member

On to 3.0 from here :)

vaszig and others added 16 commits September 20, 2024 18:01
* Added extra (legacy) mime types for ZIP files on Windows to the
  validator check
* Added data migration to update existing file components
* Added merge migration, since this is being forward-ported from
  stable/2.6.x

Forwardport-of: #4690
… 2.6.x

Django reports multiple leaf nodes when migrating, yet doesn't seem
to be able to pick up these leaf nodes when running makemigrations
with the --merge option - presumably due to the presence of a squashed
migration.

The merge migration was added manually after drawing out the migration
graph.

(originally cherry picked from commit
23d96c7 and adapted with another
merge migration)
Replaced the beta tag with the tag for the stable release
This is not ready for production yet.

The feature flag is set up so that it's enabled in development by
default, but disabled in all other environments.
Copy link

codecov bot commented Oct 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.56%. Comparing base (1a67d2a) to head (46cf565).
Report is 17 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4725   +/-   ##
=======================================
  Coverage   96.56%   96.56%           
=======================================
  Files         746      746           
  Lines       25174    25175    +1     
  Branches     3310     3310           
=======================================
+ Hits        24309    24310    +1     
  Misses        601      601           
  Partials      264      264           

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

@sergei-maertens sergei-maertens merged commit 224a896 into master Oct 2, 2024
34 checks passed
@sergei-maertens sergei-maertens deleted the chore/merge-28x-release branch October 2, 2024 16:17
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.

4 participants