diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-03-03 17:15:21 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-03-03 17:15:21 -0700 |
| commit | d7b5f47884945ef8c35d0ca793c25ed4e1f81fa1 (patch) | |
| tree | de7c35b9a5b664cc172c43f385ec745a08ae96ff /app | |
| parent | b9e9b11b7d7a77eff6be4171e3390033881bb80e (diff) | |
| download | gitlab-ce-d7b5f47884945ef8c35d0ca793c25ed4e1f81fa1.tar.gz | |
fix contains merge conflicts button
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 3 |
1 files changed, 1 insertions, 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 |