##// END OF EJS Templates
pull-requests: expose force refresh of merge workspace and expose all metadata for merge message formatting.
marcink -
r3558:d2ddd715 default
parent child Browse files
Show More
@@ -1303,10 +1303,13 b' class PullRequestModel(BaseModel):'
1303 merge_state = self._refresh_merge_state(
1303 merge_state = self._refresh_merge_state(
1304 pull_request, target_vcs, target_ref)
1304 pull_request, target_vcs, target_ref)
1305 else:
1305 else:
1306 possible = pull_request.\
1306 possible = pull_request.last_merge_status == MergeFailureReason.NONE
1307 last_merge_status == MergeFailureReason.NONE
1307 metadata = {
1308 'target_ref': pull_request.target_ref_parts,
1309 'source_ref': pull_request.source_ref_parts
1310 }
1308 merge_state = MergeResponse(
1311 merge_state = MergeResponse(
1309 possible, False, None, pull_request.last_merge_status)
1312 possible, False, None, pull_request.last_merge_status, metadata=metadata)
1310
1313
1311 return merge_state
1314 return merge_state
1312
1315
@@ -28,6 +28,9 b''
28 </span>
28 </span>
29 </li>
29 </li>
30 % endfor
30 % endfor
31 <li>
32 Try <a href="${h.current_route_path(request, force_refresh=1)}">forced recheck</a> of the merge workspace in case current status seems wrong.
33 </li>
31 </ul>
34 </ul>
32 % endif
35 % endif
33
36
General Comments 0
You need to be logged in to leave comments. Login now