| |
@@ -303,21 +303,6 @@
|
| |
response.status_code = 404
|
| |
return response
|
| |
|
| |
- threshold = request.project.settings.get(
|
| |
- "Minimum_score_to_merge_pull-request", -1
|
| |
- )
|
| |
- if threshold > 0 and int(request.score) < int(threshold):
|
| |
- response = flask.jsonify(
|
| |
- {
|
| |
- "code": "CONFLICTS",
|
| |
- "message": "Pull-Request does not meet the minimal "
|
| |
- "number of review required: %s/%s"
|
| |
- % (request.score, threshold),
|
| |
- }
|
| |
- )
|
| |
- response.status_code = 400
|
| |
- return response
|
| |
-
|
| |
merge_status = request.merge_status
|
| |
if not merge_status or force:
|
| |
try:
|
| |
@@ -340,6 +325,21 @@
|
| |
response.status_code = 500
|
| |
return response
|
| |
|
| |
+ threshold = request.project.settings.get(
|
| |
+ "Minimum_score_to_merge_pull-request", -1
|
| |
+ )
|
| |
+ if threshold > 0 and int(request.score) < int(threshold):
|
| |
+ response = flask.jsonify(
|
| |
+ {
|
| |
+ "code": "CONFLICTS",
|
| |
+ "message": "Pull-Request does not meet the minimal "
|
| |
+ "number of review required: %s/%s"
|
| |
+ % (request.score, threshold),
|
| |
+ }
|
| |
+ )
|
| |
+ response.status_code = 400
|
| |
+ return response
|
| |
+
|
| |
return flask.jsonify(pagure.utils.get_merge_options(request, merge_status))
|
| |
|
| |
|
| |
I'm running into this error:
AttributeError: 'Response' object has no attribute 'get_json'
, I'll use the code we're using elsewhere