From 59a959cb73837a0b2b2860320d83a55f6e1a4942 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jun 02 2015 15:26:34 +0000 Subject: Add the possibility to by-pass the cache and force the check --- diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py index 7171c68..905e8a7 100644 --- a/pagure/internal/__init__.py +++ b/pagure/internal/__init__.py @@ -176,6 +176,9 @@ def ticket_add_comment(): def mergeable_request_pull(): """ Returns if the specified pull-request can be merged or not. """ + force = flask.request.form.get('force', False) + if force is not False: + force = True form = pagure.forms.ConfirmationForm() if not form.validate_on_submit(): @@ -189,7 +192,7 @@ def mergeable_request_pull(): if not request: flask.abort(404, 'Pull-request not found') - if request.merge_status: + if request.merge_status and not force: return flask.jsonify({ 'code': request.merge_status, 'short_code': MERGE_OPTIONS[request.merge_status]['short_code'],