diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-21 11:36:41 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-21 11:36:41 +0200 |
| commit | de0acf3cf7f27e7a4f32dc8cad6293f823eda300 (patch) | |
| tree | 4f5810004fd2f23d5491116ca4f919efea88ee88 /app/views/projects/milestones | |
| parent | 9c2214f202e98d0427d86a57888574327a6607dd (diff) | |
| parent | d25b50fda63e830cb2c87281bba064b71185e712 (diff) | |
| download | gitlab-ce-de0acf3cf7f27e7a4f32dc8cad6293f823eda300.tar.gz | |
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'app/views/projects/milestones')
| -rw-r--r-- | app/views/projects/milestones/_issue.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/_merge_request.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/milestones/_issue.html.haml b/app/views/projects/milestones/_issue.html.haml index 88fccfe4981..133d802aaca 100644 --- a/app/views/projects/milestones/_issue.html.haml +++ b/app/views/projects/milestones/_issue.html.haml @@ -1,7 +1,7 @@ %li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid, 'data-url' => issue_path(issue) } .pull-right.assignee-icon - if issue.assignee - = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16", alt: '' + = image_tag avatar_icon(issue.assignee, 16), class: "avatar s16", alt: '' %span = link_to [@project.namespace.becomes(Namespace), @project, issue] do %span.cgray ##{issue.iid} diff --git a/app/views/projects/milestones/_merge_request.html.haml b/app/views/projects/milestones/_merge_request.html.haml index 0d7a118569a..a1033607c5d 100644 --- a/app/views/projects/milestones/_merge_request.html.haml +++ b/app/views/projects/milestones/_merge_request.html.haml @@ -5,4 +5,4 @@ = 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.email, 16), class: "avatar s16", alt: '' + = image_tag avatar_icon(merge_request.assignee, 16), class: "avatar s16", alt: '' diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 302410765fc..6487440a2ed 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -104,7 +104,7 @@ - @users.each do |user| %li = link_to user, title: user.name, class: "darken" do - = image_tag avatar_icon(user.email, 32), class: "avatar s32" + = image_tag avatar_icon(user, 32), class: "avatar s32" %strong= truncate(user.name, lenght: 40) %br %small.cgray= user.username |