From 4382f587d79b4c52b69eafac30222c31c6d800e7 Mon Sep 17 00:00:00 2001
From: František Zatloukal <fzatlouk@redhat.com>
Date: Apr 09 2021 14:29:08 +0000
Subject: Merge branch 'develop'


---

diff --git a/alembic/versions/72031671860e_added_votes_to_bug.py b/alembic/versions/72031671860e_added_votes_to_bug.py
index 2f5b238..6a6b5f4 100644
--- a/alembic/versions/72031671860e_added_votes_to_bug.py
+++ b/alembic/versions/72031671860e_added_votes_to_bug.py
@@ -17,7 +17,7 @@ import sqlalchemy as sa
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.add_column('bug', sa.Column('votes', sa.Text(),
-                                       server_default=sa.sql.text('"{}"'), nullable=False))
+                                       server_default="{}", nullable=False))
     # ### end Alembic commands ###
 
 
diff --git a/blockerbugs.spec b/blockerbugs.spec
index 126edcf..2f279ac 100644
--- a/blockerbugs.spec
+++ b/blockerbugs.spec
@@ -1,7 +1,7 @@
 Name:           blockerbugs
 # NOTE: if you update version, *make sure* to also update
 # `blockerbugs/__init__.py` and `docs/source/conf.py`
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        Fedora QA Blocker Tracking Application
 
@@ -105,6 +105,9 @@ cp -v docs/_build/man/*.1 %{buildroot}/%{_mandir}/man1/
 
 
 %changelog
+* Fri Apr 09 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.2.1-1
+- Fix the migration from 72031671860e
+
 * Wed Mar 24 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.2.0-1
 - Prioritized Bugs hotfix
 - show TBD when a discussion link doesn't exist, show if user already voted
diff --git a/blockerbugs/__init__.py b/blockerbugs/__init__.py
index 3d7bdc5..7d2add0 100644
--- a/blockerbugs/__init__.py
+++ b/blockerbugs/__init__.py
@@ -8,7 +8,7 @@ from flask_sqlalchemy import SQLAlchemy
 from . import config
 
 # the version as used in setup.py and docs
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 # Flask App
 app = Flask(__name__)
diff --git a/blockerbugs/models/bug.py b/blockerbugs/models/bug.py
index 5ae01d9..119cb87 100644
--- a/blockerbugs/models/bug.py
+++ b/blockerbugs/models/bug.py
@@ -54,7 +54,7 @@ class Bug(db.Model):
                                 backref=db.backref('bugs', lazy='dynamic'))
                                 #backref='bugs')
     discussion_link = db.Column(db.String, unique=False)
-    votes = db.Column(db.Text)
+    votes = db.Column(db.Text, default='{}', nullable=False)
 
     def __init__(self, bugid, url, summary, status, component, milestone,
                  active, needinfo, needinfo_requestee,
diff --git a/docs/source/conf.py b/docs/source/conf.py
index eab2630..13dbc0d 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -50,7 +50,7 @@ copyright = u'2021, Fedora QA'
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.