Merge branch 'master' into letter-on-usage-page

app/config.py

@@ -96,6 +96,7 @@ class Config(object):
         r"acas\.org\.uk",
         r"gov\.wales",
         r"biglotteryfund\.org\.uk",
+        r"marinemanagement\.org\.uk",
     ]
 
     LOGO_UPLOAD_BUCKET_NAME = 'public-logos-local'

app/templates/views/callbacks.html

@@ -2,7 +2,7 @@
 {% extends "withoutnav_template.html" %}
 
 {% block per_page_title %}
-  Callbacks for received text messages
+  Callback documentation
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -10,7 +10,7 @@
 <div class="grid-row">
   <div class="column-two-thirds">
 
-    <h1 class="heading-large">Callbacks for received text messages</h1>
+    <h1 class="heading-large">Callback documentation</h1>
     <p>A callback lets you receive messages from Notify to a URL you choose.</p>
     <p>You’ll need to provide a bearer token, for security. We’ll add this to the authorisation header of the callback request.</p>
     <p>The callback message is in JSON.</p>

tests/app/main/test_validators.py

@@ -99,6 +99,7 @@ def _gen_mock_field(x):
     'test@bbsrc.ac.uk',
     'test@acas.org.uk',
     'test@biglotteryfund.org.uk',
+    'test@marinemanagement.org.uk',
 ])
 def test_valid_list_of_white_list_email_domains(
     client,