From 125e1151f85fb1d5ace3213e86a85c3afe99808b Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Fri, 12 May 2017 17:26:20 +0000 Subject: 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 --- .../vue_merge_request_widget/components/mr_widget_header.js | 9 +++++++++ changelogs/unreleased/dm-copy-mr-source-branch-as-gfm.yml | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 changelogs/unreleased/dm-copy-mr-source-branch-as-gfm.yml 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 272dae25455..cfd34970f11 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,15 @@ 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) { 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: -- cgit v1.2.1