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

r1728:49fb0cec default
r2784:e8c62649 default
Show More
main.mako
20 lines | 655 B | application/x-mako | MakoHtmlLexer
project: added all source files and assets
r1 ## -*- coding: utf-8 -*-
<%inherit file="base.mako"/>
emails: fixed newlines in email templates that can break email sending code.
r1728 <%def name="subject()" filter="n,trim,whitespace_filter">
project: added all source files and assets
r1 </%def>
## plain text version of the email. Empty by default
<%def name="body_plaintext()" filter="n,trim">
${body}
notifications: adding footer to email template main.mako
r510
${self.plaintext_footer()}
project: added all source files and assets
r1 </%def>
## BODY GOES BELOW
notifications: restyling email templates #4087
r508 <table style="text-align:left;vertical-align:top;">
<tr><td style="padding-right:20px;padding-top:15px;white-space:pre-wrap">${body}</td></tr>
html: fixed found syntax problems
r1283 </table>
notifications: adding footer to email template main.mako
r510 <p><a style="margin-top:15px;margin-left:1%;font-family:sans-serif;font-weight:100;font-size:11px;display:block;color:#666666;text-decoration:none;" href="${instance_url}">
${self.plaintext_footer()}
</a></p>