BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit d7b5f478 by Regis
Options

fix contains merge conflicts button

parent b9e9b11b
Showing with 1 addition and 2 deletions
app/views/projects/merge_requests/widget/open/_conflicts.html.haml
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
%ul %ul
%li %li
%span %span
%p
To merge this request, resolve these conflicts To merge this request, resolve these conflicts
- if can_resolve && !can_resolve_in_ui - if can_resolve && !can_resolve_in_ui
locally locally
...@@ -21,7 +20,7 @@ ...@@ -21,7 +20,7 @@
merge it locally. merge it locally.
- if (can_resolve && can_resolve_in_ui) || can_merge - if (can_resolve && can_resolve_in_ui) || can_merge
.btn-group .merged-buttons.clearfix
- if can_resolve && can_resolve_in_ui - if can_resolve && can_resolve_in_ui
= link_to "Resolve conflicts", conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "btn" = link_to "Resolve conflicts", conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "btn"
- if can_merge - if can_merge
......
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