engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pr-shadow: Set last merge revision on merge status update.

Browse source
This commit is contained in:
Martin Bornhold 2016-10-23 14:37:19 +02:00
parent 26cc77cb77
commit 797d70d4cf
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rhodecode/model/pull_request.py
View file

@ -1006,11 +1006,11 @@ class PullRequestModel(BaseModel):
# Do not store the response if there was an unknown error.
if merge_state.failure_reason != MergeFailureReason.UNKNOWN:
pull_request._last_merge_source_rev = pull_request.\
source_ref_parts.commit_id
pull_request._last_merge_source_rev = \
pull_request.source_ref_parts.commit_id
pull_request._last_merge_target_rev = target_reference.commit_id
pull_request._last_merge_status = (
merge_state.failure_reason)
pull_request._last_merge_status = merge_state.failure_reason
pull_request.last_merge_rev = merge_state.merge_commit_id
Session().add(pull_request)
Session().flush()