Merge pull request #24 from GEBIT/reopened-merge-requests

dka23 · web-flow · commit 31b384edae5a · 2018-10-03T11:31:45.000+02:00
Handle merge request state 'reopened' and map to 'open'
diff --git a/src/main/java/com/dkaedv/glghproxy/converter/GitlabToGithubConverter.java b/src/main/java/com/dkaedv/glghproxy/converter/GitlabToGithubConverter.java
@@ -206,7 +206,7 @@ public static PullRequest convertMergeRequest(GitlabMergeRequest glmr, String gi
 	}
 
 	private static void convertMergeRequestState(PullRequest pull, GitlabMergeRequest glmr) {
-		if ("opened".equals(glmr.getState())) {
+		if ("opened".equals(glmr.getState()) || "reopened".equals(glmr.getState())) {
 			pull.setState("open");
 			pull.setMerged(false);
 		} else if ("closed".equals(glmr.getState())) {

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ public static PullRequest convertMergeRequest(GitlabMergeRequest glmr, String gi`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`private static void convertMergeRequestState(PullRequest pull, GitlabMergeRequest glmr) {`
`209`		`- if ("opened".equals(glmr.getState())) {`
	`209`	`+ if ("opened".equals(glmr.getState()) \|\| "reopened".equals(glmr.getState())) {`
`210`	`210`	`pull.setState("open");`
`211`	`211`	`pull.setMerged(false);`
`212`	`212`	`} else if ("closed".equals(glmr.getState())) {`