Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

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

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

app/views/repositories/entries.json.jbuilder

@@ -26,5 +26,8 @@ json.array! @entries do |entry|
     json.content entry['content']
     json.target entry['target']
   end
-  json.commit entry['latest_commit']
+
+  if entry['latest_commit']
+    json.partial! 'last_commit', entry: entry
+  end
 end