From 51abeaa1bc93862a4d15506a590704f9fc56cfd6 Mon Sep 17 00:00:00 2001 From: sue445 Date: Sun, 1 Mar 2015 02:07:53 +0900 Subject: Expose avatar_url in projects API * Impl Project#avatar_url * Refactor ApplicationHelper: Use Project#avatar_url * Update changelog --- app/helpers/application_helper.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 365de3595cd..a81e41819b7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -58,10 +58,8 @@ module ApplicationHelper Project.find_with_namespace(project_id) end - if project.avatar.present? - image_tag project.avatar.url, options - elsif project.avatar_in_git - image_tag namespace_project_avatar_path(project.namespace, project), options + if project.avatar_url + image_tag project.avatar_url, options else # generated icon project_identicon(project, options) end -- cgit v1.2.1