Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dojo/db_migrations/max_migration.txt

This file was deleted.

7 changes: 0 additions & 7 deletions dojo/settings/settings.dist.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading