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

r2333:c9f5d931 default
r2784:e8c62649 default
Show More
settings_mapping.mako
28 lines | 1.1 KiB | application/x-mako | MakoHtmlLexer
${h.secure_form(h.route_path('admin_settings_mapping_update'), request=request)}
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">${_('Import New Groups or Repositories')}</h3>
</div>
<div class="panel-body">
<div class="checkbox">
${h.checkbox('destroy',True)}
<label for="destroy">${_('Destroy old data')}</label>
</div>
<span class="help-block">${_('In case a repository or a group was deleted from the filesystem and it still exists in the database, check this option to remove obsolete data from the database.')}</span>
<div class="checkbox">
${h.checkbox('invalidate',True)}
<label for="invalidate"> ${_('Invalidate cache for all repositories')}</label>
</div>
<span class="help-block">${_('Each cache data for repositories will be cleaned with this option selected. Use this to reload data and clear cache keys.')}</span>
<div class="buttons">
${h.submit('rescan',_('Rescan Filesystem'),class_="btn")}
</div>
</div>
</div>
${h.end_form()}