diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-07 17:18:25 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-07 17:18:25 +0000 |
| commit | 903aa7c95e82949ca0a7b18e1f6d2f25fe1b04f4 (patch) | |
| tree | 312a87378af0a72c4e7c7bc40ca009ea4df70a20 /app/views/groups/milestones/_merge_request.html.haml | |
| parent | 99f08b3f727e9d155ab10ad285fe48e0279fb79e (diff) | |
| parent | 95b06a62c0db5f8c285a1d24fa1994e10c70ff27 (diff) | |
| download | gitlab-ce-903aa7c95e82949ca0a7b18e1f6d2f25fe1b04f4.tar.gz | |
Merge branch 'issue_13621_2' into 'master'
Labels should be visible in dashboard and group milestone views
Closes #13621
See merge request !2931
Diffstat (limited to 'app/views/groups/milestones/_merge_request.html.haml')
| -rw-r--r-- | app/views/groups/milestones/_merge_request.html.haml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/app/views/groups/milestones/_merge_request.html.haml b/app/views/groups/milestones/_merge_request.html.haml deleted file mode 100644 index e3aa4aad198..00000000000 --- a/app/views/groups/milestones/_merge_request.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -%li{ id: dom_id(merge_request, 'sortable'), class: 'mr-row', 'data-iid' => merge_request.iid } - %span.milestone-row - - project = merge_request.project - %strong #{project.name} · - = link_to [project.namespace.becomes(Namespace), project, merge_request] do - %span.cgray ##{merge_request.iid} - = link_to_gfm merge_request.title, [project.namespace.becomes(Namespace), project, merge_request], title: merge_request.title - .pull-right.assignee-icon - - if merge_request.assignee - = image_tag avatar_icon(merge_request.assignee, 16), class: "avatar s16", alt: '' |