diff --git a/awx/main/migrations/0005_squashed_v310_v313_updates.py b/awx/main/migrations/0005_squashed_v310_v313_updates.py index e948a1a9e2..85dac8bbaa 100644 --- a/awx/main/migrations/0005_squashed_v310_v313_updates.py +++ b/awx/main/migrations/0005_squashed_v310_v313_updates.py @@ -12,7 +12,6 @@ class Migration(migrations.Migration): replaces = [ (b'main', '0035_v310_remove_tower_settings'), - (b'main', '0036_v311_insights'), ] operations = [ diff --git a/awx/main/migrations/0005a_squashed_v310_v313_updates.py b/awx/main/migrations/0005a_squashed_v310_v313_updates.py new file mode 100644 index 0000000000..6599268ce1 --- /dev/null +++ b/awx/main/migrations/0005a_squashed_v310_v313_updates.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0005_squashed_v310_v313_updates'), + ] + + replaces = [ + (b'main', '0036_v311_insights'), + ] + + operations = [ + migrations.AlterField( + model_name='project', + name='scm_type', + field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), + ), + migrations.AlterField( + model_name='projectupdate', + name='scm_type', + field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), + ), + ] \ No newline at end of file diff --git a/awx/main/migrations/0005b_squashed_v310_v313_updates.py b/awx/main/migrations/0005b_squashed_v310_v313_updates.py index 0a8684f097..ea9d26d2bc 100644 --- a/awx/main/migrations/0005b_squashed_v310_v313_updates.py +++ b/awx/main/migrations/0005b_squashed_v310_v313_updates.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0005_squashed_v310_v313_updates'), + ('main', '0005a_squashed_v310_v313_updates'), ] replaces = [ diff --git a/awx/main/migrations/0006_v320_release.py b/awx/main/migrations/0006_v320_release.py index e526a5c762..4cb87f4fba 100644 --- a/awx/main/migrations/0006_v320_release.py +++ b/awx/main/migrations/0006_v320_release.py @@ -18,7 +18,7 @@ from awx.main.models import Host class Migration(migrations.Migration): dependencies = [ - ('main', '0005a_squashed_v310_v313_updates'), + ('main', '0005b_squashed_v310_v313_updates'), ] operations = [