floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into trustie_server

This commit is contained in:
jasder 2021-04-20 18:37:55 +08:00
parent 0867e5130f 84e48d25c1
commit 8ce7fd95cb
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/pull_requests/_commit.json.jbuilder
View File

@ -1,10 +1,10 @@
json.author do json.author do
author = User.find_by(login: commit['Author']['Name']) author = User.find_by(mail: commit['Author']['Email'])
json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] } json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] }
end end
json.committer do json.committer do
author = User.find_by(login: commit['Committer']['Name']) author = User.find_by(mail: commit['Committer']['Email'])
json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] } json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] }
end end
json.timestamp render_unix_time(commit['Committer']['When']) json.timestamp render_unix_time(commit['Committer']['When'])

13
app/views/repositories/commits.json.jbuilder
View File

@ -5,12 +5,15 @@ else
json.total_count @hash_commit[:total_count] json.total_count @hash_commit[:total_count]
json.commits do json.commits do
json.array! @hash_commit[:body] do |commit| json.array! @hash_commit[:body] do |commit|
json.commit1 commit
commiter = commit['committer'] commiter = commit['committer']
if commiter.present?
commit_user_id = commiter['id'] forge_user =
forge_user = User.simple_select.find_by(gitea_uid: commit_user_id) if commiter.present?
end User.simple_select.find_by(mail: commiter['email'])
else
User.simple_select.find_by(mail: commit['commit']['committer']['email'])
end
json.sha commit['sha'] json.sha commit['sha']
json.message commit['commit']['message'] json.message commit['commit']['message']
json.timestamp render_unix_time(commit['commit']['author']['date']) json.timestamp render_unix_time(commit['commit']['author']['date'])