Merge pull request #24999 from github/repo-sync

repo sync

Author: Octomerger

assets/images/internal-docs/copy-block-header.png

@@ -28,6 +28,17 @@ If your project communicates with an external service, you might use a token or
 
 {% data variables.product.prodname_secret_scanning_caps %} will scan your entire Git history on all branches present in your {% data variables.product.prodname_dotcom %} repository for secrets{% ifversion ghec or ghes > 3.4 or ghae > 3.4 %}, even if the repository is archived{% endif %}. {% ifversion secret-scanning-issue-body-comments %}{% data reusables.secret-scanning.scan-issue-description-and-comments %}{% endif %}
 
+{% ifversion secret-scanning-backfills-historical-issues %}
+{% data variables.product.prodname_secret_scanning_caps %} also scans the titles, descriptions, and comments, in open and closed historical issues, and reports leaked secrets as alerts on {% data variables.product.prodname_dotcom %}{% ifversion ghec %}. A notification is sent to the relevant partner when a historical partner pattern is detected{% endif %}.
+
+{% note %}
+
+**Note:** {% data variables.product.prodname_secret_scanning_caps %} for historical secret leaks is currently in public beta and subject to change.
+
+{% endnote %}
+
+{% endif %}
+
 {% ifversion fpt or ghec %}
 {% data variables.product.prodname_secret_scanning_caps %} is available on {% data variables.product.prodname_dotcom_the_website %} in two forms:
 

assets/images/internal-docs/search-results.png

@@ -51,7 +51,7 @@ The items in the table below can be migrated with a repository. Any items not sh
 | Issue comments | Cross-references to comments are rewritten for the target instance.
 | Pull requests | Cross-references to pull requests are rewritten to match the target. Timestamps are preserved.
 | Pull request reviews | Pull request reviews and associated data are migrated.
-| Pull request review comments | Cross-references to comments are rewritten for the target instance. Timestamps are preserved.
+| Pull request review comments | Cross-references to comments are rewritten for the target instance. Timestamps are preserved. File-level comments are not migrated.
 | Commit comments | Cross-references to comments are rewritten for the target instance. Timestamps are preserved.
 | Releases | All releases data is migrated.
 | Actions taken on pull requests or issues | All modifications to pull requests or issues, such as assigning users, renaming titles, and modifying labels are preserved, along with timestamps for each action.

content/code-security/secret-scanning/about-secret-scanning.md

@@ -13,11 +13,13 @@ redirect_from:
 
 When you make changes to your integration code, running the code in a local environment lets you test and iterate quickly without deploying the code. You can use {% data variables.product.prodname_cli %} to forward webhooks to your local environment.
 
-{% note %}
+Webhook forwarding in the {% data variables.product.prodname_cli %} only works with repository and organization webhooks. If you want to test sponsorship, GitHub App, enterprise, or Marketplace webhooks locally, you'll need to do this manually. For more information, see "[AUTOTITLE](/webhooks-and-events/webhooks/creating-webhooks).
 
-**Note:** Webhook forwarding in the {% data variables.product.prodname_cli %} only works with repository and organization webhooks. If you want to test sponsorship, GitHub App, enterprise, or Marketplace webhooks locally, you'll need to do this manually. For more information, see "[AUTOTITLE](/webhooks-and-events/webhooks/creating-webhooks)."
+{% warning %}
 
-{% endnote %}
+**Warning**: Webhook forwarding is only designed for use during testing and development. It is not supported for use in production environments for handling live webhooks.
+
+{% endwarning %}
 
 ## Receiving webhooks with {% data variables.product.prodname_cli %}
 
@@ -45,3 +47,9 @@ When you make changes to your integration code, running the code in a local envi
    ```
 
   Leave the command running in the background. It will receive all of the specified events for the specified repository and forward them to your webhook handler running at the specified URL.
+
+   {% note %}
+
+   **Note**: Only one person can use webhook forwarding at a time for each repository and organization. If you try to set up webhook forwarding and someone else is already working with that organization or repository, you'll receive a `Hook already exists` error.
+
+   {% endnote %}

content/migrations/using-ghe-migrator/about-ghe-migrator.md

@@ -0,0 +1,5 @@
+# Reference: #9139.
+# Documentation for secret scanning detects secrets in historical issues content.
+versions:
+  ghec: '*'
+  ghes: '>=3.9'

content/webhooks-and-events/webhooks/receiving-webhooks-with-the-github-cli.md

@@ -1,7 +1,7 @@
 {% tip %}
 
 **Tips**:
-- If required reviews are enabled and a collaborator with _write_, _admin_, or _owner_ access to the repository submits a review requesting changes, the pull request cannot be merged until the same collaborator submits another review approving the changes in the pull request.
+- If a collaborator with `admin`, `owner`, or `write` access to the repository submits a review requesting changes, the pull request cannot be merged until the same collaborator submits another review approving the changes in the pull request.
 - Repository owners and administrators can merge a pull request even if it hasn't received an approving review, or if a reviewer who requested changes has left the organization or is unavailable.
 - If both required reviews and stale review dismissal are enabled and a code-modifying commit is pushed to the branch of an approved pull request, the approval is dismissed. The pull request must be reviewed and approved again before it can be merged.
 - When several open pull requests each have a head branch pointing to the same commit, you won’t be able to merge them if one or both have a pending or rejected review.

data/features/secret-scanning-backfills-historical-issues.yml

@@ -374,7 +374,7 @@
     ghec: '*'
     ghes: '>=3.9'
     ghae: '>=3.9'
-  isPublic: false
+  isPublic: true
   isPrivateWithGhas: true
   hasPushProtection: true
   hasValidityCheck: false

data/reusables/repositories/request-changes-tips.md

@@ -47,6 +47,6 @@ You can add a header to code blocks by adding the `{:copy}` annotation after the
 
 This renders:
 
-![image](https://user-images.githubusercontent.com/10660468/95881747-e96c6900-0d46-11eb-9abf-1e8ad16c7646.png)
+![Screenshot of a code block showing the clipboard icon that is displayed when you use `{:copy}` annotation.](/assets/images/internal-docs/copy-block-header.png)
 
 The un-highlighted text is available as `button.js-btn-copy`'s `data-clipboard-text` attribute.