Merge pull request #290 from Interhyp/289-new-property-exclude-from-m…

…erge-commits feat(#289): add new configuration property 'excludeMergeCommits' to r…
Interhyp · May 28, 2024 · 86bfedd · 86bfedd
2 parents 4573c2c + d02c3fc
commit 86bfedd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/api/generated_apimodel.go b/api/generated_apimodel.go
diff --git a/api/openapi-v3-spec.json b/api/openapi-v3-spec.json
@@ -2929,6 +2929,10 @@
             "type": "integer",
             "description": "Set the required successful builds counter."
           },
+          "excludeMergeCommits": {
+            "type": "boolean",
+            "description": "Exclude merge commits from commit checks."
+          },
           "requireConditions": {
             "type": "object",
             "description": "Configuration of conditional builds as map of structs (key name e.g. some-key) of target references.",

diff --git a/internal/service/repositories/repositories.go b/internal/service/repositories/repositories.go
@@ -450,6 +450,7 @@ func patchConfiguration(patch *openapi.RepositoryConfigurationDto, original *ope
 			CommitMessageType:       patchStringPtr(patch.CommitMessageType, original.CommitMessageType),
 			RequireIssue:            patchPtr[bool](patch.RequireIssue, original.RequireIssue),
 			RequireSuccessfulBuilds: patchPtr[int32](patch.RequireSuccessfulBuilds, original.RequireSuccessfulBuilds),
+			ExcludeMergeCommits:     patchPtr[bool](patch.ExcludeMergeCommits, original.ExcludeMergeCommits),
 			RequireConditions:       patchConditions(patch.RequireConditions, original.RequireConditions),
 			Webhooks:                patchWebhooks(patch.Webhooks, original.Webhooks),
 			Approvers:               patchApprovers(patch.Approvers, original.Approvers),