From cbe3ffa020cda9892ee783f66d6025ab4e3da00b Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Sat, 11 Jan 2020 11:12:39 +0800 Subject: [PATCH 1/2] FIX decode file content --- app/helpers/repositories_helper.rb | 4 ++++ app/views/repositories/_simple_entry.json.jbuilder | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 05ffdf1cc..a521ff4c5 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -1,2 +1,6 @@ module RepositoriesHelper + def render_decode64_content(str) + return nil if str.blank? + Base64.decode64(str) + end end diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder index bb3589591..2a3719780 100644 --- a/app/views/repositories/_simple_entry.json.jbuilder +++ b/app/views/repositories/_simple_entry.json.jbuilder @@ -3,5 +3,5 @@ json.sha entry['sha'] json.path entry['path'] json.type entry['type'] json.size entry['size'] -json.content entry['content'] +json.content render_decode64_content(entry['content']) json.target entry['target'] From db2990f89bd4892426252046d27d28870c6c3406 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Sat, 11 Jan 2020 11:13:18 +0800 Subject: [PATCH 2/2] FIX fork project routes --- config/routes.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index ee5413a0d..1671f9005 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -86,7 +86,7 @@ Rails.application.routes.draw do put :change_role end end - + resources :forks, only: [:create] collection do post :migrate get :group_type_list @@ -95,7 +95,6 @@ Rails.application.routes.draw do member do get :branches post :watch - get :fork end end