Repository navigation
Pull requests: Changed the merge box and the timeline's commit rows to match GitHub - #184
Merged
Merged
Conversation
whereareiam
force-pushed
the
fix/pull-merge-box-classic
branch
from
November 14, 2026 12:18
86fb76e to
612b695
Compare
whereareiam
force-pushed
the
fix/pull-merge-box-classic
branch
3 times, most recently
from
November 14, 2026 14:27
5774f33 to
0d36f41
Compare
6 of 8 tasks
whereareiam
force-pushed
the
fix/pull-merge-box-classic
branch
from
November 14, 2026 14:28
0d36f41 to
a8c6538
Compare
whereareiam
force-pushed
the
feat/theme-phrases
branch
from
November 14, 2026 14:50
780d389 to
69445a8
Compare
whereareiam
force-pushed
the
fix/pull-merge-box-classic
branch
from
November 14, 2026 14:50
a8c6538 to
615d265
Compare
Compared against GitHub's classic conversation page at the same scale, with failing, pending and passing checks, a conflict, a draft, merged, closed and commits with and without a body: - GitHub's wording, from the theme's phrases: "Checks awaiting conflict resolution", "1 failing, 1 successful checks", "No conflicts with base branch", the draft, conflict, merged and closed sentences and "You can also merge this with the command line." A language without theme phrases keeps Forgejo's text. - Checks are grouped as on GitHub, failing first, then in progress, skipped and successful, each under a heading such as "1 failing check" that folds it, with a rule between checks of a group. The list scrolls past 300px. - Check rows are 37px with 16px icons; a failing check shows GitHub's filled red circle, and a description is set off with a dash. The status ring is 32px. - The merge button shows only its label, with GitHub's 12px padding; the disabled one of a draft or conflict keeps its dropdown arrow. - A row's button is level with its title when the row has a second line, and centred on a one-line title. - A merged or closed pull request's branch name is GitHub's blue chip. - In the timeline, the first commit of a push sits in a filled circle on a taller row, the others on 36px rows with full-size icons. A commit with a body shows GitHub's small "…" pill right after its message, and the unfolded body is muted 12px monospace under the avatar. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
whereareiam
force-pushed
the
fix/pull-merge-box-classic
branch
from
November 14, 2026 15:29
615d265 to
99b9e3b
Compare
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
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.
Summary
Compared the conversation page with GitHub's classic one at the same scale, in every state: failing, pending and passing checks, a conflict with checks, a draft, merged, closed, and commits with and without a body. Builds on #185, which adds the theme's own translated phrases.
theme-github-wording.tar.gzadd-on from Templates: Introduced an optional add-on with GitHub's wording in Forgejo's languages #185, in all 31 languages Forgejo enables by default; without it, and for a language without theme phrases, the merge box keeps Forgejo's text in GitHub's layout (checks grouped under Forgejo's state names).Left out because Forgejo has nothing behind them: the per-check app avatars (Forgejo does not load a check's creator here), the checks settings gear, "Resolve conflicts" (no web conflict editor) and the Copilot rows. The merge button keeps Forgejo's label for the chosen merge style ("Create merge commit"), since its dropdown lists the styles by the same labels.
Before and after
A pull request with a conflict and failing, pending and successful checks, at 1280px in the dark theme.
Release notes
Area: Descriptionwith a listed areaBranches: Fixed ...feature,change,bug,dependencies, orskip-changelogbugonly for a bug that shipped in a release; a fix for a bug that only existed ondevisskip-changelogmajoradded when admins must act on upgrade, for example a new minimum Forgejo version.github/release-notes.md, if admins need themChecks
bun checkandbun vitest(581 tests) pass.🤖 Generated with Claude Code