bug / pagure

Clone
Source Code
GIT

457b8e Fix the output of the merge PR API endpoint when the PR conflicts

4 files Authored by Pierre-Yves Chibon 5 years ago , Committed by pingou 5 years ago ,
raw patch tree parent
4 files changed. 87 lines added. 5 lines removed.
pagure/api/__init__.py
file modified
+1 -0
pagure/api/fork.py
file modified
+7 -2
tests/test_pagure_flask_api.py
file modified
+4 -3
tests/test_pagure_flask_api_fork.py
file modified
+75 -0 
    Fix the output of the merge PR API endpoint when the PR conflicts
    
    Before this it was returning a 500 error code with HTML, while now it
    returns a 409 error code with our usual JSON payload.
    
    Fixes https://pagure.io/pagure/issue/3999
    
    Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr></pingou@pingoured.fr>
file modified
+1 -0
file modified
+7 -2
file modified
+4 -3
file modified
+75 -0

Powered by Pagure 5.7.4

SSH Hostkey/Fingerprint | Documentation | About

© 2014-2019 Red Hat, Inc. and others.

Logo by Pavel Lashutin