Merge branch 'reference_clean_up' into 'master'

Do not display project group/name when issue and MR are in same project I noticed that things seem a bit cluttered for related merge requests when displaying the group/project name for every item, even when it's in the same project. For merge requests that are in the same project as the issue we probably don't need to display the 'in group / name' bit. See merge request !2141

Merge branch 'reference_clean_up' into 'master'
3ca78f01 · Robert Speicher · 22e65944 · 84caae72 · 3ca78f01
Commit 3ca78f01 authored Dec 18, 2015 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

_merge_requests.html.haml app/views/projects/issues/_merge_requests.html.haml +4 -3

No files found.
--- 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