Merge branch 'request/branch_compare' into 'master'

Fix for compare button within branches dialog For the button Compare within the Branches screen ( https://gitlab.com/gitlab-org/gitlab-ce/branches ) beside a branch "foo" Old behavior: Will redirect to the compare page that is defaulted to comparison for branch "foo" <--> "foo" New behavior: Will redirect and trigger compare page of branch "default" <--> "foo" Remove of button beside default branch

Merge branch 'request/branch_compare' into 'master'
4eba8036 · Dmitriy Zaporozhets · 555c25e6 · ee993dfc · 4eba8036
Commit 4eba8036 authored Feb 18, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

_branch.html.haml app/views/projects/branches/_branch.html.haml +4 -3

No files found.
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -11,9 +11,10 @@
    .pull-right
      - if can?(current_user, :download_code, @project)
        = render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'grouped btn-group-small'
-      = link_to project_compare_index_path(@project, from: branch.name, to: branch.name), class: 'btn grouped btn-small', title: "Compare" do
-        %i.icon-copy
-        Compare
+      - if branch.name != @repository.root_ref
+        = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn grouped btn-small', method: :post, title: "Compare" do
+          %i.icon-copy
+          Compare

      - if can?(current_user, :admin_project, @project) && branch.name != @repository.root_ref
        = link_to project_branch_path(@project, branch.name), class: 'btn grouped btn-small remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do