Fryuni/forgejo
Watch
1
0
Fork
You've already forked forgejo
 0
forked from mirror/forgejo
Code Pull requests Activity Actions

feat(auto-merge): show merge style in pending schedule banner #5

Closed
Fryuni wants to merge 1 commit from t3code/40ad2272 into forgejo
pull from: t3code/40ad2272
merge into: Fryuni:forgejo
Conversation 0 Commits 1 Files changed 5 +53 -5
Fryuni commented 2026-09-16 02:31:13 +00:00
Owner

Summary

  • Show which merge style a scheduled auto-merge will use in the pending schedule banner on the pull request page (e.g. "user2 scheduled this pull request to auto merge using "Create squash commit" ...").
  • Add a new locale string pulls.auto_merge_has_pending_schedule_with_style and fall back to the existing string for unknown styles.
  • Fix the merge form so styles with hideMergeMessageTexts (rebase, fast-forward-only) never ask for a commit message when scheduling auto merge.
  • Extend the periodic auto-merge integration test to assert the banner text and add frontend unit tests covering message-field visibility per merge style.

Testing

  • tests/integration/pull_auto_merge_actions_test.go: asserts the rendered banner contains the localized merge style for merge, squash, and rebase styles (extended in this PR).
  • web_src/js/components/PullRequestMergeForm.test.js: added cases verifying auto-merge scheduling omits title/message fields for rebase and fast-forward-only.
  • Not run: full make test-sqlite, make test-frontend, and E2E suites.
  • Not run: manual verification against MySQL/PostgreSQL.

Note: per CONTRIBUTING.md, Forgejo does not accept contributions authored by coding agents; this description is for local workflow use only.

## Summary - Show which merge style a scheduled auto-merge will use in the pending schedule banner on the pull request page (e.g. "user2 scheduled this pull request to auto merge using \"Create squash commit\" ..."). - Add a new locale string `pulls.auto_merge_has_pending_schedule_with_style` and fall back to the existing string for unknown styles. - Fix the merge form so styles with `hideMergeMessageTexts` (rebase, fast-forward-only) never ask for a commit message when scheduling auto merge. - Extend the periodic auto-merge integration test to assert the banner text and add frontend unit tests covering message-field visibility per merge style. ## Testing - `tests/integration/pull_auto_merge_actions_test.go`: asserts the rendered banner contains the localized merge style for merge, squash, and rebase styles (extended in this PR). - `web_src/js/components/PullRequestMergeForm.test.js`: added cases verifying auto-merge scheduling omits title/message fields for `rebase` and `fast-forward-only`. - Not run: full `make test-sqlite`, `make test-frontend`, and E2E suites. - Not run: manual verification against MySQL/PostgreSQL. > Note: per `CONTRIBUTING.md`, Forgejo does not accept contributions authored by coding agents; this description is for local workflow use only.
- The auto-merge tooltip now says which merge style will be used
- Drop the rebase exception that showed commit message fields for auto-merge
Fryuni closed this pull request 2026-09-16 02:48:28 +00:00
Fryuni deleted branch t3code/40ad2272 2026-09-16 02:48:33 +00:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
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
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!5
No description provided.