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

r2584:b8f98b31 default
r2784:e8c62649 default
Show More
codemirror.pt
35 lines | 1.6 KiB | text/plain | TextLexer
<div tal:define="rows rows|field.widget.rows;
cols cols|field.widget.cols;
css_class css_class|field.widget.css_class;
oid oid|field.oid;
name name|field.name;
style style|field.widget.style;
help_block help_block|field.widget.help_block|'';
help_block_collapsable_name help_block_collapsable_name|field.widget.help_block_collapsable_name|'';
help_block_collapsable help_block_collapsable|field.widget.help_block_collapsable|'';
codemirror_options codemirror_options|field.widget.codemirror_options|{};
codemirror_mode codemirror_mode|field.widget.codemirror_mode|''
">
<textarea tal:attributes="rows rows;
cols cols;
class string: form-control ${css_class or ''};
style style"
id="${oid}"
name="${name}">${cstruct}</textarea>
<p tal:condition="help_block" class="help-block">${help_block}</p>
<span tal:condition="help_block_collapsable" class="help-block pre-formatting"><a href="#showVars" onclick="$('#help_block_${oid}').toggle(); return false">${help_block_collapsable_name}</a>
<p id="help_block_${oid}" style="display: none">${help_block_collapsable}</p>
</span>
<script type="text/javascript">
deform.addCallback(
'${oid}',
function(oid) {
var myCodeMirror = initCodeMirror(oid, '', false, ${codemirror_options});
setCodeMirrorMode(myCodeMirror, '${codemirror_mode}');
}
);
</script>
</div>