feat(ui): differentiate merge commits in the commit view - #8372
Open
heavry wants to merge 1 commit into
Open
Conversation
Merge commits are now visually distinct in the commit list: - The entire row is dimmed (opacity 0.65) for quick scanning. - A small merge label with the octicon-git-merge icon appears next to the SHA, so the distinction is not color-only. - The commit message remains greyed out as before. Closes gogs#2696
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.
Fixes #2696
Problem
Merge commits look identical to regular commits in the commit view. Users cannot tell at a glance which commits are merges without opening each one. Bitbucket, GitHub, and other forges visually differentiate merge commits, but Gogs does not.
Solution
Merge commits are now visually distinct in the commit list:
octicon-git-mergeicon and the word "merge" appears next to the SHA. This follows WCAG 2.2 AA by not relying on color alone as the distinguishing signal.The label text is localized via
commits.merge_commitin the English locale file.Screenshot
Before: all rows look the same, merge commits blend in.
After: merge commit rows are dimmed and tagged with a merge label.
IssueHunt bounty: $5