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

r2105:4ad1a937 default
r2784:e8c62649 default
Show More
permissions_ips.mako
70 lines | 2.6 KiB | application/x-mako | MakoHtmlLexer
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">${_('Default IP Whitelist For All Users')}</h3>
</div>
<div class="panel-body">
<div class="ips_wrap">
<h5>${_('Current IP address')}: <code>${c.rhodecode_user.ip_addr}</code></h5>
<table class="rctable ip-whitelist">
<tr>
<th>IP Address</th>
<th>IP Range</th>
<th>Description</th>
<th></th>
</tr>
%if c.user_ip_map:
%for ip in c.user_ip_map:
<tr>
<td class="td-ip"><div class="ip">${ip.ip_addr}</div></td>
<td class="td-iprange"><div class="ip">${h.ip_range(ip.ip_addr)}</div></td>
<td class="td-description"><div class="ip">${ip.description}</div></td>
<td class="td-action">
${h.secure_form(h.route_path('edit_user_ips_delete', user_id=c.user.user_id), request=request)}
${h.hidden('del_ip_id',ip.ip_id)}
${h.hidden('default_user', 'True')}
${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
class_="btn btn-link btn-danger", onclick="return confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")}
${h.end_form()}
</td>
</tr>
%endfor
%else:
<tr>
<td class="ip">${_('All IP addresses are allowed')}</td>
<td></td>
<td></td>
<td></td>
</tr>
%endif
</table>
</div>
${h.secure_form(h.route_path('edit_user_ips_add', user_id=c.user.user_id), request=request)}
<div class="form">
<!-- fields -->
<div class="fields">
<div class="field">
<div class="label">
<label for="new_ip">${_('New IP Address')}:</label>
</div>
<div class="input">
${h.hidden('default_user', 'True')}
${h.text('new_ip')} ${h.text('description', placeholder=_('Description...'))}
<span class="help-block">${_('Enter a comma separated list of IP Addresses like 127.0.0.1,\n'
'or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n'
'To specify multiple addresses in a range, use the 127.0.0.1-127.0.0.10 syntax')}</span>
</div>
</div>
<div class="buttons">
${h.submit('save',_('Add'),class_="btn")}
${h.reset('reset',_('Reset'),class_="btn")}
</div>
</div>
</div>
${h.end_form()}
</div>
</div>