home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'reference_clean_up' into 'master'

Browse Source 
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
This commit is contained in:
Robert Speicher
2015-12-18 18:36:34 +00:00
parent 22e65944ee 84caae7294
commit 3ca78f015a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/issues/_merge_requests.html.haml
+4 -3
View File
@@ -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