diff --git a/dojo/db_migrations/max_migration.txt b/dojo/db_migrations/max_migration.txt deleted file mode 100644 index 82ddb1c96aa..00000000000 --- a/dojo/db_migrations/max_migration.txt +++ /dev/null @@ -1 +0,0 @@ -0263_language_type_unique_language diff --git a/dojo/settings/settings.dist.py b/dojo/settings/settings.dist.py index 4bf0fbc651e..3b189d57218 100644 --- a/dojo/settings/settings.dist.py +++ b/dojo/settings/settings.dist.py @@ -2116,14 +2116,7 @@ def saml2_attrib_map_format(din): MIDDLEWARE = ["debug_toolbar.middleware.DebugToolbarMiddleware", *MIDDLEWARE] -# Linear migrations for development -# Helps avoid merge migration conflicts by tracking the latest migration if DEBUG: - INSTALLED_APPS = ( - "django_linear_migrations", # Must be before dojo to override makemigrations - *INSTALLED_APPS, - ) - def show_toolbar(request): return True diff --git a/requirements-dev.txt b/requirements-dev.txt index ea58c1463e5..5cbe3692c57 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,6 +13,3 @@ parameterized==0.9.0 # Development file watching (hot reload) watchdog[watchmedo]==6.0.0 - -# Migration management - allows for easy rebasing via manage.py rebase_migration -django-linear-migrations==2.19.0 \ No newline at end of file