# HG changeset patch # User Marcin Kuzminski # Date 2019-03-22 15:39:11 # Node ID d2ddd715bfd320e6c75f3546a330a9d727faa646 # Parent 77e4ef40ead4a995a592694b35a8b7923921c494 pull-requests: expose force refresh of merge workspace and expose all metadata for merge message formatting. diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py --- 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 --- a/rhodecode/templates/pullrequests/pullrequest_merge_checks.mako +++ b/rhodecode/templates/pullrequests/pullrequest_merge_checks.mako @@ -28,6 +28,9 @@ % endfor +
  • + Try forced recheck of the merge workspace in case current status seems wrong. +
  • % endif