ADD conflicts file for pull api

2026-05-20 11:45:57 +08:00 · 2021-06-24 16:08:32 +08:00
parent 539b832af6
commit b7dd12927b
4 changed files with 29 additions and 0 deletions
--- a/app/views/pull_requests/show.json.jbuilder
+++ b/app/views/pull_requests/show.json.jbuilder
@@ -32,3 +32,5 @@ json.issue do
  json.version @issue.version.try(:name)
  json.issue_tags @issue.get_issue_tags
 end
+
+json.conflict_files @pull_request.conflict_files