BigW Consortium Gitlab

Commit 8915ab7e by Regis Boudinot

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
parents a1348c16 9941930a
...@@ -61,32 +61,31 @@ export default { ...@@ -61,32 +61,31 @@ export default {
</span> </span>
</div> </div>
<div class="normal"> <div class="normal">
<b>Request to merge</b> <strong>
<span Request to merge
class="label-branch" <span
:class="{'label-truncated has-tooltip': isBranchTitleLong(mr.sourceBranch)}" class="label-branch"
:title="isBranchTitleLong(mr.sourceBranch) ? mr.sourceBranch : ''" :class="{'label-truncated has-tooltip': isBranchTitleLong(mr.sourceBranch)}"
data-placement="bottom" :title="isBranchTitleLong(mr.sourceBranch) ? mr.sourceBranch : ''"
v-html="mr.sourceBranchLink"></span> data-placement="bottom"
<button v-html="mr.sourceBranchLink"></span>
class="btn btn-transparent btn-clipboard has-tooltip" <button
data-title="Copy branch name to clipboard" class="btn btn-transparent btn-clipboard has-tooltip"
:data-clipboard-text="mr.sourceBranch"> data-title="Copy branch name to clipboard"
<i :data-clipboard-text="branchNameClipboardData">
aria-hidden="true" <i
class="fa fa-clipboard"></i> aria-hidden="true"
</button> class="fa fa-clipboard"></i>
<b>into</b> </button>
<span into
class="label-branch" <span
:class="{'label-truncated has-tooltip': isBranchTitleLong(mr.targetBranch)}" class="label-branch"
:title="isBranchTitleLong(mr.targetBranch) ? mr.targetBranch : ''" :class="{'label-truncated has-tooltip': isBranchTitleLong(mr.targetBranch)}"
data-placement="bottom"> :title="isBranchTitleLong(mr.targetBranch) ? mr.targetBranch : ''"
<a data-placement="bottom">
:href="mr.targetBranchPath"> <a :href="mr.targetBranchPath">{{mr.targetBranch}}</a>
{{mr.targetBranch}} </span>
</a> </strong>
</span>
<span <span
v-if="shouldShowCommitsBehindText" v-if="shouldShowCommitsBehindText"
class="diverged-commits-count"> 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