mirror of
https://gitlink.org.cn/Gitlink/forgeplus.git
synced 2026-05-03 03:40:49 +08:00
新增: compare文件变更列表拆解
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
json.author do
|
||||
json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
|
||||
end
|
||||
|
||||
json.committer do
|
||||
json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
|
||||
end
|
||||
json.timestamp render_unix_time(commit['Committer']['When'])
|
||||
json.time_from_now time_from_now(commit['Committer']['When'])
|
||||
json.created_at render_format_time_with_date(commit['Committer']['When'])
|
||||
json.message commit['CommitMessage']
|
||||
json.sha commit['Sha']
|
||||
21
app/views/api/v1/projects/compare/files.json.jbuilder
Normal file
21
app/views/api/v1/projects/compare/files.json.jbuilder
Normal file
@@ -0,0 +1,21 @@
|
||||
if params[:filepath].present?
|
||||
json.commits_count @compare_result['CommitsCount']
|
||||
json.last_commit_sha @compare_result['LatestSha']
|
||||
json.commits @compare_result['Commits'] do |commit|
|
||||
json.partial! 'api/v1/projects/compare/simple_gitea_commit', locals: { commit: commit}
|
||||
end
|
||||
json.diff do
|
||||
if @compare_result['Diff'].present?
|
||||
json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @compare_result['Diff']
|
||||
else
|
||||
json.nil!
|
||||
end
|
||||
end
|
||||
else
|
||||
json.file_numbers @compare_result[:total_data].to_i
|
||||
json.files @compare_result[:data] do |file|
|
||||
json.partial! "api/v1/projects/simple_gitea_file", file: file
|
||||
end
|
||||
end
|
||||
json.status @merge_status
|
||||
json.message @merge_message
|
||||
Reference in New Issue
Block a user