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

r2610:0b5d6b7f default
r2784:e8c62649 default
Show More
user_profile.mako
57 lines | 1.8 KiB | application/x-mako | MakoHtmlLexer
templating: use .mako as extensions for template files.
r1282 <%namespace name="base" file="/base/base.mako"/>
<div class="panel panel-default user-profile">
<div class="panel-heading">
ui/user profiles: add better explanation of what we are viewing.
r2610 <h3 class="panel-title">${_('User Profile')}</h3>
templating: use .mako as extensions for template files.
r1282 %if h.HasPermissionAny('hg.admin')():
users: ported controllers from pylons into pyramid views.
r2114 ${h.link_to(_('Edit'), h.route_path('user_edit', user_id=c.user.user_id), class_='panel-edit')}
templating: use .mako as extensions for template files.
r1282 %endif
</div>
<div class="panel-body user-profile-content">
<div class="fieldset">
<div class="left-label">
${_('Photo')}:
</div>
<div class="right-content">
%if c.visual.use_gravatar:
${base.gravatar(c.user.email, 100)}
%else:
${base.gravatar(c.user.email, 20)}
${_('Avatars are disabled')}
%endif
</div>
</div>
<div class="fieldset">
<div class="left-label">
${_('Username')}:
</div>
<div class="right-content">
${c.user.username}
</div>
</div>
<div class="fieldset">
<div class="left-label">
${_('First name')}:
</div>
<div class="right-content">
security: use new safe escaped user attributes across the application....
r1815 ${c.user.first_name}
templating: use .mako as extensions for template files.
r1282 </div>
</div>
<div class="fieldset">
<div class="left-label">
${_('Last name')}:
</div>
<div class="right-content">
security: use new safe escaped user attributes across the application....
r1815 ${c.user.last_name}
templating: use .mako as extensions for template files.
r1282 </div>
</div>
<div class="fieldset">
<div class="left-label">
${_('Email')}:
</div>
<div class="right-content">
${c.user.email or _('Missing email, please update your user email address.')}
</div>
</div>
</div>
</div>