merge migrations

PostHog · Jul 22, 2024 · 61bd215 · 61bd215
1 parent e659ac8
commit 61bd215
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 32 deletions.
diff --git a/latest_migrations.manifest b/latest_migrations.manifest
@@ -5,7 +5,7 @@ contenttypes: 0002_remove_content_type_name
 ee: 0016_rolemembership_organization_member
 otp_static: 0002_throttling
 otp_totp: 0002_auto_20190420_0723
-posthog: 0449_alter_plugin_organization_alter_plugin_url
+posthog: 0448_alter_plugin_organization_alter_plugin_plugin_type_and_more
 sessions: 0001_initial
 social_django: 0010_uid_db_index
 two_factor: 0007_auto_20201201_1019
diff --git a/...r_plugin_organization_alter_plugin_url.py → ...tion_alter_plugin_plugin_type_and_more.py b/...r_plugin_organization_alter_plugin_url.py → ...tion_alter_plugin_plugin_type_and_more.py
@@ -1,12 +1,12 @@
-# Generated by Django 4.2.11 on 2024-07-12 08:26
+# Generated by Django 4.2.14 on 2024-07-22 08:04
 
 from django.db import migrations, models
 import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("posthog", "0448_alter_plugin_plugin_type"),
+        ("posthog", "0447_alter_integration_kind"),
     ]
 
     operations = [
@@ -21,6 +21,23 @@ class Migration(migrations.Migration):
                 to="posthog.organization",
             ),
         ),
+        migrations.AlterField(
+            model_name="plugin",
+            name="plugin_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("local", "local"),
+                    ("custom", "custom"),
+                    ("repository", "repository"),
+                    ("source", "source"),
+                    ("inline", "inline"),
+                ],
+                default=None,
+                max_length=200,
+                null=True,
+            ),
+        ),
         migrations.AlterField(
             model_name="plugin",
             name="url",

diff --git a/posthog/migrations/0448_alter_plugin_plugin_type.py b/posthog/migrations/0448_alter_plugin_plugin_type.py