Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2019-02-22 11:27:38 +0300
committerJames Lopez <james@gitlab.com>2019-02-22 11:27:38 +0300
commit9c2bcca2e5ee378fecf623444e2f5177b9d92142 (patch)
tree492325e55c047631f53985a47e0f55381d219f6a /app/views
parentd93d799bde3ee8082c1fd04387bd9bf0979a212d (diff)
parent65be48af9e68dedcade8a4d47af7f2a6f0639866 (diff)
Merge branch '9841-geo-unable-to-compare-branches-on-secondary' into 'master'
Allow users to compare branches on a read-only instance See merge request gitlab-org/gitlab-ce!25414
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/branches/_branch.html.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index c64ad1c8147..91c51d5e091 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -53,9 +53,8 @@
= _('Merge request')
- if branch.name != @repository.root_ref
- = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name),
+ = link_to project_compare_path(@project, @repository.root_ref, branch.name),
class: "btn btn-default #{'prepend-left-10' unless merge_project}",
- method: :post,
title: s_('Branches|Compare') do
= s_('Branches|Compare')