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

r2576:ccf58279 default
r2784:e8c62649 default
Show More
new.mako
68 lines | 2.8 KiB | application/x-mako | MakoHtmlLexer
## -*- coding: utf-8 -*-
<%inherit file="base.mako"/>
<%namespace name="widgets" file="/widgets.mako"/>
<%def name="breadcrumbs_links()">
%if c.repo:
${h.link_to('Settings',h.route_path('edit_repo', repo_name=c.repo.repo_name))}
&raquo;
${h.link_to(_('Integrations'),request.route_url(route_name='repo_integrations_home', repo_name=c.repo.repo_name))}
%elif c.repo_group:
${h.link_to(_('Admin'),h.route_path('admin_home'))}
&raquo;
${h.link_to(_('Repository Groups'),h.route_path('repo_groups'))}
&raquo;
${h.link_to(c.repo_group.group_name,h.route_path('edit_repo_group', repo_group_name=c.repo_group.group_name))}
&raquo;
${h.link_to(_('Integrations'),request.route_url(route_name='repo_group_integrations_home', repo_group_name=c.repo_group.group_name))}
%else:
${h.link_to(_('Admin'),h.route_path('admin_home'))}
&raquo;
${h.link_to(_('Settings'),h.route_path('admin_settings'))}
&raquo;
${h.link_to(_('Integrations'),request.route_url(route_name='global_integrations_home'))}
%endif
&raquo;
${_('Create new integration')}
</%def>
<%widgets:panel class_='integrations'>
<%def name="title()">
%if c.repo:
${_('Create New Integration for repository: {repo_name}').format(repo_name=c.repo.repo_name)}
%elif c.repo_group:
${_('Create New Integration for repository group: {repo_group_name}').format(repo_group_name=c.repo_group.group_name)}
%else:
${_('Create New Global Integration')}
%endif
</%def>
%for integration, IntegrationObject in c.available_integrations.items():
<%
if c.repo:
create_url = request.route_path('repo_integrations_create',
repo_name=c.repo.repo_name,
integration=integration)
elif c.repo_group:
create_url = request.route_path('repo_group_integrations_create',
repo_group_name=c.repo_group.group_name,
integration=integration)
else:
create_url = request.route_path('global_integrations_create',
integration=integration)
if IntegrationObject.is_dummy:
create_url = request.current_route_path()
%>
<a href="${create_url}" class="integration-box ${'dummy-integration' if IntegrationObject.is_dummy else ''}">
<%widgets:panel>
<h2>
<div class="integration-icon">
${IntegrationObject.icon()|n}
</div>
${IntegrationObject.display_name}
</h2>
${IntegrationObject.description or _('No description available')}
</%widgets:panel>
</a>
%endfor
<div style="clear:both"></div>
</%widgets:panel>