Merge lp:~twom/launchpad/merge-proposal-rescan-link into lp:launchpad

Proposed by Tom Wardill
Status: Merged
Merged at revision: 18871
Proposed branch: lp:~twom/launchpad/merge-proposal-rescan-link
Merge into: lp:launchpad
Diff against target: 18 lines (+14/-0)
1 file modified
lib/lp/code/templates/branchmergeproposal-update-diff.pt (+14/-0)
To merge this branch: bzr merge lp:~twom/launchpad/merge-proposal-rescan-link
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+362579@code.launchpad.net

Commit message

Add missing template lib/lp/code/templates/branchmergeproposal-update-diff.pt

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'lib/lp/code/templates/branchmergeproposal-update-diff.pt'
2--- lib/lp/code/templates/branchmergeproposal-update-diff.pt 1970-01-01 00:00:00 +0000
3+++ lib/lp/code/templates/branchmergeproposal-update-diff.pt 2019-02-01 08:39:15 +0000
4@@ -0,0 +1,14 @@
5+<html
6+ xmlns="http://www.w3.org/1999/xhtml"
7+ xmlns:tal="http://xml.zope.org/namespaces/tal"
8+ xmlns:metal="http://xml.zope.org/namespaces/metal"
9+ xmlns:i18n="http://xml.zope.org/namespaces/i18n"
10+ metal:use-macro="view/macro:page/main_only"
11+ i18n:domain="launchpad">
12+ <body>
13+ <div metal:fill-slot="main">
14+ <p>You can schedule an update for this merge proposal if it appears the diff is out of date.</p>
15+ <div metal:use-macro="context/@@launchpad_form/form" />
16+ </div>
17+ </body>
18+</html>