Repository navigation
fix(desktop): merge the right pull request and ignore advisory checks - #3795
Merged
Merged
Conversation
The pull request panel keeps an opened pull per project and machine, so switching threads no longer leaves another project's #N with a live Merge button. The merge control reads the detail's check runs and leaves out the advisory portability jobs the engine's merge ignores. Merge is hidden on threads from another machine, the armed button changes colour and says what the second press does, and the panel drops its repeated heading, the header check mark and the Overview file list the Diff tab already has.
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.
What
Fixes to the merge button from #3792, plus trimming the pull request panel.
ADVISORY_CHECKSinpull_requests.rs, andscripts/pr-merge.sh) ignores the portability jobs. A failing advisory job disabled Merge althoughmerge_when_greenwould merge. The control now reads the detail's check runs without the advisory jobs, and the list's counts stand in until the runs are read. The Checks headline follows the same rule, and advisory rows get an "advisory" tag./viewnow returns the list row for the number asked, with matching check runs. chore(ci): release v0.115.0 #2781's failure is an advisory job and fix(desktop): handle slash-command actions and select command-created threads #2795's a real one, so the list and the detail no longer disagree.Changelog
The merge button no longer acts on another project's pull request after a thread switch, ignores advisory checks the way the merge does, and asks for confirmation more clearly.
Testing
bun run check(2,805 pass).src/ui/MergeButton.test.tsxrenders the button: merge, waiting, blocked without the count, advisory failure not blocking, draft/finished rendering nothing. NewpullMerge.test.tscases cover the advisory rule and the headline.