diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-31 19:08:31 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-31 19:08:31 +0400 |
commit | 5b2aa853a3e1b1ef5fd5ae4a23cf7850988c9f43 (patch) | |
tree | c5014e5dd4e4686fe51ec13845d96eec506f2b83 /app/views/projects/compare | |
parent | d7a48443ce3dae559726de4d9f5ce358877bfbcd (diff) |
Fix compare view and services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/compare')
-rw-r--r-- | app/views/projects/compare/_form.html.haml | 36 | ||||
-rw-r--r-- | app/views/projects/compare/show.html.haml | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index 605b2a8428b..0762655fb93 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -1,21 +1,21 @@ -= form_tag project_compare_index_path(@project), method: :post do - .clearfix - .pull-left - - if params[:to] && params[:from] - = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} - .input-prepend - %span.add-on from - = text_field_tag :from, params[:from], class: "span3 input-xpadding" - = "..." - .input-prepend - %span.add-on to - = text_field_tag :to, params[:to], class: "span3 input-xpadding" - .pull-left - - = submit_tag "Compare", class: "btn btn-create commits-compare-btn" - - if compare_to_mr_button? - = link_to compare_mr_path, class: 'prepend-left-10' do - %strong Make a merge request += form_tag project_compare_index_path(@project), method: :post, class: 'form-inline' do + .clearfix.append-bottom-20 + - if params[:to] && params[:from] + = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} + .form-group + .input-group.inline-input-group + %span.input-group-addon from + = text_field_tag :from, params[:from], class: "form-control" + = "..." + .form-group + .input-group.inline-input-group + %span.input-group-addon to + = text_field_tag :to, params[:to], class: "form-control" + + = submit_tag "Compare", class: "btn btn-create commits-compare-btn" + - if compare_to_mr_button? + = link_to compare_mr_path, class: 'prepend-left-10' do + %strong Make a merge request :javascript diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index 4be62d36917..e9456c24960 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -6,7 +6,7 @@ = render "form" - if @commits.size > 100 - .alert.alert-block + .alert.alert-warning %p %strong Warning! This comparison includes more than 100 commits. %p To preserve performance the line diff is not shown. |