merge queue: embarking main (76fa63f), #10816, #10817, #10820 and #10821 together

package.json

@@ -61,7 +61,7 @@
     "remark-directive": "^4.0.0",
     "remark-frontmatter": "^5.0.0",
     "remark-preset-lint-markdown-style-guide": "^6.0.1",
-    "sass-embedded": "^1.98.0",
+    "sass-embedded": "^1.99.0",
     "typescript": "^6.0.2",
     "unified": "^11.0.5",
     "unist-util-remove": "^4.0.0",

src/content/docs/ci-insights/setup/github-actions.mdx

@@ -142,10 +142,10 @@ jobs:
   running when no changes are made on the code
 
 - **Job name**: Ensure the job name is the same as the one running tests on your pull request,
-  allowing CI-Insights to identify them. It can be overriden with `MERGIFY_JOB_NAME` if needed.
+  allowing CI-Insights to identify them. It can be overridden with `MERGIFY_TEST_JOB_NAME` if needed.
 
 ### Key Environment Variables
 
 - `MERGIFY_TOKEN`: Application key with `ci` scope for uploading test results to CI Insights
 - `RUN_COUNT`: Number of times to execute each test within a single job
-- `MERGIFY_JOB_NAME`: The job name reported to CI Insights
+- `MERGIFY_TEST_JOB_NAME`: The job name reported to CI Insights

src/content/docs/ci-insights/setup/jenkins.mdx

@@ -162,10 +162,10 @@ pipeline {
   running when no changes are made on the code
 
 - **Job name**: Ensure the job name is the same as the one running tests on your pull request,
-  allowing CI-Insights to identify them. It can be overriden with `MERGIFY_JOB_NAME` if needed.
+  allowing CI-Insights to identify them. It can be overridden with `MERGIFY_TEST_JOB_NAME` if needed.
 
 ### Key Environment Variables
 
 - `MERGIFY_TOKEN`: Application key with `ci` scope for uploading test results to CI Insights
 - `RUN_COUNT`: Number of times to execute each test within a single job
-- `MERGIFY_JOB_NAME`: The job name reported to CI Insights
+- `MERGIFY_TEST_JOB_NAME`: The job name reported to CI Insights

src/content/docs/ci-insights/test-frameworks/pytest.mdx

@@ -121,7 +121,7 @@ If you’re using multiple environments (e.g. `py38`, `py39`, etc.), the plugin
 will work for all of them as long as the token is set correctly.
 
 If you’re running multiple Tox environments (e.g., py38, py39, etc.), we
-recommend setting the `MERGIFY_JOB_NAME` environment variable to identify each
+recommend setting the `MERGIFY_TEST_JOB_NAME` environment variable to identify each
 environment’s report in CI Insights:
 
 In your GitHub Actions workflow:
@@ -130,11 +130,11 @@ In your GitHub Actions workflow:
 - name: Run Tox Tests
   env:
     MERGIFY_TOKEN: ${{ secrets.MERGIFY_TOKEN }}
-    MERGIFY_JOB_NAME: tox-${{ matrix.python-version }}
+    MERGIFY_TEST_JOB_NAME: tox-${{ matrix.python-version }}
   run: tox
 ```
 
 :::tip
-Use `MERGIFY_JOB_NAME` to make reports clearer in CI Insights, especially when
+Use `MERGIFY_TEST_JOB_NAME` to make reports clearer in CI Insights, especially when
 running multiple Tox environments or using a matrix.
 :::

src/content/docs/commands/rebase.mdx

@@ -19,6 +19,12 @@ import RebaseAdvantage from './_rebase_advantages.mdx';
 
 <RebaseAdvantage />
 
+:::caution
+  Rebasing fork pull requests using `bot_account` impersonation is
+  deprecated and will stop working on **July 1, 2026**. Use the
+  [`update` command](/commands/update) instead for fork PRs.
+:::
+
 ## Syntax
 
 To make use of the `rebase` command, simply comment on the desired pull

src/content/docs/merge-queue/merge-strategies.mdx

@@ -178,6 +178,13 @@ In this mode, `update_method` must be set to `rebase` (the default). If a
 rebase update occurs, the commit SHAs on the PR will change — what fast-forward
 preserves are the SHAs of the PR branch at merge time.
 
+:::caution
+  When using `update_bot_account` with fast-forward inplace mode, fork pull
+  requests will no longer be supported after **July 1, 2026**. See the
+  [update method deprecation note](#combining-merge-and-update-methods) for
+  details and migration options.
+:::
+
 ```dot class="graph"
 strict digraph {
     fontname="sans-serif";
@@ -276,6 +283,12 @@ The `update_method` option controls how Mergify updates PR branches when they
 fall behind the base branch. Combining `merge_method` with `update_method`
 gives you additional control over your history shape.
 
+:::note
+  `update_method: rebase` combined with `update_bot_account` will no longer
+  support fork pull requests after **July 1, 2026**. If your repository
+  receives fork PRs, use `update_method: merge` instead.
+:::
+
 ### Semi-Linear History (Rebase + Merge Commit)
 
 ```yaml

src/content/docs/workflow/actions/rebase.mdx

@@ -17,6 +17,13 @@ up-to-date with the latest changes from the base branch.
   before being merged.
 :::
 
+:::caution
+  The `rebase` action with `bot_account` will no longer support fork pull
+  requests after **July 1, 2026**. If you use this configuration on
+  repositories that receive PRs from forks, switch to the
+  [`update` action](/workflow/actions/update) instead.
+:::
+
 ## Parameters
 
 <ActionOptionsTable def='RebaseActionModel'/>