Merge branch 'main' into ghrunners-arch

Author: Martin Lopes

.github/workflows/add-review-template.yml

@@ -19,11 +19,8 @@ jobs:
     if: github.event.label.name == 'add-review-template' && github.repository == 'github/docs-internal'
 
     steps:
-      - name: Download the template file
-        uses: Bhacaz/checkout-files@c8f01756bfd894ba746d5bf48205e19000b0742b
-        with:
-          files: .github/review-template.md
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
 
       # Jump through some hoops to work with a multi-line file
       - name: Store review template in variable

.github/workflows/azure-preview-env-deploy.yml

@@ -177,7 +177,7 @@ jobs:
         run: .github/actions-scripts/prune-for-preview-env.sh
 
       - name: 'Build and push image'
-        uses: docker/build-push-action@7f9d37fa544684fb73bfe4835ed7214c255ce02b
+        uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0
         with:
           context: .
           push: true

.github/workflows/azure-prod-build-deploy.yml

@@ -77,7 +77,7 @@ jobs:
         run: .github/actions-scripts/merge-early-access.sh
 
       - name: 'Build and push image'
-        uses: docker/build-push-action@7f9d37fa544684fb73bfe4835ed7214c255ce02b
+        uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0
         with:
           context: .
           push: true

.github/workflows/azure-staging-build-deploy.yml

@@ -95,7 +95,7 @@ jobs:
         run: .github/actions-scripts/merge-early-access.sh
 
       - name: 'Build and push image'
-        uses: docker/build-push-action@7f9d37fa544684fb73bfe4835ed7214c255ce02b
+        uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0
         with:
           context: .
           push: true

.github/workflows/main-preview-docker-cache.yml

@@ -72,7 +72,7 @@ jobs:
         run: .github/actions-scripts/prune-for-preview-env.sh
 
       - name: 'Build and push image'
-        uses: docker/build-push-action@7f9d37fa544684fb73bfe4835ed7214c255ce02b
+        uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0
         with:
           context: .
           push: true

.github/workflows/sync-search-indices.yml

@@ -77,10 +77,6 @@ jobs:
         env:
           VERSION: ${{ github.event.inputs.version }}
           LANGUAGE: ${{ github.event.inputs.language }}
-          # We don't want or need the changelog entries in this context.
-          # Pages that display the content from these isn't included
-          # in search index bodies anyway.
-          CHANGELOG_DISABLED: true
           # If a reusable, or anything in the `data/*` directory is deleted
           # you might get a
           #
@@ -89,11 +85,6 @@ jobs:
           # But that'll get fixed in the next translation pipeline. For now,
           # let's just accept an empty string instead.
           THROW_ON_EMPTY: false
-          # Because the overload protection runs in NODE_ENV==production
-          # and it can break the sync-search.
-          DISABLE_OVERLOAD_PROTECTION: true
-          # Render caching won't help when we visit every page exactly once.
-          DISABLE_RENDERING_CACHE: true
 
         run: npm run sync-search
 

.github/workflows/sync-search-pr.yml

@@ -51,7 +51,4 @@ jobs:
           # Set filtered to only these so it doesn't run for too long.
           LANGUAGE: en
           VERSION: free-pro-team@latest
-          # Because the overload protection runs in NODE_ENV==production
-          # and it can break the sync-search.
-          DISABLE_OVERLOAD_PROTECTION: true
         run: npm run sync-search

assets/images/help/dependabot/dependabot-alerts-sort-dropdown.png

@@ -115,11 +115,20 @@ export function Search({
   const isLoading = isLoadingRaw && isLoadingDebounced
 
   useEffect(() => {
-    if ((router.query.query || '') !== debouncedQuery) {
-      const [asPathRoot, asPathQuery = ''] = router.asPath.split('?')
+    // Because we don't want to have to type .trim() everywhere we
+    // use this variable and we also don't want to change the origin.
+    // This variable is used to decide if and what we should change
+    // the URL to.
+    // Trim whitespace to make sure there's anything left and when
+    // do put this debounced query into the query string, we use it
+    // with the whitespace trimmed.
+    const query = debouncedQuery.trim()
+
+    if ((router.query.query || '') !== query) {
+      const [asPathRoot, asPathQuery = ''] = router.asPath.split('#')[0].split('?')
       const params = new URLSearchParams(asPathQuery)
-      if (debouncedQuery) {
-        params.set('query', debouncedQuery)
+      if (query) {
+        params.set('query', query)
       } else {
         params.delete('query')
       }

assets/images/help/settings/gpg-verified-with-expired-key.png

@@ -26,9 +26,9 @@ export const LanguagePicker = ({ variant }: Props) => {
   // in a "denormalized" way.
   const routerPath = router.asPath.split('#')[0]
 
-  function rememberPreferredLanguage(option: { locale: string }) {
+  function rememberPreferredLanguage(value: string) {
     try {
-      Cookies.set(PREFERRED_LOCALE_COOKIE_NAME, option.locale, {
+      Cookies.set(PREFERRED_LOCALE_COOKIE_NAME, value, {
         expires: 365,
         secure: document.location.protocol !== 'http:',
       })

components/Search.tsx

@@ -11,31 +11,33 @@ intro: You can convert your personal account into an organization. This allows m
 versions:
   fpt: '*'
   ghes: '*'
+  ghae: '*'
   ghec: '*'
 topics:
   - Accounts
 shortTitle: User into an organization
 ---
 {% warning %}
 
-**Warning**: Before converting a user into an organization, keep these points in mind:
-
- - You will **no longer** be able to sign into the converted personal account.
- - You will **no longer** be able to create or modify gists owned by the converted personal account.
- - An organization **cannot** be converted back to a user.
- - The SSH keys, OAuth tokens, job profile,  reactions, and associated user information, **will not** be transferred to the organization. This is only true for the personal account that's being converted, not any of the personal account's collaborators.
- - Any commits made with the converted personal account **will no longer be linked** to that account. The commits themselves **will** remain intact.
- - Any forks of private repositories made with the converted personal account will be deleted.
+**Warning**: Before converting a user into an organization, keep these points in mind.
 
+* You will **no longer** be able to sign into the converted personal account.
+* You will **no longer** be able to create or modify gists owned by the converted personal account.
+* An organization **cannot** be converted back to a user.
+* The SSH keys, OAuth tokens, job profile, reactions, and associated user information, **will not** be transferred to the organization. This is only true for the personal account that's being converted, not any of the personal account's collaborators.
+* Any commits made with the converted personal account **will no longer be linked** to that account. The commits themselves **will** remain intact.
+* Any existing comments made by the converted personal account **will no longer be linked** to that account. The comments themselves **will** remain intact, but will be associated with the `ghost` user.
+* Any forks of private repositories made with the converted personal account will be deleted.
 {% endwarning %}
 
+{% ifversion fpt or ghec or ghes %}
 ## Keep your personal account and create a new organization manually
 
 If you want your organization to have the same name that you are currently using for your personal account, or if you want to keep your personal account's information intact, then you must create a new organization and transfer your repositories to it instead of converting your personal account into an organization.
 
 1. To retain your current personal account name for your personal use, [change the name of your personal account](/articles/changing-your-github-username) to something new and wonderful.
 2. [Create a new organization](/articles/creating-a-new-organization-from-scratch) with the original name of your personal account.
-3. [Transfer your repositories](/articles/transferring-a-repository) to your new organization account.
+3. [Transfer your repositories](/articles/transferring-a-repository) to your new organization account.{% endif %}
 
 ## Convert your personal account into an organization automatically
 

components/page-header/LanguagePicker.tsx

@@ -88,7 +88,7 @@ This section explains how you can use release management to distribute updates t
 
 ### Good practices for release management
 
-If you're developing an action for other people to use, we recommend using release management to control how you distribute updates. Users can expect an action's major version to include necessary critical fixes and security patches, while still remaining compatible with their existing workflows. You should consider releasing a new major version whenever your changes affect compatibility.
+If you're developing an action for other people to use, we recommend using release management to control how you distribute updates. Users can expect an action's patch version to include necessary critical fixes and security patches, while still remaining compatible with their existing workflows. You should consider releasing a new major version whenever your changes affect compatibility.
 
 Under this release management approach, users should not be referencing an action's default branch, as it's likely to contain the latest code and consequently might be unstable. Instead, you can recommend that your users specify a major version when using your action, and only direct them to a more specific version if they encounter issues.
 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/converting-a-user-into-an-organization.md

@@ -369,10 +369,14 @@ runs:
 ```
 {% endif %}
 
+{% ifversion ghes > 3.5 or ghae-issue-6573 %}
+
 #### `runs.steps[*].continue-on-error`
 
 **Optional**  Prevents the action from failing when a step fails. Set to `true` to allow the action to pass when this step fails.
 
+{% endif %}
+
 ## `runs` for Docker container actions
 
 **Required** Configures the image used for the Docker container action.

content/actions/creating-actions/about-custom-actions.md

@@ -53,8 +53,8 @@ name: Create issue on commit
 on: [ push ]
 
 jobs:
-  create_commit:
-    runs-on: ubuntu-latest 
+  create_issue:
+    runs-on: ubuntu-latest
     permissions:
       issues: write 
     steps:

content/actions/creating-actions/metadata-syntax-for-github-actions.md

@@ -4,7 +4,6 @@ shortTitle: Manage code security
 intro: 'You can build security into your developers'' workflow with features that keep secrets and vulnerabilities out of your codebase, and that maintain your software supply chain.'
 versions:
   ghes: '*'
-  ghec: '*'
   ghae: '*'
 topics:
   - Enterprise