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

r2399:731e2343 default
r2784:e8c62649 default
Show More
settings.mako
52 lines | 1.1 KiB | application/x-mako | MakoHtmlLexer
## -*- coding: utf-8 -*-
<%inherit file="/base/base.mako"/>
<%def name="title()">
${_('Settings administration')}
%if c.rhodecode_name:
&middot; ${h.branding(c.rhodecode_name)}
%endif
</%def>
<%def name="breadcrumbs_links()">
${h.link_to(_('Admin'),h.route_path('admin_home'))}
&raquo;
${_('Settings')}
</%def>
<%def name="menu_bar_nav()">
${self.menu_items(active='admin')}
</%def>
<%def name="side_bar_nav()">
% for navitem in c.navlist:
<li class="${'active' if c.active in navitem.active_list else ''}">
<a href="${navitem.url}">${navitem.name}</a>
</li>
% endfor
</%def>
<%def name="main_content()">
<%include file="/admin/settings/settings_${c.active}.mako"/>
</%def>
<%def name="main()">
<div class="box">
<div class="title">
${self.breadcrumbs()}
</div>
##main
<div class='sidebar-col-wrapper'>
<div class="sidebar">
<ul class="nav nav-pills nav-stacked">
${self.side_bar_nav()}
</ul>
</div>
<div class="main-content-full-width">
${self.main_content()}
</div>
</div>
</div>
</%def>