Skip to content

Commit 87d64aa

Browse files
docs-botdocs-bot
authored
Merge pull request #27333 from github/repo-sync
Repo sync
2 parents 42adc68 + f9397b4 commit 87d64aa

File tree

47 files changed

+175083
-110120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+175083
-110120
lines changed

‎assets/images/help/security/push-protection-for-yourself.png

62.7 KB
Loading

‎content/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ Protect your organization's repositories and settings by implementing security b
3636

3737
- Encouraging your users to create strong passwords and secure them appropriately, by following {% data variables.product.prodname_dotcom %}’s recommended password guidelines. For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-strong-password)."
3838

39-
- Establishing an internal security policy in {% data variables.product.prodname_dotcom %}, so users know the appropriate steps to take and who to contact if an incident is suspected. For more information, see "[AUTOTITLE](/code-security/getting-started/adding-a-security-policy-to-your-repository)."
39+
- Establishing an internal security policy in {% data variables.product.prodname_dotcom %}, so users know the appropriate steps to take and who to contact if an incident is suspected. For more information, see "[AUTOTITLE](/code-security/getting-started/adding-a-security-policy-to-your-repository)."{% ifversion secret-scanning-push-protection-for-users %}
40+
41+
- Encouraging your users to enable push protection for users so that no matter which public repository they push to, they will be protected. For more information, see "[AUTOTITLE](/code-security/secret-scanning/push-protection-for-users)."{% endif %}
4042

4143
For more detailed information about securing accounts, see "[AUTOTITLE](/code-security/supply-chain-security/end-to-end-supply-chain/securing-accounts)."
4244

‎content/code-security/guides.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ includeGuides:
3232
- /code-security/secret-scanning/defining-custom-patterns-for-secret-scanning
3333
- /code-security/secret-scanning/managing-alerts-from-secret-scanning
3434
- /code-security/secret-scanning/protecting-pushes-with-secret-scanning
35+
- /code-security/secret-scanning/push-protection-for-users
3536
- /code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection
3637
- /code-security/secret-scanning/secret-scanning-patterns
3738
- /code-security/secret-scanning/troubleshooting-secret-scanning

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ If your project communicates with an external service, you might use a token or
5959

6060
{% endif %}
6161

62+
{% ifversion secret-scanning-push-protection-for-users %}
63+
64+
{% data reusables.secret-scanning.push-protection-for-users %}
65+
66+
{% endif %}
67+
6268
{% ifversion fpt or ghec %}
6369

6470
## About {% data variables.secret-scanning.partner_alerts %}

‎content/code-security/secret-scanning/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ children:
2121
- /defining-custom-patterns-for-secret-scanning
2222
- /managing-alerts-from-secret-scanning
2323
- /secret-scanning-patterns
24-
- /protecting-pushes-with-secret-scanning
24+
- /push-protection-for-repositories-and-organizations
25+
- /push-protection-for-users
2526
- /pushing-a-branch-blocked-by-push-protection
2627
- /troubleshooting-secret-scanning
2728
---
28-

‎content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md renamed to ‎content/code-security/secret-scanning/push-protection-for-repositories-and-organizations.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
---
2-
title: Protecting pushes with secret scanning
2+
title: Push protection for repositories and organizations
33
intro: 'You can use {% data variables.product.prodname_secret_scanning %} to prevent supported secrets from being pushed into your {% ifversion secret-scanning-enterprise-level %}enterprise,{% endif %} organization{% ifversion secret-scanning-enterprise-level %},{% endif %} or repository by enabling push protection.'
44
product: '{% data reusables.gated-features.secret-scanning %}'
55
versions:
66
feature: secret-scanning-push-protection
77
redirect_from:
88
- /early-access/code-security/secret-scanning/protecting-pushes-with-secret-scanning
9+
- /code-security/secret-scanning/protecting-pushes-with-secret-scanning
910
type: how_to
1011
topics:
1112
- Secret scanning
1213
- Advanced Security
1314
- Alerts
1415
- Repositories
15-
shortTitle: Enable push protection
16+
shortTitle: Push protection for repositories
1617
---
1718

1819
{% data reusables.secret-scanning.beta %}
1920
{% data reusables.secret-scanning.enterprise-enable-secret-scanning %}
2021

21-
## About push protection for secrets
22+
## About push protection for repositories and organizations
2223

2324
Up to now, {% data variables.product.prodname_secret_scanning %} checks for secrets _after_ a push and alerts users to exposed secrets. {% data reusables.secret-scanning.push-protection-overview %} {% ifversion secret-scanning-push-protection-custom-patterns %}{% data variables.product.prodname_secret_scanning_caps %} can also check pushes for custom patterns. For more information, see "[AUTOTITLE](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning)."{% endif %}
2425

@@ -37,6 +38,12 @@ If you are an organization owner or security manager, you can view metrics on ho
3738

3839
For information on the secrets and service providers supported for push protection, see "[AUTOTITLE](/code-security/secret-scanning/secret-scanning-patterns#supported-secrets)."
3940

41+
{% ifversion secret-scanning-push-protection-for-users %}
42+
43+
{% data reusables.secret-scanning.push-protection-for-users %}
44+
45+
{% endif %}
46+
4047
## Enabling {% data variables.product.prodname_secret_scanning %} as a push protection
4148

4249
For you to use {% data variables.product.prodname_secret_scanning %} as a push protection in public repositories, the {% ifversion secret-scanning-enterprise-level %}enterprise,{% endif %} organization{% ifversion secret-scanning-enterprise-level %},{% endif %} or repository needs to have {% data variables.product.prodname_secret_scanning %} enabled.{% ifversion secret-scanning-push-protection-private-internal %} To use {% data variables.product.prodname_secret_scanning %} as a push protection in private or internal repositories, the enterprise or organization also needs to have {% data variables.product.prodname_GH_advanced_security %} enabled.{% endif %} For more information, see {% ifversion secret-scanning-enterprise-level %}"[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise),"{% endif %} "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization)," "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository)," and "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."

‎content/code-security/secret-scanning/push-protection-for-users.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
title: Push protection for users
3+
intro: 'You can use {% data variables.product.prodname_secret_scanning %} to block commits containing secrets in any public repository by enabling push protection for yourself.'
4+
versions:
5+
feature: secret-scanning-push-protection-for-users
6+
type: how_to
7+
topics:
8+
- Secret scanning
9+
- Advanced Security
10+
- Alerts
11+
- User account
12+
---
13+
14+
{% data reusables.secret-scanning.push-protection-for-users-beta %}
15+
16+
## About push protection for users
17+
18+
With push protection for users, you can enable push protection for yourself, so that no matter which public repository you push to, you will be protected. Additionally, if you are a repository administrator, or an organization owner, you can enable push protection for your repository or organization, respectively. For more information, see "[AUTOTITLE](/code-security/secret-scanning/push-protection-for-repositories-and-organizations)."
19+
20+
If push protection is not enabled for the repository you are pushing to, but you have push protection for yourself enabled, no alerts will be created after you push a secret. However, if the bypassed secret is a {% data variables.product.prodname_dotcom %} token, the token will be revoked and you will be notified by email.
21+
22+
For information on the secrets and service providers supported for push protection, see "[AUTOTITLE](/code-security/secret-scanning/secret-scanning-patterns#supported-secrets)."
23+
24+
## Enabling push protection for yourself
25+
26+
You can enable push protection for yourself through your personal account settings.
27+
28+
{% data reusables.user-settings.access_settings %}
29+
{% data reusables.user-settings.security-analysis %}
30+
1. Under "User", to the right of "Push protection for yourself", click **Enable**.
31+
32+
![Screenshot of the "User" section of the "Code security and analysis" settings page. A button labeled "Enable" is outlined in dark orange.](/assets/images/help/security/push-protection-for-yourself.png)

‎content/code-security/secret-scanning/secret-scanning-patterns.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ If you use the REST API for secret scanning, you can use the `Secret type` to re
6969

7070
Push protection alerts are user alerts that are reported by push protection. {% data variables.product.prodname_secret_scanning_caps %} as a push protection currently scans repositories for secrets issued by some service providers.
7171

72+
{% ifversion secret-scanning-push-protection-for-users %}Push protection alerts are not created for secrets that are bypassed with user-based push protection only. For more information, see "[AUTOTITLE](/code-security/secret-scanning/push-protection-for-users)."{% endif %}
73+
7274
{% data reusables.secret-scanning.secret-scanning-pattern-pair-matches %}
7375

7476
{% data reusables.secret-scanning.push-protection-older-tokens %} For more information about push protection limitations, see "[AUTOTITLE](/code-security/secret-scanning/troubleshooting-secret-scanning#push-protection-and-pattern-versions)."

‎content/contributing/syntax-and-versioning-for-github-docs/creating-tool-switchers-in-articles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ Only include a maximum of eight different tools in an article. Including more to
3939
## Adding new tools
4040
If a writer determines that adding a new tool is the only way to accurately document something, they should explain their reasoning in the content planning stage. Whoever reviews content plan should consider if there are any alternative ways to address the documentation need without adding a new tool. If a new tool is the only way to create accurate documentation, the new tool should be added. If there is an alternative content solution that does not add a new tool, that option should be used.
4141

42-
To add a new tool, add an entry to the `allTools` object in the [`lib/all-tools.js`](https://github.com/github/docs/blob/main/lib/all-tools.js) file as a key-value pair. Add new tools in alphabetical order.
42+
To add a new tool, add an entry to the `allTools` object in the [`lib/all-tools.js`](https://github.com/github/docs/blob/main/src/tools/lib/all-tools.js) file as a key-value pair. Add new tools in alphabetical order.

‎content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/cherry-picking-a-commit-in-github-desktop.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,25 @@ You can also use cherry-picking when collaborating with a team. Some projects in
2222
![Screenshot of the "Current Branch" dropdown view. Under "Recent Branches", a branch, named "my-feature", is highlighted with an orange outline.](/assets/images/help/desktop/select-branch-from-dropdown.png)
2323

2424
{% data reusables.desktop.history-tab %}
25-
1. Drag the commit that you want to cherry-pick from the "History" tab to the {% octicon "git-branch" aria-hidden="true" %} **Current Branch** dropdown menu, then drop the commit on the branch that you want to copy the commit to.
25+
1. Select the commit you would like to cherry-pick.
26+
27+
{% mac %}
28+
29+
You can select one commit or select multiple commits using <kbd>Command</kbd> or <kbd>Shift</kbd>.
30+
31+
{% endmac %}
32+
33+
{% windows %}
34+
35+
You can select one commit or select multiple commits using <kbd>Ctrl</kbd> or <kbd>Shift</kbd>.
36+
37+
{% endwindows %}
38+
39+
1. Right-click the selected commit and click **Cherry pick commit**, then select the branch that you want to copy the commit to. You can also drag the commit that you want to cherry-pick from the "History" tab to the {% octicon "git-branch" aria-hidden="true" %} **Current Branch** dropdown menu, then drop the commit on the branch that you want to copy the commit to.
2640

2741
![Screenshot of the "History" tab and the "Current Branch" dropdown view. The cursor hovers over the "my-feature" branch, and "plus one" icons indicate the addition of one commit.](/assets/images/help/desktop/cherry-picking.png)
2842

43+
2944
## Further reading
3045

3146
- [git-cherry-pick](https://git-scm.com/docs/git-cherry-pick) in the Git documentation

0 commit comments

Comments
 (0)