kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

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

See merge request !11315
This commit is contained in:
Sean McGivern 2017-05-12 17:26:20 +00:00
commit 5c7f63f590
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
View file

@ -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 {
<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>

4
changelogs/unreleased/dm-copy-mr-source-branch-as-gfm.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Paste a copied MR source branch name as code when pasted into a GFM form
merge_request:
author: