Skip to content

Commit 9c4620e

Browse files
authored
Merge pull request #36932 from github/repo-sync
Repo sync
2 parents dbf3243 + c03d61c commit 9c4620e

13 files changed

Lines changed: 138 additions & 117 deletions

File tree

content/admin/upgrading-your-instance/troubleshooting-upgrades/known-issues-with-upgrades-to-your-instance.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,20 @@ If undecryptable records are detected, you will be prompted whether you want to
7474

7575
If you have any questions during the upgrade, you can reach out to {% data variables.contact.github_support %}. Once you have had the time and opportunity to understand the impact, you can retrigger the upgrade.
7676
{% endif %}
77+
78+
{% ifversion ghes > 3.13 and ghes < 3.17 %}
79+
80+
## Upgrading from 3.14 to 3.16.0
81+
82+
If you are using {% data variables.product.prodname_ghe_server %} 3.14, and you have enabled security products by default at the organization level, you cannot upgrade directly from 3.14 to 3.16.0. To determine your upgrade eligibility, run the following command:
83+
84+
```shell
85+
ghe-console -y
86+
Organization.any? { |o| [o.vulnerability_updates_enabled_for_new_repos?, o.security_alerts_enabled_for_new_repos?, o.dependency_graph_enabled_for_new_repos?, o.advanced_security_enabled_on_new_repos?, SecretScanning::Features::Org::TokenScanning.new(o).secret_scanning_enabled_for_new_repos?, SecretScanning::Features::Org::PushProtection.new(o).enabled_for_new_repos?].any? }
87+
```
88+
89+
If the command returns `true`, a direct upgrade from 3.14 to 3.16.0 will fail, and we recommend you wait for the next 3.16 patch to upgrade.
90+
91+
Alternatively, you can move to 3.16.0 now by first upgrading from 3.14 to 3.15, then from 3.15 to 3.16.0.
92+
93+
{% endif %}

content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ topics:
88
- Copilot
99
children:
1010
- /managing-your-github-copilot-pro-subscription
11-
- /about-github-copilot-free
11+
- /managing-copilot-free
1212
- /managing-copilot-policies-as-an-individual-subscriber
1313
- /extending-the-capabilities-of-github-copilot-in-your-personal-account
1414
---

content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/about-github-copilot-free.md renamed to content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/managing-copilot-free/about-github-copilot-free.md

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ versions:
77
type: overview
88
topics:
99
- Copilot
10+
redirect_from:
11+
- /copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/about-github-copilot-free
1012
---
1113

1214
{% data variables.product.prodname_copilot_free %} provides limited access to select features of {% data variables.product.prodname_copilot_short %}, allowing you to experience AI-powered coding assistance without a subscription.
@@ -54,51 +56,15 @@ When you reach these limits, you can upgrade to {% data variables.product.prodna
5456
* Usage data
5557
* Indemnification coverage
5658

57-
## How do I get access to {% data variables.product.prodname_copilot_free_short %}?
58-
59-
There are a few ways to access {% data variables.product.prodname_copilot_free_short %}.
60-
61-
* [{% data variables.product.prodname_vs %} and {% data variables.product.prodname_vscode_shortname %}](#visual-studio-and-vs-code)
62-
* [{% data variables.product.prodname_dotcom_the_website %}](#githubcom)
63-
* [{% data variables.product.prodname_mobile %}](#github-mobile)
64-
* [Other IDEs](#other-ides)
65-
66-
### {% data variables.product.prodname_vs %} and {% data variables.product.prodname_vscode_shortname %}
67-
68-
In {% data variables.product.prodname_vs %} and {% data variables.product.prodname_vscode_shortname %} you can access {% data variables.product.prodname_copilot_free_short %} directly from the editor.
69-
70-
1. In the top right of {% data variables.product.prodname_vs %} or {% data variables.product.prodname_vscode_shortname %}, click **{% octicon "copilot" aria-hidden="true" %}**.
71-
1. In the sidebar, click **Sign up for {% data variables.product.prodname_copilot_free_short %}**.
72-
1. If you have a {% data variables.product.github %} account, you will be prompted to sign in. If you don't have a {% data variables.product.github %} account, you will be prompted to create one.
73-
74-
### {% data variables.product.prodname_dotcom_the_website %}
75-
76-
With {% data variables.product.prodname_copilot_free_short %}, you can ask {% data variables.product.prodname_copilot_short %} questions within a chat interface on {% data variables.product.github %}.
77-
78-
1. To access your personal dashboard once you're signed in, click the {% octicon "mark-github" aria-label="The github octocat logo" %} in the upper-left corner of any page on {% data variables.product.github %}.
79-
1. At the top of the dashboard, use the "Ask a question" box to start a chat with {% data variables.product.prodname_copilot_short %}.
80-
81-
### {% data variables.product.prodname_mobile %}
82-
83-
You'll automatically get subscribed to {% data variables.product.prodname_copilot_free_short %} when you start a chat with {% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_mobile %}.
84-
85-
{% data reusables.copilot.chat-mobile-start-chat %}
86-
1. At the bottom of the page, use the "Ask {% data variables.product.prodname_copilot_short %}" box to start a chat with {% data variables.product.prodname_copilot_short %}.
87-
88-
Alternatively, go to "Settings" in {% data variables.product.prodname_mobile %}, then under {% data variables.product.prodname_copilot_short %} settings, click **Get started for Free**.
89-
90-
### Other IDEs
91-
92-
To use {% data variables.product.prodname_copilot_free_short %} in other IDEs, you first have to activate {% data variables.product.prodname_copilot_free_short %} in your {% data variables.product.github %} account settings.
93-
94-
{% data reusables.user-settings.copilot-settings %}
95-
1. Click **Start using {% data variables.product.prodname_copilot_free_short %}** to activate {% data variables.product.prodname_copilot_free_short %} and open a conversation thread.
96-
1. Click **Use {% data variables.product.prodname_copilot_short %} in other IDEs** and follow the instructions for your IDE.
97-
9859
## How can I upgrade to {% data variables.product.prodname_copilot_pro_short %}?
9960

10061
If you use {% data variables.product.prodname_copilot_free_short %} in {% data variables.product.prodname_vs %}, {% data variables.product.prodname_vscode_shortname %}, or on {% data variables.product.prodname_dotcom_the_website %}, and reach the usage limits, you'll receive a notification. The notification includes the reset date for your limits and a link to set up a 30-day free trial of {% data variables.product.prodname_copilot_pro_short %}. After the trial ends, you'll need a paid subscription to keep using {% data variables.product.prodname_copilot_short %}.
10162

10263
If you use {% data variables.product.prodname_copilot_free_short %} in a different IDE and reach the limits, an error message will appear in your editor. To continue, you can start a 30-day free trial of {% data variables.product.prodname_copilot_pro_short %} in your {% data variables.product.github %} account settings. See [AUTOTITLE](/copilot/setting-up-github-copilot/setting-up-github-copilot-for-yourself#1-get-access-to-github-copilot).
10364

10465
If you use {% data variables.product.prodname_copilot_free_short %} in {% data variables.product.prodname_mobile %} and reach the usage limits, you'll be prompted to upgrade to {% data variables.product.prodname_copilot_pro_short %} via an in-app purchase.
66+
67+
## Next steps
68+
69+
* To learn how to access {% data variables.product.prodname_copilot_free %}, see [Accessing {% data variables.product.prodname_copilot_free %}](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/managing-copilot-free/accessing-github-copilot-free).
70+
* To learn how to disable {% data variables.product.prodname_copilot_free %}, see [Disabling {% data variables.product.prodname_copilot_free %}](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/managing-copilot-free/disabling-github-copilot-free).
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
title: Accessing GitHub Copilot Free
3+
shortTitle: Access Copilot Free
4+
intro: 'Learn how to access {% data variables.product.prodname_copilot_free_short %} in your IDE, {% data variables.product.prodname_mobile %}, or {% data variables.product.prodname_dotcom_the_website %}.'
5+
versions:
6+
feature: copilot
7+
type: how_to
8+
topics:
9+
- Copilot
10+
---
11+
12+
There are a few ways to access {% data variables.product.prodname_copilot_free_short %}.
13+
14+
* {% data variables.product.prodname_vs %} and {% data variables.product.prodname_vscode_shortname %}
15+
* {% data variables.product.prodname_dotcom_the_website %}
16+
* {% data variables.product.prodname_mobile %}
17+
* Other IDEs
18+
19+
For more information about the features available in {% data variables.product.prodname_copilot_free_short %}, see [About {% data variables.product.prodname_copilot_free_short %}](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/managing-copilot-free/about-github-copilot-free).
20+
21+
## {% data variables.product.prodname_vs %} and {% data variables.product.prodname_vscode_shortname %}
22+
23+
In {% data variables.product.prodname_vs %} and {% data variables.product.prodname_vscode_shortname %} you can access {% data variables.product.prodname_copilot_free_short %} directly from the editor.
24+
25+
1. In the top right of {% data variables.product.prodname_vs %} or {% data variables.product.prodname_vscode_shortname %}, click **{% octicon "copilot" aria-hidden="true" %}**.
26+
1. In the sidebar, click **Sign up for {% data variables.product.prodname_copilot_free_short %}**.
27+
1. If you have a {% data variables.product.github %} account, you will be prompted to sign in. If you don't have a {% data variables.product.github %} account, you will be prompted to create one.
28+
29+
## {% data variables.product.prodname_dotcom_the_website %}
30+
31+
With {% data variables.product.prodname_copilot_free_short %}, you can ask {% data variables.product.prodname_copilot_short %} questions within a chat interface on {% data variables.product.github %}.
32+
33+
1. To access your personal dashboard once you're signed in, click the {% octicon "mark-github" aria-label="The github octocat logo" %} in the upper-left corner of any page on {% data variables.product.github %}.
34+
1. At the top of the dashboard, use the "Ask a question" box to start a chat with {% data variables.product.prodname_copilot_short %}.
35+
36+
## {% data variables.product.prodname_mobile %}
37+
38+
You'll automatically get subscribed to {% data variables.product.prodname_copilot_free_short %} when you start a chat with {% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_mobile %}.
39+
40+
{% data reusables.copilot.chat-mobile-start-chat %}
41+
1. At the bottom of the page, use the "Ask {% data variables.product.prodname_copilot_short %}" box to start a chat with {% data variables.product.prodname_copilot_short %}.
42+
43+
Alternatively, go to "Settings" in {% data variables.product.prodname_mobile %}, then under {% data variables.product.prodname_copilot_short %} settings, click **Get started for Free**.
44+
45+
## Other IDEs
46+
47+
To use {% data variables.product.prodname_copilot_free_short %} in other IDEs, you first have to activate {% data variables.product.prodname_copilot_free_short %} in your {% data variables.product.github %} account settings.
48+
49+
{% data reusables.user-settings.copilot-settings %}
50+
1. Click **Start using {% data variables.product.prodname_copilot_free_short %}** to activate {% data variables.product.prodname_copilot_free_short %} and open a conversation thread.
51+
1. Click **Use {% data variables.product.prodname_copilot_short %} in other IDEs** and follow the instructions for your IDE.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
title: Disabling GitHub Copilot Free
3+
shortTitle: Disable Copilot Free
4+
intro: 'Learn how to disable {% data variables.product.prodname_copilot_free_short %} in your IDE or {% data variables.product.prodname_dotcom_the_website %}.'
5+
versions:
6+
feature: copilot
7+
type: how_to
8+
topics:
9+
- Copilot
10+
---
11+
12+
{% data variables.product.prodname_copilot_free_short %} is automatically disabled when you have a paid subscription to {% data variables.product.prodname_copilot_pro_short %}, or when you are granted a license through an organization or enterprise. If you want to disable {% data variables.product.prodname_copilot_free_short %} without a paid subscription, you can do so in your IDE and in {% data variables.product.prodname_dotcom_the_website %}.
13+
14+
## Disabling {% data variables.product.prodname_copilot_free_short %} in {% data variables.product.github %}
15+
16+
You can disable {% data variables.product.prodname_copilot_free_short %} in your {% data variables.product.github %} account settings. This will disable all features of {% data variables.product.prodname_copilot_short %} on {% data variables.product.github %}.
17+
18+
1. In the upper-right corner of any page, click your profile photo, then click **{% octicon "copilot" aria-hidden="true" %} Your {% data variables.product.prodname_copilot_short %}**.
19+
1. Under "Visibility", to the right of "Show {% data variables.product.prodname_copilot_short %}, select **Disabled** from the dropdown.
20+
21+
## Disabling {% data variables.product.prodname_copilot_free_short %} in your IDE
22+
23+
You can partially or fully disable {% data variables.product.prodname_copilot_free_short %} in JetBrains IDEs, {% data variables.product.prodname_vscode_shortname %}, {% data variables.product.prodname_vs %}, and XCode:
24+
25+
1. Navigate to [AUTOTITLE](/copilot/managing-copilot/configure-personal-settings/configuring-github-copilot-in-your-environment).
26+
1. At the top of the page, select your IDE.
27+
1. At the top right of the page, under "In this article", select **Enabling or disabling {% data variables.product.prodname_copilot_short %}**.
28+
1. Follow the instructions to disable {% data variables.product.prodname_copilot_free_short %} in your IDE.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
title: Managing Copilot Free
3+
shortTitle: Manage Copilot Free
4+
intro: 'Individual users can use {% data variables.product.prodname_copilot_free_short %} without a subscription, or disable it.'
5+
versions:
6+
feature: copilot
7+
topics:
8+
- Copilot
9+
children:
10+
- /about-github-copilot-free
11+
- /accessing-github-copilot-free
12+
- /disabling-github-copilot-free
13+
---

data/release-notes/enterprise-server/3-16/0.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ date: '2025-03-11'
22
release_candidate: false
33
deprecated: false
44
intro: |
5+
{% warning %}
6+
7+
**Warning**: Customers who have security products enabled by default at the organization level will experience issues when upgrading from 3.14 to 3.16.0. We recommend waiting for the next 3.16 patch to upgrade.
8+
9+
{% endwarning %}
10+
511
For upgrade instructions, see [AUTOTITLE](/admin/upgrading-your-instance/preparing-to-upgrade/overview-of-the-upgrade-process).
612
sections:
713

@@ -187,6 +193,8 @@ sections:
187193
The CodeQL Action has been updated to v3.28.6 to enable uploading artifacts in debug mode without logging the complete environment when running CodeQL CLI v2.20.3+.
188194
189195
known_issues:
196+
- |
197+
{% data reusables.release-notes.2025-03-security-product-transition-bug %} [Updated: 2025-03-17]
190198
- |
191199
Custom firewall rules are removed during the upgrade process.
192200
- |
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Instances with security products enabled by default at the organization level will experience issues while upgrading from 3.14 to 3.16.0. We recommend waiting for the next 3.16 patch to upgrade. If you instead upgrade from 3.14 to 3.15, then from 3.15 to 3.16.0, the upgrade will succeed.

src/content-render/unified/rewrite-local-links.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ function logError(file, line, message, title = 'Error') {
4747
}
4848

4949
function getFrontmatterOffset(filePath) {
50+
if (!fs.existsSync(filePath)) return 0
5051
const rawContent = fs.readFileSync(filePath, 'utf-8')
5152
let delimiters = 0
5253
let count = 0

src/fixtures/tests/playwright-rendering.spec.ts

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -797,59 +797,6 @@ test.describe('translations', () => {
797797
})
798798
})
799799

800-
test.describe('domain edit', () => {
801-
test('edit a domain (using header nav)', async ({ page }) => {
802-
test.skip(true, 'Editing domain from header is disabled')
803-
804-
await page.goto('/')
805-
await expect(page.getByText('Domain name:')).not.toBeVisible()
806-
await page.getByLabel('Select GitHub product version').click()
807-
await page
808-
.getByLabel(/Enterprise Server/)
809-
.first()
810-
.click()
811-
await expect(page.getByText('Domain name:')).toBeVisible()
812-
await page.getByRole('button', { name: 'Edit' }).click()
813-
814-
await expect(page.getByTestId('domain-name-edit-form')).toBeVisible()
815-
await expect(page.getByRole('heading', { name: 'Edit your domain name' })).toBeVisible()
816-
await page.getByLabel('Your domain name', { exact: true }).fill(' github.com ')
817-
await expect(page.getByText("Can't be github.com")).toBeVisible()
818-
await page.getByLabel('Your domain name', { exact: true }).fill('github.peterbe.com ')
819-
await expect(page.getByText("Can't be github.com")).not.toBeVisible()
820-
await page.getByRole('button', { name: 'Save' }).click()
821-
822-
// This tests that the dialog is gone.
823-
// XXX Peterbe: These don't work and I don't know why yet.
824-
await expect(page.getByTestId('domain-name-edit-form')).not.toBeVisible()
825-
await expect(page.getByText('github.peterbe.com')).toBeVisible()
826-
})
827-
828-
test('edit a domain (clicking HOSTNAME)', async ({ page }) => {
829-
await page.goto('/get-started/markdown/replace-domain')
830-
await page.getByLabel('Select GitHub product version').click()
831-
await page.getByLabel('Enterprise Server 3.12').click() // XXX
832-
833-
// This is generally discourage in Playwright, but necessary here
834-
// in this case. Because of the way
835-
// the `main.addEventListener('click', ...)` is handled, it's setting
836-
// up that event listener too late. In fact, it happens in a useEffect.
837-
// Adding a little delay makes is much more likely that the event
838-
// listener has been set up my the time we fire the `.click()` on the
839-
// next line.
840-
await page.waitForTimeout(500)
841-
await page.getByText('HOSTNAME', { exact: true }).first().click()
842-
843-
await expect(page.getByTestId('domain-name-edit-form')).toBeVisible()
844-
await page
845-
.getByTestId('domain-name-edit-form')
846-
.getByLabel('Your domain name')
847-
.fill('peterbe.ghe.com')
848-
await page.getByTestId('domain-name-edit-form').getByLabel('Your domain name').press('Enter')
849-
await expect(page.getByTestId('domain-name-edit-form')).not.toBeVisible()
850-
})
851-
})
852-
853800
test.describe('view pages with custom domain cookie', () => {
854801
test('view article page', async ({ page }) => {
855802
await page.goto(

0 commit comments

Comments
 (0)