From d7b5f47884945ef8c35d0ca793c25ed4e1f81fa1 Mon Sep 17 00:00:00 2001 From: Regis Date: Fri, 3 Mar 2017 17:15:21 -0700 Subject: fix contains merge conflicts button --- app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml index 06066270753..621ee313026 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -11,7 +11,6 @@ %ul %li %span - %p To merge this request, resolve these conflicts - if can_resolve && !can_resolve_in_ui locally @@ -21,7 +20,7 @@ merge it locally. - if (can_resolve && can_resolve_in_ui) || can_merge - .btn-group + .merged-buttons.clearfix - if can_resolve && can_resolve_in_ui = link_to "Resolve conflicts", conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "btn" - if can_merge -- cgit v1.2.1