Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: do not group commits by type when rendering and harmonize commit color keys #5072

Merged
merged 5 commits into from
Oct 9, 2024
Merged

fix: do not group commits by type when rendering and harmonize commit color keys #5072

merged 5 commits into from
Oct 9, 2024

Conversation

ndom91
Copy link
Contributor

@ndom91 ndom91 commented Oct 9, 2024 •
edited
Loading

☕️ Reasoning

  • When rendering, do not group the commits together in Remote, LocalAndRemote, etc. groups
    • Instead, render remotePatches (i.e. remote only) into the yellow accordion
    • Render the rest of the patches through 1 #each block
  • Ensure that the commitStatus and color key's are harmonized and we're rendering the correct color for the commitCard lines and branchHeader lines
  • Remove the "Create Branch" / "Push Ref" buttons from the stacking commit card

🧢 Changes

@vercel Vercel
Copy link

vercel bot commented Oct 9, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
gitbutler-web ❌ Failed (Inspect) Oct 9, 2024 7:23pm

@ndom91 ndom91 changed the title Virtual-branch-2386180627 fix: do not group commits by type when rendering and harmonize commit color keys Oct 9, 2024
@ndom91 ndom91 merged commit 95767ab into master Oct 9, 2024
13 of 14 checks passed
@ndom91 ndom91 deleted the Virtual-branch-2386180627 branch October 9, 2024 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krlvi krlvi krlvi approved these changes

@mtsgrd mtsgrd Awaiting requested review from mtsgrd

@Caleb-T-Owens Caleb-T-Owens Awaiting requested review from Caleb-T-Owens

@estib-vega estib-vega Awaiting requested review from estib-vega

Assignees
No one assigned
Labels
@gitbutler/desktop @gitbutler/ui
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ndom91 @krlvi