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

r2748:2362c2ca stable
r2784:e8c62649 default
Show More
user_edit_ssh_keys_generate.mako
51 lines | 1.7 KiB | application/x-mako | MakoHtmlLexer
/ rhodecode / templates / admin / users / user_edit_ssh_keys_generate.mako
users: added SSH key management for user admin pages
r1993 <div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">${_('New SSH Key generated')}</h3>
</div>
<div class="panel-body">
<p>
${_('Below is a 2048 bit generated SSH RSA key. You can use it to access RhodeCode via the SSH wrapper.')}
</p>
<h4>${_('Private key')}</h4>
<pre>
ssh(sec): fix newline problem on key saving that would allow bypassing command sandbox.
r2748 # Save the below content as
# Windows: /Users/{username}/.ssh/id_rsa_rhodecode_access_priv.key
# macOS: /Users/{yourname}/.ssh/id_rsa_rhodecode_access_priv.key
# Linux: /home/{username}/.ssh/id_rsa_rhodecode_access_priv.key
ssh: update docs based on feedback.
r2478
# Change permissions to 0600 to make it secure, and usable.
ssh(sec): fix newline problem on key saving that would allow bypassing command sandbox.
r2748 e.g chmod 0600 /home/{username}/.ssh/id_rsa_rhodecode_access_priv.key
users: added SSH key management for user admin pages
r1993 </pre>
<div>
<textarea style="height: 300px">${c.private}</textarea>
</div>
<br/>
<h4>${_('Public key')}</h4>
<pre>
ssh(sec): fix newline problem on key saving that would allow bypassing command sandbox.
r2748 # Save the below content as
# Windows: /Users/{username}/.ssh/id_rsa_rhodecode_access_pub.key
# macOS: /Users/{yourname}/.ssh/id_rsa_rhodecode_access_pub.key
# Linux: /home/{username}/.ssh/id_rsa_rhodecode_access_pub.key
users: added SSH key management for user admin pages
r1993 </pre>
<input type="text" value="${c.public}" class="large text" size="100"/>
<p>
ssh: added ssh key management into my account.
r2044 % if hasattr(c, 'target_form_url'):
ssh: add few explanation text about two step addition of generated keys....
r2477 <a href="${c.target_form_url}">${_('Use this generated key')}.</a>
ssh: added ssh key management into my account.
r2044 % else:
ssh: add few explanation text about two step addition of generated keys....
r2477 <a href="${h.route_path('edit_user_ssh_keys', user_id=c.user.user_id, _query=dict(default_key=c.public))}">${_('Use this generated key')}.</a>
ssh: added ssh key management into my account.
r2044 % endif
ssh: add few explanation text about two step addition of generated keys....
r2477 ${_('Confirmation required on the next screen')}.
users: added SSH key management for user admin pages
r1993 </p>
</div>
</div>
<script>
$(document).ready(function(){
});
</script>