diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -3013,6 +3013,7 @@ div.form div.fields div.buttons input height: 12px; margin-bottom: 4px; margin-left: 5px; + white-space: pre; } #clone_url{ diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -57,12 +57,17 @@
${_('merge')}merge
- %endif + %endif + + %if c.changeset.parents: %for p_cs in reversed(c.changeset.parents):
${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.short_id, h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.short_id),title=p_cs.message)}
%endfor + %else: +
${_('No parents')}
+ %endif ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.short_id))}