diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-02 17:30:50 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-02 17:30:50 +0100 |
| commit | 74a81cbfe3e7b6fb6c3b7a620b07905f19971a86 (patch) | |
| tree | 1cbf3ab25c30f943e8298637aefe36835c4d658f | |
| parent | 05c9d882166710a26e27a7b79e7855db47ca43c0 (diff) | |
| download | gitlab-ce-74a81cbfe3e7b6fb6c3b7a620b07905f19971a86.tar.gz | |
Fix branch rendering
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index cc4243e1559..7f3a61a5e38 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -56,12 +56,14 @@ module MergeRequestsHelper end def source_branch_with_namespace(merge_request) + branch = link_to(merge_request.source_branch, namespace_project_commits_path(merge_request.source_project.namespace, merge_request.source_project, merge_request.source_branch)) + if merge_request.for_fork? namespace = link_to(merge_request.source_project_namespace, project_path(merge_request.source_project)) - namespace + ":#{merge_request.source_branch}" + namespace + ":" + branch else - merge_request.source_branch + branch end end diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 09b228b7c0c..e1992504232 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -26,7 +26,8 @@ %li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff) .normal %span Request to merge - = link_to source_branch_with_namespace(@merge_request), namespace_project_commits_path(@merge_request.source_project.namespace, @merge_request.source_project, @merge_request.source_branch), class: "label-branch" + %span.label-branch + = source_branch_with_namespace(@merge_request) %span into = link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do = @merge_request.target_branch |