Skip to content

Commit 1573291

Browse files
authored
Merge branch 'main' into yours
2 parents d451859 + 5dd35dc commit 1573291

39 files changed

Lines changed: 126 additions & 863 deletions

File tree

-17 KB
Loading

content/actions/guides/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ includeGuides:
7373
- /actions/guides/moving-assigned-issues-on-project-boards
7474
- /actions/guides/removing-a-label-when-a-card-is-added-to-a-project-board-column
7575
- /actions/guides/managing-github-actions-with-github-cli
76+
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions
77+
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
7678
children:
7779
- /about-continuous-integration
7880
- /setting-up-continuous-integration-using-workflow-templates

content/admin/enterprise-support/overview/about-github-enterprise-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo
3232
- Written support through our support portal 24 hours per day, 7 days per week
3333
- Phone support 24 hours per day, 7 days per week
3434
- A Service Level Agreement (SLA) with guaranteed initial response times
35-
- Technical account managers
35+
- Customer Reliability Engineers
3636
- Access to premium content
3737
- Scheduled health checks
3838
- Managed Admin hours

content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enforcing-github-actions-policies-for-your-enterprise.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,18 @@ shortTitle: Enforce enterprise policies
2828
{% data reusables.enterprise-accounts.actions-tab %}
2929
{% data reusables.actions.enterprise-actions-permissions %}
3030

31+
{% ifversion ghes > 2.22 %}
32+
## Allowing specific actions to run
33+
34+
{% data reusables.actions.allow-specific-actions-intro %}
35+
36+
{% data reusables.enterprise-accounts.access-enterprise %}
37+
{% data reusables.enterprise-accounts.policies-tab %}
38+
{% data reusables.enterprise-accounts.actions-tab %}
39+
1. Under **Policies**, select **Allow select actions** and add your required actions to the list.
40+
![Add actions to allow list](/assets/images/help/organizations/enterprise-actions-policy-allow-list.png)
41+
{% endif %}
42+
3143
{% ifversion ghes > 2.22 or ghae %}
3244
## Enabling workflows for private repository forks
3345

content/code-security/guides.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ includeGuides:
5454
- /code-security/security-advisories/withdrawing-a-security-advisory
5555
- /code-security/security-overview/exploring-security-alerts
5656
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates
57+
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions
5758
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
5859
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/customizing-dependency-updates
5960
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/enabling-and-disabling-version-updates

content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,16 @@ permissions: 'People with write permissions to a repository can configure {% dat
55
miniTocMaxHeadingLevel: 3
66
versions:
77
free-pro-team: '*'
8+
type: how_to
89
topics:
910
- Actions
11+
- Dependabot
12+
- Version updates
13+
- Security updates
14+
- Repositories
15+
- Dependencies
16+
- Pull requests
17+
shortTitle: Use Dependabot with actions
1018
---
1119

1220
## About {% data variables.product.prodname_dependabot %} and {% data variables.product.prodname_actions %}
@@ -275,4 +283,4 @@ If your workflow run fails, check the following:
275283
- You aren't trying to access secrets from within a Dependabot-triggered `pull_request`, `pull_request_review`, `pull_request_review_comment`, or `push` event.
276284
- You aren't trying to perform any `write` actions from within a Dependabot-triggered `pull_request`, `pull_request_review`, `pull_request_review_comment`, or `push` event.
277285

278-
For information on writing and debugging {% data variables.product.prodname_actions %}, see "[Learning GitHub Actions](/actions/learn-github-actions)."
286+
For information on writing and debugging {% data variables.product.prodname_actions %}, see "[Learning GitHub Actions](/actions/learn-github-actions)."

content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ When you merge a pull request that contains a security update, the corresponding
5050

5151
## About compatibility scores
5252

53-
{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency.
53+
{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a dependency could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency.
5454

5555
## About notifications for {% data variables.product.prodname_dependabot %} security updates
5656

content/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/limits-for-viewing-content-and-diffs-in-a-repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Text files over **5 MB** are only available through their raw URLs, which are se
2626
Because diffs can become very large, we impose these limits on diffs for commits, pull requests, and compare views:
2727

2828
- No single file's diff may exceed *20,000 lines that you can load* or *1 MB* of raw diff data. *Four hundred lines* and *20 KB* are automatically loaded for a single file.
29-
- The maximum number of files in a single diff is limited to *3,000*.
29+
- The maximum number of files in a single diff is limited to *300*.
3030
- The maximum number of renderable files (such as images, PDFs, and GeoJSON files) in a single diff is limited to *25*.
3131

3232
Some portions of a limited diff may be displayed, but anything exceeding the limit is not shown.

content/rest/reference/apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Be sure to replace stubbed endpoints with production endpoints before deploying
6969
{% ifversion fpt or ghes > 2.22 or ghae %}
7070
## Webhooks
7171

72-
{% data reusables.webhooks.webhooks-rest-api-links %}
72+
A {% data variables.product.prodname_github_app %}'s webhook allows you to receive HTTP `POST` payloads whenever certain events happen for an app. {% data reusables.webhooks.webhooks-rest-api-links %}
7373

7474
{% for operation in currentRestOperations %}
7575
{% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %}

content/rest/reference/orgs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The token used to authenticate the call must have the `admin:org` scope in order
4141

4242
## Webhooks
4343

44-
Organization webhooks allow you to receive HTTP `POST` payloads whenever certain events happen within the organization. Subscribing to these events makes it possible to build integrations that react to events on {% data variables.product.product_name %}. {% data reusables.webhooks.webhooks-rest-api-links %}
44+
Organization webhooks allow you to receive HTTP `POST` payloads whenever certain events happen in an organization. {% data reusables.webhooks.webhooks-rest-api-links %}
4545

4646
For more information on actions you can subscribe to, see "[{% data variables.product.prodname_dotcom %} event types](/developers/webhooks-and-events/github-event-types)."
4747

0 commit comments

Comments
 (0)