Merge pull request #46505 from github/repo-sync

Repo sync

Author: docs-bot

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
 # Update ARG and FROM together from the Node devcontainer image tags:
 # https://mcr.microsoft.com/en-us/product/devcontainers/javascript-node/tags
 ARG VARIANT=dev-24-bookworm
-FROM mcr.microsoft.com/devcontainers/javascript-node:dev-24-bookworm@sha256:d0445b9546f96869b509aa70b8593bdc0054aca6689bc1dd0324083d0fd2bcc3
+FROM mcr.microsoft.com/devcontainers/javascript-node:dev-24-bookworm@sha256:42a1a7629b5a2c22c759a1de4fbb277c9e600b6fecd66b89583fc36e9453e698

.github/workflows/check-for-spammy-issues.yml

@@ -1,10 +1,12 @@
 name: Check for Spammy Issues
 
-# Closes low-value public issues so spam does not stay open in github/docs.
+# Closes low-value public issues and issues with emoji titles in github/docs.
+# GitHub employees, docs-bot, and the skip-spammy-check label are exempt.
+# Add skip-spammy-check before reopening an issue whose title still contains emoji.
 
 on:
   issues:
-    types: [opened]
+    types: [opened, edited, reopened]
 
 permissions:
   contents: read
@@ -13,58 +15,78 @@ jobs:
   spammy-title-check:
     name: Remove issues with spammy titles
     if: github.repository == 'github/docs'
+    concurrency:
+      group: ${{ github.workflow }}-spammy-title-${{ github.event.issue.number }}
+      cancel-in-progress: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |
+            const params = { ...context.repo, issue_number: context.payload.issue.number }
 
-            const issue = context.payload.issue
-            const owner = 'github'
-            const repo = 'docs'
+            // Events can predate title edits or an exemption label, so read the current issue.
+            const { data: issue } = await github.rest.issues.get(params)
+            if (issue.state !== 'open' || issue.user.login === 'docs-bot') {
+              return
+            }
+            if (issue.labels.some(label => label.name.toLowerCase() === 'skip-spammy-check')) {
+              core.info('Skipping because the issue has the skip-spammy-check label.')
+              return
+            }
 
             const titleWordCount = issue.title.trim().split(' ').length
             const titleWordCountMin = 3
             const urlRegex = /https?:\/\/\S+/i
             const titleHasUrl = urlRegex.test(issue.title)
             const titleHasDollarSign = issue.title.includes('$')
+            // Text-default symbols need an emoji selector; plain digits, #, and * need a keycap.
+            const titleHasEmoji = /\p{Emoji_Presentation}(?!\uFE0E)|\p{Extended_Pictographic}\uFE0F|[#*0-9]\uFE0F?\u20E3/u.test(issue.title)
+            // Keep the existing non-emoji heuristics limited to newly opened issues.
+            const hasOtherSpam = context.payload.action === 'opened' &&
+              (titleWordCount < titleWordCountMin || titleHasUrl || titleHasDollarSign)
+            if (!titleHasEmoji && !hasOtherSpam) {
+              return
+            }
 
             try {
               await github.rest.teams.getMembershipForUserInOrg({
                 org: 'github',
                 team_slug: 'employees',
-                username: context.payload.sender.login,
-              });
+                username: issue.user.login,
+              })
 
               // Skip GitHub employees so legitimate internal reports stay open.
               return
             } catch (err) {
-              // The membership lookup throws for non-employees, so fall through to title checks.
-              if (titleWordCount >= titleWordCountMin && !titleHasUrl && !titleHasDollarSign) {
-                return
+              // Only a missing membership means non-employee; other failures must stop moderation.
+              if (err.status !== 404) {
+                throw err
               }
             }
 
-            await github.rest.issues.update({
-              owner: owner,
-              repo: repo,
-              issue_number: issue.number,
+            await github.rest.issues.addLabels({
+              ...params,
               labels: ['invalid'],
-              state: 'closed'
-            });
+            })
+
+            await github.rest.issues.update({
+              ...params,
+              state: 'closed',
+            })
 
             await github.rest.issues.createComment({
-              owner: owner,
-              repo: repo,
-              issue_number: issue.number,
-              body: `This issue may have been opened accidentally. I'm going to close it now, but feel free to open a new issue with a more descriptive title! Make sure not to include full URLs in your issue titles, and use paths instead.`
-            });
+              ...params,
+              body: titleHasEmoji
+                ? 'Closing because the title contains emoji. Please remove the emoji and open a new issue.'
+                : `This issue may have been opened accidentally. I'm going to close it now, but feel free to open a new issue with a more descriptive title! Make sure not to include full URLs in your issue titles, and use paths instead.`,
+            })
 
             try {
               await github.rest.projects.createCard({
                 column_id: 11167427,
-                content_id: context.payload.issue.id,
+                content_id: issue.id,
                 content_type: "Issue"
               });
             } catch (error) {

.github/workflows/check-for-spammy-prs.yml

@@ -1,6 +1,6 @@
 name: Check for Spammy PRs
 
-# Flags low-value public PRs and closes PRs that target branches other than main.
+# Flags low-value public PRs and closes PRs with non-main targets or emoji titles.
 # Maintainers add the skip-spammy-check label to exempt a PR.
 
 on:
@@ -10,9 +10,57 @@ on:
 permissions:
   contents: read
   issues: read
-  pull-requests: write
 
 jobs:
+  emoji-title-check:
+    name: Close PRs with emoji titles
+    if: github.repository == 'github/docs'
+    concurrency:
+      group: ${{ github.workflow }}-emoji-title-${{ github.event.pull_request.number }}
+      cancel-in-progress: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
+        with:
+          github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
+          script: |
+            const item = context.payload.pull_request
+            const params = { ...context.repo, issue_number: item.number }
+
+            // Events can predate title edits or an exemption label, so read the current PR.
+            const { data: current } = await github.rest.issues.get(params)
+            if (current.state !== 'open' || current.user.login === 'docs-bot') {
+              return
+            }
+
+            // Text-default symbols need an emoji selector; plain digits, #, and * need a keycap.
+            const hasEmoji = /\p{Emoji_Presentation}(?!\uFE0E)|\p{Extended_Pictographic}\uFE0F|[#*0-9]\uFE0F?\u20E3/u.test(current.title)
+            if (!hasEmoji) {
+              return
+            }
+
+            if (current.labels.some(label => label.name.toLowerCase() === 'skip-spammy-check')) {
+              core.info('Skipping because the pull request has the skip-spammy-check label.')
+              return
+            }
+
+            // Mark automated closures so the skip label can trigger the existing recovery workflow.
+            await github.rest.issues.addLabels({
+              ...params,
+              labels: ['invalid'],
+            })
+
+            await github.rest.pulls.update({
+              ...context.repo,
+              pull_number: item.number,
+              state: 'closed',
+            })
+
+            await github.rest.issues.createComment({
+              ...params,
+              body: 'Closing because the title contains emoji. Please remove the emoji and open a new PR.',
+            })
+
   spammy-pr-check:
     name: Label spammy PRs and reject non-main targets
     if: >
@@ -50,6 +98,21 @@ jobs:
               return changedLines.length > 0 &&
                 changedLines.every(line => line.slice(1).trim() === '')
             })
+            const onlyBreaksOpeningFrontmatter = files.length > 0 && files.every(file => {
+              if (
+                file.status !== 'modified' ||
+                !file.filename.startsWith('content/') ||
+                !file.filename.endsWith('.md') ||
+                file.additions !== 1 ||
+                file.deletions !== 1
+              ) return false
+
+              const lines = (file.patch || '').split('\n')
+              return /^@@ -1(?:,\d+)? \+1(?:,\d+)? @@/.test(lines[0]) &&
+                lines[1] === '----' && // Diff prefix "-" followed by the original "---".
+                lines[2]?.startsWith('+') &&
+                !/^---(?:\s*yaml)?\s*$/i.test(lines[2].slice(1))
+            })
             const onlyRenames = files.length > 0 && files.every(
               f => f.status === 'renamed' && f.additions === 0 && f.deletions === 0
             )
@@ -101,6 +164,7 @@ jobs:
               isEmptyCommit ||
               touchesTooMany ||
               isBlankLineEdit ||
+              onlyBreaksOpeningFrontmatter ||
               onlyRenames ||
               onlyIndexMd
             ) {

content/account-and-profile/how-tos/contribution-settings/troubleshooting-missing-contributions.md

@@ -23,6 +23,21 @@ category:
 
 After making a commit that meets the requirements to count as a contribution, you may need to wait for up to 24 hours to see the contribution appear on your contributions graph. For more information, see [AUTOTITLE](/account-and-profile/how-tos/contribution-settings/viewing-commit-details-from-your-timeline).
 
+## Contribution counts are stale after rewriting history
+
+If you own an account and squash commits or force-push rewritten history, your profile may continue to count commits that are no longer in the repository's visible history. This can include contributions to private repositories. This is a stale-count issue, not a missing-contribution issue, so the other troubleshooting steps in this article do not apply.
+
+{% ifversion ghes %}
+If you use {% data variables.product.prodname_ghe_server %}, ask your site administrator to rebuild your contribution data. For more information, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/rebuilding-contributions-data).
+{% else %}
+If the counts remain incorrect, {% data variables.contact.github_support %} may be able to rebuild your contribution data, depending on the support options available to your account. For more information, see [AUTOTITLE](/support/learning-about-github-support/about-github-support).
+{% endif %}
+
+After a rebuild, allow up to 24 hours for your profile's contributions graph and activity summary to refresh. Then:
+
+1. Recheck the affected dates.
+1. If the counts are still incorrect, {% ifversion ghes %}contact your site administrator{% else %}follow up through the support options available to your account{% endif %}.
+
 ## Your local Git commit email isn't connected to your account
 
 Commits must be made with an email address that is connected to your account on {% data variables.product.prodname_dotcom %}{% ifversion fpt or ghec %}, or the {% data variables.product.prodname_dotcom %}-provided `noreply` email address provided to you in your email settings,{% endif %} in order to appear on your contributions graph.{% ifversion fpt or ghec %} For more information about `noreply` email addresses, see [AUTOTITLE](/account-and-profile/reference/email-addresses-reference#your-noreply-email-address).{% endif %}

content/admin/troubleshooting-your-instance/index.md

@@ -4,6 +4,8 @@ intro: 'Diagnose and resolve common problems with {% data variables.location.pro
 versions:
   ghes: '*'
 children:
+  - /troubleshooting-instance-configuration
+  - /troubleshooting-tls-and-certificates
   - /troubleshooting-upgrades-and-migrations
   - /troubleshooting-storage-and-disks
   - /troubleshooting-github-actions-data-and-database-health