Merge branch 'develop' into standalone_develop

2024-03-18 16:31:22 +08:00 · 2024-03-18 16:31:22 +08:00 · 531611c9df
parent 62ff6dd1d7 c88d0c2712
commit 531611c9df
1 changed files with 1 additions and 0 deletions
--- a/app/views/api/v1/projects/commits/recent.json.jbuilder
+++ b/app/views/api/v1/projects/commits/recent.json.jbuilder
@ -9,5 +9,6 @@ json.commits @result_object[:data].each do |commit|
    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name'] }
  end
  json.commit_message commit['commit']['message']
+  json.time_from_now time_from_now(commit['created'])
  json.parent_shas commit['parents'].map{|x|x['sha']}
 end