Skip to content

Commit ed620aa

Browse files
authored
Merge pull request #37009 from github/repo-sync
Repo sync
2 parents 880148c + 7e6e069 commit ed620aa

File tree

18 files changed

+58
-200
lines changed

18 files changed

+58
-200
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ jobs:
133133
if: ${{ matrix.name == 'content-linter' }}
134134
uses: ./.github/actions/get-changed-files
135135
with:
136-
token: ${{ secrets.GITHUB_TOKEN }}
137-
pr: ${{ github.event.pull_request.number }}
138136
head: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref }}
139137
output_file: get_diff_files.txt
140138

content/admin/managing-your-enterprise-account/creating-an-enterprise-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The following changes also apply to single organizations that are automatically
5454
* **Enterprise account name:** During the upgrade, the new enterprise account name will match your organization name or be as close as possible if taken. You can rename it after the upgrade.
5555
* **SAML SSO:** Existing SAML SSO will stay at the organization level after being added to the new enterprise account. You can configure SSO at the enterprise level post-upgrade, which will override the organization level. Existing PATs and SAML-authorized tokens will remain unchanged.
5656
* **Policies:** The new enterprise account starts with no policies, so existing organization policies won't be overridden.
57-
* **Spending limits:** Existing organization spending limits transfer to the new enterprise account. Post-upgrade, billing is handled at the enterprise level. To adjust spending limits, under "Settings" in the enterprise account sidebar, select **Billing**.
57+
* **Spending limits:** Existing organization spending limits transfer to the new enterprise account. Post-upgrade, billing is handled at the enterprise level. To adjust spending limits, at the top of the page, click {% octicon "credit-card" aria-hidden="true" %} **Billing & Licensing**.
5858
* **Coupons:** Existing coupons will carry over to the new enterprise account with no interruptions.
5959
* **Workflow permissions:** The new enterprise account will inherit your organization's workflow permissions. If the organization has a permissive setting ("Read and write"), the enterprise account will also default to permissive. Otherwise, it defaults to restrictive ("Read repository contents and packages"). For workflows with the id-token permission, the default changes to read-only due to a February 2023 update. Add an explicit permissions block in these workflows to grant the required permissions.
6060

content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/exporting-server-statistics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To learn more about {% data variables.product.prodname_github_connect %}, see [A
2424

2525
{% data reusables.enterprise-accounts.access-enterprise %}
2626

27-
1. On the left side of the page, in the enterprise account sidebar, click **GitHub Connect**.
27+
1. {% ifversion horizontal-nav %}At the top of the page, in the enterprise account sidebar, click {% octicon "plug" aria-hidden="true" %} **GitHub Connect**.{% else %}On the left side of the page, in the enterprise account sidebar, click {% octicon "plug" aria-hidden="true" %} **GitHub Connect**.{% endif %}
2828

2929
{% data reusables.server-statistics.csv-download %}
3030

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ You can view the enterprise account's current license limits and usage.
6666

6767
{% endif %}
6868
{%- ifversion ghec -%}
69-
1. Optionally, to see a detailed breakdown of usage per organization{% ifversion secret-scanning-user-owned-repos %} and user namespace when using {% data variables.product.prodname_emus %}{% endif %}, in the enterprise account sidebar, click **Billing**.
69+
1. Optionally, to see a detailed breakdown of usage per organization{% ifversion secret-scanning-user-owned-repos %} and user namespace when using {% data variables.product.prodname_emus %}{% endif %}, click {% octicon "credit-card" aria-hidden="true" %} **Billing & Licensing**.
7070

7171
In the “{% data variables.product.prodname_GH_advanced_security %}” section, you can see a summary of your current license usage, as well as the number of committers and unique committers for each organization{% ifversion secret-scanning-user-owned-repos %} and user namespace when using {% data variables.product.prodname_emus %}{% endif %}. The organizations{% ifversion secret-scanning-user-owned-repos %} and user namespaces{% endif %} in the billing table are sorted by the highest number of unique committers in descending order.
7272
{% endif %}

content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ To check if you have access:
6464

6565
{% data reusables.enterprise-accounts.access-enterprise %}
6666

67-
If you have access, there will be a **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing** option in the enterprise account sidebar.
67+
If you have access, there will be a **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing** option {% ifversion horizontal-nav %}at the top of the page.{% else %}in the enterprise account sidebar.{% endif %}
6868

6969
{% endif %}
7070

content/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ The invited person will receive an invitation email asking them to become a bill
6363
{% data reusables.profile.org_settings %}
6464
1. If you are an organization owner, in the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" %} Billing and plans**.
6565
1. Click the link in the text box, **Enterprise account billing settings**, which will direct you to your organizations billing settings page.
66-
1. On the left side of the page, in the enterprise account sidebar, click **{% octicon "person" aria-hidden="true" %} People**.
66+
1. {% ifversion horizontal-nav %}At the top of the page, click {% octicon "person" aria-hidden="true" %} **People**{% else %}On the left side of the page, in the enterprise account sidebar, click {% octicon "person" aria-hidden="true" %} **People**{% endif %}.
6767
1. Under "People", click **Administrators**.
6868
1. Above the list of administrators, click **Invite admin**.
6969
1. Type the username, full name, or email address of the person you want to invite, then select the appropriate person from the results.

content/copilot/managing-copilot/configuring-and-auditing-content-exclusion/excluding-content-from-github-copilot.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ You can use content exclusions to configure {% data variables.product.prodname_c
2929
* Code completion will not be available in the affected files.
3030
* The content in affected files will not inform code completion suggestions in other files.
3131
* The content in affected files will not inform {% data variables.product.prodname_copilot_chat %}'s responses.
32+
* Affected files will not be reviewed in a {% data variables.product.prodname_copilot_short %} code review.
3233

3334
### Who can configure content exclusion
3435

@@ -44,8 +45,8 @@ Repository administrators{% ifversion ghec %}, organization owners, and enterpri
4445
| {% data variables.product.prodname_vscode %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
4546
| JetBrains IDEs | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
4647
| Vim/Neovim | {% octicon "check" aria-label="Supported" %} | Not applicable |
47-
| Xcode | {% octicon "check" aria-label="Supported" %} | Not applicable |
48-
| Eclipse | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
48+
| Xcode | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
49+
| Eclipse | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
4950
| Azure Data Studio | {% octicon "x" aria-label="Not supported" %} | Not applicable |
5051
| The {% data variables.product.github %} website | Not applicable | {% octicon "check" aria-label="Supported" %} |
5152
| {% data variables.product.prodname_mobile %} | Not applicable | {% octicon "check" aria-label="Supported" %} |

data/features/horizontal-nav.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Reference: #17228
2+
# Move Enterprise navigation from left sidebar to top of page
3+
versions:
4+
ghec: '*'
5+
ghes: '>3.16'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1. On the left side of the page, in the enterprise account sidebar, click **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing**.
1+
1. {% ifversion horizontal-nav %}At the top of the page, click **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing**.{% else %}On the left side of the page, in the enterprise account sidebar, click **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing**.{% endif %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1. On the left side of the page, in the enterprise account sidebar, click **{% octicon "shield" aria-hidden="true" %} Code Security**.
1+
1. {% ifversion horizontal-nav %}At the top of the page, click **{% octicon "shield" aria-hidden="true" %} Code Security**.{% else %}On the left side of the page, in the enterprise account sidebar, click **{% octicon "shield" aria-hidden="true" %} Code Security**.{% endif %}

0 commit comments

Comments
 (0)