Files
@ a07296564f6b
Branch filter:
Location: kallithea/rhodecode/templates/shortlog/shortlog.html - annotation
a07296564f6b
877 B
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.
1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 76d156bef5a2 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 79818f546538 f91d3f9b7230 1e757ac98988 1e757ac98988 a520d542697e a520d542697e a520d542697e a520d542697e a520d542697e a520d542697e a520d542697e 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 b4f401524060 b4f401524060 b4f401524060 1e757ac98988 f91d3f9b7230 f91d3f9b7230 | ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
${_('%s Shortlog') % c.repo_name} - ${c.rhodecode_name}
</%def>
<%def name="breadcrumbs_links()">
${h.link_to(_(u'Home'),h.url('/'))}
»
${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
»
%if c.file_history:
${h.link_to(_('shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}
»
${c.file_history}
%else:
${_('shortlog')}
%endif
</%def>
<%def name="page_nav()">
${self.menu('shortlog')}
</%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<!-- end box / title -->
<div class="table">
<div id="shortlog_data">
${c.shortlog_data}
</div>
</div>
</div>
</%def>
|