merge queue: embarking main (6227522) and #476 together#493
Closed
mergify[bot] wants to merge 3 commits into
Closed
merge queue: embarking main (6227522) and #476 together#493mergify[bot] wants to merge 3 commits into
mergify[bot] wants to merge 3 commits into
Conversation
…yling
Reuse Primer utility classes (bgColor-muted, borderColor-muted, border-top,
rounded-bottom-2) and the --base-size-16 padding token, so the Mergify row
sits flush against GH's own "Merge pull request" section in the merge box
instead of inheriting the darker page bg with an ad-hoc border-top.
Restructure the row so it reads like a GH action panel:
[Add to merge queue] [Refresh] [Rebase] [Update] ☰ queue 🕓 logs [● Mergify]
- All action buttons grouped on the left (matches GH's "Squash and merge"
+ chevron block).
- Right cluster holds the navigation: queue/logs links with Octicon
prefixes (list-unordered for queue, clock for logs) so they read as
first-class nav rather than metadata, and the logo+Mergify text fused
into one anchor linking to dashboard.mergify.com.
- Primary/dequeue labels expanded ("Add to merge queue" / "Remove from
merge queue") so the primary button has the same visual weight as
GitHub's merge button and clearly states what it does.
- 24px effective left padding so the primary button doesn't crowd the
card edge.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Change-Id: I41e4c5e0a527bea4915e4bff37b04402a58f8fe6
…rives
Previously the row was the very last thing to appear in the merge box on
cold loads — the user would see GitHub's "Squash and merge" panel for
seconds before the Mergify "Add to merge queue" button materialised.
The reason is that `_tryInject` awaited four network roundtrips in
sequence before building the row:
1. `/search?q=…mergify.yml` (is Mergify enabled on this repo?)
2. fetchCommentBodies (stack/revision context)
3. `/{org}/{repo}/pull/{n}/checks` (find the queue check-run ID)
4. `/{org}/{repo}/runs/{check_run_id}` (resolve "queued" vs "evaluating")
Reorder so the row appears as soon as the merge box exists:
- The is-Mergify-enabled check now tries the synchronous detection path
first (Mergify app-icon in the DOM or a cached repo result). The
`/search` fetch is only paid on the rare cold load where Mergify has
not yet commented on the page.
- The initial row is built with state derived synchronously from the
DOM (`deriveQueueButtonState` reads open/merged/closed, the expanded
Checks section if present, and the last `@mergifyio` command — all
sync), then injected immediately into the merge box.
- `renderMergifyContext` and `fetchQueueStateIfNeeded` now run in
parallel as background fire-and-forgets. When the queue-state fetch
resolves, a `then()` callback runs `updateMergifyRow`, which swaps
the button in place if its `data-mergify-queue-btn` attribute
changed — no full row rebuild.
- The merge-box DOM-walking is extracted into `injectRowIntoMergeBox()`
to keep the new early-injection path readable.
Trade-off: on a PR that *is* queued, when the Checks section has not
been expanded, the button briefly shows "Add to merge queue" before
flipping to "Remove from merge queue" once the network state arrives.
This is a single-button swap, not a row reflow.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Change-Id: Iaab5480cfb96d04421bd4136576620f2487c4780
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.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch main (6227522) and #476 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #476.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:depends-on = Mergifyio/browser-extension#475[⛓️ feat(extension): rework merge-box queue row to match GitHub native styling #475]check-success=actionlintcheck-success=testtitle ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:#approved-reviews-by >= 2author = dependabot[bot]body ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0Required conditions to stay in the queue:
#approved-reviews-by>=2#changes-requested-reviews-by=0#review-requested=0#review-threads-unresolved=0depends-on = Mergifyio/browser-extension#475[⛓️ feat(extension): rework merge-box queue row to match GitHub native styling #475]check-success=actionlintcheck-success=testtitle ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:#approved-reviews-by >= 2author = dependabot[bot]body ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0