From: Stephen Finucane <stephen@that.guru>
Date: Sat, 29 Sep 2018 22:03:08 +0000 (+0100)
Subject: templates: Remove trailing newlines
X-Git-Tag: v2.2.0-rc1~265
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c93e8a3ebe3a6ff9590223686d5ce56a30201250;p=thirdparty%2Fpatchwork.git

templates: Remove trailing newlines

These got added accidentally during merge.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Fixes: 45fa5c5c ("templates: Move additional email subjects to templates")
---

diff --git a/patchwork/templates/patchwork/mails/activation-subject.txt b/patchwork/templates/patchwork/mails/activation-subject.txt
index c409f38c..632eea8f 100644
--- a/patchwork/templates/patchwork/mails/activation-subject.txt
+++ b/patchwork/templates/patchwork/mails/activation-subject.txt
@@ -1 +1 @@
-Patchwork account confirmation
+Patchwork account confirmation
\ No newline at end of file
diff --git a/patchwork/templates/patchwork/mails/optout-request-subject.txt b/patchwork/templates/patchwork/mails/optout-request-subject.txt
index 377dfc89..32ac6998 100644
--- a/patchwork/templates/patchwork/mails/optout-request-subject.txt
+++ b/patchwork/templates/patchwork/mails/optout-request-subject.txt
@@ -1 +1 @@
-Patchwork opt-out confirmation
\ No newline at end of file
+Patchwork opt-out request
\ No newline at end of file
diff --git a/patchwork/templates/patchwork/mails/patch-change-notification-subject.txt b/patchwork/templates/patchwork/mails/patch-change-notification-subject.txt
index c9d96d41..42dcaa62 100644
--- a/patchwork/templates/patchwork/mails/patch-change-notification-subject.txt
+++ b/patchwork/templates/patchwork/mails/patch-change-notification-subject.txt
@@ -1 +1 @@
-[{{ projects|join:"," }}] Patch notification: {{notifications|length}} patch{{notifications|length|pluralize:"es"}} updated
+[{{ projects|join:"," }}] Patch notification: {{notifications|length}} patch{{notifications|length|pluralize:"es"}} updated
\ No newline at end of file
diff --git a/patchwork/tests/test_mail_settings.py b/patchwork/tests/test_mail_settings.py
index 78cbd6db..8991252c 100644
--- a/patchwork/tests/test_mail_settings.py
+++ b/patchwork/tests/test_mail_settings.py
@@ -86,7 +86,7 @@ class OptoutRequestTest(TestCase):
         self.assertEqual(len(mail.outbox), 1)
         msg = mail.outbox[0]
         self.assertEqual(msg.to, [email])
-        self.assertEqual(msg.subject, 'Patchwork opt-out confirmation')
+        self.assertEqual(msg.subject, 'Patchwork opt-out request')
         self.assertIn(reverse('confirm', kwargs={'key': conf.key}), msg.body)
 
     def test_post_empty(self):
@@ -167,7 +167,7 @@ class OptinRequestTest(TestCase):
         self.assertEqual(len(mail.outbox), 1)
         msg = mail.outbox[0]
         self.assertEqual(msg.to, [self.email])
-        self.assertEqual(msg.subject, 'Patchwork opt-in confirmation')
+        self.assertEqual(msg.subject, 'Patchwork opt-in request')
         self.assertIn(reverse('confirm', kwargs={'key': conf.key}), msg.body)
 
     def test_post_empty(self):