Merge lp:~wgrant/launchpad/git-fixes into lp:launchpad
Proposed by
William Grant
Status: | Merged |
---|---|
Merged at revision: | 17474 |
Proposed branch: | lp:~wgrant/launchpad/git-fixes |
Merge into: | lp:launchpad |
Diff against target: |
103 lines (+21/-20) 4 files modified
lib/lp/code/interfaces/branch.py (+4/-3) lib/lp/code/model/branch.py (+3/-1) lib/lp/code/model/codereviewcomment.py (+2/-2) lib/lp/code/model/diff.py (+12/-14) |
To merge this branch: | bzr merge lp:~wgrant/launchpad/git-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Review via email: mp+257977@code.launchpad.net |
Commit message
Fix Git merge proposal diff JSON rendering, Unicode diffs, and comment rendering.
Description of the change
Fix a few trivial issues with Git MPs:
- Fix Git PreviewDiff JSON rendering.
- Fix non-ASCII git diffs.
- Fix codereviewcomment rendering OOPS for git MPs.
To post a comment you must log in.