Files
@ a07296564f6b
Branch filter:
Location: kallithea/rhodecode/templates/pullrequests/pullrequest_show_all.html - annotation
a07296564f6b
1.4 KiB
text/html
compare: show aggregated diff of what will be merged to other repo, using merge ancestor
pull_request.get_compare_data will also now return the ancestor that would be
used for actual merging. Showing a diff from that ancestor instead of the first
'new' changeset will give a more realistic diff that doesn't include merges.
pull_request.get_compare_data will also now return the ancestor that would be
used for actual merging. Showing a diff from that ancestor instead of the first
'new' changeset will give a more realistic diff that doesn't include merges.
1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 58c529332e7e 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 79818f546538 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 8eab81115660 1bc579bcd67a a5e32ed7f790 99cb0cf75a4c 99cb0cf75a4c 1095b67f8054 99cb0cf75a4c 1095b67f8054 99cb0cf75a4c 99cb0cf75a4c 99cb0cf75a4c a5e32ed7f790 a5e32ed7f790 a5e32ed7f790 99cb0cf75a4c a5e32ed7f790 1bc579bcd67a 8eab81115660 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a | <%inherit file="/base/base.html"/>
<%def name="title()">
${c.repo_name} ${_('all pull requests')}
</%def>
<%def name="breadcrumbs_links()">
${h.link_to(_(u'Home'),h.url('/'))}
»
${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}
»
${_('All pull requests')}
</%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
%for pr in c.pull_requests:
<div>
<h4 style="border:0px;padding:0px">
%if pr.is_closed():
<img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>
%endif
<img src="${h.url('/images/icons/flag_status_%s.png' % str(pr.last_review_status))}" />
<a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}">
${_('Pull request #%s opened by %s on %s') % (pr.pull_request_id, pr.author.full_name, h.fmt_date(pr.created_on))}
</a>
</h4>
<h5 style="border:0px;padding-bottom:0px">${_('Title')}: ${pr.title}</h5>
<div style="padding:0px 24px">${pr.description}</div>
<div style="border-bottom: 1px solid #DDD;margin:10px 20px;padding-bottom:10px"></div>
</div>
%endfor
</div>
<script type="text/javascript"></script>
</%def>
|