Branch: refs/heads/master
Home: https://github.com/jenkinsci/stash-pullrequest-builder-plugin
Commit: 61f31689780998ec4cd8613fb9a2f602f2cee5ed
https://github.com/jenkinsci/stash-pullrequest-builder-plugin/commit/61f31689780998ec4cd8613fb9a2f602f2cee5ed
Author: Pavel Roskin <plros...@gmail.com>
Date: 2019-11-26 (Tue, 26 Nov 2019)
Changed paths:
M
src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildListener.java
M
src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashRepository.java
M
src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/stash/StashApiClient.java
M
src/test/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildListenerTest.java
M
src/test/java/stashpullrequestbuilder/stashpullrequestbuilder/stash/StashApiClientTest.java
A src/test/resources/__files/PullRequestMergeFailed.json
A src/test/resources/__files/PullRequestMerged.json
Log Message:
-----------
Fix error handling when merging pull requests
Treat HTTP code 409 as valid. That makes it possible to process the
responses sent with that code.
Parse the response to the merge call as a pull request. If it succeeds
and the pull request state is "MERGED", return empty Optional. Otherwise,
return the server response as a string and write it to the build log.
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/stash-pullrequest-builder-plugin/push/refs/heads/master/bde3d5-61f316%40github.com.
