diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-11 17:05:02 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-11 17:05:08 -0500 |
commit | 5efb0a952489f9f33346408b7b8e240788bff933 (patch) | |
tree | 53f87389414e8eb42e94b3e55332295da7185e46 | |
parent | e65d9326fcaecafbbfdc423f1c9e51f584d03463 (diff) | |
download | gitlab-ce-5efb0a952489f9f33346408b7b8e240788bff933.tar.gz |
Paste a copied MR source branch name as code when pasted into a GFM form
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js | 10 | ||||
-rw-r--r-- | changelogs/unreleased/dm-copy-mr-source-branch-as-gfm.yml | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js index 4a1fd881169..2d39d091878 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js @@ -12,6 +12,14 @@ export default { commitsText() { 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: { isBranchTitleLong(branchTitle) { @@ -71,7 +79,7 @@ export default { <button class="btn btn-transparent btn-clipboard has-tooltip" data-title="Copy branch name to clipboard" - :data-clipboard-text="mr.sourceBranch"> + :data-clipboard-text="branchNameClipboardData"> <i aria-hidden="true" class="fa fa-clipboard"></i> diff --git a/changelogs/unreleased/dm-copy-mr-source-branch-as-gfm.yml b/changelogs/unreleased/dm-copy-mr-source-branch-as-gfm.yml new file mode 100644 index 00000000000..708c82604ad --- /dev/null +++ b/changelogs/unreleased/dm-copy-mr-source-branch-as-gfm.yml @@ -0,0 +1,4 @@ +--- +title: Paste a copied MR source branch name as code when pasted into a GFM form +merge_request: +author: |