Merge pull request github#17446 from github/repo-sync

repo sync

Author: Octomerger

assets/images/help/repository/secret-scanning-push-protection-web-ui-allow-secret-options.png

@@ -76,13 +76,40 @@ If {% data variables.product.prodname_dotcom %} blocks a secret that you believe
 
 If you confirm a secret is real and that you intend to fix it later, you should aim to remediate the secret as soon as possible. For example, you might revoke the secret and remove the secret from the repository's commit history. For more information, see "[Removing sensitive data from a repository](/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository)."
 
-When you allow a secret to be pushed, an alert is created in the "Security" tab. The alert is closed and no notifications are sent if you specify that the secret is a false positive or used only in tests. If you specify that the secret is real and that you will fix it later, the security alert remains open and notifications are sent to the author of the commit and repository administrators. For more information, see "[Managing alerts from secret scanning](/code-security/secret-scanning/managing-alerts-from-secret-scanning)."
+{% data reusables.secret-scanning.push-protection-allow-secrets-alerts %}
 
 1. Visit the URL returned by {% data variables.product.prodname_dotcom %} when your push was blocked.
   ![Screenshot showing form with options for unblocking the push of a secret](/assets/images/help/repository/secret-scanning-unblock-form.png)
-2. Choose the option that best describes why you should be able to push the secret.
-    - If the secret is only used in tests and poses no threat, click **It's used in tests**.
-    - If the detected string is not a secret, click **It's a false positive**.
-    - If the secret is real but you intend to fix it later, click **I'll fix it later**.
-3. Click **Allow me to push this secret**.
-4. Reattempt the push on the command line within three hours. If you have not pushed within three hours, you will need to repeat this process.
+{% data reusables.secret-scanning.push-protection-choose-allow-secret-options %}
+1. Click **Allow me to push this secret**.
+2. Reattempt the push on the command line within three hours. If you have not pushed within three hours, you will need to repeat this process.
+
+{% if secret-scanning-push-protection-web-ui %}
+## Using secret scanning as a push protection from the web UI
+
+When you use the web UI to attempt to commit a supported secret to a repository or organization with secret scanning as a push protection enabled, {% data variables.product.prodname_dotcom %} will block the commit. You will see a banner at the top of the page with information about the secret's location, and the secret will also be underlined in the file so you can easily find it.  
+
+  ![Screenshot showing commit in web ui blocked because of secret scanning push protection](/assets/images/help/repository/secret-scanning-push-protection-web-ui-commit-blocked-banner.png)
+
+{% data variables.product.prodname_dotcom %} will only display one detected secret at a time in the web UI. If a particular secret has already been detected in the repository and an alert already exists, {% data variables.product.prodname_dotcom %} will not block that secret.
+
+You can remove the secret from the file using the web UI. Once you remove the secret, the banner at the top of the page will change and tell you that you can now commit your changes.
+
+  ![Screenshot showing commit in web ui allowed after secret fixed](/assets/images/help/repository/secret-scanning-push-protection-web-ui-commit-allowed.png)
+
+### Bypassing push protection for a secret
+
+If {% data variables.product.prodname_dotcom %} blocks a secret that you believe is safe to push, you can allow the secret and specify the reason why it should be allowed. If you confirm a secret is real and that you intend to fix it later, you should aim to remediate the secret as soon as possible.
+
+{% data reusables.secret-scanning.push-protection-allow-secrets-alerts %}
+
+If you confirm a secret is real and that you intend to fix it later, you should aim to remediate the secret as soon as possible.
+
+1. In the banner that appeared at the top of the page when {% data variables.product.prodname_dotcom %} blocked your commit, click **Bypass protection**.
+{% data reusables.secret-scanning.push-protection-choose-allow-secret-options %}
+
+  ![Screenshot showing form with options for unblocking the push of a secret](/assets/images/help/repository/secret-scanning-push-protection-web-ui-allow-secret-options.png)
+
+1. Click **Allow secret**.
+
+{% endif %}

assets/images/help/repository/secret-scanning-push-protection-web-ui-commit-allowed.png

@@ -1,6 +1,6 @@
 ---
 title: Collaborators
-intro: 'The Collaborators API allows you to add, invite, and remove collaborators from a repository.'
+intro: 'The Collaborators API allows you manage collaborators for a repository.'
 versions:
   fpt: '*'
   ghes: '*'

assets/images/help/repository/secret-scanning-push-protection-web-ui-commit-blocked-banner.png

@@ -1,6 +1,8 @@
 ---
-title: Invitations
-intro: 'The Repository Invitations API allows users or external services to invite other users to collaborate on a repo.'
+title: Repository invitations
+allowTitleToDifferFromFilename: true
+shortTitle: Invitations
+intro: 'The Repository invitations API allows you to view and manage invitations to collaborate on a repository.'
 versions:
   fpt: '*'
   ghes: '*'
@@ -11,12 +13,12 @@ topics:
 miniTocMaxHeadingLevel: 3
 ---
 
-The invited users (or external services on behalf of invited users) can choose to accept or decline the invitations.
+## About the Repository invitations API
+
+The Repository invitations API allows you to view and manage invitations to collaborate on a repository. The invited users (or external services on behalf of invited users) can choose to accept or decline the invitations.
+
+To add a user as a collaborator, use the Collaborators API instead. For more information, see "[Add a repository collaborator](/rest/collaborators/collaborators#add-a-repository-collaborator)."
 
 Note that the `repo:invite` [OAuth scope](/developers/apps/scopes-for-oauth-apps) grants targeted
 access to invitations **without** also granting access to repository code, while the
 `repo` scope grants permission to code as well as invitations.
-
-### Invite a user to a repository		
-
-Use the API endpoint for adding a collaborator. For more information, see "[Add a repository collaborator](/rest/collaborators/collaborators#add-a-repository-collaborator)."

assets/images/help/repository/secret-scanning-unblock-form.png

@@ -1,6 +1,8 @@
 ---
-title: Community
-intro: ''
+title: Community metrics
+shortTitle: Community
+allowTitleToDifferFromFilename: true
+intro: 'The Community metrics API lets you get data about your community profile.'
 versions:
   fpt: '*'
   ghec: '*'

content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md

@@ -1,6 +1,8 @@
 ---
-title: Statistics
-intro: 'The Repository Statistics API allows you to fetch the data that {% data variables.product.product_name %} uses for visualizing different types of repository activity.'
+title: Repository statistics
+shortTitle: Statistics
+allowTitleToDifferFromFilename: true
+intro: 'The Repository statistics API allows you to fetch the data that {% data variables.product.product_name %} uses for visualizing different types of repository activity.'
 versions:
   fpt: '*'
   ghes: '*'
@@ -11,6 +13,10 @@ topics:
 miniTocMaxHeadingLevel: 3
 ---
 
+## About the Repository statistics API
+
+The Repository statistics API allows you to fetch the data that {% data variables.product.product_name %} uses for visualizing different types of repository activity.
+
 ### A word about caching
 
 Computing repository statistics is an expensive operation, so we try to return cached

content/rest/collaborators/collaborators.md

@@ -1,6 +1,8 @@
 ---
-title: Traffic
-intro: 'For repositories that you have push access to, the traffic API provides access to the information provided in your repository graph. '
+title: Repository traffic
+shortTitle: Traffic
+allowTitleToDifferFromFilename: true
+intro: 'The Repository traffic API provides access to the information provided in your repository graph.'
 versions:
   fpt: '*'
   ghec: '*'
@@ -9,4 +11,7 @@ topics:
 miniTocMaxHeadingLevel: 3
 ---
 
-For more information, see "<a href="/repositories/viewing-activity-and-data-for-your-repository/viewing-traffic-to-a-repository" class="dotcom-only">Viewing traffic to a repository</a>."
+## About the Repository traffic API
+
+For repositories that you have push access to, the Repository traffic API provides access to the information provided in your repository graph. 
+For more information, see "[Viewing traffic to a repository](/repositories/viewing-activity-and-data-for-your-repository/viewing-traffic-to-a-repository)."