Show More
@@ -924,6 +924,7 b' class PullRequestModel(BaseModel):' | |||||
924 |
|
924 | |||
925 | try: |
|
925 | try: | |
926 | resp = self._try_merge(pull_request) |
|
926 | resp = self._try_merge(pull_request) | |
|
927 | log.debug("Merge response: %s", resp) | |||
927 | status = resp.possible, self.merge_status_message( |
|
928 | status = resp.possible, self.merge_status_message( | |
928 | resp.failure_reason) |
|
929 | resp.failure_reason) | |
929 | except NotImplementedError: |
|
930 | except NotImplementedError: | |
@@ -983,7 +984,7 b' class PullRequestModel(BaseModel):' | |||||
983 | _last_merge_status == MergeFailureReason.NONE |
|
984 | _last_merge_status == MergeFailureReason.NONE | |
984 | merge_state = MergeResponse( |
|
985 | merge_state = MergeResponse( | |
985 | possible, False, None, pull_request._last_merge_status) |
|
986 | possible, False, None, pull_request._last_merge_status) | |
986 | log.debug("Merge response: %s", merge_state) |
|
987 | ||
987 | return merge_state |
|
988 | return merge_state | |
988 |
|
989 | |||
989 | def _refresh_reference(self, reference, vcs_repository): |
|
990 | def _refresh_reference(self, reference, vcs_repository): |
General Comments 0
You need to be logged in to leave comments.
Login now