Merge pull request #251 from lucas-zmroczek-apl/93-gitlab-nested-repos

handle nested repos in init for GitLab

Author: jakegut

VERSION

@@ -1 +1 @@
-0.0.34
+0.0.35

initialize/initialize.go

@@ -109,7 +109,8 @@ func reposFromFile(p *lib.Provider, file string) ([]lib.Repo, error) {
 			// in case file ends with newline, ignore it
 			continue
 		}
-		parts := strings.Split(item, "/")
+		// GitLab may have nested directories
+		parts := strings.SplitN(item, "/", 2)
 		if len(parts) != 2 {
 			return []lib.Repo{}, fmt.Errorf("unable determine repo from line, expected format '{org}/{repo}': %s", item)
 		}

merge/mergeGitlab.go

@@ -64,9 +64,9 @@ func GitlabMerge(ctx context.Context, input Input, repoLimiter *time.Ticker, mer
 			return Output{Success: false}, fmt.Errorf("MR is not approved. Review state is %s", mr.State)
 		}
 	}
-	// Try to rebase master if Diverged Commits greates that zero
+	// Try to rebase master if Diverged Commits greater than zero
 	if mr.DivergedCommitsCount > 0 {
-		_, err := client.MergeRequests.RebaseMergeRequest(pid, input.PRNumber, ctxFunc)
+		_, err := client.MergeRequests.RebaseMergeRequest(pid, input.PRNumber, &gitlab.RebaseMergeRequestOptions{}, ctxFunc)
 		if err != nil {
 			return Output{Success: false}, fmt.Errorf("Failed to rebase from master")
 		}