##// 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:

r2592:0e0508de default
r2784:e8c62649 default
Show More
my_account_emails.mako
54 lines | 1.9 KiB | application/x-mako | MakoHtmlLexer
<%namespace name="base" file="/base/base.mako"/>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">${_('Account Emails')}</h3>
</div>
<div class="panel-body">
<div class="emails_wrap">
<table class="rctable account_emails">
<tr>
<td class="td-user">
${base.gravatar(c.user.email, 16)}
<span class="user email">${c.user.email}</span>
</td>
<td class="td-tags">
<span class="tag tag1">${_('Primary')}</span>
</td>
</tr>
%if c.user_email_map:
%for em in c.user_email_map:
<tr>
<td class="td-user">
${base.gravatar(em.email, 16)}
<span class="user email">${em.email}</span>
</td>
<td class="td-action">
${h.secure_form(h.route_path('my_account_emails_delete'), request=request)}
${h.hidden('del_email_id',em.email_id)}
<button class="btn btn-link btn-danger" type="submit" id="${'remove_email_%s'.format(em.email_id)}"
onclick="return confirm('${_('Confirm to delete this email: {}').format(em.email)}');">
${_('Delete')}
</button>
${h.end_form()}
</td>
</tr>
%endfor
%else:
<tr class="noborder">
<td colspan="3">
<div class="td-email">
${_('No additional emails specified')}
</div>
</td>
</tr>
%endif
</table>
</div>
<div>
${c.form.render() | n}
</div>
</div>
</div>