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

r2504:dc37941f default
r2784:e8c62649 default
Show More
templates.html
129 lines | 4.0 KiB | text/html | HtmlLexer
default-reviewers: introduce new voting rule logic that allows...
r2484 <%text>
<div style="display: none">
<script id="ejs_gravatarWithUser" type="text/template" class="ejsTemplate">
<%
if (size > 16) {
var gravatar_class = 'gravatar gravatar-large';
} else {
var gravatar_class = 'gravatar';
}
%>
<%
if (show_disabled) {
var user_cls = 'user user-disabled';
} else {
var user_cls = 'user';
}
%>
<div class="rc-user">
<img class="<%= gravatar_class %>" src="<%- gravatar_url -%>" height="<%= size %>" width="<%= size %>">
<span class="<%= user_cls %>"> <%- user_link -%> </span>
</div>
</script>
reviewers: colorify the groups
r2485 <script>
var CG = new ColorGenerator();
</script>
default-reviewers: introduce new voting rule logic that allows...
r2484
<script id="ejs_reviewMemberEntry" type="text/template" class="ejsTemplate">
<li id="reviewer_<%= member.user_id %>" class="reviewer_entry">
reviewers: colorify the groups
r2485 <%
default-reviewers: fixed edit mode when creating new entries.
r2504 if (create) {
var edit_visibility = 'visible';
} else {
var edit_visibility = 'hidden';
}
reviewers: colorify the groups
r2485
if (member.user_group && member.user_group.vote_rule) {
var groupStyle = 'border-left: 1px solid '+CG.asRGB(CG.getColor(member.user_group.vote_rule));
} else {
var groupStyle = 'border-left: 1px solid white';
}
%>
<div class="reviewers_member" style="<%= groupStyle%>" >
default-reviewers: introduce new voting rule logic that allows...
r2484 <div class="reviewer_status tooltip" title="<%= review_status_label %>">
<div class="flag_status <%= review_status %> pull-left reviewer_member_status"></div>
</div>
<div id="reviewer_<%= member.user_id %>_name" class="reviewer_name">
<% if (mandatory) { %>
<div class="reviewer_member_mandatory tooltip" title="Mandatory reviewer">
<i class="icon-lock"></i>
</div>
<% } %>
<%-
renderTemplate('gravatarWithUser', {
'size': 16,
'show_disabled': false,
'user_link': member.user_link,
'gravatar_url': member.gravatar_link
})
%>
</div>
<input type="hidden" name="__start__" value="reviewer:mapping">
reviewers: colorify the groups
r2485
<%if (member.user_group && member.user_group.vote_rule) {%>
<div class="reviewer_reason">
<%if (member.user_group.vote_rule == -1) {%>
- group votes required: ALL
<%} else {%>
- group votes required: <%= member.user_group.vote_rule %>
<%}%>
</div>
<%}%>
default-reviewers: introduce new voting rule logic that allows...
r2484 <input type="hidden" name="__start__" value="reasons:sequence">
<% for (var i = 0; i < reasons.length; i++) { %>
<% var reason = reasons[i] %>
<div class="reviewer_reason">- <%= reason %></div>
<input type="hidden" name="reason" value="<%= reason %>">
<% } %>
<input type="hidden" name="__end__" value="reasons:sequence">
<input type="hidden" name="__start__" value="rules:sequence">
<% for (var i = 0; i < member.rules.length; i++) { %>
<% var rule = member.rules[i] %>
<input type="hidden" name="rule_id" value="<%= rule %>">
<% } %>
<input type="hidden" name="__end__" value="rules:sequence">
<input id="reviewer_<%= member.user_id %>_input" type="hidden" value="<%= member.user_id %>" name="user_id" />
<input type="hidden" name="mandatory" value="<%= mandatory %>"/>
<input type="hidden" name="__end__" value="reviewer:mapping">
<% if (mandatory) { %>
default-reviewers: fixed edit mode when creating new entries.
r2504 <div class="reviewer_member_mandatory_remove" style="visibility: <%= edit_visibility %>;">
default-reviewers: introduce new voting rule logic that allows...
r2484 <i class="icon-remove-sign"></i>
</div>
<% } else { %>
<% if (allowed_to_update) { %>
default-reviewers: fixed edit mode when creating new entries.
r2504 <div class="reviewer_member_remove action_button" onclick="reviewersController.removeReviewMember(<%= member.user_id %>, true)" style="visibility: <%= edit_visibility %>;">
default-reviewers: introduce new voting rule logic that allows...
r2484 <i class="icon-remove-sign" ></i>
</div>
<% } %>
<% } %>
</div>
</li>
</script>
</div>
<script>
// registers the templates into global cache
registerTemplates();
</script>
reviewers: colorify the groups
r2485 </%text>