From e9c20a454b2b20349f594af7d5b33f67b59755d6 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Mon, 23 Dec 2024 00:31:06 +0100 Subject: [PATCH] fix merge --- src/backend/InvenTree/InvenTree/urls.py | 2 +- ...e_mfa_20240408_1659.py => 0013_migrate_mfa_20240408_1659.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/backend/InvenTree/users/migrations/{0012_migrate_mfa_20240408_1659.py => 0013_migrate_mfa_20240408_1659.py} (96%) diff --git a/src/backend/InvenTree/InvenTree/urls.py b/src/backend/InvenTree/InvenTree/urls.py index 5dac368d6d..0f0aa73943 100644 --- a/src/backend/InvenTree/InvenTree/urls.py +++ b/src/backend/InvenTree/InvenTree/urls.py @@ -140,7 +140,7 @@ apipatterns = [ # SocialAccountDisconnectView.as_view(), # name='social_account_disconnect', # ), - path('login/', users.api.Login.as_view(), name='api-login'), + # path('login/', users.api.Login.as_view(), name='api-login'), path('logout/', users.api.Logout.as_view(), name='api-logout'), path( 'login-redirect/', diff --git a/src/backend/InvenTree/users/migrations/0012_migrate_mfa_20240408_1659.py b/src/backend/InvenTree/users/migrations/0013_migrate_mfa_20240408_1659.py similarity index 96% rename from src/backend/InvenTree/users/migrations/0012_migrate_mfa_20240408_1659.py rename to src/backend/InvenTree/users/migrations/0013_migrate_mfa_20240408_1659.py index f38d594409..85f48829b4 100644 --- a/src/backend/InvenTree/users/migrations/0012_migrate_mfa_20240408_1659.py +++ b/src/backend/InvenTree/users/migrations/0013_migrate_mfa_20240408_1659.py @@ -38,7 +38,7 @@ def move_mfa(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [('users', '0011_auto_20240523_1640'), + dependencies = [('users', '0012_alter_ruleset_can_view'), ('otp_static', '0002_throttling'), ('otp_totp', '0002_auto_20190420_0723'), ('mfa', '0002_authenticator_timestamps'),]