|
- json.partial! "api/v1/projects/pulls/simple_detail", pull: @pull_request
- json.merge_base @result_object['merge_base']
- json.base_commit_sha @result_object['base']['sha']
- json.head_commit_sha @result_object['head']['sha']
- json.commit_num @result_object['commit_num']
- json.changed_files @result_object['changed_files']
- json.is_locked @result_object['is_locked']
- json.mergeable @result_object['mergeable'] # 是否能合并
- json.merged @result_object['merged']
- json.merged_at @result_object['merged_at'].nil? ? '' : render_unix_time( @result_object['merged_at'])
- json.merge_commit_sha @result_object['merge_commit_sha']
- json.merge_by do
- if @result_object['merged_by']
- json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(@result_object['merged_by']), name: @result_object['merged_by']['login'] }
- else
- json.nil!
- end
- end
- json.last_review do
- if @last_review.present?
- json.(@last_review, :id, :commit_id, :content, :status)
- json.created_at format_time(@last_review.created_at)
- json.reviewer do
- json.partial! "api/v1/users/simple_user", user: @last_review.reviewer
- end
- else
- json.nil!
- end
- end
- json.conflict_files @pull_request.conflict_files
|