pagure

#4178 Fix the output of the merge PR API endpoint when the PR conflicts
Merged by pingou. Opened by pingou.
fix_api_merge_conflict  into  master

Download 4178.patch

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

Pretty please pagure-ci rebuild

rebased onto 2c0e55f5d9c47f8df21865fe3f17f4d6b08d2dac

:thumbsup:

rebased onto 457b8ed2786dbadb1bc7ac0c3963d85d42a27b8a

Pull-Request has been merged by pingou
Metadata
None
No Tags
Static archive. pagure.io was sunset in 2026; this is a read-only snapshot.
Red Hat Logo

Fedora is sponsored by Red Hat. Learn more about the relationship between Red Hat and Fedora »

© Red Hat, Inc. and others.