Commit 5c7f63f5 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'dm-copy-mr-source-branch-as-gfm' into 'master'

Paste a copied MR source branch name as code when pasted into a GFM form

See merge request !11315
parents fa3a1fad 7942d863
...@@ -12,6 +12,15 @@ export default { ...@@ -12,6 +12,15 @@ export default {
commitsText() { commitsText() {
return gl.text.pluralize('commit', this.mr.divergedCommitsCount); return gl.text.pluralize('commit', this.mr.divergedCommitsCount);
}, },
branchNameClipboardData() {
// This supports code in app/assets/javascripts/copy_to_clipboard.js that
// works around ClipboardJS limitations to allow the context-specific
// copy/pasting of plain text or GFM.
return JSON.stringify({
text: this.mr.sourceBranch,
gfm: `\`${this.mr.sourceBranch}\``,
});
},
}, },
methods: { methods: {
isBranchTitleLong(branchTitle) { isBranchTitleLong(branchTitle) {
...@@ -72,7 +81,7 @@ export default { ...@@ -72,7 +81,7 @@ export default {
<button <button
class="btn btn-transparent btn-clipboard has-tooltip" class="btn btn-transparent btn-clipboard has-tooltip"
data-title="Copy branch name to clipboard" data-title="Copy branch name to clipboard"
:data-clipboard-text="mr.sourceBranch"> :data-clipboard-text="branchNameClipboardData">
<i <i
aria-hidden="true" aria-hidden="true"
class="fa fa-clipboard"></i> class="fa fa-clipboard"></i>
......
---
title: Paste a copied MR source branch name as code when pasted into a GFM form
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment