Skip to content

Commit 3067418

Browse files
authored
Merge branch 'main' into mchammer01/dependency-review-action-config
2 parents c83eead + ae94a24 commit 3067418

File tree

209 files changed

+1179
-806
lines changed

Some content is hidden

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

209 files changed

+1179
-806
lines changed

.github/workflows/check-all-english-links.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ jobs:
5656
# The default is 10s. But because this runs overnight, we can
5757
# be a lot more patient.
5858
REQUEST_TIMEOUT: 20000
59+
# Don't care about CDN caching image URLs
60+
DISABLE_REWRITE_ASSET_URLS: true
5961
# The default is 300 which works OK on a fast macbook pro
6062
# but so well in Actions.
6163
LINKINATOR_CONCURRENCY: 100

.github/workflows/link-check-all.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ jobs:
4949
run: cat $HOME/files.json
5050

5151
- name: Link check (warnings, changed files)
52+
env:
53+
# Don't care about CDN caching image URLs
54+
DISABLE_REWRITE_ASSET_URLS: true
5255
run: |
5356
./script/rendered-content-link-checker.mjs \
5457
--language en \
@@ -59,6 +62,9 @@ jobs:
5962
--list $HOME/files.json
6063
6164
- name: Link check (critical, all files)
65+
env:
66+
# Don't care about CDN caching image URLs
67+
DISABLE_REWRITE_ASSET_URLS: true
6268
run: |
6369
./script/rendered-content-link-checker.mjs \
6470
--language en \

content/actions/deployment/security-hardening-your-deployments/using-openid-connect-with-reusable-workflows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ redirect_from:
77
- /actions/deployment/security-hardening-your-deployments/using-oidc-with-your-reusable-workflows
88
versions:
99
fpt: '*'
10-
ghae: issue-4757-and-5856
10+
ghae: issue-4757
1111
ghec: '*'
1212
ghes: '>=3.5'
1313
type: how_to

content/actions/managing-workflow-runs/removing-workflow-artifacts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ shortTitle: Remove workflow artifacts
1616

1717
{% warning %}
1818

19-
**Warning:** Once you delete an artifact, it can not be restored.
19+
**Warning:** Once you delete an artifact, it cannot be restored.
2020

2121
{% endwarning %}
2222

content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,10 @@ updates:
280280
prefix-development: "pip dev"
281281
include: "scope"
282282
```
283+
If you use the same configuration as in the example above, bumping the `requests` library in the `pip` development dependency group will generate a commit message of:
284+
285+
`pip dev: bump requests from 1.0.0 to 1.0.1`
286+
283287
### `ignore`
284288

285289
{% data reusables.dependabot.default-dependencies-allow-ignore %}

content/get-started/quickstart/create-a-repo.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ You can store a variety of projects in {% data variables.product.product_name %}
3333

3434
{% note %}
3535

36-
**Note:** You can create public repositories for an open source project. When creating your public repository, make sure to include a [license file](https://choosealicense.com/) that determines how you want your project to be shared with others. {% data reusables.open-source.open-source-guide-repositories %} {% data reusables.open-source.open-source-learning %}
36+
**Notes:**
37+
- You can create public repositories for an open source project. When creating your public repository, make sure to include a [license file](https://choosealicense.com/) that determines how you want your project to be shared with others. {% data reusables.open-source.open-source-guide-repositories %}
38+
- {% data reusables.open-source.open-source-learning %}
39+
- You can also add community health files to your repositories, to set guidelines on how to contribute, keep your repositories safe, and much more. For more information, see "[Creating a default community health file](/communities/setting-up-your-project-for-healthy-contributions/creating-a-default-community-health-file)."
3740

3841
{% endnote %}
3942

content/get-started/writing-on-github/working-with-advanced-formatting/organizing-information-with-collapsed-sections.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ versions:
66
ghes: '*'
77
ghae: '*'
88
ghec: '*'
9-
redirect_from:
10-
- /github/writing-on-github/working-with-advanced-formatting/organizing-information-with-collapsed-sections
9+
redirect_from:
10+
- /github/writing-on-github/working-with-advanced-formatting/organizing-information-with-collapsed-sections
1111
shortTitle: Collapsed sections
1212
---
1313
## Creating a collapsed section

content/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ versions:
66
ghes: '*'
77
ghae: '*'
88
ghec: '*'
9-
redirect_from:
10-
- /github/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests
9+
redirect_from:
10+
- /github/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests
1111
topics:
1212
- Issues
1313
- Pull requests

content/pages/getting-started-with-github-pages/securing-your-github-pages-site-with-https.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ Assets are commonly found in the following locations:
6767
|:----------:|:-----------------------------------------:|:---------------------------------:|
6868
| CSS | `<link rel="stylesheet" href="http://example.com/css/main.css">` | `<link rel="stylesheet" href="https://example.com/css/main.css">`
6969
| JavaScript | `<script type="text/javascript" src="http://example.com/js/main.js"></script>` | `<script type="text/javascript" src="https://example.com/js/main.js"></script>`
70-
| Image | `<A HREF="http://www.somesite.com"><IMG SRC="http://www.example.com/logo.jpg" alt="Logo"></a>` | `<A HREF="https://www.somesite.com"><IMG SRC="https://www.example.com/logo.jpg" alt="Logo"></a>`
70+
| Image | `<a href="http://www.somesite.com"><img src="http://www.example.com/logo.jpg" alt="Logo"></a>` | `<a href="https://www.somesite.com"><img src="https://www.example.com/logo.jpg" alt="Logo"></a>`

content/rest/guides/index.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ children:
2525
- /getting-started-with-the-checks-api
2626
---
2727
This section of the documentation is intended to get you up-and-running with
28-
real-world {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API applications. We'll cover everything you need to know, from
29-
authentication, to manipulating results, to combining results with other apps.
30-
Every tutorial here will have a project, and every project will be
31-
stored and documented in our public
28+
real-world {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API applications. We'll go over everything you need to know, from authentication to results manipulation to integrating results with other apps.
29+
Every tutorial will include a project, and each project will be saved and documented in our public
3230
[platform-samples](https://github.com/github/platform-samples) repository.
3331
![The Octocat](/assets/images/electrocat.png)

0 commit comments

Comments
 (0)