summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-11-29 12:44:34 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-04-16 16:38:32 +0200
commita8e52fddea741a19e95c61aede8185f9fdc2319b (patch)
tree5f0dec92fff964f3d17938474520084995bf0cee
parent5920a59c48fe8dfb1b458b3d90773606f4f383bd (diff)
downloadIshtar-a8e52fddea741a19e95c61aede8185f9fdc2319b.tar.bz2
Ishtar-a8e52fddea741a19e95c61aede8185f9fdc2319b.zip
🗃️ imports: merge migrations
-rw-r--r--archaeological_context_records/migrations/0114_contextrecord_imports_updated.py2
-rw-r--r--archaeological_files/migrations/0113_file_imports_updated.py2
-rw-r--r--archaeological_finds/migrations/0114_auto_20231115_1617.py2
-rw-r--r--archaeological_operations/migrations/0114_auto_20231115_1616.py2
-rw-r--r--archaeological_warehouse/migrations/0120_auto_20231115_1617.py2
-rw-r--r--ishtar_common/migrations/0232_auto_20231115_1616.py (renamed from ishtar_common/migrations/0231_auto_20231115_1616.py)2
-rw-r--r--ishtar_common/migrations/0233_default_mandatory_keys_import_permissions.py (renamed from ishtar_common/migrations/0232_default_mandatory_keys_import_permissions.py)2
7 files changed, 7 insertions, 7 deletions
diff --git a/archaeological_context_records/migrations/0114_contextrecord_imports_updated.py b/archaeological_context_records/migrations/0114_contextrecord_imports_updated.py
index a5081ba19..989cd1846 100644
--- a/archaeological_context_records/migrations/0114_contextrecord_imports_updated.py
+++ b/archaeological_context_records/migrations/0114_contextrecord_imports_updated.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0231_auto_20231115_1616'),
+ ('ishtar_common', '0232_auto_20231115_1616'),
('archaeological_context_records', '0113_auto_20231113_1610'),
]
diff --git a/archaeological_files/migrations/0113_file_imports_updated.py b/archaeological_files/migrations/0113_file_imports_updated.py
index b59e8bd01..bd3a2f907 100644
--- a/archaeological_files/migrations/0113_file_imports_updated.py
+++ b/archaeological_files/migrations/0113_file_imports_updated.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0231_auto_20231115_1616'),
+ ('ishtar_common', '0232_auto_20231115_1616'),
('archaeological_files', '0112_auto_20231113_1610'),
]
diff --git a/archaeological_finds/migrations/0114_auto_20231115_1617.py b/archaeological_finds/migrations/0114_auto_20231115_1617.py
index de4d76a71..dba1b5d29 100644
--- a/archaeological_finds/migrations/0114_auto_20231115_1617.py
+++ b/archaeological_finds/migrations/0114_auto_20231115_1617.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0231_auto_20231115_1616'),
+ ('ishtar_common', '0232_auto_20231115_1616'),
('archaeological_finds', '0113_auto_20231113_1610'),
]
diff --git a/archaeological_operations/migrations/0114_auto_20231115_1616.py b/archaeological_operations/migrations/0114_auto_20231115_1616.py
index 845ff9b52..3fa41a802 100644
--- a/archaeological_operations/migrations/0114_auto_20231115_1616.py
+++ b/archaeological_operations/migrations/0114_auto_20231115_1616.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0231_auto_20231115_1616'),
+ ('ishtar_common', '0232_auto_20231115_1616'),
('archaeological_operations', '0113_auto_20231114_1058'),
]
diff --git a/archaeological_warehouse/migrations/0120_auto_20231115_1617.py b/archaeological_warehouse/migrations/0120_auto_20231115_1617.py
index 25bb63576..274b5e1e2 100644
--- a/archaeological_warehouse/migrations/0120_auto_20231115_1617.py
+++ b/archaeological_warehouse/migrations/0120_auto_20231115_1617.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0231_auto_20231115_1616'),
+ ('ishtar_common', '0232_auto_20231115_1616'),
('archaeological_warehouse', '0119_auto_20231113_1611'),
]
diff --git a/ishtar_common/migrations/0231_auto_20231115_1616.py b/ishtar_common/migrations/0232_auto_20231115_1616.py
index 0f692d5d2..0ddcf1b9b 100644
--- a/ishtar_common/migrations/0231_auto_20231115_1616.py
+++ b/ishtar_common/migrations/0232_auto_20231115_1616.py
@@ -9,7 +9,7 @@ import ishtar_common.utils
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0230_auto_20231114_1334'),
+ ('ishtar_common', '0231_set_default_profile_value'),
]
operations = [
diff --git a/ishtar_common/migrations/0232_default_mandatory_keys_import_permissions.py b/ishtar_common/migrations/0233_default_mandatory_keys_import_permissions.py
index a465ad9a4..22d1df4f6 100644
--- a/ishtar_common/migrations/0232_default_mandatory_keys_import_permissions.py
+++ b/ishtar_common/migrations/0233_default_mandatory_keys_import_permissions.py
@@ -108,7 +108,7 @@ def migrate(apps, __):
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0231_auto_20231115_1616'),
+ ('ishtar_common', '0232_auto_20231115_1616'),
]
operations = [