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

r883:ae526446 default
r1051:668a5e47 default
Show More
shared-components.html
9 lines | 626 B | text/html | HtmlLexer
<!-- required for stamped out templates that might use common elements -->
<link rel="import" href="rhodecode-legacy-js/rhodecode-legacy-js.html">
<link rel="import" href="../../../../../bower_components/iron-ajax/iron-ajax.html">
<link rel="import" href="shared-styles.html">
<link rel="import" href="channelstream-connection/channelstream-connection.html">
<link rel="import" href="rhodecode-toast/rhodecode-toast.html">
<link rel="import" href="rhodecode-toggle/rhodecode-toggle.html">
<link rel="import" href="rhodecode-unsafe-html/rhodecode-unsafe-html.html">
<link rel="import" href="rhodecode-app/rhodecode-app.html">