Skip to content

Commit b3960f3

Browse files
authored
Merge branch 'main' into main
2 parents e32c1a3 + 5810c23 commit b3960f3

14 files changed

Lines changed: 39 additions & 30 deletions

File tree

.github/workflows/repo-sync-stalls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
const timeDelta = Date.now() - Date.parse(pr.created_at);
4141
const minutesOpen = timeDelta / 1000 / 60;
4242
43-
if (minutesOpen > 30) {
43+
if (minutesOpen > 180) {
4444
core.setFailed('Repo sync appears to be stalled')
4545
}
4646
})

content/actions/guides/building-and-testing-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ steps:
195195

196196
To authenticate to your private registry, you'll need to store your npm authentication token as a secret. For example, create a repository secret called `NPM_TOKEN`. For more information, see "[Creating and using encrypted secrets](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)."
197197

198-
In the example below, the secret `NPM_TOKEN` stores the npm authentication token. The `setup-node` action configures the *.npmrc* file to read the npm authentication token from the `NODE_AUTH_TOKEN` environment variable. When using the `setup-node` action to create an *.npmrc* file, you must set the `NPM_AUTH_TOKEN` environment variable with the secret that contains your npm authentication token.
198+
In the example below, the secret `NPM_TOKEN` stores the npm authentication token. The `setup-node` action configures the *.npmrc* file to read the npm authentication token from the `NODE_AUTH_TOKEN` environment variable. When using the `setup-node` action to create an *.npmrc* file, you must set the `NODE_AUTH_TOKEN` environment variable with the secret that contains your npm authentication token.
199199

200200
Before installing dependencies, use the `setup-node` action to create the *.npmrc* file. The action has two input parameters. The `node-version` parameter sets the Node.js version, and the `registry-url` parameter sets the default registry. If your package registry uses scopes, you must use the `scope` parameter. For more information, see [`npm-scope`](https://docs.npmjs.com/misc/scope).
201201

content/actions/index.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,15 @@ featuredLinks:
2525
- /actions/reference/workflow-commands-for-github-actions
2626
- /actions/reference/environment-variables
2727
changelog:
28+
- title: Workflow visualization
29+
date: '2020-12-08'
30+
href: https://github.blog/changelog/2020-12-08-github-actions-workflow-visualization/
2831
- title: Removing set-env and add-path commands on November 16
2932
date: '2020-11-09'
3033
href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
3134
- title: Ubuntu-latest workflows will use Ubuntu-20.04
3235
date: '2020-10-29'
3336
href: https://github.blog/changelog/2020-10-29-github-actions-ubuntu-latest-workflows-will-use-ubuntu-20-04
34-
- title: MacOS Big Sur Preview
35-
date: '2020-10-29'
36-
href: https://github.blog/changelog/2020-10-29-github-actions-macos-big-sur-preview
37-
- title: Self-Hosted Runner Group Access Changes
38-
date: '2020-10-16'
39-
href: https://github.blog/changelog/2020-10-16-github-actions-self-hosted-runner-group-access-changes/
4037

4138
product_video: https://www.youtube-nocookie.com/embed/cP0I9w2coGU
4239

content/actions/learn-github-actions/finding-and-customizing-actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ steps:
7979
8080
#### Using branches
8181
82-
Referring to a specific branch means that the action will always use include the latest updates on the target branch, but can create problems if those updates include breaking changes. This example targets a branch named `@main`:
82+
Referring to a specific branch means that the action will always use the latest updates on the target branch, but can create problems if those updates include breaking changes. This example targets a branch named `@main`:
8383

8484
```yaml
8585
steps:

content/admin/configuration/configuring-email-for-notifications.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Notification emails are sent if there is activity on a repository a user is watc
1818
Your dedicated technical account manager in {% data variables.contact.github_support %} can configure email for notifications to be sent through your SMTP server. Make sure you include the following details in your support request.
1919

2020
- Your SMTP server address
21+
- Login information to authenticate to the server: username and password
2122
- The port your SMTP server uses to send email
2223
- The domain name that your SMTP server will send with a HELO response, if any
2324
- The type of encryption used by your SMTP server

content/developers/webhooks-and-events/securing-your-webhooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ end
7272
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}
7373
def verify_signature(payload_body)
7474
signature = 'sha256=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), ENV['SECRET_TOKEN'], payload_body)
75-
return halt 500, "Signatures didn't match!" unless Rack::Utils.secure_compare(signature, request.env['HTTP_X_HUB_SIGNATURE_2'])
75+
return halt 500, "Signatures didn't match!" unless Rack::Utils.secure_compare(signature, request.env['HTTP_X_HUB_SIGNATURE_256'])
7676
end{% elsif currentVersion ver_lt "enterprise-server@2.23" %}
7777
def verify_signature(payload_body)
7878
signature = 'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), ENV['SECRET_TOKEN'], payload_body)

content/graphql/overview/resource-limitations.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ These two examples show how to calculate the total nodes in a call.
125125

126126
= 22,060 total nodes</pre>
127127

128-
### Rate limit
128+
## Rate limit
129129

130130
The GraphQL API v4 limit is different from the REST API v3's [rate limits](/rest/overview/resources-in-the-rest-api#rate-limiting).
131131

@@ -136,13 +136,7 @@ To accurately represent the server cost of a query, the GraphQL API v4 calculate
136136
* The formula uses the `first` and `last` arguments on a parent connection and its children to pre-calculate the potential load on GitHub's systems, such as MySQL, ElasticSearch, and Git.
137137
* Each new connection has its own point value. Points are combined with other points from the call into an overall rate limit score.
138138

139-
The GraphQL API v4 rate limit is **5,000 points per hour**.
140-
141-
{% if currentVersion == "free-pro-team@latest" %}
142-
143-
For {% data variables.product.prodname_github_apps %} or {% data variables.product.prodname_oauth_app %}s that belong to a {% data variables.product.prodname_ghe_cloud %} account, requests to resources owned by the same {% data variables.product.prodname_ghe_cloud %} account have an increased limit of 15,000 points per hour.
144-
145-
{% endif %}
139+
The GraphQL API v4 rate limit is **5,000 points per hour**.
146140

147141
Note that 5,000 points per hour is not the same as 5,000 calls per hour: the GraphQL API v4 and REST API v3 use different rate limits.
148142

content/packages/index.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ featuredLinks:
1919
- /packages/guides/enabling-improved-container-support
2020
- /packages/guides/configuring-rubygems-for-use-with-github-packages
2121
changelog:
22+
- title: ghcr.io container names redirect to the container page
23+
date: '2020-12-14'
24+
href: https://github.blog/changelog/2020-12-14-ghcr-io-container-names-redirect-to-the-container-page/
25+
- title: Filter for tagged and untagged containers
26+
date: '2020-12-14'
27+
href: https://github.blog/changelog/2020-12-14-packages-can-filter-for-tagged-and-untagged-containers/
2228
- title: Packages container support is an opt-in beta
2329
date: '2020-11-17'
2430
href: https://docs.github.com/packages/getting-started-with-github-container-registry/enabling-improved-container-support
25-
- title: Organization admins access to containers
26-
date: '2020-11-16'
27-
href: https://github.blog/changelog/2020-11-16-packages-organization-admins-access-to-containers/
28-
- title: Packages now respects IP allow list settings
29-
date: '2020-11-12'
30-
href: https://github.blog/changelog/2020-11-12-packages-now-respects-ip-allow-list-settings/
3131
redirect_from:
3232
- /github/managing-packages-with-github-packages
3333
- /categories/managing-packages-with-github-package-registry

data/reusables/dependabot/supported-package-managers.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Terraform: `terraform` | **✓** | |
2525

2626
-`yarn` (v1 only) (specify `npm`)
2727

28+
-`.gradle.tks` files, for Kotlin projects (specify `gradle`)
29+
2830
-`pipenv`, `pip-compile`, and `poetry` (specify `pip`)
2931

3032
For example, if you use `poetry` to manage your Python dependencies and want {% data variables.product.prodname_dependabot %} to monitor your dependency manifest file for new versions, use `package-ecosystem: "pip"` in your *dependabot.yml* file.
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
{% if enterpriseServerVersions contains currentVersion %}
2-
1+
{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %}
32
{% note %}
43

54
**Note**: You'll only receive email notifications if outbound email support is enabled on {% data variables.product.product_location %}. For more information, contact your site administrator.
65

76
{% endnote %}
8-
97
{% endif %}

0 commit comments

Comments
 (0)