GitLab merge request generation ignored followChangeRequestTemplates because its provider did not implement the existing template reader. It now reads .gitlab/merge_request_templates/Default.md from the requested committed base, with a case-insensitive filename. Other templates are never used as a fallback.
The reader accepts regular Git blobs, trims blank content, returns no template on read failure, and bounds content at 8,000 bytes with a truncation marker. Feature-branch changes, uncommitted files, symlinks, and submodules do not supply the template. The existing setting and generation service handle forwarding; no client or contract changes are needed.
Rebuilt from @fixfon's #19813, preserving their history. Removed the standalone test suite and redundant stub coverage: 12 feature tests → 4 in the existing GitManager suite, retaining all 182 existing main tests. Reduced the reader to 53 lines and kept the existing provider extension.
Verification at d9a24fb:
git diff --check passed.Current-head CI passed. A cancelled duplicate fingerprint run is superseded by the successful run on the same head. The existing human approval requirement remains outstanding.
No authenticated GitLab API/glab MR creation or external model generation was run; those boundaries are stubbed in the generation integration tests. No new visual behavior requires screenshots. macOS, Windows, Electron desktop, iOS, Android, and remote/tunnel connections were not run. For an account-backed check, enable the setting and generate a GitLab MR from a feature branch with different template content; confirm the generated description follows the committed target template, then disable the setting and repeat.
Human approval is required for the newly honored generation default. This takeover does not merge the PR.
Implementation: Codex gpt-6.1-sol (high), tests: Codex gpt-6-astra (high), reviews: Claude claude-opus-5-5 and Codex gpt-6-sol (high), orchestrated through T3 Code and the Codex harness.
Added 1 commit
Verdict: Needs Human Approval
Macroscope's review found this PR not approvable — This PR changes the default-enabled GitLab merge-request generation path so repository Default.md content is now read and supplied to description generation, affecting existing user-visible output. The implementation is focused and tested, but the behavioral/default change warrants human review.
You can add or adjust custom eligibility rules. Learn more.
Warning
Only developers with an assigned seat can use this organization's usage-based review budget, and seats here are assigned manually. Ask an admin to assign a seat, or change the review continuation mode in Billing.
Next included review available in 6 minutes.
Limit details: You’ve used all 10 included reviews currently available.
Review configuration:
6fa9b0e4-4b23-4a6d-b672-bd9aa6d6bb6fReviewing files that changed from the base of the PR and between 265ec9e9e5caf8a78d086805bbfff14d984e3163 and 2b5856465cc29041687453abad8b18ff10c25656.
apps/server/src/git/GitManager.test.tspackages/source-control-gitlab/src/server/GitLabSourceControlProvider.test.tspackages/source-control-gitlab/src/server/GitLabSourceControlProvider.tspackages/source-control-gitlab/src/server/gitLabChangeRequestTemplate.tsNo actionable comments were generated in the recent review. 🎉
0c8e838c-a017-4fbe-8e11-0783b938fe13Reviewing files that changed from the base of the PR and between 339179f50a84dc599cce373dbb48f172f182f44e and 265ec9e9e5caf8a78d086805bbfff14d984e3163.
apps/server/src/git/GitManager.test.tsapps/server/src/sourceControl/gitLabChangeRequestTemplate.test.tspackages/source-control-gitlab/src/server/GitLabSourceControlProvider.test.tspackages/source-control-gitlab/src/server/GitLabSourceControlProvider.tspackages/source-control-gitlab/src/server/gitLabChangeRequestTemplate.tsIncluded review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review.
The GitLab source-control provider now detects and reads default merge-request templates from committed Git trees. Tests cover template selection and bounds, provider access through the host Git client, and passing template content to pull-request content generation.
Changes: GitLab merge-request templates
| Layer / File(s) | Summary |
|---|---|
Detect templates from Git trees packages/source-control-gitlab/src/server/gitLabChangeRequestTemplate.ts, apps/server/src/sourceControl/gitLabChangeRequestTemplate.test.ts | Adds detection for case-insensitive Default.md files in the GitLab template directory. The detector handles requested treeishes, empty content, symlinks, listing limits, and oversized blobs. Tests exercise these cases. |
Expose template reading through the GitLab provider packages/source-control-gitlab/src/server/GitLabSourceControlProvider.ts, packages/source-control-gitlab/src/server/GitLabSourceControlProvider.test.ts | The provider uses the host Git client to detect templates for a working directory and treeish. Tests verify the Git commands and returned content. |
Pass templates to pull-request content generation apps/server/src/git/GitManager.test.ts | Tests verify that commit_push_pr supplies the GitLab default template to content generation. The fork-matching test reuses its process-host test layer. |
Priority: ⬇️ Low
Estimated code review effort: 3 (Moderate) | ~20 minutes
Change: Bug fix
| 1 | sequenceDiagram |
| 2 | participant GitManager |
| 3 | participant GitLabSourceControlProvider |
| 4 | participant Git |
| 5 | GitManager->>GitLabSourceControlProvider: Read template for working directory and treeish |
| 6 | GitLabSourceControlProvider->>Git: List tree and read template blob |
| 7 | Git-->>GitLabSourceControlProvider: Tree entry and blob content |
| 8 | GitLabSourceControlProvider-->>GitManager: Detected template |
Suggested reviewers: juliusmarminge
265ecGitLab default-template support is ready to merge after normal checks; no actionable risk remains identified.
265ecThe template lookup uses committed repository data, rejects symlinks, limits output, and preserves the existing user switch. No introduced security defect was established. Some uncertainty remains around how supported generation providers enforce isolation.
Retained concerns No architecture-level concerns identified.
Security Blast Radius
Security Findings and Attack Paths
Trust Boundaries and Controls
Resilience and Maintainability Implications
| Check name | Status | Explanation |
|---|---|---|
| Linked Issues check | Passed | Check skipped because no linked issues were found for this pull request. |
| Out of Scope Changes check | Passed | Check skipped because no linked issues were found for this pull request. |
| Title check | Passed | The title clearly and concisely describes the main change: GitLab now follows the repository default merge request template. |
| Description check | Passed | The description clearly explains the problem, implementation, scope, verification results, limitations, and approval status. It does not provide explicit maintainer approval or a linked approval discu… |
Explanation
The description clearly explains the problem, implementation, scope, verification results, limitations, and approval status. It does not provide explicit maintainer approval or a linked approval discussion as requested by the Scope and approval template section, but the overall description is substantially complete.
Comment @coderabbitai help to get the list of available commands.
Taking over this one as maintainer for batch worktree-git-14. I’ll keep this focused on GitLab’s committed Default.md template, rebuild the reader against the current package, and reduce the tests to the necessary generation behaviors. Human approval remains required. No merge.
Added 4 commits
