Launchpad itself

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

  1. bug-527450
  2. Merge into devel
Proposed by Paul Hummer on 2010-03-09
Status: Merged
Approved by: Aaron Bentley on 2010-03-09
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) 2010-03-09 Approve on 2010-03-09
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.
Aaron Bentley (abentley) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/doc/branch-notifications.txt'
2--- lib/lp/code/doc/branch-notifications.txt 2010-01-14 02:37:15 +0000
3+++ lib/lp/code/doc/branch-notifications.txt 2010-03-10 05:51:30 +0000
4@@ -69,7 +69,7 @@
5 http://code.launchpad.dev/~name12/firefox/main
6 <BLANKLINE>
7 You are subscribed to branch lp://dev/~name12/firefox/main.
8- To unsubscribe from this branch go to http://code.launchpad.dev/~name12/firefox/main/+edit-subscription.
9+ To unsubscribe from this branch go to http://code.launchpad.dev/~name12/firefox/main/+edit-subscription
10 <BLANKLINE>
11 >>> branch.unsubscribe(branch.owner)
12
13@@ -268,7 +268,7 @@
14 Your team Launchpad Developers is subscribed to branch
15 lp://dev/~name12/firefox/main.
16 To unsubscribe from this branch go to
17- http://code.launchpad.dev/~name12/firefox/main/+edit-subscription.
18+ http://code.launchpad.dev/~name12/firefox/main/+edit-subscription
19 <BLANKLINE>
20 0 1 ... 5999...
21
22@@ -288,7 +288,7 @@
23 <BLANKLINE>
24 ...
25 To unsubscribe from this branch go to
26- http://code.launchpad.dev/~name12/firefox/main/+edit-subscription.
27+ http://code.launchpad.dev/~name12/firefox/main/+edit-subscription
28 0 1 ... 5999...
29
30 And just to be sure, lets create one with 800 lines.
31@@ -467,7 +467,7 @@
32 <BLANKLINE>
33 You are subscribed to branch lp://dev/~name12/firefox/main.
34 To unsubscribe from this branch go to
35- http://code.launchpad.dev/~name12/firefox/main/+edit-subscription.
36+ http://code.launchpad.dev/~name12/firefox/main/+edit-subscription
37
38
39 The fields that are currently tracked with the delta, and cause
40@@ -523,7 +523,7 @@
41 <BLANKLINE>
42 You are subscribed to branch lp://dev/~name12/firefox/new-name.
43 To unsubscribe from this branch go to
44- http://code.launchpad.dev/~name12/firefox/new-name/+edit-subscription.
45+ http://code.launchpad.dev/~name12/firefox/new-name/+edit-subscription
46
47
48 == Unicode in emails ==
49@@ -553,7 +553,7 @@
50 u'',
51 u'You are subscribed to branch lp://dev/~name12/firefox/new-name.',
52 u'To unsubscribe from this branch go to
53- http://code.launchpad.dev/~name12/firefox/new-name/+edit-subscription.']
54+ http://code.launchpad.dev/~name12/firefox/new-name/+edit-subscription']
55
56
57 == Modifications by users other than the branch owner ==
58
59=== modified file 'lib/lp/code/mail/branch.py'
60--- lib/lp/code/mail/branch.py 2009-11-12 21:35:33 +0000
61+++ lib/lp/code/mail/branch.py 2010-03-10 05:51:30 +0000
62@@ -268,7 +268,7 @@
63 # Give subscribers a link to unsubscribe.
64 params['unsubscribe'] = (
65 "\nTo unsubscribe from this branch go to "
66- "%s/+edit-subscription." % canonical_url(branch))
67+ "%s/+edit-subscription" % canonical_url(branch))
68 else:
69 params['unsubscribe'] = ''
70 params['diff'] = self.contents or ''
71
72=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
73--- lib/lp/code/model/tests/test_branchjob.py 2010-03-05 19:41:41 +0000
74+++ lib/lp/code/model/tests/test_branchjob.py 2010-03-10 05:51:30 +0000
75@@ -330,7 +330,7 @@
76 '%(url)s\n'
77 '\nYou are subscribed to branch %(identity)s.\n'
78 'To unsubscribe from this branch go to'
79- ' %(url)s/+edit-subscription.\n' % {
80+ ' %(url)s/+edit-subscription\n' % {
81 'url': canonical_url(branch),
82 'identity': branch.bzr_identity
83 },
84
85=== modified file 'lib/lp/code/stories/branches/xx-branch-edit.txt'
86--- lib/lp/code/stories/branches/xx-branch-edit.txt 2010-01-15 04:09:45 +0000
87+++ lib/lp/code/stories/branches/xx-branch-edit.txt 2010-03-10 05:51:30 +0000
88@@ -261,7 +261,7 @@
89 ...
90 To: Sample Person <test@canonical.com>
91 From: No Privileges Person <no-priv@canonical.com>
92- Subject: [Branch ~name12/foogoo/foogoo-svn]
93+ Subject: [Branch ~name12/foogoo/foogoo-svn]
94 ...
95 New whiteboard value
96 <BLANKLINE>
97@@ -271,7 +271,7 @@
98 <BLANKLINE>
99 You are subscribed to branch lp://dev/~name12/foogoo/foogoo-svn.
100 To unsubscribe from this branch go to http://code.launchpad.dev/~name12/foo=
101- goo/foogoo-svn/+edit-subscription.
102+ goo/foogoo-svn/+edit-subscription
103 <BLANKLINE>
104
105