diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-26 10:38:27 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-26 10:38:27 +0000 |
| commit | 86d92bdae7c87ec2c00b19052ef4799e42a12573 (patch) | |
| tree | 28bcdfd552881737e3e2eb6c4840157ec69570af /app/views | |
| parent | cc4b638c343d49c205fa510380b65043229e5a9e (diff) | |
| parent | bda409c4c8e938c4cee254b04dd954978f770d8c (diff) | |
| download | gitlab-ce-86d92bdae7c87ec2c00b19052ef4799e42a12573.tar.gz | |
Merge branch 'userfriendly-compare-page' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/compare/_form.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index ee733f80954..6fb7b1fd3dd 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -5,7 +5,8 @@ %code.label-branch 4eedf23 or branch/tag name like %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 @@ -14,9 +15,9 @@ .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'} - = 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 = submit_tag "Compare", class: "btn btn-create commits-compare-btn" @@ -34,4 +35,4 @@ minLength: 1 }); - disableButtonIfEmptyField('#to', '.commits-compare-btn'); + disableButtonIfEmptyField('#to', '.commits-compare-btn');
\ No newline at end of file |