feat(gitlab): respect project level squash setting (lindell#228)

rerikson · Feb 5, 2022 · b189661 · b189661
1 parent af2c2d9
commit b189661
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/internal/scm/gitlab/gitlab.go b/internal/scm/gitlab/gitlab.go
@@ -226,6 +226,7 @@ func (g *Gitlab) CreatePullRequest(ctx context.Context, repo scm.Repository, prR
 		TargetProjectID:    &r.pid,
 		ReviewerIDs:        reviewersIDs,
 		RemoveSourceBranch: &removeSourceBranch,
+		Squash:             &r.shouldSquash,
 		AssigneeIDs:        assigneesIDs,
 	})
 	if err != nil {

diff --git a/internal/scm/gitlab/repository.go b/internal/scm/gitlab/repository.go
@@ -26,15 +26,28 @@ func (g *Gitlab) convertProject(project *gitlab.Project) (repository, error) {
 		name:          project.Path,
 		ownerName:     project.Namespace.Path,
 		defaultBranch: project.DefaultBranch,
+		shouldSquash:  shouldSquash(project),
 	}, nil
 }
 
+func shouldSquash(project *gitlab.Project) bool {
+	switch project.SquashOption {
+	case gitlab.SquashOptionAlways, gitlab.SquashOptionDefaultOn:
+		return true
+	case gitlab.SquashOptionNever, gitlab.SquashOptionDefaultOff:
+		return false
+	default:
+		return false
+	}
+}
+
 type repository struct {
 	url           string
 	pid           int
 	name          string
 	ownerName     string
 	defaultBranch string
+	shouldSquash  bool
 }
 
 func (r repository) CloneURL() string {