fix(pull): show scheduled merge style in auto-merge banner and keep merge message fields visible #6

Merged

Fryuni merged 2 commits from t3code/44b1c273 into forgejo 2026-09-16 11:06:26 +00:00

Conversation 0 Commits 2 Files changed 18 +302 -110

Fryuni commented 2026-09-16 02:32:48 +00:00

Owner

• Copy link
• Copy Markdown

Summary

• Show the scheduled (auto-merge) merge style in the auto-merge banner independently of the currently selected merge style, instead of only the generic tip message
• Pass pendingMergeStyle from the template into PullRequestMergeForm and derive its display label from the known merge styles
• Always show merge title/message fields when the form is open, removing the special case that hid them for rebase auto-merge, so the saved message and branch choice work consistently (including rebase-merge)

Testing

• Added frontend unit tests in PullRequestMergeForm.test.js:
  • auto-merge banner shows the scheduled method label while the selected method can differ
  • message fields are absent for rebase/fast-forward-only styles in all merge/auto-merge combinations
  • auto-merge saves message and branch choice for merge, squash, and rebase-merge
• Added integration test TestPullViewScheduledMergeStyle verifying pendingMergeStyle is rendered empty without a schedule and as the scheduled style (e.g. rebase) after ScheduleAutoMerge
• Not run: browser E2E suite; frontend tests and SQLite integration test should be exercised via npx vitest run web_src/js/components/PullRequestMergeForm.test.js and make 'test-sqlite#TestPullViewScheduledMergeStyle'

## Summary - Show the scheduled (auto-merge) merge style in the auto-merge banner independently of the currently selected merge style, instead of only the generic tip message - Pass `pendingMergeStyle` from the template into `PullRequestMergeForm` and derive its display label from the known merge styles - Always show merge title/message fields when the form is open, removing the special case that hid them for rebase auto-merge, so the saved message and branch choice work consistently (including `rebase-merge`) ## Testing - Added frontend unit tests in `PullRequestMergeForm.test.js`: - auto-merge banner shows the scheduled method label while the selected method can differ - message fields are absent for `rebase`/`fast-forward-only` styles in all merge/auto-merge combinations - auto-merge saves message and branch choice for `merge`, `squash`, and `rebase-merge` - Added integration test `TestPullViewScheduledMergeStyle` verifying `pendingMergeStyle` is rendered empty without a schedule and as the scheduled style (e.g. `rebase`) after `ScheduleAutoMerge` - Not run: browser E2E suite; frontend tests and SQLite integration test should be exercised via `npx vitest run web_src/js/components/PullRequestMergeForm.test.js` and `make 'test-sqlite#TestPullViewScheduledMergeStyle'`

Fryuni added 1 commit 2026-09-16 02:32:48 +00:00

fix(pull): show scheduled merge style in auto-merge banner and keep mess ... 7d0335f4f7

- Pass the pending auto-merge style to the merge form and display its label in the info banner, independent of the currently selected style
- No longer force-show merge title/message fields for scheduled rebase merges
- Add integration and component tests

Fryuni added 1 commit 2026-09-16 03:04:06 +00:00

fix(pull): reject merge messages for rebase and fast-forward-only merges ... ee81ef98ba

- Rebase and fast-forward-only preserve original commit messages; a supplied title/body now returns 422 (API) or an error (web), including when scheduling auto-merge
- Drop the REBASE_TEMPLATE amend of the tip commit and skip message templates for non-message styles
- Document MergeTitleField/MergeMessageField constraints in API form

Fryuni merged commit 608cbcfa91 into forgejo 2026-09-16 11:06:26 +00:00

Fryuni deleted branch t3code/44b1c273 2026-09-16 11:06:26 +00:00

Fryuni referenced this pull request from a commit 2026-09-16 11:06:26 +00:00

fix(pull): show scheduled merge style in auto-merge banner and keep merge message fields visible (#6)

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

Fryuni/forgejo!6

No description provided.