summaryrefslogtreecommitdiff
path: root/app/helpers/merge_requests_helper.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-02 17:30:50 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-02 17:30:50 +0100
commit74a81cbfe3e7b6fb6c3b7a620b07905f19971a86 (patch)
tree1cbf3ab25c30f943e8298637aefe36835c4d658f /app/helpers/merge_requests_helper.rb
parent05c9d882166710a26e27a7b79e7855db47ca43c0 (diff)
downloadgitlab-ce-74a81cbfe3e7b6fb6c3b7a620b07905f19971a86.tar.gz
Fix branch rendering
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
-rw-r--r--app/helpers/merge_requests_helper.rb6
1 files changed, 4 insertions, 2 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