##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2351:59272121 default
r2784:e8c62649 default
Show More
journal_data.mako
53 lines | 2.1 KiB | application/x-mako | MakoHtmlLexer
## -*- coding: utf-8 -*-
<%namespace name="base" file="/base/base.mako"/>
%if c.journal_day_aggreagate:
%for day,items in c.journal_day_aggreagate:
<div class="journal_day">${day}</div>
% for user,entries in items:
<div class="journal_container">
${base.gravatar(user.email if user else '', 30)}
%if user:
<div class="journal_user user">${h.link_to_user(user.username)}</div>
%else:
<div class="journal_user user deleted">${entries[0].username}</div>
%endif
<div class="journal_action_container">
% for entry in entries:
<div class="journal_icon"> ${h.action_parser(request, entry)[2]()}</div>
<div class="journal_action">${h.action_parser(request, entry)[0]()}</div>
<div class="journal_repo">
<span class="journal_repo_name">
%if entry.repository is not None:
${h.link_to(entry.repository.repo_name,
h.route_path('repo_summary',repo_name=entry.repository.repo_name))}
%else:
${entry.repository_name}
%endif
</span>
</div>
<div class="journal_action_params">${h.literal(h.action_parser(request, entry)[1]())}</div>
<div class="date">
${h.age_component(entry.action_date, time_is_local=True)}
</div>
%endfor
</div>
</div>
%endfor
%endfor
<div class="pagination-wh pagination-left" >
${c.journal_pager.pager('$link_previous ~2~ $link_next')}
</div>
<script type="text/javascript">
$(document).pjax('#journal .pager_link','#journal');
$(document).on('pjax:success',function(){
show_more_event();
timeagoActivate();
});
</script>
%else:
<div>
${_('No entries yet')}
</div>
%endif