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

r764:52c2b99a default
r1051:668a5e47 default
Show More
plugin_init.html
16 lines | 561 B | text/html | HtmlLexer
<script>
var CHANNELSTREAM_URLS = ${config['url_gen'](request)|n};
%if request.registry.rhodecode_plugins['channelstream']['enabled'] and c.rhodecode_user.username != h.DEFAULT_USER:
var CHANNELSTREAM_SETTINGS = {
'enabled': true,
'ws_location': '${request.registry.settings.get('channelstream.ws_url')}',
'webapp_location': '${h.url('/', qualified=True)[:-1]}'
};
%else:
var CHANNELSTREAM_SETTINGS = {
'enabled':false,
'ws_location': '',
'webapp_location': ''};
%endif
</script>