##// END OF EJS Templates
vcs: Return merge reference in merge response....
vcs: Return merge reference in merge response. Previously we returned only the merge commit id. Now we set a bookmark(hg) or branch reference(git) to point to the merge commit. By returning a merge reference we have both informations available (id and name)

File last commit:

r1:854a839a default
r1051:668a5e47 default
Show More
settings_supervisor_tail.html
4 lines | 146 B | text/html | HtmlLexer
/ rhodecode / templates / admin / settings / settings_supervisor_tail.html
<h4>${_('Last %(size)s bytes of process logs, use ?offset=[num] GET param to set custom size') % {'size': c.log_size}}</h4>
<pre>
${c.log}
</pre>