sync django 1.7 migrations

django-cms · Jan 12, 2015 · 0150c6f · 0150c6f
1 parent 3a2f192
commit 0150c6f
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 1 deletion.
diff --git a/cms/migrations/0002_auto_20140816_1918.py b/cms/migrations/0002_auto_20140816_1918.py
@@ -125,7 +125,7 @@ class Migration(migrations.Migration):
                 ('meta_description', models.TextField(max_length=155, null=True, help_text='The text displayed in search engines.', blank=True, verbose_name='description')),
                 ('slug', models.SlugField(max_length=255, verbose_name='slug')),
                 ('path', models.CharField(db_index=True, max_length=255, verbose_name='Path')),
-                ('has_url_overwrite', models.BooleanField(default=False, verbose_name='has URL overwrite', db_index=True, editable=False)),
+                ('has_url_overwrite', models.BooleanField(db_index=True, default=False, editable=False, verbose_name='has url overwrite')),
                 ('redirect', models.CharField(max_length=255, null=True, blank=True, verbose_name='redirect')),
                 ('creation_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='creation date', editable=False)),
                 ('published', models.BooleanField(default=False, verbose_name='is published')),

diff --git a/cms/test_utils/project/mti_pluginapp/migrations/0002_auto_20150112_2250.py b/cms/test_utils/project/mti_pluginapp/migrations/0002_auto_20150112_2250.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mti_pluginapp', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='testpluginalphamodel',
+            name='alpha',
+            field=models.CharField(max_length=32, default='test plugin alpha', verbose_name='name'),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='testpluginbetamodel',
+            name='beta',
+            field=models.CharField(max_length=32, default='test plugin beta', verbose_name='name'),
+            preserve_default=True,
+        ),
+    ]
diff --git a/...any_rel/migrations_django/0001_initial.py → ...manytomany_rel/migrations/0001_initial.py b/...any_rel/migrations_django/0001_initial.py → ...manytomany_rel/migrations/0001_initial.py
diff --git a/...ytomany_rel/migrations_django/__init__.py → ...ins/manytomany_rel/migrations/__init__.py b/...ytomany_rel/migrations_django/__init__.py → ...ins/manytomany_rel/migrations/__init__.py
diff --git a/...ns/meta/migrations_django/0001_initial.py → ...p/plugins/meta/migrations/0001_initial.py b/...ns/meta/migrations_django/0001_initial.py → ...p/plugins/meta/migrations/0001_initial.py
diff --git a/...lugins/meta/migrations_django/__init__.py → ...inapp/plugins/meta/migrations/__init__.py b/...lugins/meta/migrations_django/__init__.py → ...inapp/plugins/meta/migrations/__init__.py
diff --git a/...e_thing/migrations_django/0001_initial.py → ...gins/one_thing/migrations/0001_initial.py b/...e_thing/migrations_django/0001_initial.py → ...gins/one_thing/migrations/0001_initial.py
diff --git a/...s/one_thing/migrations_django/__init__.py → .../plugins/one_thing/migrations/__init__.py b/...s/one_thing/migrations_django/__init__.py → .../plugins/one_thing/migrations/__init__.py