Merge branch 'main' into cleanup-config

* main:
  lingering merge repair
  remove alerts from env
  remove broadcast-related code
This commit is contained in:
Ryan Ahearn
2022-10-26 13:23:01 +00:00
104 changed files with 210 additions and 38538 deletions

View File

@@ -59,9 +59,6 @@ class Config(object):
REDIS_URL = cloud_config.redis_url
REDIS_ENABLED = os.environ.get('REDIS_ENABLED', '1') == '1'
# as defined in api db migration 0331_add_broadcast_org.py
BROADCAST_ORGANISATION_ID = '38e4bf69-93b0-445d-acee-53ea53fe02df'
# TODO: reassign this
NOTIFY_SERVICE_ID = 'd6aa2c68-a2d9-4437-ab19-3ae8eb202553'