diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-18 18:36:34 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-18 18:36:34 +0000 |
| commit | 3ca78f015afd02503d96bd8837ae55d2ad62db13 (patch) | |
| tree | 7a83d5c1ddf9175ed4475a703696ebf17d9323ea | |
| parent | 22e65944ee8695cc6108dbb8cc0b4ed729e1c265 (diff) | |
| parent | 84caae7294c17de4786679ee0ca79305a2ae053a (diff) | |
| download | gitlab-ce-3ca78f015afd02503d96bd8837ae55d2ad62db13.tar.gz | |
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
| -rw-r--r-- | app/views/projects/issues/_merge_requests.html.haml | 7 |
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 |