diff options
Diffstat (limited to 'app/views/projects/compare')
-rw-r--r-- | app/views/projects/compare/_form.html.haml | 29 | ||||
-rw-r--r-- | app/views/projects/compare/index.html.haml | 16 | ||||
-rw-r--r-- | app/views/projects/compare/show.html.haml | 23 |
3 files changed, 0 insertions, 68 deletions
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml deleted file mode 100644 index dfb1dded9ea..00000000000 --- a/app/views/projects/compare/_form.html.haml +++ /dev/null @@ -1,29 +0,0 @@ -= form_tag namespace_project_compare_index_path(@project.namespace, @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" - - = button_tag "Compare", class: "btn btn-create commits-compare-btn" - - if compare_to_mr_button? - = link_to compare_mr_path, class: 'prepend-left-10 btn' do - %strong Make a merge request - - -:javascript - var availableTags = #{@project.repository.ref_names.to_json}; - - $("#from, #to").autocomplete({ - source: availableTags, - minLength: 1 - }); - - disableButtonIfEmptyField('#to', '.commits-compare-btn'); diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml deleted file mode 100644 index 4745bfbeaaf..00000000000 --- a/app/views/projects/compare/index.html.haml +++ /dev/null @@ -1,16 +0,0 @@ -= render "projects/commits/head" - -%h3.page-title - Compare View -%p.slead - Compare branches, tags or commit ranges. - %br - Fill input field with commit id like - %code.label-branch 4eedf23 - or branch/tag name like - %code.label-branch master - and press compare button for the commits list and a code diff. - %br - Changes are shown <b>from</b> the version in the first field <b>to</b> the version in the second field. - -= render "form" diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml deleted file mode 100644 index 214b5bd337b..00000000000 --- a/app/views/projects/compare/show.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -= render "projects/commits/head" - -%h3.page-title - Compare View - -= render "form" - -- if @commits.present? - = render "projects/commits/commit_list" - = render "projects/diffs/diffs", diffs: @diffs, project: @project -- else - .light-well - .center - %h4 - There isn't anything to compare. - %p.slead - - if params[:to] == params[:from] - %span.label-branch #{params[:from]} - and - %span.label-branch #{params[:to]} - are the same. - - else - You'll need to use different branch names to get a valid comparison. |