Commit 86d92bda authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'userfriendly-compare-page' of /home/git/repositories/gitlab/gitlabhq

parents cc4b638c bda409c4
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
%code.label-branch 4eedf23 %code.label-branch 4eedf23
or branch/tag name like or branch/tag name like
%code.label-branch master %code.label-branch master
and press compare button for commits list, code diff. and press compare button for the commits list and a code diff.
Changes are shown <b>from</b> the version in the first field <b>to</b> the version in the second field.
%br %br
...@@ -14,9 +15,9 @@ ...@@ -14,9 +15,9 @@
.pull-left .pull-left
- if params[:to] && params[:from] - 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'} = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
= text_field_tag :from, params[:from], placeholder: "master", class: "input-xlarge input-xpadding" = text_field_tag :from, params[:from], placeholder: "from", class: "input-xlarge input-xpadding"
= "..." = "..."
= text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "input-xlarge input-xpadding" = text_field_tag :to, params[:to], placeholder: "to", class: "input-xlarge input-xpadding"
.pull-left .pull-left
&nbsp; &nbsp;
= submit_tag "Compare", class: "btn btn-create commits-compare-btn" = submit_tag "Compare", class: "btn btn-create commits-compare-btn"
...@@ -34,4 +35,4 @@ ...@@ -34,4 +35,4 @@
minLength: 1 minLength: 1
}); });
disableButtonIfEmptyField('#to', '.commits-compare-btn'); disableButtonIfEmptyField('#to', '.commits-compare-btn');
\ No newline at end of file
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