Merge branch 'fix-500-error-when-rendering-avatar-for-deleted-project-creator' into 'master'

Fix 500 error when rendering avatar for deleted project creator

See merge request !13110

app/views/shared/projects/_project.html.haml

@@ -14,7 +14,7 @@
     - if avatar
       .avatar-container.s40
         = link_to project_path(project), class: dom_class(project) do
-          - if use_creator_avatar
+          - if project.creator && use_creator_avatar
             = image_tag avatar_icon(project.creator.email, 40), class: "avatar s40", alt:''
           - else
             = project_icon(project, alt: '', class: 'avatar project-avatar s40')

changelogs/unreleased/fix-500-error-when-rendering-avatar-for-deleted-project-creator.yml

+---
+title: Modify if condition to be more readable
+merge_request:
+author:

spec/views/shared/projects/_project.html.haml_spec.rb

+require 'spec_helper'
+
+describe 'shared/projects/_project.html.haml' do
+  let(:project) { create(:empty_project) }
+
+  it 'should render creator avatar if project has a creator' do
+    render 'shared/projects/project', use_creator_avatar: true, project: project
+
+    expect(rendered).to have_selector('img.avatar')
+  end
+
+  it 'should render a generic avatar if project does not have a creator' do
+    project.creator = nil
+
+    render 'shared/projects/project', use_creator_avatar: true, project: project
+
+    expect(rendered).to have_selector('.project-avatar')
+  end
+end