Merge branch 'master' into request-creator-name

2018-08-08 15:28:36 -04:00
parent df93db4cd8 00f1500940
commit 47957384fc
12 changed files with 145 additions and 29 deletions
--- a/alembic/versions/77b065750596_new_request_statuses.py
+++ b/alembic/versions/77b065750596_new_request_statuses.py
@@ -40,7 +40,7 @@ def upgrade():
                WHERE id = :id"""
            )
            db.execute(query, id=status_event["id"], status=status.name)
-        except ValueError:
+        except KeyError:
            query = sa.text("DELETE FROM request_status_events WHERE id = :id")
            db.execute(query, id=status_event["id"])