Mercurial > kallithea
changeset 4317:205521e789ec
pull requests: show PR owner and destination and ancestor
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 10 Dec 2013 19:30:37 +0100 |
| parents | c3a68137453a |
| children | afbd43437237 |
| files | kallithea/templates/pullrequests/pullrequest_show.html |
| diffstat | 1 files changed, 31 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/pullrequests/pullrequest_show.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Tue Dec 10 19:30:37 2013 +0100 @@ -78,6 +78,18 @@ </div> <div class="field"> <div class="label-summary"> + <label>${_('Target repository')}:</label> + </div> + <div class="input"> + <div> + <span><a href="${h.url('summary_home', repo_name=c.pull_request.other_repo.repo_name)}">${c.pull_request.other_repo.clone_url()}</a></span> + ## branch link is only valid if it is a branch + <span class="spantag"><a href="${h.url('summary_home', repo_name=c.pull_request.other_repo.repo_name, anchor=c.other_ref_name)}">${c.other_ref_type}: ${c.other_ref_name}</a></span> + </div> + </div> + </div> + <div class="field"> + <div class="label-summary"> <label>${_('Pull changes')}:</label> </div> <div class="input"> @@ -107,6 +119,20 @@ <div>${h.fmt_date(c.pull_request.created_on)}</div> </div> </div> + <div class="field"> + <div class="label-summary"> + <label>${_('Created by')}:</label> + </div> + <div class="input"> + <div class="author"> + <div class="gravatar"> + <img alt="gravatar" src="${h.gravatar_url(c.pull_request.author.email,20)}"/> + </div> + <span>${c.pull_request.author.username_and_name}</span><br/> + <span><a href="mailto:${c.pull_request.author.email}">${c.pull_request.author.email}</a></span><br/> + </div> + </div> + </div> </div> </div> ## REVIEWERS @@ -165,6 +191,11 @@ <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div> <%include file="/compare/compare_cs.html" /> + <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px"> + ${_('Common ancestor')}: + ${h.link_to(h.short_id(c.other_rev),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=c.other_rev))} + </div> + ## FILES <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">