##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
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.
marcink - - Load All Authors

File last commit:

r1785:1cce4ff2 default
r2784:e8c62649 default
Show More
settings_system.mako
57 lines | 1.7 KiB | application/x-mako | MakoHtmlLexer
/ rhodecode / templates / admin / settings / settings_system.mako
History | Annotation | Raw |Copy content |Copy permalink
<div id="update_notice" style="display: none; margin: -40px 0px 20px 0px">
<div>${_('Checking for updates...')}</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">${_('System Info')}</h3>
% if c.allowed_to_snapshot:
<a href="${h.route_path('admin_settings_system', _query={'snapshot':1})}" class="panel-edit">${_('create summary snapshot')}</a>
% endif
</div>
<div class="panel-body">
<dl class="dl-horizontal settings">
% for dt, dd, warn in c.data_items:
<dt>${dt}${':' if dt else '---'}</dt>
<dd>${dd}${'' if dt else '---'}
% if warn and warn['message']:
<div class="alert-${warn['type']}">
<strong>${warn['message']}</strong>
</div>
% endif
</dd>
% endfor
</dl>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">${_('Python Packages')}</h3>
</div>
<div class="panel-body">
<table class="table">
<colgroup>
<col class='label'>
<col class='content'>
</colgroup>
<tbody>
% for key, value in c.py_modules['human_value']:
<tr>
<td>${key}</td>
<td>${value}</td>
</tr>
% endfor
</tbody>
</table>
</div>
</div>
<script>
$('#check_for_update').click(function(e){
$('#update_notice').show();
$('#update_notice').load("${h.route_path('admin_settings_system_update')}");
})
</script>