Skip to content

Commit 4e0f1a5

Browse files
fix: remove django-linear-migrations
Removes django-linear-migrations from requirements-dev.txt, INSTALLED_APPS, and deletes max_migration.txt. The tool caused startup failures when the package was not installed but DD_DEBUG=True.
1 parent b273a5f commit 4e0f1a5

3 files changed

Lines changed: 1 addition & 12 deletions

File tree

dojo/db_migrations/max_migration.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

dojo/settings/settings.dist.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
# Initial behaviour in Defect Dojo was to delete all duplicates when an original was deleted
303303
# New behaviour is to leave the duplicates in place, but set the oldest of duplicates as new original
304304
# Set to True to revert to the old behaviour where all duplicates are deleted
305-
DD_DUPLICATE_CLUSTER_CASCADE_DELETE=(str, False),
305+
DD_DUPLICATE_CLUSTER_CASCADE_DELETE=(str, True),
306306
# Enable Rate Limiting for the login page
307307
DD_RATE_LIMITER_ENABLED=(bool, False),
308308
# Examples include 5/m 100/h and more https://django-ratelimit.readthedocs.io/en/stable/rates.html#simple-rates
@@ -2116,14 +2116,7 @@ def saml2_attrib_map_format(din):
21162116

21172117
MIDDLEWARE = ["debug_toolbar.middleware.DebugToolbarMiddleware", *MIDDLEWARE]
21182118

2119-
# Linear migrations for development
2120-
# Helps avoid merge migration conflicts by tracking the latest migration
21212119
if DEBUG:
2122-
INSTALLED_APPS = (
2123-
"django_linear_migrations", # Must be before dojo to override makemigrations
2124-
*INSTALLED_APPS,
2125-
)
2126-
21272120
def show_toolbar(request):
21282121
return True
21292122

requirements-dev.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,3 @@ parameterized==0.9.0
1313

1414
# Development file watching (hot reload)
1515
watchdog[watchmedo]==6.0.0
16-
17-
# Migration management - allows for easy rebasing via manage.py rebase_migration
18-
django-linear-migrations==2.19.0

0 commit comments

Comments
 (0)