summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/merge_requests/conflicts/_file_actions.html.haml')
-rw-r--r--app/views/projects/merge_requests/conflicts/_file_actions.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
index 124dfde7b22..05af57acf03 100644
--- a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
@@ -1,5 +1,5 @@
.file-actions
- .btn-group
+ .btn-group{"v-if" => "file.type === 'text'"}
%button.btn{ ":class" => "{ 'active': file.resolveMode == 'interactive' }",
'@click' => "onClickResolveModeButton(file, 'interactive')",
type: 'button' }