summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2014-04-26 22:07:05 -0300
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2014-04-26 22:07:05 -0300
commit0b6024816bd19b903f1a483037bc367e1bf8cc0a (patch)
tree4948b894987553864c874a6c3baeab3ce65a2d82
parentbe8a4c9be188adbf6093be3913ecd9ab034e875b (diff)
parent6db96aae6b499629b40379442fb1afa8f42f8b81 (diff)
downloadaskbot-0b6024816bd19b903f1a483037bc367e1bf8cc0a.tar.gz
askbot-0b6024816bd19b903f1a483037bc367e1bf8cc0a.tar.bz2
askbot-0b6024816bd19b903f1a483037bc367e1bf8cc0a.zip
Merge branch 'master' of github.com:ASKBOT/askbot-devel
-rw-r--r--askbot/migrations/0055_auto__chg_field_question_thread.py2
-rw-r--r--askbot/migrations/0080_transplant_favquestions_2.py2
-rw-r--r--askbot/migrations/0093_auto__del_field_vote_content_type__del_field_vote_object_id__chg_field.py2
-rw-r--r--askbot/migrations/0099_auto__del_field_thread_accepted_answer__del_field_anonymousanswer_ques.py4
4 files changed, 5 insertions, 5 deletions
diff --git a/askbot/migrations/0055_auto__chg_field_question_thread.py b/askbot/migrations/0055_auto__chg_field_question_thread.py
index 9fa7885b..f0f04916 100644
--- a/askbot/migrations/0055_auto__chg_field_question_thread.py
+++ b/askbot/migrations/0055_auto__chg_field_question_thread.py
@@ -9,7 +9,7 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Changing field 'Question.thread'
- db.alter_column(u'question', 'thread_id', self.gf('django.db.models.fields.related.ForeignKey')(default=0, unique=True, to=orm['askbot.Thread']))
+ db.alter_column(u'question', 'thread_id', self.gf('django.db.models.fields.related.ForeignKey')(default=None, unique=True, to=orm['askbot.Thread']))
def backwards(self, orm):
diff --git a/askbot/migrations/0080_transplant_favquestions_2.py b/askbot/migrations/0080_transplant_favquestions_2.py
index 3edd95c3..81a8ea56 100644
--- a/askbot/migrations/0080_transplant_favquestions_2.py
+++ b/askbot/migrations/0080_transplant_favquestions_2.py
@@ -12,7 +12,7 @@ class Migration(SchemaMigration):
db.delete_column(u'favorite_question', 'question_id')
# Changing field 'FavoriteQuestion.thread'
- db.alter_column(u'favorite_question', 'thread_id', self.gf('django.db.models.fields.related.ForeignKey')(default=0, to=orm['askbot.Thread']))
+ db.alter_column(u'favorite_question', 'thread_id', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['askbot.Thread']))
def backwards(self, orm):
diff --git a/askbot/migrations/0093_auto__del_field_vote_content_type__del_field_vote_object_id__chg_field.py b/askbot/migrations/0093_auto__del_field_vote_content_type__del_field_vote_object_id__chg_field.py
index 830a3cd6..ccbb3e25 100644
--- a/askbot/migrations/0093_auto__del_field_vote_content_type__del_field_vote_object_id__chg_field.py
+++ b/askbot/migrations/0093_auto__del_field_vote_content_type__del_field_vote_object_id__chg_field.py
@@ -18,7 +18,7 @@ class Migration(SchemaMigration):
db.delete_column(u'vote', 'object_id')
# Changing field 'Vote.voted_post'
- db.alter_column(u'vote', 'voted_post_id', self.gf('django.db.models.fields.related.ForeignKey')(default=0, to=orm['askbot.Post']))
+ db.alter_column(u'vote', 'voted_post_id', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['askbot.Post']))
# Adding unique constraint on 'Vote', fields ['user', 'voted_post']
db.create_unique(u'vote', ['user_id', 'voted_post_id'])
diff --git a/askbot/migrations/0099_auto__del_field_thread_accepted_answer__del_field_anonymousanswer_ques.py b/askbot/migrations/0099_auto__del_field_thread_accepted_answer__del_field_anonymousanswer_ques.py
index ac9507a5..36dd4850 100644
--- a/askbot/migrations/0099_auto__del_field_thread_accepted_answer__del_field_anonymousanswer_ques.py
+++ b/askbot/migrations/0099_auto__del_field_thread_accepted_answer__del_field_anonymousanswer_ques.py
@@ -21,13 +21,13 @@ class Migration(SchemaMigration):
db.delete_column('askbot_anonymousanswer', 'question_id')
# Changing field 'AnonymousAnswer.question_post'
- db.alter_column('askbot_anonymousanswer', 'question_post_id', self.gf('django.db.models.fields.related.ForeignKey')(default=0, to=orm['askbot.Post']))
+ db.alter_column('askbot_anonymousanswer', 'question_post_id', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['askbot.Post']))
# Deleting field 'QuestionView.question'
db.delete_column('askbot_questionview', 'question_id')
# Changing field 'QuestionView.question_post'
- db.alter_column('askbot_questionview', 'question_post_id', self.gf('django.db.models.fields.related.ForeignKey')(default=0, to=orm['askbot.Post']))
+ db.alter_column('askbot_questionview', 'question_post_id', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['askbot.Post']))
# Deleting field 'PostRevision.question'
db.delete_column('askbot_postrevision', 'question_id')