##// END OF EJS Templates
pr-shadow: Set last merge revision on merge status update.
Martin Bornhold -
r1043:4da21655 default
parent child Browse files
Show More
@@ -1006,11 +1006,11 b' class PullRequestModel(BaseModel):'
1006
1006
1007 # Do not store the response if there was an unknown error.
1007 # Do not store the response if there was an unknown error.
1008 if merge_state.failure_reason != MergeFailureReason.UNKNOWN:
1008 if merge_state.failure_reason != MergeFailureReason.UNKNOWN:
1009 pull_request._last_merge_source_rev = pull_request.\
1009 pull_request._last_merge_source_rev = \
1010 source_ref_parts.commit_id
1010 pull_request.source_ref_parts.commit_id
1011 pull_request._last_merge_target_rev = target_reference.commit_id
1011 pull_request._last_merge_target_rev = target_reference.commit_id
1012 pull_request._last_merge_status = (
1012 pull_request._last_merge_status = merge_state.failure_reason
1013 merge_state.failure_reason)
1013 pull_request.last_merge_rev = merge_state.merge_commit_id
1014 Session().add(pull_request)
1014 Session().add(pull_request)
1015 Session().flush()
1015 Session().flush()
1016
1016
General Comments 0
You need to be logged in to leave comments. Login now