From 5d3505ec7c87b372aa6bea8407c92ac75a6245af Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 22 May 2020 16:50:33 +0800
Subject: [PATCH 1/3] FIX commit time format

---
 app/views/repositories/entries.json.jbuilder | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/repositories/entries.json.jbuilder b/app/views/repositories/entries.json.jbuilder
index 7327774fb..c5aa28990 100644
--- a/app/views/repositories/entries.json.jbuilder
+++ b/app/views/repositories/entries.json.jbuilder
@@ -26,5 +26,15 @@ json.array! @entries do |entry|
     json.content entry['content']
     json.target entry['target']
   end
-  json.commit entry['latest_commit']
+
+  if entry['latest_commit']
+    created_at = Time.at(entry['latest_commit']['created_at'].to_i).strftime("%Y-%m-%d %H:%M")
+    json.commit do
+      json.message entry['latest_commit']['message']
+      json.sha entry['latest_commit']['sha']
+      json.created_at fix_time entry['latest_commit']
+      json.time_from_now time_from_now(created_at)
+      json.created_at_unix entry['latest_commit']['created_at']
+    end
+  end
 end

From c0a4a4855bf95af38cde2fb85031d1a15f0f8925 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 22 May 2020 16:54:18 +0800
Subject: [PATCH 2/3] FIX bug

---
 app/views/repositories/entries.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/repositories/entries.json.jbuilder b/app/views/repositories/entries.json.jbuilder
index c5aa28990..5091d30c3 100644
--- a/app/views/repositories/entries.json.jbuilder
+++ b/app/views/repositories/entries.json.jbuilder
@@ -32,7 +32,7 @@ json.array! @entries do |entry|
     json.commit do
       json.message entry['latest_commit']['message']
       json.sha entry['latest_commit']['sha']
-      json.created_at fix_time entry['latest_commit']
+      json.created_at created_at
       json.time_from_now time_from_now(created_at)
       json.created_at_unix entry['latest_commit']['created_at']
     end

From cc9e86f01051933166ef36e7abbfcabfae6ec200 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 22 May 2020 17:34:39 +0800
Subject: [PATCH 3/3] FIX coder review

---
 app/views/repositories/_last_commit.json.jbuilder  | 8 ++++++++
 app/views/repositories/_simple_entry.json.jbuilder | 4 ++++
 app/views/repositories/entries.json.jbuilder       | 9 +--------
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 app/views/repositories/_last_commit.json.jbuilder

diff --git a/app/views/repositories/_last_commit.json.jbuilder b/app/views/repositories/_last_commit.json.jbuilder
new file mode 100644
index 000000000..9d6bbe345
--- /dev/null
+++ b/app/views/repositories/_last_commit.json.jbuilder
@@ -0,0 +1,8 @@
+created_at = Time.at(entry['latest_commit']['created_at'].to_i).strftime("%Y-%m-%d %H:%M")
+json.commit do
+  json.message entry['latest_commit']['message']
+  json.sha entry['latest_commit']['sha']
+  json.created_at created_at
+  json.time_from_now time_from_now(created_at)
+  json.created_at_unix entry['latest_commit']['created_at']
+end
diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder
index 836e30443..0698769e0 100644
--- a/app/views/repositories/_simple_entry.json.jbuilder
+++ b/app/views/repositories/_simple_entry.json.jbuilder
@@ -10,3 +10,7 @@ json.content entry['content'].present? && !direct_download ? render_decode64_con
 json.target entry['target']
 json.download_url entry['download_url']
 json.direct_download direct_download
+
+if entry['latest_commit']
+  json.partial! 'last_commit', entry: entry
+end
diff --git a/app/views/repositories/entries.json.jbuilder b/app/views/repositories/entries.json.jbuilder
index 5091d30c3..45ea71218 100644
--- a/app/views/repositories/entries.json.jbuilder
+++ b/app/views/repositories/entries.json.jbuilder
@@ -28,13 +28,6 @@ json.array! @entries do |entry|
   end
 
   if entry['latest_commit']
-    created_at = Time.at(entry['latest_commit']['created_at'].to_i).strftime("%Y-%m-%d %H:%M")
-    json.commit do
-      json.message entry['latest_commit']['message']
-      json.sha entry['latest_commit']['sha']
-      json.created_at created_at
-      json.time_from_now time_from_now(created_at)
-      json.created_at_unix entry['latest_commit']['created_at']
-    end
+    json.partial! 'last_commit', entry: entry
   end
 end