diff options
| author | Regis Boudinot <boudinot.regis@yahoo.com> | 2017-05-19 17:48:10 +0000 |
|---|---|---|
| committer | Regis Boudinot <boudinot.regis@yahoo.com> | 2017-05-19 17:48:10 +0000 |
| commit | 8915ab7ed7306abd9703bbe05f144f5cd3f38281 (patch) | |
| tree | b99c56a84a93dec39ae2360676c35cf77a06ec35 | |
| parent | a1348c166656d59412239092fd0df8ba1efa8fb8 (diff) | |
| parent | 9941930af6171b20cf64e88c533dc8c7ed9171cc (diff) | |
| download | gitlab-ce-8915ab7ed7306abd9703bbe05f144f5cd3f38281.tar.gz | |
Merge branch '9-2-stable-fix-conflicts-for-mr-11463' into '9-2-stable'
Fix 9.2 conflicts for "Refactored the anchor tag to remove the trailing space in the target branch"
See merge request !11526
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js | 51 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-trailing-space-mr-widget.yml | 4 |
2 files changed, 29 insertions, 26 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 fb648d66a30..272dae25455 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 @@ -61,32 +61,31 @@ export default { </span> </div> <div class="normal"> - <b>Request to merge</b> - <span - class="label-branch" - :class="{'label-truncated has-tooltip': isBranchTitleLong(mr.sourceBranch)}" - :title="isBranchTitleLong(mr.sourceBranch) ? mr.sourceBranch : ''" - data-placement="bottom" - v-html="mr.sourceBranchLink"></span> - <button - class="btn btn-transparent btn-clipboard has-tooltip" - data-title="Copy branch name to clipboard" - :data-clipboard-text="mr.sourceBranch"> - <i - aria-hidden="true" - class="fa fa-clipboard"></i> - </button> - <b>into</b> - <span - class="label-branch" - :class="{'label-truncated has-tooltip': isBranchTitleLong(mr.targetBranch)}" - :title="isBranchTitleLong(mr.targetBranch) ? mr.targetBranch : ''" - data-placement="bottom"> - <a - :href="mr.targetBranchPath"> - {{mr.targetBranch}} - </a> - </span> + <strong> + Request to merge + <span + class="label-branch" + :class="{'label-truncated has-tooltip': isBranchTitleLong(mr.sourceBranch)}" + :title="isBranchTitleLong(mr.sourceBranch) ? mr.sourceBranch : ''" + data-placement="bottom" + v-html="mr.sourceBranchLink"></span> + <button + class="btn btn-transparent btn-clipboard has-tooltip" + data-title="Copy branch name to clipboard" + :data-clipboard-text="branchNameClipboardData"> + <i + aria-hidden="true" + class="fa fa-clipboard"></i> + </button> + into + <span + class="label-branch" + :class="{'label-truncated has-tooltip': isBranchTitleLong(mr.targetBranch)}" + :title="isBranchTitleLong(mr.targetBranch) ? mr.targetBranch : ''" + data-placement="bottom"> + <a :href="mr.targetBranchPath">{{mr.targetBranch}}</a> + </span> + </strong> <span v-if="shouldShowCommitsBehindText" class="diverged-commits-count"> diff --git a/changelogs/unreleased/fix-trailing-space-mr-widget.yml b/changelogs/unreleased/fix-trailing-space-mr-widget.yml new file mode 100644 index 00000000000..86be36f3cf4 --- /dev/null +++ b/changelogs/unreleased/fix-trailing-space-mr-widget.yml @@ -0,0 +1,4 @@ +--- +title: Refactored the anchor tag to remove the trailing space in the target branch +merge_request: +author: |