diff --git a/common/djangoapps/django_comment_common/migrations/0004_auto_20161117_1209.py b/common/djangoapps/django_comment_common/migrations/0004_auto_20161117_1209.py new file mode 100644 index 0000000000..fe49d518ed --- /dev/null +++ b/common/djangoapps/django_comment_common/migrations/0004_auto_20161117_1209.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('django_comment_common', '0003_enable_forums'), + ] + + operations = [ + migrations.AlterField( + model_name='forumsconfig', + name='connection_timeout', + field=models.FloatField(default=5.0, help_text=b'Seconds to wait when trying to connect to the comment service.'), + ), + ] diff --git a/common/djangoapps/student/migrations/0008_auto_20161117_1209.py b/common/djangoapps/student/migrations/0008_auto_20161117_1209.py new file mode 100644 index 0000000000..6dee71b711 --- /dev/null +++ b/common/djangoapps/student/migrations/0008_auto_20161117_1209.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('student', '0007_registrationcookieconfiguration'), + ] + + operations = [ + migrations.AlterField( + model_name='userprofile', + name='level_of_education', + field=models.CharField(blank=True, max_length=6, null=True, db_index=True, choices=[(b'p', b'Doctorate'), (b'm', b"Master's or professional degree"), (b'b', b"Bachelor's degree"), (b'a', b'Associate degree'), (b'hs', b'Secondary/high school'), (b'jhs', b'Junior secondary/junior high/middle school'), (b'el', b'Elementary/primary school'), (b'none', b'No formal education'), (b'other', b'Other education')]), + ), + ]