diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-03-03 15:49:03 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-03-03 15:49:03 -0700 |
| commit | 578b2b2fc6e1dd4f1cef02ce96ef71efd0d0e365 (patch) | |
| tree | 8ac668668c6e70c3934fe96d79d223ae1a6ed05d /app/views/projects/merge_requests/widget/open | |
| parent | 5d2c70b117600e3dd37e40bb206195e694a6546c (diff) | |
| download | gitlab-ce-578b2b2fc6e1dd4f1cef02ce96ef71efd0d0e365.tar.gz | |
add grey lines - adequate spacing for action buttons
Diffstat (limited to 'app/views/projects/merge_requests/widget/open')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 25 |
1 files changed, 15 insertions, 10 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 c98b2c42597..06066270753 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -3,17 +3,22 @@ - can_merge = @merge_request.can_be_merged_via_command_line_by?(current_user) %h4.has-conflicts - = icon("exclamation-triangle") - This merge request contains merge conflicts + %p + = icon("exclamation-triangle") + This merge request contains merge conflicts -%p - To merge this request, resolve these conflicts - - if can_resolve && !can_resolve_in_ui - locally - or - - unless can_merge - ask someone with write access to this repository to - merge it locally. +.remove-message-pipes + %ul + %li + %span + %p + To merge this request, resolve these conflicts + - if can_resolve && !can_resolve_in_ui + locally + or + - unless can_merge + ask someone with write access to this repository to + merge it locally. - if (can_resolve && can_resolve_in_ui) || can_merge .btn-group |