##// 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.mako
33 lines | 1006 B | application/x-mako | MakoHtmlLexer
## -*- coding: utf-8 -*-
<%inherit file="base.mako"/>
<%def name="subject()" filter="n,trim,whitespace_filter">
RhodeCode Password reset
</%def>
## plain text version of the email. Empty by default
<%def name="body_plaintext()" filter="n,trim">
Hi ${user.username},
There was a request to reset your password using the email address ${email} on ${h.format_date(date)}
*If you didn't do this, please contact your RhodeCode administrator.*
You can continue, and generate new password by clicking following URL:
${password_reset_url}
This link will be active for 10 minutes.
${self.plaintext_footer()}
</%def>
## BODY GOES BELOW
<p>
Hello ${user.username},
</p><p>
There was a request to reset your password using the email address ${email} on ${h.format_date(date)}
<br/>
<strong>If you did not request a password reset, please contact your RhodeCode administrator.</strong>
</p><p>
<a href="${password_reset_url}">${_('Generate new password here')}.</a>
This link will be active for 10 minutes.
</p>