From f609b711c23e629128049c934eddf65c6935673e Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Fri, 29 May 2020 17:35:02 +0800 Subject: [PATCH 1/2] FIX get user info with branches api --- app/views/projects/branches.json.jbuilder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/branches.json.jbuilder b/app/views/projects/branches.json.jbuilder index 3e0981d68..15a51428e 100644 --- a/app/views/projects/branches.json.jbuilder +++ b/app/views/projects/branches.json.jbuilder @@ -13,13 +13,13 @@ json.array! @branches do |branch| json.time_from_now time_from_now(branch['commit']['timestamp']) end - user = User.find_by_login branch['commit']['author']['name'] + user = User.find_by_login branch['commit']['author']['username'] json.author do if user json.login user.login json.image_url url_to_avatar(user) else - json.nil + json.nil! end end end From d391972b8ba058a4792adc05e5ab99f74b1fc241 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Fri, 29 May 2020 17:56:52 +0800 Subject: [PATCH 2/2] FIX image download with in reposotiroy entries --- app/helpers/repositories_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 440f833aa..b0eea0e59 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -5,8 +5,8 @@ module RepositoriesHelper end def download_type(str) - default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb) - default_type.include?(str) + default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb png jpg gif tif psd svg) + default_type.include?(str&.downcase) end def render_commit_author(author_json)