Skip to content

Commit 8cace96

Browse files
authored
Merge pull request #34441 from github/repo-sync
Repo sync
2 parents e0375fa + fd586ca commit 8cace96

File tree

24 files changed

+128
-27
lines changed

24 files changed

+128
-27
lines changed

.github/branch_protection_settings/main.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"frame",
4040
"products",
4141
"workflows",
42-
"lint-code"
42+
"lint-code",
43+
"secret-scanning",
4344
],
4445
"contexts_url": "https://api.github.com/repos/github/docs-internal/branches/main/protection/required_status_checks/contexts",
4546
"checks": [
@@ -81,7 +82,8 @@
8182
{ "context": "frame", "app_id": 15368 },
8283
{ "context": "products", "app_id": 15368 },
8384
{ "context": "workflows", "app_id": 15368 },
84-
{ "context": "lint-code", "app_id": 15368 }
85+
{ "context": "lint-code", "app_id": 15368 },
86+
{ "context": "secret-scanning", "app_id": 15368 }
8587
]
8688
},
8789
"restrictions": {
Loading
67.2 KB
Loading

content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ shortTitle: Manage support entitlements
1616

1717
People with support entitlements for your enterprise account can use the support portal to open, view, and comment on support tickets associated with the enterprise account.
1818

19-
Enterprise owners and billing managers automatically have a support entitlement. Enterprise owners can add support entitlements to up to 20 additional members of organizations owned by their enterprise account.
19+
Enterprise owners and billing managers automatically have a support entitlement. Enterprise owners can add support entitlements to a limited number of enterprise members.
20+
* **{% data variables.product.premium_support_plan %}**: Up to 20 members
21+
* **{% data variables.product.premium_plus_support_plan %}**: Up to 40 members
2022

2123
## Adding a support entitlement to an enterprise member
2224

content/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/about-delegated-bypass-for-push-protection.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,3 @@ shortTitle: Delegated bypass
2020
{% data reusables.secret-scanning.push-protection-delegated-bypass-intro %}
2121

2222
{% data reusables.secret-scanning.push-protection-delegated-bypass-overview %}
23-
24-
For information about enabling delegated bypass, see "[AUTOTITLE](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/enabling-delegated-bypass-for-push-protection)."

content/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/enabling-delegated-bypass-for-push-protection.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ topics:
1414
shortTitle: Enable delegated bypass
1515
---
1616

17-
## Enabling delegated bypass for push protection
17+
## About enabling delegated bypass for push protection
1818

1919
{% data reusables.secret-scanning.push-protection-delegate-bypass-beta-note %}
2020

@@ -24,6 +24,8 @@ When you enable this feature, you will create a bypass list of roles and teams w
2424

2525
>[!NOTE] You can't add secret teams to the bypass list.
2626
27+
{% ifversion push-protection-bypass-fine-grained-permissions %}Alternatively, you can grant specific organization members the ability to review and manage bypass requests using fine-grained permissions, which give you more refined control over which individuals and teams can approve and deny bypass requests. For more information, see "[Using fine-grained permissions to control who can review and manage bypass requests](#using-fine-grained-permissions-to-control-who-can-review-and-manage-bypass-requests)."{% endif %}
28+
2729
## Configuring delegated bypass for an organization
2830

2931
{% data reusables.organizations.navigate-to-org %}
@@ -51,3 +53,16 @@ When you enable this feature, you will create a bypass list of roles and teams w
5153
>[!NOTE] You can't add secret teams to the bypass list.
5254
5355
1. In the dialog box, select the roles and teams that you want to add to the bypass list, then click **Add selected**.
56+
57+
{% ifversion push-protection-bypass-fine-grained-permissions %}
58+
59+
## Using fine-grained permissions to control who can review and manage bypass requests
60+
61+
You can grant specific individuals or teams the ability to review and manage bypass requests using fine-grained permissions.
62+
63+
1. Ensure that delegated bypass is enabled for the organization. For more information, follow steps 1-5 in "[Configuring delegated bypass for your organization](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/enabling-delegated-bypass-for-push-protection#configuring-delegated-bypass-for-an-organization)."
64+
1. Create (or edit) a custom organization role. For information on creating and editing custom roles, see "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-organization-roles#creating-a-custom-role)."
65+
1. When choosing which permissions to add to the custom role, select the "Review and manage {% data variables.product.prodname_secret_scanning %} bypass requests" permission.
66+
1. Assign the custom role to individual members or teams in your organization. For more information on assigning custom roles, see "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/using-organization-roles#assigning-an-organization-role)."
67+
68+
{% endif %}

content/copilot/managing-copilot/managing-github-copilot-in-your-organization/customizing-copilot-for-your-organization/indexing-repositories-for-copilot-chat.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ After you index a repository it is automatically re-indexed every time a change
2727
1. On {% data variables.product.prodname_dotcom_the_website %}, browse to the repository you want to index.
2828
1. On any page, click the **{% octicon "copilot" aria-hidden="true" %} {% data variables.product.prodname_copilot_short %}** icon in the upper-right corner.
2929

30-
The indexing status of the repository is displayed near top of the {% data variables.product.prodname_copilot_short %} Chat panel.
30+
If the repository has been indexed, this is shown near top of the {% data variables.product.prodname_copilot_short %} Chat panel.
31+
32+
![Screenshot showing 'Indexed for improved understanding and accuracy' highlighted with a dark orange outline.](/assets/images/help/copilot/indexed-repo.png)
3133

3234
1. If the repository has not been indexed, an **Index REPOSITORY NAME** button is displayed. Click this button to start the indexing process.
3335

content/copilot/using-github-copilot/asking-github-copilot-questions-in-githubcom.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,31 @@ Depending on the question you ask, and your enterprise and organization settings
106106

107107
{% data variables.product.prodname_copilot_short %} allows you to use natural language questions to explore repositories on {% data variables.product.prodname_dotcom %}. This can help you get a better understanding of where specific aspects of a codebase are implemented.
108108

109-
{% data reusables.copilot.go-to-copilot-page %}
109+
1. On the {% data variables.product.prodname_dotcom %} website, go to the repository you want to chat about.
110110

111-
{% data reusables.copilot.ask-copilot-not-displayed %}
111+
1. Click the **{% octicon "copilot" aria-hidden="true" %}** {% data variables.product.prodname_copilot %} icon at the top right of the page.
112112

113-
1. In the "Ask {% data variables.product.prodname_copilot_short %}" box, type a question and press <kbd>Enter</kbd>.
113+
The {% data variables.product.prodname_copilot_chat %} panel is displayed. To resize the panel, click and drag the top or left edge.
114+
115+
1. The heading at the top of the panel should read "Chatting about" followed by the name of the current repository.
116+
117+
If the wrong repository name is displayed, because you were previously chatting about another repository, click **All repositories** then choose the repository you want to chat about.
118+
119+
![Screenshot of the {% data variables.product.prodname_copilot_short %} chat panel page with "All repositories" highlighted with a dark orange outline.](/assets/images/help/copilot/copilot-chat-all-repositories.png)
120+
121+
1. In the "Ask {% data variables.product.prodname_copilot_short %}" box, at the bottom of the chat panel, type a question and press <kbd>Enter</kbd>.
114122

115123
For example, you could ask:
116124

117125
* When was the most recent release?
118126
* Where is rate limiting implemented in our API?
119127
* How does the WidgetFactory class work?
120-
* Where is the code for converting an organization member to be an outside collaborator?
128+
* Where is the code for updating a phone number?
121129
* Where are SAT tokens generated?
130+
* Show the most recently updated issues assigned to USERNAME
131+
* List open issues about SUBJECT
132+
* What was the last merged PR by USERNAME
133+
* What are the latest commits to the main branch by USERNAME
122134

123135
{% data variables.product.prodname_copilot_short %} replies in the chat panel.
124136

content/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,8 @@ Manage organization OAuth application policies | Access to the "OAuth applicatio
5151
| {% ifversion actions-usage-metrics %} |
5252
| View organization Actions usage metrics | View {% data variables.product.prodname_actions %} usage metrics for your organization. | "[AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/viewing-usage-metrics-for-github-actions)" |
5353
| {% endif %} |
54+
| {% ifversion push-protection-bypass-fine-grained-permissions %} |
55+
| Review and manage {% data variables.product.prodname_secret_scanning %} bypass requests | Review and manage {% data variables.product.prodname_secret_scanning %} bypass requests for your organization. | "[AUTOTITLE](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection)" |
56+
| {% endif %} |
5457

5558
{% endrowheaders %}

content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ Some of the features listed below are limited to organizations using {% data var
205205
| {% ifversion repo-rules-enterprise %} |
206206
| Manage organization-level rulesets (see "[AUTOTITLE](/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
207207
| {% endif %} |
208+
| {% ifversion push-protection-bypass-fine-grained-permissions %} |
209+
| Review and manage {% data variables.product.prodname_secret_scanning %} bypass requests (see "[AUTOTITLE](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |
210+
| {% endif %} |
208211

209212
{% endrowheaders %}
210213

content/sponsors/receiving-sponsorships-through-github-sponsors/editing-your-profile-details-for-github-sponsors.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,11 @@ Featured sponsors allows you to spotlight your sponsors. You can opt to automati
4747
* A pop up window will display allowing you to search your sponsors. Click on the desired sponsors and click **Save**.
4848

4949
{% data reusables.sponsors.save-profile %}
50+
51+
## Sharing your profile
52+
53+
Let others know about your Sponsors profile by sharing it out on social media or embedding it on your personal website.
54+
55+
{% data reusables.sponsors.navigate-to-sponsors-dashboard %}
56+
1. From the left sidebar, click **Overview**.
57+
1. Under "Share it out", select the option to share your Sponsors profile on social media or embed it on a website.

content/sponsors/receiving-sponsorships-through-github-sponsors/managing-your-sponsorship-goal.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,11 @@ After you retire a goal, you won't be able to reactivate the goal. You must crea
4646
{% data reusables.sponsors.navigate-to-your-goals-tab %}
4747
{% data reusables.sponsors.edit-goal %}
4848
{% data reusables.sponsors.retire-goal %}
49+
50+
## Sharing a goal
51+
52+
You can share your sponsorship goal on social media or embed it on your personal website.
53+
54+
{% data reusables.sponsors.navigate-to-sponsors-dashboard %}
55+
{% data reusables.sponsors.navigate-to-your-goals-tab %}
56+
1. Under your goal, click the **Share** or **Embed it** button.

content/support/learning-about-github-support/about-github-premium-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ There are two {% data variables.contact.premium_support %} plans: Premium and Pr
4848
| Initial response time | <ul><li>30 minutes for {% data variables.product.support_ticket_priority_urgent %} (including initial troubleshooting)</li><li>4 hours for {% data variables.product.support_ticket_priority_high %}</li></ul> | <ul><li>30 minutes for {% data variables.product.support_ticket_priority_urgent %} (including initial troubleshooting)</li><li>4 hours for {% data variables.product.support_ticket_priority_high %}</li></ul> |
4949
| Support channels | <ul><li>Online ticket submission</li><li>Phone support in English via callback request (when required for ticket resolution)</li><li>Screen share request for critical issues</li></ul> | <ul><li>Online ticket submission</li><li>Phone support in English via callback request (when required for ticket resolution)</li><li>Screen share request for critical issues</li></ul> |
5050
| Training | Access to premium content | <ul><li>Access to premium content</li><li>1 virtual training class per year</li></ul> |
51-
| Members with support entitlements | 20 | 20 |
51+
| Members with support entitlements | 20 | 40 |
5252
| Resources | Priority ticket handling | <ul><li>Priority ticket handling</li><li>Named Customer Reliability Engineer</li></ul> |
5353
Escalation management | For high and urgent priority tickets | For High and Urgent priority tickets
5454
Incident management | None | For urgent priority tickets, as needed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Issue 13329
2+
# Push protection bypass fine-grained permissions
3+
versions:
4+
ghec: '*'
5+
ghes: '>=3.16'
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
When you enable push protection, by default, anyone with write access to the repository can choose to bypass the protection by specifying a reason for allowing the push containing a secret. With delegated bypass, contributors to a repository are instead obligated to request "bypass privileges." The request is sent to a designated group of reviewers, who either approve or deny the request to bypass push protection.
1+
When you enable push protection, by default, anyone with write access to the repository can choose to bypass the protection by specifying a reason for allowing the push containing a secret. With delegated bypass, only specific roles and teams can bypass push protection. All other contributors are instead obligated to make a request for "bypass privileges", which is sent to a designated group of reviewers who either approve or deny the request to bypass push protection.
22

33
If the request to bypass push protection is approved, the contributor can push the commit containing the secret. If the request is denied, the contributor must remove the secret from the commit (or commits) containing the secret before pushing again.
44

5-
To configure delegated bypass, organization owners or repository administrators need to first create a "bypass list". The bypass list comprises specific roles and teams, such as the security team or repository administrators, who oversee requests from non-members to bypass push protection. For more information, see "[Configuring delegated bypass for an organization](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/enabling-delegated-bypass-for-push-protection#configuring-delegated-bypass-for-an-organization)" and "[Configuring delegated bypass for a repository](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/enabling-delegated-bypass-for-push-protection#configuring-delegated-bypass-for-a-repository)."
5+
To configure delegated bypass, organization owners or repository administrators must change the "Who can bypass push protection for {% data variables.product.prodname_secret_scanning %}" setting in the UI from **Anyone with write access** to **Specific roles and teams**.
66

7-
Members of the bypass list view and manage requests through the "Push protection bypass" page in the **Security** tab of the repository. For more information, see "[Managing requests to bypass push protection](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/managing-requests-to-bypass-push-protection)."
7+
Organization owners or repository administrators are them prompted to create a "bypass list". The bypass list comprises the specific roles and teams, such as the security team or repository administrators, who oversee requests from non-members to bypass push protection. For more information, see "[Configuring delegated bypass for an organization](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/enabling-delegated-bypass-for-push-protection#configuring-delegated-bypass-for-an-organization)" and "[Configuring delegated bypass for a repository](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/enabling-delegated-bypass-for-push-protection#configuring-delegated-bypass-for-a-repository)."
88

9-
Members of the bypass list are still protected from accidentally pushing secrets to a repository. When a member of the bypass list attempts to push a commit containing a secret, their push is still blocked, but they can choose to bypass the block by specifying a reason for allowing the push. Members of the bypass list do not have to request bypass privileges from other members in order to override the block.
9+
{% ifversion push-protection-bypass-fine-grained-permissions %} Alternatively, instead of creating a bypass list, you can grant specific organization members the ability to review and manage bypass requests using fine-grained permissions. For more information, see "[Using fine-grained permissions to control who can review and manage bypass requests](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/enabling-delegated-bypass-for-push-protection#using-fine-grained-permissions-to-control-who-can-review-and-manage-bypass-requests)."{% endif %}
10+
11+
Members {% ifversion push-protection-bypass-fine-grained-permissions %}with permission to review (approve or deny) bypass requests can manage these {% else %}of the bypass list can review and manage {% endif %}requests through the "Push protection bypass" page in the **Security** tab of the repository. For more information, see "[AUTOTITLE](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/managing-requests-to-bypass-push-protection)."
12+
13+
Members {% ifversion push-protection-bypass-fine-grained-permissions %}with permission to review and manage bypass requests {% else %}of the bypass list{% endif %} are still protected from accidentally pushing secrets to a repository. If they attempt to push a commit containing a secret, their push is still blocked, but they can choose to bypass the block by specifying a reason for allowing the push. Members {% ifversion push-protection-bypass-fine-grained-permissions %}with permission to review and manage bypass requests {% else %}of the bypass list {% endif %}do not have to request bypass privileges from other members in order to override the block.

src/github-apps/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@
6060
"2022-11-28"
6161
]
6262
},
63-
"sha": "f4af24ddbbf60c5b325b2c99e438c7f9c6d362a4"
63+
"sha": "2a29b70c717f70a4afa122ed166a6a885a1d7d77"
6464
}

src/rest/data/fpt-2022-11-28/schema.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513203,7 +513203,9 @@
513203513203
"type": "string",
513204513204
"enum": [
513205513205
"updated",
513206-
"published"
513206+
"published",
513207+
"epss_percentage",
513208+
"epss_percentile"
513207513209
],
513208513210
"default": "published"
513209513211
}

0 commit comments

Comments
 (0)