Merge branch 'master' into remove-initial-update-sms-sender

2026-02-03 18:01:08 -05:00 · 2017-11-15 12:33:38 +00:00
parent fc5dae8ec2 d9f885b881
commit fd217e67f5
17 changed files with 178 additions and 53 deletions
--- a/tests/app/db.py
+++ b/tests/app/db.py
@@ -185,8 +185,7 @@ def create_notification(
        'job': job,
        'service_id': template.service.id,
        'service': template.service,
-        'template_id': template and template.id,
-        'template': template,
+        'template_id': template.id,
        'template_version': template.version,
        'status': status,
        'reference': reference,