From 579978a0eebc11da49874aae4550ae118697d409 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jun 02 2015 15:16:21 +0000 Subject: If the pull-request already has a merge_status, rely on it --- diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py index ba1d64b..7171c68 100644 --- a/pagure/internal/__init__.py +++ b/pagure/internal/__init__.py @@ -189,6 +189,12 @@ def mergeable_request_pull(): if not request: flask.abort(404, 'Pull-request not found') + if request.merge_status: + return flask.jsonify({ + 'code': request.merge_status, + 'short_code': MERGE_OPTIONS[request.merge_status]['short_code'], + 'message': MERGE_OPTIONS[request.merge_status]['message']}) + # Get the fork repopath = pagure.get_repo_path(request.project_from) fork_obj = pygit2.Repository(repopath)