summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2015-12-17 10:14:50 -0600
committerDrew Blessing <drew@gitlab.com>2015-12-17 10:14:50 -0600
commit84caae7294c17de4786679ee0ca79305a2ae053a (patch)
treebc746972ded2f3b7740e7aee9b5e452d39c8eca7
parent110a5f9c96457ac314f30630735dd827d9d96a4c (diff)
downloadgitlab-ce-84caae7294c17de4786679ee0ca79305a2ae053a.tar.gz
Do not display project group/name when issue and MR are in same project
-rw-r--r--app/views/projects/issues/_merge_requests.html.haml7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index fe856ac991e..254968e4f67 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -15,9 +15,10 @@
%span.merge-request-info
%strong
= link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"
- in
- - project = merge_request.target_project
- = link_to project.name_with_namespace, namespace_project_path(project.namespace, project)
+ - unless @issue.project.id == merge_request.target_project.id
+ in
+ - project = merge_request.target_project
+ = link_to project.name_with_namespace, namespace_project_path(project.namespace, project)
%span.merge-request-status.prepend-left-10
- if merge_request.merged?
MERGED