Merge pull request #28923 from github/repo-sync

Repo sync

content/billing/index.md

@@ -10,8 +10,6 @@ introLinks:
 featuredLinks:
   startHere:
     - '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method{% endif %}'
-    - '{% ifversion fpt %}/billing/managing-the-plan-for-your-github-accountt/upgrading-your-accounts-plan{% endif %}'
-    - '{% ifversion ghec %}/billing/managing-the-plan-for-your-github-accountt/about-billing-for-your-enterprise{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/setting-your-billing-email{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/about-per-user-pricing{% endif %}'
     - '{% ifversion ghes %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'

content/organizations/index.md

@@ -15,7 +15,7 @@ featuredLinks:
     - /organizations/organizing-members-into-teams/about-teams
   popular:
     - /organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch
-    - /organizations/managing-user-access-to-your-organizations-repositories/repository-roles-for-an-organization
+    - /organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization
     - /organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization
     - /organizations/managing-oauth-access-to-your-organizations-data/about-oauth-app-access-restrictions
     - '{% ifversion ghae %}/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization{% endif %}'
@@ -50,3 +50,4 @@ children:
   - /managing-git-access-to-your-organizations-repositories
   - /migrating-to-improved-organization-permissions
 ---
+

tests/rendering-fixtures/images.js

@@ -1,9 +1,14 @@
+import { jest } from '@jest/globals'
 import sharp from 'sharp'
 
 import { get, head, getDOM } from '../../tests/helpers/e2etest.js'
 import { MAX_WIDTH } from '#src/content-render/unified/rewrite-asset-img-tags.js'
 
 describe('render Markdown image tags', () => {
+  // The default timeout is 5 seconds, which is not enough for this test
+  // in potentially slower CI environments.
+  jest.setTimeout(30 * 1000)
+
   test('page with a single image', async () => {
     const $ = await getDOM('/get-started/images/single-image')