From 55152a28ca3fa1b28d2bfff7accb6e57ae34d44e Mon Sep 17 00:00:00 2001 From: Oliver Braun Date: Thu, 23 Apr 2026 20:07:43 +0200 Subject: [PATCH] docs: update configuration for merge request options and strategies Co-authored-by: Copilot --- docs/configuration.md | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 0fe1b9e..a138eca 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -143,7 +143,6 @@ Patterns are **regular expressions**, so: | `description` | GitLab project description | `generated by glabs` | Visible in UI | | `accesslevel` | Initial project access (see below) | `developer` | Can be changed later with `setaccess` | | `containerRegistry` | Enable container registry | `false` | Auto-enabled if `release.dockerImages` set | -| `mergeRequest.mergeMethod` | Merge strategy (see below) | `merge` | Applied at project creation | | `students` | Override/add assignment-specific students | — | Merged with course-level | | `groups` | Override/add assignment-specific groups | — | Merged with course-level | @@ -309,9 +308,29 @@ release: | `mergeRequest.pipeline` | Wait for CI | `false` | Require passing checks | | `dockerImages` | Images to build | `[]` | Creates container registry entries | -### Merge method values +**Notes:** + +- Container registry is auto-enabled when `dockerImages` is set +- Enables GitLab Flow workflow for releases +- Works with CI/CD pipeline to build/deploy + +## Merge Request options + +Control how merge requests are merged in every generated project: + +```yaml +: + mergeRequest: + mergeMethod: merge # merge | semi_linear | ff +``` -The assignment-level `mergeRequest.mergeMethod` option controls how merge requests are merged in every generated project: +### Merge Request keys + +| Key | Purpose | Default | Notes | +|---|---|---|---| +| `mergeRequest.mergeMethod` | Merge strategy for all MRs | `merge` | Applied at project creation | + +### Merge method values | Value | GitLab UI name | Description | |---|---|---| @@ -327,12 +346,6 @@ blatt01: mergeMethod: ff # Students must keep a linear history ``` -**Notes:** - -- Container registry is auto-enabled when `dockerImages` is set -- Enables GitLab Flow workflow for releases -- Works with CI/CD pipeline to build/deploy - ## Full example ```yaml