From d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 20 Oct 2021 08:43:02 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-4-stable-ee

---
 .../merge_conflicts/components/inline_conflict_lines.vue            | 6 +++++-
 .../merge_conflicts/components/parallel_conflict_lines.vue          | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts/merge_conflicts/components')

diff --git a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue
index a856d38c089..87eeb272659 100644
--- a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue
+++ b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue
@@ -35,7 +35,11 @@ export default {
         <td :class="lineCssClass(line)" class="diff-line-num header"></td>
         <td :class="lineCssClass(line)" class="line_content header">
           <strong>{{ line.richText }}</strong>
-          <button type="button" @click="handleSelected({ file, line })">
+          <button
+            type="button"
+            class="gl-border-1 gl-border-solid"
+            @click="handleSelected({ file, line })"
+          >
             {{ line.buttonTitle }}
           </button>
         </td>
diff --git a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue
index 2c89b614c87..2c59e7bfa2f 100644
--- a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue
+++ b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue
@@ -35,7 +35,11 @@ export default {
           <td class="diff-line-num header" :class="lineCssClass(line)"></td>
           <td class="line_content header" :class="lineCssClass(line)">
             <strong>{{ line.richText }}</strong>
-            <button type="button" @click="handleSelected({ file, line })">
+            <button
+              type="button"
+              class="gl-border-1 gl-border-solid"
+              @click="handleSelected({ file, line })"
+            >
               {{ line.buttonTitle }}
             </button>
           </td>
-- 
cgit v1.2.3