BigW Consortium Gitlab

Commit f5c924c7 by Fatih Acet Committed by Jose Ivan Vargas

Merge branch 'fix-trailing-space-mr-widget' into 'master'

Refactored the anchor tag to remove the trailing space in the target branch Closes #32445 See merge request !11463 Conflicts: app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
parent d0b92f92
......@@ -61,6 +61,7 @@ export default {
</span>
</div>
<div class="normal">
<<<<<<< HEAD
<b>Request to merge</b>
<span
class="label-branch"
......@@ -87,6 +88,33 @@ export default {
{{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>
>>>>>>> 4de3d0b... Merge branch 'fix-trailing-space-mr-widget' into 'master'
<span
v-if="shouldShowCommitsBehindText"
class="diverged-commits-count">
......
---
title: Refactored the anchor tag to remove the trailing space in the target branch
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