From 69ea375e9d51f56db5ff36e5d5ebe722c1dd1ff6 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 22 Mar 2019 16:39:11 +0100
Subject: [PATCH] pull-requests: expose force refresh of merge workspace and
 expose all metadata for merge message formatting.

---
 rhodecode/model/pull_request.py                          | 9 ++++++---
 .../templates/pullrequests/pullrequest_merge_checks.mako | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index 9fb2aa51..698a5058 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -1303,10 +1303,13 @@ class PullRequestModel(BaseModel):
             merge_state = self._refresh_merge_state(
                 pull_request, target_vcs, target_ref)
         else:
-            possible = pull_request.\
-                last_merge_status == MergeFailureReason.NONE
+            possible = pull_request.last_merge_status == MergeFailureReason.NONE
+            metadata = {
+                'target_ref': pull_request.target_ref_parts,
+                'source_ref': pull_request.source_ref_parts
+            }
             merge_state = MergeResponse(
-                possible, False, None, pull_request.last_merge_status)
+                possible, False, None, pull_request.last_merge_status, metadata=metadata)
 
         return merge_state
 
diff --git a/rhodecode/templates/pullrequests/pullrequest_merge_checks.mako b/rhodecode/templates/pullrequests/pullrequest_merge_checks.mako
index 3650586b..8bf018f4 100644
--- a/rhodecode/templates/pullrequests/pullrequest_merge_checks.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_merge_checks.mako
@@ -28,6 +28,9 @@
                 </span>
             </li>
         % endfor
+        <li>
+            Try <a href="${h.current_route_path(request, force_refresh=1)}">forced recheck</a> of the merge workspace in case current status seems wrong.
+        </li>
     </ul>
     % endif