Launchpad itself

Merge lp:~rockstar/launchpad/bug-527450 into lp:launchpad

  1. bug-527450
  2. Merge into devel
Proposed by Paul Hummer
Status: Merged
Approved by: Aaron Bentley
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~rockstar/launchpad/bug-527450
Merge into: lp:launchpad
Diff against target: 103 lines (+10/-10)
4 files modified
lib/lp/code/doc/branch-notifications.txt (+6/-6)
lib/lp/code/mail/branch.py (+1/-1)
lib/lp/code/model/tests/test_branchjob.py (+1/-1)
lib/lp/code/stories/branches/xx-branch-edit.txt (+2/-2)
To merge this branch: bzr merge lp:~rockstar/launchpad/bug-527450
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+20981@code.launchpad.net

Description of the change

This branch is really easy. It removes a period at the end of a sentence in
the branch subscription notifications because it was borking the url to
unsubscribe in most mail clients.

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/code/doc/branch-notifications.txt'
--- lib/lp/code/doc/branch-notifications.txt 2010-01-14 02:37:15 +0000
+++ lib/lp/code/doc/branch-notifications.txt 2010-03-10 05:51:30 +0000
@@ -69,7 +69,7 @@
69 http://code.launchpad.dev/~name12/firefox/main69 http://code.launchpad.dev/~name12/firefox/main
70 <BLANKLINE>70 <BLANKLINE>
71 You are subscribed to branch lp://dev/~name12/firefox/main.71 You are subscribed to branch lp://dev/~name12/firefox/main.
72 To unsubscribe from this branch go to http://code.launchpad.dev/~name12/firefox/main/+edit-subscription.72 To unsubscribe from this branch go to http://code.launchpad.dev/~name12/firefox/main/+edit-subscription
73 <BLANKLINE>73 <BLANKLINE>
74 >>> branch.unsubscribe(branch.owner)74 >>> branch.unsubscribe(branch.owner)
7575
@@ -268,7 +268,7 @@
268 Your team Launchpad Developers is subscribed to branch268 Your team Launchpad Developers is subscribed to branch
269 lp://dev/~name12/firefox/main.269 lp://dev/~name12/firefox/main.
270 To unsubscribe from this branch go to270 To unsubscribe from this branch go to
271 http://code.launchpad.dev/~name12/firefox/main/+edit-subscription.271 http://code.launchpad.dev/~name12/firefox/main/+edit-subscription
272 <BLANKLINE>272 <BLANKLINE>
273 0 1 ... 5999...273 0 1 ... 5999...
274274
@@ -288,7 +288,7 @@
288 <BLANKLINE>288 <BLANKLINE>
289 ...289 ...
290 To unsubscribe from this branch go to290 To unsubscribe from this branch go to
291 http://code.launchpad.dev/~name12/firefox/main/+edit-subscription.291 http://code.launchpad.dev/~name12/firefox/main/+edit-subscription
292 0 1 ... 5999...292 0 1 ... 5999...
293293
294And just to be sure, lets create one with 800 lines.294And just to be sure, lets create one with 800 lines.
@@ -467,7 +467,7 @@
467 <BLANKLINE>467 <BLANKLINE>
468 You are subscribed to branch lp://dev/~name12/firefox/main.468 You are subscribed to branch lp://dev/~name12/firefox/main.
469 To unsubscribe from this branch go to469 To unsubscribe from this branch go to
470 http://code.launchpad.dev/~name12/firefox/main/+edit-subscription.470 http://code.launchpad.dev/~name12/firefox/main/+edit-subscription
471471
472472
473The fields that are currently tracked with the delta, and cause473The fields that are currently tracked with the delta, and cause
@@ -523,7 +523,7 @@
523 <BLANKLINE>523 <BLANKLINE>
524 You are subscribed to branch lp://dev/~name12/firefox/new-name.524 You are subscribed to branch lp://dev/~name12/firefox/new-name.
525 To unsubscribe from this branch go to525 To unsubscribe from this branch go to
526 http://code.launchpad.dev/~name12/firefox/new-name/+edit-subscription.526 http://code.launchpad.dev/~name12/firefox/new-name/+edit-subscription
527527
528528
529== Unicode in emails ==529== Unicode in emails ==
@@ -553,7 +553,7 @@
553 u'',553 u'',
554 u'You are subscribed to branch lp://dev/~name12/firefox/new-name.',554 u'You are subscribed to branch lp://dev/~name12/firefox/new-name.',
555 u'To unsubscribe from this branch go to555 u'To unsubscribe from this branch go to
556 http://code.launchpad.dev/~name12/firefox/new-name/+edit-subscription.']556 http://code.launchpad.dev/~name12/firefox/new-name/+edit-subscription']
557557
558558
559== Modifications by users other than the branch owner ==559== Modifications by users other than the branch owner ==
560560
=== modified file 'lib/lp/code/mail/branch.py'
--- lib/lp/code/mail/branch.py 2009-11-12 21:35:33 +0000
+++ lib/lp/code/mail/branch.py 2010-03-10 05:51:30 +0000
@@ -268,7 +268,7 @@
268 # Give subscribers a link to unsubscribe.268 # Give subscribers a link to unsubscribe.
269 params['unsubscribe'] = (269 params['unsubscribe'] = (
270 "\nTo unsubscribe from this branch go to "270 "\nTo unsubscribe from this branch go to "
271 "%s/+edit-subscription." % canonical_url(branch))271 "%s/+edit-subscription" % canonical_url(branch))
272 else:272 else:
273 params['unsubscribe'] = ''273 params['unsubscribe'] = ''
274 params['diff'] = self.contents or ''274 params['diff'] = self.contents or ''
275275
=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py 2010-03-05 19:41:41 +0000
+++ lib/lp/code/model/tests/test_branchjob.py 2010-03-10 05:51:30 +0000
@@ -330,7 +330,7 @@
330 '%(url)s\n'330 '%(url)s\n'
331 '\nYou are subscribed to branch %(identity)s.\n'331 '\nYou are subscribed to branch %(identity)s.\n'
332 'To unsubscribe from this branch go to'332 'To unsubscribe from this branch go to'
333 ' %(url)s/+edit-subscription.\n' % {333 ' %(url)s/+edit-subscription\n' % {
334 'url': canonical_url(branch),334 'url': canonical_url(branch),
335 'identity': branch.bzr_identity335 'identity': branch.bzr_identity
336 },336 },
337337
=== modified file 'lib/lp/code/stories/branches/xx-branch-edit.txt'
--- lib/lp/code/stories/branches/xx-branch-edit.txt 2010-01-15 04:09:45 +0000
+++ lib/lp/code/stories/branches/xx-branch-edit.txt 2010-03-10 05:51:30 +0000
@@ -261,7 +261,7 @@
261 ...261 ...
262 To: Sample Person <test@canonical.com>262 To: Sample Person <test@canonical.com>
263 From: No Privileges Person <no-priv@canonical.com>263 From: No Privileges Person <no-priv@canonical.com>
264 Subject: [Branch ~name12/foogoo/foogoo-svn] 264 Subject: [Branch ~name12/foogoo/foogoo-svn]
265 ...265 ...
266 New whiteboard value266 New whiteboard value
267 <BLANKLINE>267 <BLANKLINE>
@@ -271,7 +271,7 @@
271 <BLANKLINE>271 <BLANKLINE>
272 You are subscribed to branch lp://dev/~name12/foogoo/foogoo-svn.272 You are subscribed to branch lp://dev/~name12/foogoo/foogoo-svn.
273 To unsubscribe from this branch go to http://code.launchpad.dev/~name12/foo=273 To unsubscribe from this branch go to http://code.launchpad.dev/~name12/foo=
274 goo/foogoo-svn/+edit-subscription.274 goo/foogoo-svn/+edit-subscription
275 <BLANKLINE>275 <BLANKLINE>
276276
277277