Launchpad itself

Merge lp:~thumper/launchpad/fix-commit-message-oops into lp:launchpad

  1. fix-commit-message-oops
  2. Merge into devel
Proposed by Tim Penhey
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~thumper/launchpad/fix-commit-message-oops
Merge into: lp:launchpad
Diff against target: 10 lines
1 file modified
lib/lp/code/browser/branchmergeproposal.py (+1/-1)
To merge this branch: bzr merge lp:~thumper/launchpad/fix-commit-message-oops
Reviewer Review Type Date Requested Status
Edwin Grubbs (community) code Approve
Review via email: mp+14120@code.launchpad.net

Commit message

Encode the xhtml result as UTF-8 as now required by the lazr-js widget.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

My branch was broken by the commit the followed it changing the lazr-js widget.

This change makes it work (kinda) again.

It still renders incorrectly, but so does the bug description. Both are dependant on the lazr-js branch that deryck has landed, but not rolled into download-cache.

Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Looks good.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/code/browser/branchmergeproposal.py'
--- lib/lp/code/browser/branchmergeproposal.py 2009-10-22 22:25:01 +0000
+++ lib/lp/code/browser/branchmergeproposal.py 2009-10-28 22:30:30 +0000
@@ -1267,5 +1267,5 @@
1267 def renderer(value):1267 def renderer(value):
1268 nomail = formatter(value).obfuscate_email()1268 nomail = formatter(value).obfuscate_email()
1269 html = formatter(nomail).text_to_html()1269 html = formatter(nomail).text_to_html()
1270 return html1270 return html.encode('utf-8')
1271 return renderer1271 return renderer