Skip to content

Commit 5ee5cea

Browse files
authored
Merge pull request #15741 from github/repo-sync
repo sync
2 parents fefa288 + b60d095 commit 5ee5cea

27 files changed

+256
-163
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ blc_output.log
1717
blc_output_internal.log
1818
broken_links.md
1919
lib/redirects/.redirects-cache.json
20+
# This one is purely for historical reasons because so many people might
21+
# still have thes files on their disk.
22+
lib/redirects/.redirects-cache_*.json
2023

2124
# During the preview deploy untrusted user code may be cloned into this directory
2225
# We ignore it from git to keep things deterministic
Loading

components/page-header/VersionPicker.tsx

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { useRouter } from 'next/router'
2-
import { ArrowRightIcon } from '@primer/octicons-react'
2+
import { ArrowRightIcon, InfoIcon } from '@primer/octicons-react'
33

44
import { Link } from 'components/Link'
55
import { useMainContext } from 'components/context/MainContext'
6-
import { useVersion } from 'components/hooks/useVersion'
6+
import { DEFAULT_VERSION, useVersion } from 'components/hooks/useVersion'
77
import { useTranslation } from 'components/hooks/useTranslation'
88
import { Picker } from 'components/ui/Picker'
99

@@ -17,7 +17,7 @@ export const VersionPicker = ({ variant }: Props) => {
1717
const { allVersions, page, enterpriseServerVersions } = useMainContext()
1818
const { t } = useTranslation(['pages', 'picker'])
1919

20-
if (page.permalinks && page.permalinks.length <= 1) {
20+
if (page.permalinks && page.permalinks.length < 1) {
2121
return null
2222
}
2323

@@ -37,7 +37,7 @@ export const VersionPicker = ({ variant }: Props) => {
3737
item: (
3838
<Link
3939
href={`/${router.locale}/${enterpriseServerVersions[0]}/admin/all-releases`}
40-
className="f6 no-underline color-fg-muted"
40+
className="f6 no-underline"
4141
>
4242
{t('all_enterprise_releases')}{' '}
4343
<ArrowRightIcon verticalAlign="middle" size={15} className="mr-2" />
@@ -46,6 +46,23 @@ export const VersionPicker = ({ variant }: Props) => {
4646
})
4747
}
4848

49+
if (allLinks) {
50+
const currentVersionPathSegment = currentVersion === DEFAULT_VERSION ? '' : `/${currentVersion}`
51+
52+
allLinks.push({
53+
text: t('docs_versions'),
54+
selected: false,
55+
item: (
56+
<Link
57+
href={`/${router.locale}${currentVersionPathSegment}/get-started/learning-about-github/about-versions-of-github-docs`}
58+
className="f6 no-underline"
59+
>
60+
{t('about_versions')} <InfoIcon verticalAlign="middle" size={15} className="mr-2" />
61+
</Link>
62+
),
63+
})
64+
}
65+
4966
return (
5067
<Picker
5168
variant={variant}

content/code-security/guides.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ includeGuides:
4747
- /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system
4848
- /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/running-codeql-runner-in-your-ci-system
4949
- /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/troubleshooting-codeql-runner-in-your-ci-system
50-
- /code-security/security-advisories/about-coordinated-disclosure-of-security-vulnerabilities
51-
- /code-security/security-advisories/about-github-security-advisories
52-
- /code-security/security-advisories/adding-a-collaborator-to-a-security-advisory
53-
- /code-security/security-advisories/collaborating-in-a-temporary-private-fork-to-resolve-a-security-vulnerability
54-
- /code-security/security-advisories/creating-a-security-advisory
55-
- /code-security/security-advisories/editing-a-security-advisory
56-
- /code-security/security-advisories/permission-levels-for-security-advisories
57-
- /code-security/security-advisories/publishing-a-security-advisory
58-
- /code-security/security-advisories/removing-a-collaborator-from-a-security-advisory
59-
- /code-security/security-advisories/withdrawing-a-security-advisory
50+
- /code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities
51+
- /code-security/repository-security-advisories/about-github-security-advisories-for-repositories
52+
- /code-security/repository-security-advisories/adding-a-collaborator-to-a-repository-security-advisory
53+
- /code-security/repository-security-advisories/collaborating-in-a-temporary-private-fork-to-resolve-a-repository-security-vulnerability
54+
- /code-security/repository-security-advisories/creating-a-repository-security-advisory
55+
- /code-security/repository-security-advisories/editing-a-repository-security-advisory
56+
- /code-security/repository-security-advisories/permission-levels-for-repository-security-advisories
57+
- /code-security/repository-security-advisories/publishing-a-repository-security-advisory
58+
- /code-security/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory
59+
- /code-security/repository-security-advisories/withdrawing-a-repository-security-advisory
6060
- /code-security/security-overview/about-the-security-overview
6161
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates
6262
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions
@@ -72,6 +72,7 @@ includeGuides:
7272
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates
7373
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-managing-vulnerable-dependencies
7474
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/browsing-security-vulnerabilities-in-the-github-advisory-database
75+
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/editing-security-advisories-in-the-github-advisory-database
7576
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates
7677
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies
7778
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors

content/code-security/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ featuredLinks:
88
guides:
99
- /code-security/getting-started/securing-your-repository
1010
- /code-security/getting-started/securing-your-organization
11-
- '{% ifversion fpt %}/code-security/security-advisories/creating-a-security-advisory{% endif %}'
11+
- '{% ifversion fpt %}/code-security/repository-security-advisories/creating-a-repository-security-advisory{% endif %}'
1212
- '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif%}'
1313
guideCards:
1414
- '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates{% endif %}'
@@ -22,7 +22,7 @@ featuredLinks:
2222
popular:
2323
- '{% ifversion ghes %}/admin/release-notes{% endif %}'
2424
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies
25-
- /code-security/security-advisories/about-coordinated-disclosure-of-security-vulnerabilities
25+
- /code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities
2626
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
2727
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
2828
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot
@@ -51,7 +51,7 @@ children:
5151
- /getting-started
5252
- /secret-scanning
5353
- /code-scanning
54-
- /security-advisories
54+
- /repository-security-advisories
5555
- /supply-chain-security
5656
- /security-overview
5757
- /guides

content/code-security/security-advisories/about-coordinated-disclosure-of-security-vulnerabilities.md renamed to content/code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
22
title: About coordinated disclosure of security vulnerabilities
33
intro: Vulnerability disclosure is a coordinated effort between security reporters and repository maintainers.
4+
redirect_from:
5+
- /code-security/security-advisories/about-coordinated-disclosure-of-security-vulnerabilities
46
miniTocMaxHeadingLevel: 3
57
versions:
68
fpt: '*'
@@ -63,7 +65,7 @@ The process for reporting and disclosing vulnerabilities for projects on {% data
6365

6466
If you are a maintainer, you can take ownership of the process at the very beginning of the pipeline by setting up a security policy for your repository, or otherwise making security reporting instructions clearly available, for example in your project’s README file. For information about adding a security policy, see "[About security policies](/code-security/getting-started/adding-a-security-policy-to-your-repository#about-security-policies)." If there is no security policy, it's likely that a vulnerability reporter will try to email you or otherwise privately contact you. Alternatively, someone may open a (public) issue with details of a security issue.
6567

66-
As a maintainer, to disclose a vulnerability in your code, you first create a draft security advisory in the package's repository in {% data variables.product.prodname_dotcom %}. {% data reusables.security-advisory.security-advisory-overview %} For more information, see "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)."
68+
As a maintainer, to disclose a vulnerability in your code, you first create a draft security advisory in the package's repository in {% data variables.product.prodname_dotcom %}. {% data reusables.security-advisory.security-advisory-overview %} For more information, see "[About {% data variables.product.prodname_security_advisories %} for repositories](/code-security/repository-security-advisories/about-github-security-advisories-for-repositories)."
6769

6870

69-
To get started, see "[Creating a security advisory](/github/managing-security-vulnerabilities/creating-a-security-advisory)."
71+
To get started, see "[Creating a repository security advisory](/code-security/repository-security-advisories/creating-a-repository-security-advisory)."

content/code-security/security-advisories/about-github-security-advisories.md renamed to content/code-security/repository-security-advisories/about-github-security-advisories-for-repositories.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
2-
title: About GitHub Security Advisories
2+
title: About GitHub Security Advisories for repositories
33
intro: 'You can use {% data variables.product.prodname_security_advisories %} to privately discuss, fix, and publish information about security vulnerabilities in your repository.'
44
redirect_from:
55
- /articles/about-maintainer-security-advisories
66
- /github/managing-security-vulnerabilities/about-maintainer-security-advisories
77
- /github/managing-security-vulnerabilities/about-github-security-advisories
8+
- /code-security/security-advisories/about-github-security-advisories
89
versions:
910
fpt: '*'
1011
ghec: '*'
@@ -13,7 +14,7 @@ topics:
1314
- Security advisories
1415
- Vulnerabilities
1516
- CVEs
16-
shortTitle: Security advisories
17+
shortTitle: Repository security advisories
1718
---
1819

1920
{% data reusables.repositories.security-advisory-admin-permissions %}
@@ -22,23 +23,25 @@ shortTitle: Security advisories
2223

2324
## About {% data variables.product.prodname_security_advisories %}
2425

25-
{% data reusables.security-advisory.disclosing-vulnerabilities %} For more information, see "[About coordinated disclosure of security vulnerabilities](/code-security/security-advisories/about-coordinated-disclosure-of-security-vulnerabilities)."
26+
{% data reusables.security-advisory.disclosing-vulnerabilities %} For more information, see "[About coordinated disclosure of security vulnerabilities](/code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities)."
2627

2728
{% data reusables.security-advisory.security-advisory-overview %}
2829

2930
With {% data variables.product.prodname_security_advisories %}, you can:
3031

31-
1. Create a draft security advisory, and use the draft to privately discuss the impact of the vulnerability on your project. For more information, see "[Creating a security advisory](/github/managing-security-vulnerabilities/creating-a-security-advisory)."
32+
1. Create a draft security advisory, and use the draft to privately discuss the impact of the vulnerability on your project. For more information, see "[Creating a repository security advisory](/code-security/repository-security-advisories/creating-a-repository-security-advisory)."
3233
2. Privately collaborate to fix the vulnerability in a temporary private fork.
33-
3. Publish the security advisory to alert your community of the vulnerability once a patch is released. For more information, see "[Publishing a security advisory](/github/managing-security-vulnerabilities/publishing-a-security-advisory)."
34+
3. Publish the security advisory to alert your community of the vulnerability once a patch is released. For more information, see "[Publishing a repository security advisory](/code-security/repository-security-advisories/publishing-a-repository-security-advisory)."
3435

3536
{% data reusables.repositories.security-advisories-republishing %}
3637

37-
You can give credit to individuals who contributed to a security advisory. For more information, see "[Editing a security advisory](/github/managing-security-vulnerabilities/editing-a-security-advisory#about-credits-for-security-advisories)."
38+
You can give credit to individuals who contributed to a security advisory. For more information, see "[Editing a repository security advisory](/code-security/repository-security-advisories/editing-a-repository-security-advisory#about-credits-for-security-advisories)."
3839

3940
{% data reusables.repositories.security-guidelines %}
4041

41-
If you created a security advisory in your repository, the security advisory will stay in your repository. We publish security advisories for any of the ecosystems supported by the dependency graph to the {% data variables.product.prodname_advisory_database %} on [github.com/advisories](https://github.com/advisories). If a security advisory is specifically for npm, we also publish the advisory to the npm security advisories. For more information, see [npmjs.com/advisories](https://www.npmjs.com/advisories).
42+
If you created a security advisory in your repository, the security advisory will stay in your repository. We publish security advisories for any of the ecosystems supported by the dependency graph to the {% data variables.product.prodname_advisory_database %} on [github.com/advisories](https://github.com/advisories). Anyone can submit a change to an advisory published in the {% data variables.product.prodname_advisory_database %}. For more information, see "[Editing security advisories in the {% data variables.product.prodname_advisory_database %}](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/editing-security-advisories-in-the-github-advisory-database)."
43+
44+
If a security advisory is specifically for npm, we also publish the advisory to the npm security advisories. For more information, see [npmjs.com/advisories](https://www.npmjs.com/advisories).
4245

4346
{% data reusables.repositories.github-security-lab %}
4447

@@ -51,7 +54,7 @@ If you created a security advisory in your repository, the security advisory wil
5154
When you create a security advisory for a public repository on {% data variables.product.prodname_dotcom %}, you have the option of providing an existing CVE identification number for the security vulnerability. {% data reusables.repositories.request-security-advisory-cve-id %}
5255

5356
Once you've published the security advisory and {% data variables.product.prodname_dotcom %} has assigned a CVE identification number to the vulnerability, {% data variables.product.prodname_dotcom %} publishes the CVE to the MITRE database.
54-
For more information, see "[Publishing a security advisory](/github/managing-security-vulnerabilities/publishing-a-security-advisory#requesting-a-cve-identification-number)."
57+
For more information, see "[Publishing a repository security advisory](/code-security/repository-security-advisories/publishing-a-repository-security-advisory)."
5558

5659
## {% data variables.product.prodname_dependabot_alerts %} for published security advisories
5760

content/code-security/security-advisories/adding-a-collaborator-to-a-security-advisory.md renamed to content/code-security/repository-security-advisories/adding-a-collaborator-to-a-repository-security-advisory.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
2-
title: Adding a collaborator to a security advisory
2+
title: Adding a collaborator to a repository security advisory
33
intro: You can add other users or teams to collaborate on a security advisory with you.
44
redirect_from:
55
- /articles/adding-a-collaborator-to-a-maintainer-security-advisory
66
- /github/managing-security-vulnerabilities/adding-a-collaborator-to-a-maintainer-security-advisory
77
- /github/managing-security-vulnerabilities/adding-a-collaborator-to-a-security-advisory
8+
- /code-security/security-advisories/adding-a-collaborator-to-a-security-advisory
89
versions:
910
fpt: '*'
1011
ghec: '*'
@@ -13,18 +14,20 @@ topics:
1314
- Security advisories
1415
- Vulnerabilities
1516
- Collaboration
16-
shortTitle: Add collaborator to advisory
17+
shortTitle: Add collaborators
1718
---
1819

1920
People with admin permissions to a security advisory can add collaborators to the security advisory.
2021

22+
{% data reusables.security-advisory.repository-level-advisory-note %}
23+
2124
## Adding a collaborator to a security advisory
2225

23-
Collaborators have write permissions to the security advisory. For more information, see "[Permission levels for security advisories](/github/managing-security-vulnerabilities/permission-levels-for-security-advisories)."
26+
Collaborators have write permissions to the security advisory. For more information, see "[Permission levels for repository security advisories](/code-security/repository-security-advisories/permission-levels-for-repository-security-advisories)."
2427

2528
{% note %}
2629

27-
{% data reusables.repositories.security-advisory-collaborators-public-repositories %} For more information about removing a collaborator on a security advisory, see "[Removing a collaborator from a security advisory](/github/managing-security-vulnerabilities/removing-a-collaborator-from-a-security-advisory)."
30+
{% data reusables.repositories.security-advisory-collaborators-public-repositories %} For more information about removing a collaborator on a security advisory, see "[Removing a collaborator from a repository security advisory](/code-security/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory)."
2831

2932
{% endnote %}
3033

@@ -39,6 +42,6 @@ Collaborators have write permissions to the security advisory. For more informat
3942

4043
## Further reading
4144

42-
- "[Permission levels for security advisories](/github/managing-security-vulnerabilities/permission-levels-for-security-advisories)"
43-
- "[Collaborating in a temporary private fork to resolve a security vulnerability](/github/managing-security-vulnerabilities/collaborating-in-a-temporary-private-fork-to-resolve-a-security-vulnerability)"
44-
- "[Removing a collaborator from a security advisory](/github/managing-security-vulnerabilities/removing-a-collaborator-from-a-security-advisory)"
45+
- "[Permission levels for repository security advisories](/code-security/repository-security-advisories/permission-levels-for-repository-security-advisories)"
46+
- "[Collaborating in a temporary private fork to resolve a repository security vulnerability](/code-security/repository-security-advisories/collaborating-in-a-temporary-private-fork-to-resolve-a-repository-security-vulnerability)"
47+
- "[Removing a collaborator from a repository security advisory](/code-security/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory)."

0 commit comments

Comments
 (0)