Repository navigation
Pull request: Show a scheduled merge as a merge box section - #83
Merged
Merged
Conversation
When a merge is scheduled for when checks succeed, Forgejo prints a blue notice above the merge button. In the themed merge box it sat half-width beside the instructions link, with the buttons loosely below it. The notice is now one more section of the box, like the rows above it: a round clock icon and the sentence, with the merge button and "Cancel" in the bar underneath, 8px apart. The rules live in a new page stylesheet because the theme files are at their size limit. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Oct 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stacked on #82 (base is its branch): both add a page stylesheet to the same two lists.
What was wrong
With a merge scheduled for when checks succeed, Forgejo renders
<div class="ui info message">above the merge button. Inside the themed merge box it was a blue box about half the width of the bar, with "View command line instructions" beside it and the merge and cancel buttons on a second line, 22px apart.What changed
styles/pages/pull-request.css(new page stylesheet, linked fromcomponent_assets.tmpl):Not measured against GitHub: its equivalent ("auto-merge enabled") needs branch protection, which GitHub does not offer on a private repository without a paid plan. The layout follows the merge box sections that were measured.
The rules are in a page stylesheet, not in
pull_review.ts, because the theme files have about 600 bytes left under the size limit.Verification
Reproduced in the preview by adding a required status check and scheduling the merge through the API (both removed afterwards).
bun vitest(403 passed),bun checkand Prettier pass. Screenshots are not attached.🤖 Generated with Claude Code