Skip to content

Commit d1b08e1

Browse files
committed
fix: resolve migration conflict
Signed-off-by: Keshav Priyadarshi <git@keshav.space>
1 parent 2a4de51 commit d1b08e1

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

vulnerabilities/migrations/0136_alter_pipelineschedule_run_interval.py renamed to vulnerabilities/migrations/0137_alter_pipelineschedule_run_interval.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# Generated by Django 5.2.11 on 2026-06-15 11:50
1+
# Generated by Django 5.2.11 on 2026-06-16 12:29
22

33
import django.core.validators
44
from django.db import migrations, models
5-
from django.db.models import F
5+
66

77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
("vulnerabilities", "0135_advisoryexploit_record_id_and_more"),
10+
("vulnerabilities", "0136_advisorysetmember_unique_advisory_per_set"),
1111
]
1212

1313
def convert_hours_to_minutes(apps, schema_editor):
@@ -29,7 +29,7 @@ def revert_convert_hours_to_minutes(apps, schema_editor):
2929
migrations.AlterField(
3030
model_name="pipelineschedule",
3131
name="run_interval",
32-
field=models.PositiveSmallIntegerField(
32+
field=models.IntegerField(
3333
default=720,
3434
help_text="Number of minutes to wait between run of this pipeline.",
3535
validators=[

vulnerabilities/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2302,7 +2302,7 @@ class ExecutionPriority(models.IntegerChoices):
23022302
),
23032303
)
23042304

2305-
run_interval = models.PositiveSmallIntegerField(
2305+
run_interval = models.IntegerField(
23062306
validators=[
23072307
MinValueValidator(5, message="Interval must be at least 5 minutes."),
23082308
MaxValueValidator(

0 commit comments

Comments
 (0)