add: compare code return can merge status

2026-05-02 19:30:48 +08:00 · 2021-07-12 18:10:26 +08:00
parent 4929734a1a
commit de2b54c39e
2 changed files with 7 additions and 6 deletions
--- a/app/views/compare/show.json.jbuilder
+++ b/app/views/compare/show.json.jbuilder
@@ -83,4 +83,5 @@ json.diff do

  end
 end
+json.status @merge_status
 json.message @merge_message