##// 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
password_reset_confirmation.mako
29 lines | 711 B | application/x-mako | MakoHtmlLexer
/ rhodecode / templates / email_templates / password_reset_confirmation.mako
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 Your new RhodeCode password
</%def>
## plain text version of the email. Empty by default
<%def name="body_plaintext()" filter="n,trim">
Hi ${user.username},
password-reset: strengthten security on password reset logic....
r1471 Below is your new access password for RhodeCode.
notifications: restyling email templates #4087
r508
*If you didn't do this, please contact your RhodeCode administrator.*
project: added all source files and assets
r1
password-reset: strengthten security on password reset logic....
r1471 password: ${new_password}
project: added all source files and assets
r1
notifications: restyling email templates #4087
r508 ${self.plaintext_footer()}
project: added all source files and assets
r1 </%def>
## BODY GOES BELOW
notifications: restyling email templates #4087
r508 <p>
Hello ${user.username},
</p><p>
Below is your new access password for RhodeCode.
<br/>
<strong>If you didn't request a new password, please contact your RhodeCode administrator.</strong>
</p>
password-reset: strengthten security on password reset logic....
r1471 <p>password: <pre>${new_password}</pre>