api: expose merge message in the merge operation

This commit is contained in:
Marcin Kuzminski 2019-02-05 17:17:58 +01:00
parent a1d69a8c7f
commit 01cd008a20
3 changed files with 8 additions and 5 deletions

View file

@ -109,6 +109,7 @@ class TestMergePullRequest(object):
expected = {
'executed': True,
'failure_reason': 0,
'merge_status_message': 'This pull request can be automatically merged.',
'possible': True,
'merge_commit_id': pull_request.shadow_merge_ref.commit_id,
'merge_ref': pull_request.shadow_merge_ref._asdict()

View file

@ -267,10 +267,11 @@ def merge_pull_request(
"id": <id_given_in_input>,
"result": {
"executed": "<bool>",
"failure_reason": "<int>",
"merge_commit_id": "<merge_commit_id>",
"possible": "<bool>",
"executed": "<bool>",
"failure_reason": "<int>",
"merge_status_message": "<str>",
"merge_commit_id": "<merge_commit_id>",
"possible": "<bool>",
"merge_ref": {
"commit_id": "<commit_id>",
"type": "<type>",

View file

@ -221,7 +221,8 @@ class MergeResponse(object):
def asdict(self):
data = {}
for k in ['possible', 'executed', 'merge_ref', 'failure_reason']:
for k in ['possible', 'executed', 'merge_ref', 'failure_reason',
'merge_status_message']:
data[k] = getattr(self, k)
return data