diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-05-19 00:52:59 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-05-19 09:25:31 -0500 |
| commit | 9941930af6171b20cf64e88c533dc8c7ed9171cc (patch) | |
| tree | 98d3f2f12acf2f5065e04c71925ccb30e78471f5 | |
| parent | f5c924c7e80bd99e75c46f4ce871274867d61210 (diff) | |
| download | gitlab-ce-9-2-stable-fix-conflicts-for-mr-11463.tar.gz | |
Resolve mr_widget_header conflict9-2-stable-fix-conflicts-for-mr-11463
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js | 29 |
1 files changed, 0 insertions, 29 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 1455641cfff..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,34 +61,6 @@ export default { </span> </div> <div class="normal"> -<<<<<<< HEAD - <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 @@ -114,7 +86,6 @@ export default { <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"> |