pull-requests: expose force refresh of merge workspace and expose all metadata for merge message formatting.

This commit is contained in:
Marcin Kuzminski 2019-03-22 16:39:11 +01:00
parent 0cac94b946
commit 69ea375e9d
2 changed files with 9 additions and 3 deletions

View file

@ -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

View file

@ -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