darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-12 08:12:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into async-job-stats

Browse Source 
Conflicts:
	app/notifications/notifications_ses_callback.py
This commit is contained in:
Martyn Inglis
2017-05-17 09:49:43 +01:00
parent a5dae0bebd c4964d8cf4
commit 83a1b1526e
25 changed files with 713 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/config.py
View File

@@ -89,6 +89,7 @@ class Config(object):
PASSWORD_RESET_TEMPLATE_ID = '474e9242-823b-4f99-813d-ed392e7f1201'
ALREADY_REGISTERED_EMAIL_TEMPLATE_ID = '0880fbb1-a0c6-46f0-9a8e-36c986381ceb'
CHANGE_EMAIL_CONFIRMATION_TEMPLATE_ID = 'eb4d9930-87ab-4aef-9bce-786762687884'
SERVICE_NOW_LIVE_TEMPLATE_ID = '618185c6-3636-49cd-b7d2-6f6f5eb3bdde'
BROKER_URL = 'sqs://'
BROKER_TRANSPORT_OPTIONS = {