|
|
|
@@ -7,25 +7,31 @@ else |
|
|
|
json.array! @hash_commit[:body] do |commit| |
|
|
|
commiter = commit['committer'] |
|
|
|
|
|
|
|
forge_user = |
|
|
|
if commiter.present? |
|
|
|
User.simple_select.find_by(gitea_uid: commiter['id']) |
|
|
|
end |
|
|
|
# forge_user = |
|
|
|
# if commiter.present? |
|
|
|
# User.simple_select.find_by(gitea_uid: commiter['id']) |
|
|
|
# end |
|
|
|
|
|
|
|
json.sha commit['sha'] |
|
|
|
json.message commit['commit']['message'] |
|
|
|
json.timestamp render_unix_time(commit['commit']['author']['date']) |
|
|
|
json.time_from_now time_from_now(commit['commit']['author']['date']) |
|
|
|
if forge_user |
|
|
|
json.partial! 'author', user: forge_user |
|
|
|
else |
|
|
|
json.author do |
|
|
|
json.id nil |
|
|
|
json.login commit['commit']['author']['name'] |
|
|
|
json.type nil |
|
|
|
json.name commit['commit']['author']['name'] |
|
|
|
json.image_url User::Avatar.get_letter_avatar_url(commit['commit']['author']['name']) |
|
|
|
end |
|
|
|
# if forge_user |
|
|
|
# json.partial! 'author', user: forge_user |
|
|
|
# else |
|
|
|
# json.author do |
|
|
|
# json.id nil |
|
|
|
# json.login commit['commit']['author']['name'] |
|
|
|
# json.type nil |
|
|
|
# json.name commit['commit']['author']['name'] |
|
|
|
# json.image_url User::Avatar.get_letter_avatar_url(commit['commit']['author']['name']) |
|
|
|
# end |
|
|
|
# end |
|
|
|
json.author do |
|
|
|
json.partial! 'commit_author', user: render_commit_author(commit['commit']['author']), name: commit['commit']['author']['name'] |
|
|
|
end |
|
|
|
json.committer do |
|
|
|
json.partial! 'commit_author', user: render_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name'] |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
|