Add django-linear-migrations for linear migration history #14145
+38
−0
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.
Summary
This PR adds django-linear-migrations to DefectDojo to maintain a linear migration history and prevent merge migration conflicts.
This will provide two benefits:
manage rebase-migrationcommand to fix it locally and push the branch/PR. --> UPDATE: while testing this I realized this is quite complicated and manual resolution is much easier.What Changed
settings.dist.pyto conditionally load the package whenDEBUG=True(development only)docker-compose.override.dev.ymlto usetarget: developmentfor all containersCONTRIBUTING.mdfor resolving migration conflictsAGENTS.mdfor AI agentsdojo/db_migrations/max_migration.txttracking fileHow It Works
makemigrationsas normal - it automatically updatesmax_migration.txtDEBUG=True, following the same pattern asdjango-debug-toolbarpython manage.py rebase_migration dojoto automatically fix them