Merge branch 'empty-avatar-alt-text' into 'master'

Explicitly set image alt to prevent graphical glitches

Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded.

Fixes https://github.com/gitlabhq/gitlabhq/issues/6036.

Signed-off-by: Sven Strickroth <email@cs-ware.de>

See merge request !503

8 files changed, 9 insertions, 9 deletions

diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml
index 30e5faf822e..2462c952090 100644
--- a/app/views/groups/group_members/_group_member.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
@@ -4,7 +4,7 @@
 
 %li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)}
   %span{class: ("list-item-name" if show_controls)}
-    = image_tag avatar_icon(user.email, 16), class: "avatar s16"
+    = image_tag avatar_icon(user.email, 16), class: "avatar s16", alt: ''
     %strong= user.name
     %span.cgray= user.username
     - if user == current_user
diff --git a/app/views/groups/milestones/_issue.html.haml b/app/views/groups/milestones/_issue.html.haml
index 27d0c62df8c..09f9b4b8969 100644
--- a/app/views/groups/milestones/_issue.html.haml
+++ b/app/views/groups/milestones/_issue.html.haml
@@ -7,4 +7,4 @@
     = link_to_gfm issue.title, [project.namespace.becomes(Namespace), project, issue], title: issue.title
   .pull-right.assignee-icon
     - if issue.assignee
-      = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16"
+      = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16", alt: ''
diff --git a/app/views/groups/milestones/_merge_request.html.haml b/app/views/groups/milestones/_merge_request.html.haml
index b2d2097dfab..d0d1426762b 100644
--- a/app/views/groups/milestones/_merge_request.html.haml
+++ b/app/views/groups/milestones/_merge_request.html.haml
@@ -7,4 +7,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"
+      = image_tag avatar_icon(merge_request.assignee.email, 16), class: "avatar s16", alt: ''
diff --git a/app/views/projects/milestones/_issue.html.haml b/app/views/projects/milestones/_issue.html.haml
index 26c83841a22..9f164d44f26 100644
--- a/app/views/projects/milestones/_issue.html.haml
+++ b/app/views/projects/milestones/_issue.html.haml
@@ -5,5 +5,5 @@
     = link_to_gfm issue.title, [@project.namespace.becomes(Namespace), @project, issue], title: issue.title
   .pull-right.assignee-icon
     - if issue.assignee
-      = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16"
+      = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16", alt: ''
 
diff --git a/app/views/projects/milestones/_merge_request.html.haml b/app/views/projects/milestones/_merge_request.html.haml
index 42fbd0cd2ca..0d7a118569a 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"
+      = image_tag avatar_icon(merge_request.assignee.email, 16), class: "avatar s16", alt: ''
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 71bdf5c8f2a..0728f8fa42b 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -5,7 +5,7 @@
         %span.fa.fa-circle
       - else
         = link_to user_path(note.author) do
-          = image_tag avatar_icon(note.author_email), class: "avatar s40"
+          = image_tag avatar_icon(note.author_email), class: "avatar s40", alt: ''
     .timeline-content
       .note-header
         .note-actions
@@ -23,7 +23,7 @@
               Remove
         - if note.system
           = link_to user_path(note.author) do
-            = image_tag avatar_icon(note.author_email), class: "avatar s16"
+            = image_tag avatar_icon(note.author_email), class: "avatar s16", alt: ''
         = link_to_member(@project, note.author, avatar: false)
         %span.author-username
           = '@' + note.author.username
diff --git a/app/views/projects/project_members/_project_member.html.haml b/app/views/projects/project_members/_project_member.html.haml
index a07d0762334..4f053977215 100644
--- a/app/views/projects/project_members/_project_member.html.haml
+++ b/app/views/projects/project_members/_project_member.html.haml
@@ -3,7 +3,7 @@
 
 %li{class: "#{dom_class(member)} js-toggle-container project_member_row access-#{member.human_access.downcase}", id: dom_id(member)}
   %span.list-item-name
-    = image_tag avatar_icon(user.email, 16), class: "avatar s16"
+    = image_tag avatar_icon(user.email, 16), class: "avatar s16", alt: ''
     %strong= user.name
     %span.cgray= user.username
     - if user == current_user
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 55a990c94ed..5204fb9a907 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -17,7 +17,7 @@
     %span.light
       by
       = link_to user_snippets_path(@snippet.author) do
-        = image_tag avatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
+        = image_tag avatar_icon(@snippet.author_email), class: "avatar avatar-inline s16", alt: ''
         = @snippet.author_name
 
   .back-link