Skip to content

Commit cd2e02b

Browse files
authored
Merge branch 'main' into mchammer01/more-broken-link-fixes
2 parents e3ef829 + 0385842 commit cd2e02b

15 files changed

Lines changed: 159 additions & 337 deletions

File tree

.github/workflows/browser-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ jobs:
4040
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
4141
name: Install
4242
uses: ianwalter/puppeteer-container@2466ba8ecf689ccf4e5dfadeff3ac2db227b2e17
43+
timeout-minutes: 5
4344
with:
4445
args: npm ci
4546

4647
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
4748
name: Test
49+
timeout-minutes: 10
4850
uses: ianwalter/puppeteer-container@2466ba8ecf689ccf4e5dfadeff3ac2db227b2e17
4951
with:
5052
args: npm run browser-test

content/actions/guides/building-and-testing-net.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
steps:
5050
- uses: actions/checkout@v2
5151
- name: Setup .NET Core SDK ${{ matrix.dotnet }}
52-
uses: actions/setup-dotnet@v1.6.0
52+
uses: actions/setup-dotnet@v1.7.2
5353
with:
5454
dotnet-version: ${{ matrix.dotnet-version }}
5555
- name: Install dependencies
@@ -86,7 +86,7 @@ jobs:
8686
steps:
8787
- uses: actions/checkout@v2
8888
- name: Setup dotnet ${{ matrix.dotnet-version }}
89-
uses: actions/setup-dotnet@v1.6.0
89+
uses: actions/setup-dotnet@v1.7.2
9090
with:
9191
dotnet-version: ${{ matrix.dotnet-version }}
9292
# You can test your matrix by printing the current dotnet version
@@ -118,7 +118,7 @@ You can configure your job to use a specific version of .NET, such as `3.1.3`. A
118118
steps:
119119
- uses: actions/checkout@v2
120120
- name: Setup dotnet
121-
uses: actions/setup-dotnet@v1.6.0
121+
uses: actions/setup-dotnet@v1.7.2
122122
with:
123123
dotnet-version: '3.1.x'
124124
- name: Install dependencies
@@ -139,7 +139,7 @@ For more information, see "[Caching dependencies to speed up workflows](/actions
139139
steps:
140140
- uses: actions/checkout@v2
141141
- name: Setup dotnet
142-
uses: actions/setup-dotnet@v1.6.0
142+
uses: actions/setup-dotnet@v1.7.2
143143
with:
144144
dotnet-version: '3.1.x'
145145
- uses: actions/cache@v2
@@ -171,7 +171,7 @@ You can use the same commands that you use locally to build and test your code.
171171
steps:
172172
- uses: actions/checkout@v2
173173
- name: Setup dotnet
174-
uses: actions/setup-dotnet@v1.6.0
174+
uses: actions/setup-dotnet@v1.7.2
175175
with:
176176
dotnet-version: '3.1.x'
177177
- name: Install dependencies
@@ -206,7 +206,7 @@ jobs:
206206
steps:
207207
- uses: actions/checkout@v2
208208
- name: Setup dotnet
209-
uses: actions/setup-dotnet@v1.6.0
209+
uses: actions/setup-dotnet@v1.7.2
210210
with:
211211
dotnet-version: ${{ matrix.dotnet-version }}
212212
- name: Install dependencies

content/actions/reference/events-that-trigger-workflows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ This event runs in the context of the base of the pull request, rather than in t
596596

597597
{% warning %}
598598

599-
**Warning:** The `pull_request_target` event is granted a read/write repository token and can access secrets, even when it is triggered from a fork. Although the workflow runs in the context of the base of the pull request, you should make sure that you do not check out, build, or run untrusted code from the pull request with this event. Additionally, any caches share the same scope as the base branch, and to help prevent cache poisoning, you should not save the cache if there is a possibility that the cache contents were altered.
599+
**Warning:** The `pull_request_target` event is granted a read/write repository token and can access secrets, even when it is triggered from a fork. Although the workflow runs in the context of the base of the pull request, you should make sure that you do not check out, build, or run untrusted code from the pull request with this event. Additionally, any caches share the same scope as the base branch, and to help prevent cache poisoning, you should not save the cache if there is a possibility that the cache contents were altered. For more information, see "[Keeping your GitHub Actions and workflows secure: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests)" on the GitHub Security Lab website.
600600

601601
{% endwarning %}
602602

content/admin/overview/github-ae-release-notes.md

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,64 +9,73 @@ versions:
99

1010
#### {% data variables.product.prodname_actions %} beta
1111

12-
[{% data variables.product.prodname_actions %}](https://github.com/features/actions) is a powerful, flexible solution for CI/CD and workflow automation. {% data variables.product.prodname_actions %} on GHAE uses a new [{% data variables.actions.hosted_runner %}](/github-ae@latest/actions/using-github-hosted-runners/about-ae-hosted-runners), only available on GHAE, that enables you to customize the size, image, and networking configuration of the runners. These all new runners are a finished-service CI compute environment with auto-scaling and management, all taken care of by GitHub. During the beta, use of these powerful new GHAE hosted runners is free of charge.
12+
[{% data variables.product.prodname_actions %}](https://github.com/features/actions) is a powerful, flexible solution for CI/CD and workflow automation. For more information, see "[Introduction to {% data variables.product.prodname_actions %}](/actions/learn-github-actions/introduction-to-github-actions)."
13+
14+
{% data variables.product.prodname_actions %} on {% data variables.product.product_name %} uses a new [{% data variables.actions.hosted_runner %}](/actions/using-github-hosted-runners/about-ae-hosted-runners), only available for {% data variables.product.product_name %}, that enables you to customize the size, image, and networking configuration of the runners. These runners are a finished-service CI compute environment with auto-scaling and management, fully managed by {% data variables.product.company_short %}. During the beta, the use {% data variables.actions.hosted_runner %}s is free of charge. For more information, see "[Adding {% data variables.actions.hosted_runner %}s](/actions/using-github-hosted-runners/adding-ae-hosted-runners)."
15+
16+
Please note that when {% data variables.product.prodname_actions %} is enabled during this upgrade, two organizations named "GitHub Actions" (@**actions** and @**github**) will appear in {% data variables.product.product_location %}. These organizations are required by {% data variables.product.prodname_actions %}. Users named @**ghost** and @**actions** appear as the actors for creation of these organizations in the audit log.
17+
1318

1419
#### {% data variables.product.prodname_registry %} beta
1520

16-
[{% data variables.product.prodname_registry %}](https://github.com/features/packages) is a package hosting service, natively integrated with GitHub APIs, Actions, and webhooks. Create an [end-to-end DevOps workflow](/github-ae@latest/packages/quickstart) that includes your code, continuous integration, and deployment solutions. During this beta, {% data variables.product.prodname_registry %} is offered free of charge to GitHub AE customers.
21+
[{% data variables.product.prodname_registry %}](https://github.com/features/packages) is a package hosting service, natively integrated with {% data variables.product.prodname_actions %}, APIs, and webhooks. Create an [end-to-end DevOps workflow](/github-ae@latest/packages/quickstart) that includes your code, continuous integration, and deployment solutions. During this beta, {% data variables.product.prodname_registry %} is offered free of charge to {% data variables.product.product_name %} customers.
1722

1823
#### {% data variables.product.prodname_GH_advanced_security %} beta
1924

20-
{% data variables.product.prodname_GH_advanced_security %} is available in beta and includes both code scanning and secret scanning. During this beta, {% data variables.product.prodname_GH_advanced_security %} features are being offered free of charge to GitHub AE customers. Repository and organization administrators can opt-in to use {% data variables.product.prodname_GH_advanced_security %} in the Security and Analysis tab under settings.
25+
{% data variables.product.prodname_GH_advanced_security %} is available in beta and includes both code scanning and secret scanning. During this beta, {% data variables.product.prodname_GH_advanced_security %} features are being offered free of charge to {% data variables.product.product_name %} customers. Repository and organization administrators can opt-in to use {% data variables.product.prodname_GH_advanced_security %} in the Security and Analysis tab under settings.
2126

2227
Learn more about {% data variables.product.prodname_GH_advanced_security %} [code scanning](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) and [secret scanning](/github/administering-a-repository/about-secret-scanning) on {% data variables.product.prodname_ghe_managed %}.
2328

24-
#### Manage teams from your identity provider
29+
#### Manage teams from your identity provider (IdP)
2530

26-
Customers using SCIM (System for Cross-domain Identity Management) can now sync security groups in Azure Active Directory with GitHub teams. Once a team has been linked to a security group, membership will be automatically updated in GitHub when a user is added or removed from their assigned security group.
31+
Customers using SCIM (System for Cross-domain Identity Management) can now sync security groups in Azure Active Directory with {% data variables.product.company_short %} teams. Once a team has been linked to a security group, membership will be automatically updated in {% data variables.product.product_name %} when a user is added or removed from their assigned security group.
2732

2833
#### IP allow lists beta
2934

30-
[GitHub IP allow lists](/admin/configuration/restricting-network-traffic-to-your-enterprise) provide the ability to filter traffic from administrator-specified IP ranges, defined by CIDR notation. The allow list is defined at the enterprise or organization account level in Security > Settings. All traffic that attempts to reach resources within the enterprise account and organizations are filtered by the IP allow lists. This functionality is provided in addition to the ability to request network security group changes that filter traffic to the entirety of the GHAE tenant.
35+
[{% data variables.product.company_short %} IP allow lists](/admin/configuration/restricting-network-traffic-to-your-enterprise) provide the ability to filter traffic from administrator-specified IP ranges, defined by CIDR notation. The allow list is defined at the enterprise or organization account level in Security > Settings. All traffic that attempts to reach resources within the enterprise account and organizations are filtered by the IP allow lists. This functionality is provided in addition to the ability to request network security group changes that filter traffic to the entirety of the GHAE tenant.
3136

3237

3338
### Changes
3439

3540
#### Developer changes
3641

37-
- [Organization owners can now disable publication](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization) of GitHub Pages sites from repositories in the organization. This will not unpublish existing sites.
38-
- Repositories that use GitHub Pages can now [build and deploy from any branch](/github/working-with-github-pages/about-github-pages#publishing-sources-for-github-pages-sites).
42+
- [Organization owners can now disable publication](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization) of {% data variables.product.prodname_pages %} sites from repositories in the organization. This will not unpublish existing sites.
43+
- Repositories that use {% data variables.product.prodname_pages %} can now [build and deploy from any branch](/github/working-with-github-pages/about-github-pages#publishing-sources-for-github-pages-sites).
3944
- When writing an issue or pull request, the list syntax for bullets, numbers, and tasks will now be autocompleted after you press `return` or `enter`.
40-
- You can now delete a directory in a repository from the repository page. When navigating to a directory, a new kebab button next to the Add file button gives the option to delete the directory.
41-
- It’s now easier and faster to [reference issues or pull requests](/github/writing-on-github/basic-writing-and-formatting-syntax#referencing-issues-and-pull-requests), with search across multiple words after the “#”.
45+
- You can now delete a directory in a repository from the repository page. When navigating to a directory, a new kebab button next to the "Add file" button gives the option to delete the directory.
46+
- It’s now easier and faster to [reference issues or pull requests](/github/writing-on-github/basic-writing-and-formatting-syntax#referencing-issues-and-pull-requests), with search across multiple words after the "#".
4247

4348
##### Administration changes
4449

45-
- Enterprise administrators can now publish a mandatory message. The message is shown to all users and they must acknowledge it. This can be used to display important information, terms of service or policies.
46-
- The GitHub App single file path permission can now [support up to ten files](/developers/apps/creating-a-github-app-using-url-parameters).
47-
- When configuring a GitHub App, the authorization callback URL is a required field. Now we will permit the integrator to specify multiple callback URLs. GitHub denies authorization if the callback URL from the request is not listed.
50+
- Enterprise owners can now publish a mandatory message. The message is shown to all users and they must acknowledge it. This can be used to display important information, terms of service or policies.
51+
- The {% data variables.product.prodname_github_app%} single file path permission can now [support up to ten files](/developers/apps/creating-a-github-app-using-url-parameters).
52+
- When configuring a {% data variables.product.prodname_github_app%}, the authorization callback URL is a required field. Now we will permit the integrator to specify multiple callback URLs. {% data variables.product.product_name %} denies authorization if the callback URL from the request is not listed.
4853
- A [new API endpoint](/rest/reference/apps#create-a-scoped-access-token) enables the exchange of a user to server token for a user to server token scoped to specific repositories.
4954
- Events are now logged in the audit log on [promoting a team member to be a team maintainer and on demoting a team maintainer to be a team member](/admin/user-management/audited-actions#teams).
5055
- The [OAuth device authorization flow](/developers/apps/authorizing-oauth-apps#device-flow) is now supported. This allows any CLI client or developer tool to authenticate using a secondary system.
5156
- A user can no longer delete their account if SCIM provisioning is enabled.
5257

5358
##### Default branch renaming
5459

55-
Enterprise and organization administrators can now set the default branch name for new repositories. Enterprise administrators can also enforce their choice of default branch name across all organizations or allow individual organizations to choose their own.
60+
Enterprise and organization owners can now set the default branch name for new repositories. Enterprise owners can also enforce their choice of default branch name across all organizations or allow individual organizations to choose their own.
5661

5762
Existing repositories are unaffected by these settings, and their default branch name will not be changed.
5863

59-
This change is one of many changes GitHub is making to support projects and maintainers that want to rename their default branch. To learn more, see [github/renaming](https://github.com/github/renaming).
64+
This change is one of many changes {% data variables.product.company_short %} is making to support projects and maintainers that want to rename their default branch. To learn more, see [github/renaming](https://github.com/github/renaming).
6065

6166

6267
### Bug fixes
63-
- Users can no longer set a backup email address on their profile. Their email address is set through the Identity Provider only.
64-
- GitHub AE can now connect to Azure Boards.
65-
- Version headers were missing from the APIs, and have now been set to “GitHub AE”.
68+
- Users can no longer set a backup email address on their profile. Their email address is set through the IdP only.
69+
- You can no longer enable two-factor authentication after configuring authentication through your IdP.
70+
- {% data variables.product.product_name %} can now connect to Azure Boards.
71+
- Version headers were missing from the APIs, and have now been set to "GitHub AE."
6672
- Links to documentation have been fixed.
73+
- Configuration of audit log forwarding within the enterprise's settings was failing.
74+
- Navigating to gists could result in a 500 error.
75+
- The Support email or URL was failing to save. It now saves after a period of a few minutes.
76+
- Organization level pull request templates were not being applied to all pull requests in the organization.
6777

6878
### Known issues
6979

70-
- Audit log forwarding can fail.
7180
- Geographic location data is not shown in the audit log. Location information can otherwise be discerned from the IP address associated with each event.
72-
- The link to Packages from a repository page shows an incorrect search page when that repository does not have any packages.
81+
- The link to {% data variables.product.prodname_registry %} from a repository page shows an incorrect search page when that repository does not have any packages.

content/github/setting-up-and-managing-your-enterprise/viewing-people-in-your-enterprise.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ You can view enterprise owners {% if currentVersion == "free-pro-team@latest" %}
2323

2424
### Viewing members and outside collaborators
2525

26-
You can view the number of pending members and outside collaborators. You can filter the list of members by {% if currentVersion == "free-pro-team@latest" %}deployment ({% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %}),{% endif %}role {% if currentVersion == "free-pro-team@latest" %}, and{% elsif currentVersion == "github-ae@latest" %}or {% endif %}organization. You can filter the list of outside collaborators by the visibility of the repositories the collaborator has access to. You can find a specific person by searching for their username or display name.
26+
You can view the number of pending members and outside collaborators. You can filter the list of members by {% if currentVersion == "free-pro-team@latest" %}deployment ({% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %}),{% endif %} role{% if currentVersion == "free-pro-team@latest" %}, and{% else %} or {% endif %} organization. You can filter the list of outside collaborators by the visibility of the repositories the collaborator has access to. You can find a specific person by searching for their username or display name.
2727

2828
You can view {% if currentVersion == "free-pro-team@latest" %}all the {% data variables.product.prodname_ghe_cloud %} organizations and {% data variables.product.prodname_ghe_server %} instances that a member belongs to, and {% endif %}which repositories an outside collaborator has access to{% if currentVersion == "free-pro-team@latest" %}, {% endif %} by clicking on the person's name.
2929

data/graphql/ghae/graphql_previews.ghae.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,6 @@
8484
- Mutation.createContentAttachment
8585
owning_teams:
8686
- '@github/feature-lifecycle'
87-
- title: Pinned Issues Preview
88-
description: This preview adds support for pinned issues.
89-
toggled_by: ':elektra-preview'
90-
announcement: null
91-
updates: null
92-
toggled_on:
93-
- Repository.pinnedIssues
94-
- PinnedIssue
95-
- PinnedIssueEdge
96-
- PinnedIssueConnection
97-
- Mutation.pinIssue
98-
- Mutation.unpinIssue
99-
owning_teams:
100-
- '@github/pe-pull-requests'
10187
- title: Labels Preview
10288
description: >-
10389
This preview adds support for adding, updating, creating and deleting

0 commit comments

Comments
 (0)