Merge branch 'main' into jules-4795

Author: jules-p

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,7 +5,7 @@ See our [CONTRIBUTING.md](/main/CONTRIBUTING.md) for information how to contribu
 
 For changes to content in [site policy](https://github.com/github/docs/tree/main/content/github/site-policy), see the [CONTRIBUTING guide in the site-policy repo](https://github.com/github/site-policy/blob/main/CONTRIBUTING.md).
 
-We cannot accept changes to our translated content right now. See the [contributing.md](/main/CONTRIBUTING.md#earth_asia-translations) for more information.
+We cannot accept changes to our translated content right now. See the [types-of-contributions.md](/main/contributing/types-of-contributions.md#earth_asia-translations) for more information.
 
 Thanks again!
 -->

.github/actions-scripts/create-enterprise-issue.js

@@ -86,7 +86,7 @@ async function run() {
     'utf8'
   )
   const issueLabels =
-    milestone === 'release' ? ['enterprise release'] : ['enterprise deprecation', 'priority-3']
+    milestone === 'release' ? ['enterprise release'] : ['enterprise deprecation', 'priority-4', 'batch', 'time sensitive']
   const issueTitle = `[${nextMilestoneDate}] Enterprise Server ${versionNumber} ${milestone} (technical steps)`
 
   const issueBody = `GHES ${versionNumber} ${milestone} occurs on ${nextMilestoneDate}.

.github/actions-scripts/projects.js

@@ -164,10 +164,13 @@ export function generateUpdateProjectNextItemFieldMutation({
   function generateMutationToUpdateField({ item, fieldID, value, literal = false }) {
     const parsedValue = literal ? `value: "${value}"` : `value: ${value}`
 
-    // Strip "=" out of the item ID when creating the mutation ID to avoid a GraphQL parsing error
+    // Strip all non-alphanumeric out of the item ID when creating the mutation ID to avoid a GraphQL parsing error
     // (statistically, this should still give us a unique mutation ID)
     return `
-      set_${fieldID.substr(1)}_item_${item.replaceAll('=', '')}: updateProjectNextItemField(input: {
+      set_${fieldID.substr(1)}_item_${item.replaceAll(
+      /[^a-z0-9]/g,
+      ''
+    )}: updateProjectNextItemField(input: {
         projectId: $project
         itemId: "${item}"
         fieldId: ${fieldID}

.github/dependabot.yml

@@ -9,4 +9,4 @@ updates:
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
-      interval: weekly
+      interval: monthly

.github/workflows/crowdin.yml

@@ -27,6 +27,8 @@ jobs:
       - name: Sync
         uses: crowdin/github-action@d7f217268068f1244883a993379d62d816f84f25
         with:
+          # This option enables the transfer of existing translations in this project to Crowdin.
+          # We explicitly set this to `false` since we only want to use the downloaded translations managed by Crowdin.
           upload_translations: false
           download_translations: true
           create_pull_request: true

.github/workflows/move-reopened-issues-to-triage.yaml

@@ -37,5 +37,5 @@ jobs:
                 }
               }
             } catch(e) {
-              console.log(error);
+              console.log(e);
             }

.github/workflows/notify-when-maintainers-cannot-edit.yaml

@@ -0,0 +1,64 @@
+name: Notify When Maintainers Cannot Edit
+
+# **What it does**: Notifies the author of a PR when their PR does not allow maintainers to edit it.
+# **Why we have it**: To prevent having to do this manually.
+# **Who does it impact**: Open-source.
+
+on:
+  pull_request_target:
+    types:
+      - opened
+
+permissions:
+  pull-requests: write
+
+jobs:
+  notify-when-maintainers-cannot-edit:
+    if: github.repository == 'github/docs'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
+        with:
+          script: |
+            const query = `
+              query($number: Int!) {
+                repository(owner: "github", name: "docs") {
+                  pullRequest(number: $number) {
+                    headRepositoryOwner {
+                      login
+                    }
+                    maintainerCanModify
+                  }
+                }
+              }
+            `;
+
+            const pullNumber = context.issue.number;
+            const variables = { number: pullNumber };
+
+            try {
+              console.log(`Check github/docs#${pullNumber} for maintainer edit access ...`);
+              const result = await github.graphql(query, variables);
+
+              console.log(JSON.stringify(result, null, 2));
+
+              const pullRequest = result.repository.pullRequest;
+
+              if (pullRequest.headRepositoryOwner.login === 'github') {
+                console.log('PR owned by github');
+                return;
+              }
+
+              if (!pullRequest.maintainerCanModify) {
+                console.log('PR not owned by github and does not have maintainer edits enabled');
+
+                await github.issues.createComment({
+                  issue_number: pullNumber,
+                  owner: 'github',
+                  repo: 'docs',
+                  body: "Thanks for submitting a PR to the GitHub Docs project!\n\nIn order to review and merge PRs most efficiently, we require that all PRs grant maintainer edit access before we review them. For information on how to do this, [see the documentation](https://docs.github.com/en/github/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)."
+                });
+              }
+            } catch(e) {
+              console.log(e);
+            }

.github/workflows/staging-deploy-pr.yml

@@ -79,9 +79,18 @@ jobs:
                 name: prRepoName
               }
             } = run
-            const headLabel = `${prRepoOwner}:${headBranch}`
 
             const prIsInternal = owner === prRepoOwner && repo === prRepoName
+            let headLabel = `${prRepoOwner}:${headBranch}`
+
+            // If the PR is external, prefix its head branch name with the
+            // forked repo owner's login and their fork repo name e.g.
+            // "octocat/my-fork:docs".  We need to include the fork repo
+            // name as well to account for an API issue (this will work fine
+            // if they don't have a different fork repo name).
+            if (!prIsInternal) {
+              headLabel = `${prRepoOwner}/${prRepoName}:${headBranch}`
+            }
 
             // If the PR is external, prefix its head branch name with the
             // forked repo owner's login, e.g. "octocat:docs"

.github/workflows/triage-issues.yml

@@ -12,6 +12,7 @@ on:
 
 permissions:
   issues: write
+  repository-projects: write
 
 jobs:
   triage_issues:

CONTRIBUTING.md

@@ -6,7 +6,7 @@ Read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approacha
 
 In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR.
 
-Use the table of contents icon <img src="./assets/images/table-of-contents.png" width="25" height="25" /> on the top left corner of the this document to get to a specific section of this guide quickly.
+Use the table of contents icon <img src="./assets/images/table-of-contents.png" width="25" height="25" /> on the top left corner of this document to get to a specific section of this guide quickly.
 
 ## New contributor guide