Skip to content

Pull requests: Changed the merge box and the timeline's commit rows to match GitHub - #184

Merged
whereareiam merged 1 commit into
devfrom
fix/pull-merge-box-classic
Nov 14, 2026
Merged

whereareiam merged 1 commit into
devfrom
fix/pull-merge-box-classic

Conversation

@whereareiam

@whereareiam whereareiam commented Nov 14, 2026 •

Copy link
Copy Markdown
Owner

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.

  • GitHub's wording, from the theme's phrases: "Checks awaiting conflict resolution", "1 failing, 1 successful checks", "No conflicts with base branch", the conflict, draft, merged and closed sentences, and "You can also merge this with the command line." With the optional theme-github-wording.tar.gz add-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).
  • 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, as GitHub's does. Rows are 37px with 16px icons; a failing check shows GitHub's filled red circle, and a description is set off with a dash ("ci/lint — Lint failed"). The status ring is 32px.
  • The merge button shows only its label, with GitHub's padding. The disabled button of a draft or a conflict keeps its dropdown arrow.
  • Row buttons ("Remove WIP: prefix", "Delete branch") sit level with the title when the row has a second line, as in the draft, merged and closed rows, and stay centred on a one-line title.
  • Merged and closed: the branch name is GitHub's blue branch chip.
  • Commits 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 (Forgejo's padding shrank them to 10px). A commit with a body shows GitHub's small "…" pill right after its message instead of a full button beside the hash, and its unfolded body is muted 12px monospace under the avatar.

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.

Before After
Merge box before Merge box after

Release notes

  • The title follows Area: Description with a listed area
  • The title describes the effect in the past tense, for example Branches: Fixed ...
  • Exactly one label: feature, change, bug, dependencies, or skip-changelog
  • bug only for a bug that shipped in a release; a fix for a bug that only existed on dev is skip-changelog
  • major added when admins must act on upgrade, for example a new minimum Forgejo version
  • Upgrade steps or warnings added to .github/release-notes.md, if admins need them

Checks

  • Tests added or updated
  • Checked in the dev preview at desktop width in dark mode, in English and Russian

bun check and bun vitest (581 tests) pass.

🤖 Generated with Claude Code

@whereareiam whereareiam added the change Changed look, templates or compatibility label Nov 14, 2026
@whereareiam
whereareiam force-pushed the fix/pull-merge-box-classic branch from 86fb76e to 612b695 Compare November 14, 2026 12:18
@whereareiam whereareiam changed the title Pull requests: Changed the merge box's check list and merge button to match GitHub Pull requests: Changed the merge box and the timeline's commit rows to match GitHub Nov 14, 2026
@whereareiam
whereareiam force-pushed the fix/pull-merge-box-classic branch 3 times, most recently from 5774f33 to 0d36f41 Compare November 14, 2026 14:27
@whereareiam
whereareiam changed the base branch from dev to feat/theme-phrases November 14, 2026 14:28
@whereareiam
whereareiam force-pushed the fix/pull-merge-box-classic branch from 0d36f41 to a8c6538 Compare November 14, 2026 14:28
@whereareiam
whereareiam force-pushed the fix/pull-merge-box-classic branch from a8c6538 to 615d265 Compare November 14, 2026 14:50
Base automatically changed from feat/theme-phrases to dev November 14, 2026 15:28
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
whereareiam force-pushed the fix/pull-merge-box-classic branch from 615d265 to 99b9e3b Compare November 14, 2026 15:29
@whereareiam
whereareiam merged commit e0250b7 into dev Nov 14, 2026
5 checks passed
@whereareiam
whereareiam deleted the fix/pull-merge-box-classic branch November 14, 2026 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

change Changed look, templates or compatibility

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant