# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2019-02-05 16:17:58
# Node ID a818b875c6e00b81897b2b77d94e3730ba6c45d7
# Parent  4532f88db0037949fc4f2b8ab8bc01e02c3f365f

api: expose merge message in the merge operation

diff --git a/rhodecode/api/tests/test_merge_pull_request.py b/rhodecode/api/tests/test_merge_pull_request.py
--- a/rhodecode/api/tests/test_merge_pull_request.py
+++ b/rhodecode/api/tests/test_merge_pull_request.py
@@ -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()
diff --git a/rhodecode/api/views/pull_request_api.py b/rhodecode/api/views/pull_request_api.py
--- a/rhodecode/api/views/pull_request_api.py
+++ b/rhodecode/api/views/pull_request_api.py
@@ -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>",
diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@@ -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