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

r1815:7cb6e1ce default
r2784:e8c62649 default
Show More
user_registration.mako
26 lines | 1.6 KiB | 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">
notifications: restyling email templates #4087
r508 RhodeCode new user registration: ${user.username}
project: added all source files and assets
r1 </%def>
<%def name="body_plaintext()" filter="n,trim">
A new user `${user.username}` has registered on ${h.format_date(date)}
- Username: ${user.username}
security: use new safe escaped user attributes across the application....
r1815 - Full Name: ${user.first_name} ${user.last_name}
project: added all source files and assets
r1 - Email: ${user.email}
emails: fixed qualified url in user registration email.
r1777 - Profile link: ${h.route_url('user_profile', username=user.username)}
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 <table style="text-align:left;vertical-align:middle;">
emails: fix url for user registration to be a fully qualified path.
r1645 <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${h.route_url('user_profile', username=user.username)}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('New user %(user)s has registered on %(date)s') % {'user': user.username, 'date': h.format_date(date)}}</a></h4></td></tr>
notifications: restyling email templates #4087
r508 <tr><td style="padding-right:20px;padding-top:20px;">${_('Username')}</td><td style="line-height:1;padding-top:20px;"><img style="margin-bottom:-5px;text-align:left;border:1px solid #dbd9da" src="${h.gravatar_url(user.email, 16)}" height="16" width="16">&nbsp;${user.username}</td></tr>
security: use new safe escaped user attributes across the application....
r1815 <tr><td style="padding-right:20px;">${_('Full Name')}</td><td>${user.first_name} ${user.last_name}</td></tr>
notifications: restyling email templates #4087
r508 <tr><td style="padding-right:20px;">${_('Email')}</td><td>${user.email}</td></tr>
emails: fix url for user registration to be a fully qualified path.
r1645 <tr><td style="padding-right:20px;">${_('Profile')}</td><td><a href="${h.route_url('user_profile', username=user.username)}">${h.route_url('user_profile', username=user.username)}</a></td></tr>
notifications: restyling email templates #4087
r508 </table>