Merge a7eba8a into 7e99262

zulip · Jun 19, 2017 · 45c0a53 · 45c0a53
2 parents 7e99262 + a7eba8a
commit 45c0a53
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/zerver/views/test_emails.py b/zerver/views/test_emails.py
@@ -48,6 +48,7 @@ def email_page(request):
         },
         'referrer_name': 'Road Runner',
         'referrer_email': 'runner@acme.com',
+        'referrer_realm_name': 'Acme Corporation',
         'realm_uri': realm.uri,
         'server_uri': settings.SERVER_URI,
         'old_email': 'old_address@acme.com',

diff --git a/zproject/settings.py b/zproject/settings.py
@@ -335,6 +335,8 @@ def get_secret(key):
 })
 non_html_template_engine_settings['OPTIONS'].update({
     'autoescape': False,
+    'trim_blocks': True,
+    'lstrip_blocks': True,
 })
 
 # The order here is important; get_template and related/parent functions try