From 2738efb04da195a611b88ea0dd82b0841c821c09 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 22 Apr 2020 15:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9commits=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb            | 4 +---
 app/services/gitea/repository/commits/list_service.rb | 7 +++----
 app/views/repositories/commits.json.jbuilder          | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 0c0cda9b5..557ed4729 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -38,9 +38,7 @@ class RepositoriesController < ApplicationController
   end
 
   def commits
-    hash_commit = Gitea::Repository::Commits::ListService.new(@project.owner, @project.identifier, sha: params[:sha], page: params[:page]).call
-    Rails.logger.info("##########__________hash_commit__________########{hash_commit}")
-    @hash_commit = hash_commit
+    @hash_commit = Gitea::Repository::Commits::ListService.new(@project.owner, @project.identifier, sha: params[:sha], page: params[:page]).call
   end
 
   def single_commit
diff --git a/app/services/gitea/repository/commits/list_service.rb b/app/services/gitea/repository/commits/list_service.rb
index a8c1527c7..4bba67457 100644
--- a/app/services/gitea/repository/commits/list_service.rb
+++ b/app/services/gitea/repository/commits/list_service.rb
@@ -24,9 +24,7 @@ class Gitea::Repository::Commits::ListService < Gitea::ClientService
   end
 
   def render_result(response)
-    Rails.logger.info("#####___________response.status_________##########{response.status}")
-    Rails.logger.info("#####___________response.body_________##########{response.body}")
-    body = JSON.parse(response.body)
+
     case response.status
     when 200
       result = {}
@@ -35,7 +33,8 @@ class Gitea::Repository::Commits::ListService < Gitea::ClientService
       total_count = headers["x-total"]
       result.merge(total_count: total_count.to_i, body: body)
     else
-      {status: -1, message: "#{body['message']}"}
+      nil
+      # {status: -1, message: "#{body['message']}"}
     end
   end
 end
diff --git a/app/views/repositories/commits.json.jbuilder b/app/views/repositories/commits.json.jbuilder
index eacd1e6cf..7cabe209e 100644
--- a/app/views/repositories/commits.json.jbuilder
+++ b/app/views/repositories/commits.json.jbuilder
@@ -1,5 +1,4 @@
-Rails.logger.info("#######_______@hash_commit______############{@hash_commit}")
-if @hash_commit[:status].present?   #如果有状态值，则表示报错了
+if @hash_commit.blank?   #如果有状态值，则表示报错了
   json.total_count 0
   json.commits []
 else