diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 15:23:41 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 15:23:41 +0000 |
| commit | bb23d462fa8bb270698e6e83c479884803658162 (patch) | |
| tree | ad333a1b917f2999efc98476d67d055d3373d83c | |
| parent | 883be9c67bdb78bfb695e23cf0b76102d0a358fc (diff) | |
| parent | 9442c33584d9667551447aa2d579aec03fb18d50 (diff) | |
| download | gitlab-ce-bb23d462fa8bb270698e6e83c479884803658162.tar.gz | |
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
3 files changed, 24 insertions, 1 deletions
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 4bdbc26a4c3..f4f155c8d94 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/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') diff --git a/changelogs/unreleased/fix-500-error-when-rendering-avatar-for-deleted-project-creator.yml b/changelogs/unreleased/fix-500-error-when-rendering-avatar-for-deleted-project-creator.yml new file mode 100644 index 00000000000..be6f1ea00fb --- /dev/null +++ b/changelogs/unreleased/fix-500-error-when-rendering-avatar-for-deleted-project-creator.yml @@ -0,0 +1,4 @@ +--- +title: Modify if condition to be more readable +merge_request: +author: diff --git a/spec/views/shared/projects/_project.html.haml_spec.rb b/spec/views/shared/projects/_project.html.haml_spec.rb new file mode 100644 index 00000000000..43334c2c236 --- /dev/null +++ b/spec/views/shared/projects/_project.html.haml_spec.rb @@ -0,0 +1,19 @@ +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 |