diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-11-18 16:49:20 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-11-18 16:49:20 +0300 |
| commit | 058287ea0ff97ac6d2394f5446718b7a73efc3a9 (patch) | |
| tree | d8224551323e39ef662da7b115a09626042e68fe /app/views/projects | |
| parent | cda016651d59fe8402931c7b239b3d4ff5784aa6 (diff) | |
| parent | 7c5af3ea92e213423f8f0e376cbb8fd8b863f22c (diff) | |
Merge branch 'optimize-mr-index' into 'master'
More aggressively preload on merge request and issue index pages
See merge request !7564
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 12408068834..9ffcc48eb80 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -54,15 +54,18 @@ = link_to namespace_project_commits_path(merge_request.project.namespace, merge_request.project, merge_request.target_branch) do = icon('code-fork') = merge_request.target_branch + - if merge_request.milestone = link_to namespace_project_merge_requests_path(merge_request.project.namespace, merge_request.project, milestone_title: merge_request.milestone.title) do = icon('clock-o') = merge_request.milestone.title + - if merge_request.labels.any? - merge_request.labels.each do |label| = link_to_label(label, subject: merge_request.project, type: :merge_request) + - if merge_request.tasks? %span.task-status |