fix: merge conflicts

Merge branch 'preview' of github.com:makeplane/plane into feat-sites-vite-migration

Author: prateekshourya29

.gitignore

@@ -102,6 +102,9 @@ dev-editor
 storybook-static
 
 CLAUDE.md
+
+build/
+.react-router/
 AGENTS.md
 
 build/

apps/api/plane/db/migrations/0108_alter_issueactivity_issue_comment.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.25 on 2025-11-05 07:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0107_migrate_filters_to_rich_filters'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='issueactivity',
+            name='issue_comment',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='issue_comment', to='db.issuecomment'),
+        ),        
+        migrations.AlterField(
+            model_name='issueactivity',
+            name='issue',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='issue_activity', to='db.issue'),
+        ),
+    ]

apps/api/plane/db/models/issue.py

@@ -407,7 +407,7 @@ def __str__(self):
 
 
 class IssueActivity(ProjectBaseModel):
-    issue = models.ForeignKey(Issue, on_delete=models.SET_NULL, null=True, related_name="issue_activity")
+    issue = models.ForeignKey(Issue, on_delete=models.DO_NOTHING, null=True, related_name="issue_activity")
     verb = models.CharField(max_length=255, verbose_name="Action", default="created")
     field = models.CharField(max_length=255, verbose_name="Field Name", blank=True, null=True)
     old_value = models.TextField(verbose_name="Old Value", blank=True, null=True)
@@ -417,7 +417,7 @@ class IssueActivity(ProjectBaseModel):
     attachments = ArrayField(models.URLField(), size=10, blank=True, default=list)
     issue_comment = models.ForeignKey(
         "db.IssueComment",
-        on_delete=models.SET_NULL,
+        on_delete=models.DO_NOTHING,
         related_name="issue_comment",
         null=True,
     )