Commit 4eba8036 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents 555c25e6 ee993dfc
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
.pull-right .pull-right
- if can?(current_user, :download_code, @project) - if can?(current_user, :download_code, @project)
= render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'grouped btn-group-small' = 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 - 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 %i.icon-copy
Compare Compare
......
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