Skip to content

Commit 04065ce

Browse files
authoredFeb 10, 2025··
Merge pull request #36239 from github/repo-sync
Repo sync
2 parents fbb42b3 + dfe64ef commit 04065ce

20 files changed

+81
-164
lines changed
 

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# --------------------------------------------------------------------------------
88
# To update the sha:
99
# https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
10-
FROM ghcr.io/github/gh-base-image/gh-base-noble:20250130-211232-g78f3af16c AS base
10+
FROM ghcr.io/github/gh-base-image/gh-base-noble:20250131-172559-g0fd5a2edc AS base
1111

1212
# Install git for cloning docs-early-access & translations repos
1313
# Install curl for determining the early access branch

‎content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/permission-levels-for-a-personal-account-repository.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The repository owner has full control of the repository. In addition to the acti
4343
| Manage security and analysis settings for the repository | [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository) |
4444
| {% endif %} |
4545
| {% ifversion fpt or ghec %} |
46-
| Enable the dependency graph for a private repository | [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository) |
46+
| Enable the dependency graph for a private {% ifversion ghec %}or internal {% endif %}repository, or public fork | [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph) |
4747
| {% endif %} |
4848
| Delete and restore packages | [AUTOTITLE](/packages/learn-github-packages/deleting-and-restoring-a-package) |
4949
| Customize the repository's social media preview | [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview) |

‎content/code-security/getting-started/quickstart-for-securing-your-repository.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ From the main page of your repository, click **{% octicon "gear" aria-hidden="tr
4848

4949
{% data reusables.dependabot.dependabot-alerts-dependency-graph-enterprise %}
5050

51-
For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository).
51+
For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph).
5252

5353
## Managing {% data variables.product.prodname_dependabot_alerts %}
5454

‎content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ Public repositories:
145145
You can also enable or disable Dependabot alerts for all repositories owned by your user account or organization. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-security-and-analysis-settings-for-your-personal-account) or [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization).
146146

147147
Private repositories:
148-
* **Dependency graph:** Not enabled by default. The feature can be enabled by repository administrators. For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository).
148+
* **Dependency graph:** Not enabled by default. The feature can be enabled by repository administrators. For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph).
149149
{% ifversion fpt %}
150150
* **Dependency review:** Available in private repositories owned by organizations that use {% data variables.product.prodname_ghe_cloud %} and have a license for {% data variables.product.prodname_GH_advanced_security %}. For more information, see the [{% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review).
151151
{% elsif ghec %}
152-
* **Dependency review:** Available in private repositories owned by organizations provided you have a license for {% data variables.product.prodname_GH_advanced_security %} and the dependency graph enabled. For more information, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security) and [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository).
152+
* **Dependency review:** Available in private repositories owned by organizations provided you have a license for {% data variables.product.prodname_GH_advanced_security %} and the dependency graph enabled. For more information, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security) and [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph).
153153
{% endif %}
154154
* **{% data variables.product.prodname_dependabot_alerts %}:** Not enabled by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories.
155155
You can also enable or disable Dependabot alerts for all repositories owned by your user account or organization. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-security-and-analysis-settings-for-your-personal-account) or [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization).

‎content/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph.md

+9-16
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,25 @@ shortTitle: Configure dependency graph
2121

2222
For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph).
2323

24-
{% ifversion fpt or ghec %}
25-
26-
## Configuring the dependency graph
24+
{% ifversion ghes %}
2725

28-
To generate a dependency graph, {% data variables.product.github %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private {% ifversion ghec %}and internal {% endif %}repositories. For more information on viewing the dependency graph, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository).
26+
## Enabling the dependency graph
2927

30-
{% data reusables.dependency-submission.dependency-submission-link %}
28+
{% data reusables.dependabot.ghes-enabling-dependency-graph %}
3129

3230
{% endif %}
3331

34-
{% ifversion ghes %}
35-
36-
## Enabling the dependency graph
37-
38-
{% data reusables.dependabot.ghes-enabling-dependency-graph %}{% endif %}
32+
{% ifversion fpt or ghec %}
3933

40-
{% ifversion ghec %}
34+
## Configuring the dependency graph
4135

42-
### Enabling and disabling the dependency graph for a private or internal repository
36+
To generate a dependency graph, {% data variables.product.github %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private {% ifversion ghec %}and internal {% endif %}repositories, and public forks. For more information on viewing the dependency graph, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository).
4337

44-
{% endif %}{% ifversion fpt %}
38+
{% data reusables.dependency-submission.dependency-submission-link %}
4539

46-
### Enabling and disabling the dependency graph for a private repository
40+
### Enabling and disabling the dependency graph
4741

48-
{% endif %}{% ifversion fpt or ghec %}
49-
{% data reusables.dependabot.enabling-disabling-dependency-graph-private-repo %}
42+
{% data reusables.dependabot.enabling-disabling-dependency-graph-private-repo-public-fork %}
5043

5144
{% endif %}
5245

‎content/code-security/supply-chain-security/understanding-your-software-supply-chain/customizing-your-dependency-review-action-configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This guide shows you how to add three very common customizations: failing builds
2424

2525
This guide assumes that:
2626

27-
* Dependency graph is enabled for the repository.{% ifversion fpt or ghec %} Dependency graph is enabled by default for public repositories and you can choose to enable it for private repositories.{% endif %} For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph#enabling-and-disabling-the-dependency-graph-for-a-private-repository).
27+
* Dependency graph is enabled for the repository.{% ifversion fpt or ghec %} Dependency graph is enabled by default for public repositories and you can choose to enable it for private{% ifversion ghec %} and internal{% endif %} repositories, and public forks.{% endif %} For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph#enabling-and-disabling-the-dependency-graph-for-a-private-repository).
2828
* {% data variables.product.prodname_actions %} is enabled for the repository. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository).
2929

3030
## Step 1: Adding the dependency review action

‎content/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ If vulnerabilities have been detected in the repository, these are shown at the
7777

7878
For public repositories, the dependents view shows how the repository is used by other repositories. To show only the repositories that contain a library in a package manager, click **NUMBER Packages** immediately above the list of dependent repositories. The dependent counts are approximate and may not always match the dependents listed.
7979

80-
## Enabling and disabling the dependency graph for a private repository
80+
## Enabling and disabling the dependency graph
8181

82-
{% data reusables.dependabot.enabling-disabling-dependency-graph-private-repo %}
82+
{% data reusables.dependabot.enabling-disabling-dependency-graph-private-repo-public-fork %}
8383

8484
## Changing the "Used by" package
8585

‎content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ shortTitle: Review dependency changes
2525

2626
{% data reusables.dependency-review.feature-overview %}
2727

28-
{% ifversion ghec %}Before you can use dependency review in a private repository, you must enable the dependency graph. For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository).{% endif %}
28+
{% ifversion ghec %}Before you can use dependency review in a private or internal repository, or a public fork, you must enable the dependency graph. For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph).{% endif %}
2929

3030
{% ifversion ghes %}Before you can use dependency review, you must enable the dependency graph and connect {% data variables.location.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. For more information, see [AUTOTITLE](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise).{% endif %}
3131

‎content/pull-requests/collaborating-with-pull-requests/working-with-forks/detaching-a-fork.md

+23-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Detaching a fork
3-
intro: You can delete a fork and recreate the same repository, without the connection to the original network.
3+
intro: You can disconnect a repository from its fork network by leaving the network or manually deleting the fork and recreating it without any connection to the original.
44
versions:
55
fpt: '*'
66
ghes: '*'
@@ -10,15 +10,14 @@ topics:
1010
permissions: People with admin access for a forked repository can delete the forked repository.
1111
---
1212

13-
## About detaching forks
13+
## Converting a fork into a standalone repository
1414

15-
To turn your fork into a standalone repository, you can clone the fork, use the clone to create a new repository, and then delete the fork. This is useful when you want to take the work you are doing in a different direction or maintain distinct versions.
15+
To turn your fork into a standalone repository, you can leave the fork network ensuring the new repository will no longer automatically sync with changes from the original repository. This is useful when you want to take the work you are doing in a different direction or maintain distinct versions.
1616

17-
The new repository will no longer automatically sync with changes from the original repository.
18-
19-
> [!NOTE]
17+
> [!WARNING]
2018
> * The new repository will not retain any of its issues, pull requests, wikis, stars, watchers, comments, child forks, or other metadata that may currently be associated with your current fork.
2119
> * All git commit metadata will be preserved. Commits may become eligible to be counted as contributions if they meet certain criteria. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile#your-local-git-commit-email-isnt-connected-to-your-account).
20+
> * Leaving the fork network is **permanent** and the new repository **cannot** be reconnected to the fork network.
2221
2322
{% ifversion ghes %}
2423

@@ -27,9 +26,25 @@ The new repository will no longer automatically sync with changes from the origi
2726
2827
{% endif %}
2928

30-
## Detaching a fork
29+
## Leaving the fork network
30+
31+
You can only detach forks with the leave network option when:
32+
* The fork is public
33+
* The fork is less than 1GB
34+
* The fork does not have any child forks attached
35+
36+
{% data reusables.repositories.navigate-to-repo %}
37+
{% data reusables.repositories.sidebar-settings %}
38+
1. On the "General" settings page (which is selected by default), scroll down to the "Danger Zone" section, and click **Leave fork network**.
39+
1. Read the warnings and click **I have read and understand these effects**.
40+
1. To verify that you're deleting the correct repository, in the text box, type the name of the fork.
41+
1. Click **Leave fork network**.
42+
43+
While the fork is being detached, some operations will be briefly unavailable until the fork has been transitioned to a standalone repository.
44+
45+
## Manually Leaving the fork network
3146

32-
You can delete a fork and recreate the same repository, without the connection to the original network.
47+
To turn your fork into a standalone repository, you can clone the fork, use the clone to create a new repository, and then delete the fork removing the connection to the original network.
3348

3449
{% data reusables.command_line.open_the_multi_os_terminal %}
3550
1. Create a bare clone of the fork.

‎data/features/actions-server-statistics.yml

-2
This file was deleted.

‎data/features/actions-setup-go-default-cache-enabled.yml

-6
This file was deleted.

‎data/features/actions-single-use-tokens.yml

-6
This file was deleted.

‎data/features/actions-token-updated-triggers.yml

-6
This file was deleted.

‎data/features/actions-unified-inputs.yml

-5
This file was deleted.

‎data/reusables/copilot/ai-models-intro.md

-5
This file was deleted.

‎data/reusables/copilot/copilot-chat-models-list-o1-preview.md

-15
This file was deleted.

‎data/reusables/copilot/integrating-ai-models-into-your-development-workflow.md

-64
This file was deleted.

‎data/reusables/dependabot/enabling-disabling-dependency-graph-private-repo.md ‎data/reusables/dependabot/enabling-disabling-dependency-graph-private-repo-public-fork.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Repository administrators can enable or disable the dependency graph for private {% ifversion ghec %}or internal{% endif %} repositories.
1+
Repository administrators can enable or disable the dependency graph for private {% ifversion ghec %}or internal{% endif %} repositories, or public forks.
22

33
You can enable or disable the dependency graph for all repositories owned by your user account. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/managing-security-and-analysis-settings-for-your-personal-account).
44

‎data/reusables/security-configurations/view-configurations-page-enterprise.md

-1
This file was deleted.

‎src/events/components/dotcom-cookies.ts

+39-20
Original file line numberDiff line numberDiff line change
@@ -8,50 +8,69 @@ type DotcomCookies = {
88

99
let cachedCookies: DotcomCookies | null = null
1010
let inFlightPromise: Promise<DotcomCookies> | null = null
11-
let tries = 0
1211

1312
const GET_COOKIES_ENDPOINT = '/api/cookies'
14-
const MAX_TRIES = 3
13+
const LOCAL_STORAGE_KEY = 'dotcomCookies'
1514

16-
// Fetches httpOnly cookies from the server and cache the result
17-
// We use an in-flight promise to avoid duplicate requests
15+
// Fetches httpOnly cookies from the server and caches the result.
16+
// We don't want to do this every time because of the load it would place on our servers
17+
// So on success, the data is stored in local storage and reused on subsequent loads
18+
// On failure, returns default empty values
19+
// If a user is staff and they didn't happen to be logged in when these cookies were saved,
20+
// we can instruct them as needed to update the cookies and correctly set the isStaff flag.
1821
async function fetchCookies(): Promise<DotcomCookies> {
22+
// Return the cached object if we have it in memory.
1923
if (cachedCookies) {
2024
return cachedCookies
2125
}
2226

23-
// If request is already in progress, return the same promise
24-
if (inFlightPromise) {
25-
return inFlightPromise
26-
}
27-
28-
if (tries > MAX_TRIES) {
29-
// In prod, fail without a serious error
30-
console.error('Failed to fetch cookies after 3 tries')
31-
// In dev, be loud about the issue
32-
if (process.env.NODE_ENV === 'development') {
33-
throw new Error('Failed to fetch cookies after 3 tries')
27+
// Try to load from local storage.
28+
const storedCookies = localStorage.getItem(LOCAL_STORAGE_KEY)
29+
if (storedCookies) {
30+
try {
31+
cachedCookies = JSON.parse(storedCookies) as DotcomCookies
32+
return cachedCookies
33+
} catch (e) {
34+
console.error('Error parsing cookies from local storage:', e)
35+
localStorage.removeItem(LOCAL_STORAGE_KEY)
3436
}
37+
}
3538

36-
return Promise.resolve({})
39+
// If a request is already in progress, reuse it.
40+
if (inFlightPromise) {
41+
return inFlightPromise
3742
}
3843

44+
// Make a single fetch request to the backend.
3945
inFlightPromise = fetch(GET_COOKIES_ENDPOINT)
4046
.then((response) => {
41-
tries++
4247
if (!response.ok) {
4348
throw new Error(`Failed to fetch cookies: ${response.statusText}`)
4449
}
4550
return response.json() as Promise<DotcomCookies>
4651
})
4752
.then((data) => {
4853
cachedCookies = data
54+
// Store the fetched cookies in local storage for future use.
55+
try {
56+
localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(data))
57+
} catch (e) {
58+
console.error('Error storing cookies in local storage:', e)
59+
}
4960
return data
5061
})
62+
.catch((err) => {
63+
console.error('Error fetching cookies:', err)
64+
// On failure, return default values.
65+
const defaultCookies: DotcomCookies = {
66+
dotcomUsername: '',
67+
isStaff: false,
68+
}
69+
cachedCookies = defaultCookies
70+
return defaultCookies
71+
})
5172
.finally(() => {
52-
// Clear the in-flight promise regardless of success or failure
53-
// On success, subsequent calls will return the cached value
54-
// On failure, subsequent calls will retry the request up to MAX_TRIES times
73+
// Clear the in-flight promise regardless of success or failure.
5574
inFlightPromise = null
5675
})
5776

0 commit comments

Comments
 (0)
Please sign in to comment.