Files
@ b19b1723ff10
Branch filter:
Location: kallithea/rhodecode/templates/forks/forks_data.html - annotation
b19b1723ff10
1.8 KiB
text/html
pullrequest: pullrequest from changelog view
It seems like it didn't work ... perhaps because I broke it. But now we clean
it up and make it work:
Use rev_end as the revision to merge. We don't know where to merge ... but
start_rev cannot be used for that.
This might to some extent have been working before ... but we prefer to clean
it up and start over again when the normal merge workflow is fully working.
It seems like it didn't work ... perhaps because I broke it. But now we clean
it up and make it work:
Use rev_end as the revision to merge. We don't know where to merge ... but
start_rev cannot be used for that.
This might to some extent have been working before ... but we prefer to clean
it up and start over again when the normal merge workflow is fully working.
7e75af301842 7e75af301842 5a96551ee9c0 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 c20adbaf16af c20adbaf16af b4f401524060 b4f401524060 b4f401524060 c20adbaf16af c20adbaf16af c9b0f1d363c7 c20adbaf16af c20adbaf16af b4f401524060 b4f401524060 b4f401524060 c6b811f11c94 c6b811f11c94 c6b811f11c94 c6b811f11c94 2bfcec6a3985 b4f401524060 b4f401524060 b4f401524060 2bfcec6a3985 c6b811f11c94 c6b811f11c94 c6b811f11c94 c6b811f11c94 c6b811f11c94 f91d3f9b7230 5a96551ee9c0 b4f401524060 f91d3f9b7230 | ## -*- coding: utf-8 -*-
% if c.forks_pager:
% for f in c.forks_pager:
<div>
<div class="fork_user">
<div class="gravatar">
<img alt="gravatar" src="${h.gravatar_url(f.user.email,24)}"/>
</div>
<span style="font-size: 20px">
<b>${f.user.username}</b> (${f.user.name} ${f.user.lastname}) /
${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}
</span>
<div style="padding:5px 3px 3px 42px;">${f.description}</div>
</div>
<div style="clear:both;padding-top: 10px"></div>
<div class="follower_date">${_('forked')} -
<span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
<a title="${_('compare fork with %s' % c.repo_name)}"
href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref='default',other_repo=f.repo_name,other_ref_type='branch',other_ref='default')}"
class="ui-btn small">${_('Compare fork')}</a>
</div>
<div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
</div>
% endfor
<div class="pagination-wh pagination-left">
<script type="text/javascript">
YUE.onDOMReady(function(){
YUE.delegate("forks","click",function(e, matchedEl, container){
ypjax(e.target.href,"forks",function(){
show_more_event();
tooltip_activate();
show_changeset_tooltip();
});
YUE.preventDefault(e);
},'.pager_link');
});
</script>
${c.forks_pager.pager('$link_previous ~2~ $link_next')}
</div>
% else:
${_('There are no forks yet')}
% endif
|