Download as
Browse Code »

Commit 86d92bdae7c87ec2c00b19052ef4799e42a12573

Authored by Dmitriy Zaporozhets
2 parents cc4b638c bda409c4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 1 changed file with 5 additions and 4 deletions   Show diff stats
app/views/projects/compare/_form.html.haml
  Diff comments   View file @86d92bd
... ... @@ -5,7 +5,8 @@
5 5 %code.label-branch 4eedf23
6 6 or branch/tag name like
7 7 %code.label-branch master
8   - and press compare button for commits list, code diff.
  8 + and press compare button for the commits list and a code diff.
  9 + Changes are shown <b>from</b> the version in the first field <b>to</b> the version in the second field.
9 10  
10 11 %br
11 12  
... ... @@ -14,9 +15,9 @@
14 15 .pull-left
15 16 - if params[:to] && params[:from]
16 17 = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
17   - = text_field_tag :from, params[:from], placeholder: "master", class: "input-xlarge input-xpadding"
  18 + = text_field_tag :from, params[:from], placeholder: "from", class: "input-xlarge input-xpadding"
18 19 = "..."
19   - = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "input-xlarge input-xpadding"
  20 + = text_field_tag :to, params[:to], placeholder: "to", class: "input-xlarge input-xpadding"
20 21 .pull-left
21 22 &nbsp;
22 23 = submit_tag "Compare", class: "btn btn-create commits-compare-btn"
... ... @@ -34,4 +35,4 @@
34 35 minLength: 1
35 36 });
36 37  
37 38 - disableButtonIfEmptyField('#to', '.commits-compare-btn');
  39 + disableButtonIfEmptyField('#to', '.commits-compare-btn');
38 40 \ No newline at end of file
... ...