diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/help/ui.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 7c89457ace3..1bd271477e4 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -107,6 +107,7 @@ .example %button.btn.btn-default{:type => "button"} Default + %button.btn.btn-gray{:type => "button"} Gray %button.btn.btn-primary{:type => "button"} Primary %button.btn.btn-success{:type => "button"} Success %button.btn.btn-info{:type => "button"} Info diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 58d8478744e..e7ac7a0eaa4 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -34,7 +34,7 @@ = render "projects/merge_requests/widget/show.html.haml" - if @merge_request.open? && @merge_request.can_be_merged? - .light + .light.append-bottom-20 You can also accept this merge request manually using the = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" |