Skip to content

Commit 05c346e

Browse files
authored
Merge branch 'main' into patch-1
2 parents 8f3ca61 + 467fa29 commit 05c346e

9 files changed

Lines changed: 69 additions & 21 deletions

File tree

.github/workflows/no-response.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name: No Response
99

1010
on:
1111
issue_comment:
12-
types: created
12+
types: [created]
1313

1414
schedule:
1515
# Schedule for five minutes after the hour every hour
@@ -27,4 +27,6 @@ jobs:
2727
to our request for more information from the original author. With only the
2828
information that is currently in the issue, we don't have enough information
2929
to take action. Please reach out if you have or find the answers we need so
30-
that we can investigate further. See [this blog post on bug reports and the importance of repro steps](https://www.lee-dohm.com/2015/01/04/writing-good-bug-reports/) for more information about the kind of information that may be helpful.
30+
that we can investigate further. See [this blog post on bug reports and the
31+
importance of repro steps](https://www.lee-dohm.com/2015/01/04/writing-good-bug-reports/)
32+
for more information about the kind of information that may be helpful.

.github/workflows/site-policy-sync.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: site-policy-sync
22

3-
# **What it does**: Updates our site policy docs when changes happen to site policy.
4-
# **Why we have it**: We want up to date site policy docs.
5-
# **Who does it impact**: Site policy team.
3+
# **What it does**: Updates our site-policy repo when changes happen to site policy docs.
4+
# **Why we have it**: We want keep site-policy repo up to date.
5+
# **Who does it impact**: Site-policy team.
66

77
# Controls when the action will run.
88
on:
@@ -30,6 +30,10 @@ jobs:
3030
steps:
3131
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
3232
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
33+
# Sets commit message
34+
- name: custom message
35+
run: |
36+
echo "MESSAGE=${{github.event.pull_request.title}}" >> $GITHUB_ENV
3337
3438
# Pushes to other repo
3539
- name: Push folder to another repository
@@ -42,6 +46,6 @@ jobs:
4246
destination_branch: 'main'
4347
destination_branch_create: 'repo-sync'
4448
destination_folder: 'Policies'
45-
user_email: 'pcihon@users.noreply.github.com'
46-
user_name: 'pcihon'
47-
commit_msg: 'Automatic sync from GitHub Docs.'
49+
user_email: 'site-policy-bot@users.noreply.github.com'
50+
user_name: 'site-policy-bot'
51+
commit_msg: '${{ env.MESSAGE }}'

content/actions/guides/managing-github-actions-with-github-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ For more information on using commands in specific scenarios, see the following
3333
- "[Manually running a workflow](/actions/managing-workflow-runs/manually-running-a-workflow#running-a-workflow-using-github-cli)"
3434
- "[Downloading workflow artifacts](/actions/managing-workflow-runs/downloading-workflow-artifacts#download-artifacts-through-github-cli)"
3535
- "[Using workflow run logs](/actions/managing-workflow-runs/using-workflow-run-logs#viewing-logs-through-github-cli)"
36-
- "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history#viewing-workflow-run-history-with-github-cli)"
37-
- "[Disabling and enabling a workflow](/actions/managing-workflow-runs/disabling-and-enabling-a-workflow#disabling-and-enabling-workflows-through-github-cli)"
36+
- "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history#viewing-workflow-run-history-with-github-cli)"{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}
37+
- "[Disabling and enabling a workflow](/actions/managing-workflow-runs/disabling-and-enabling-a-workflow#disabling-and-enabling-workflows-through-github-cli)"{% endif %}

content/admin/enterprise-management/increasing-storage-capacity.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ As more users join {% data variables.product.product_location %}, you may need t
3131
1. Resize the existing user volume disk using your virtualization platform's tools.
3232
{% data reusables.enterprise_installation.ssh-into-instance %}
3333
3. Put the appliance in maintenance mode. For more information, see "[Enabling and scheduling maintenance mode](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)."
34-
4. Reboot the appliance to detect the new storage allocation.
34+
4. Reboot the appliance to detect the new storage allocation:
35+
```shell
36+
$ sudo reboot
37+
```
3538
5. Run the `ghe-storage-extend` command to expand the `/data/user` filesystem:
3639
```shell
3740
$ ghe-storage-extend
@@ -40,7 +43,10 @@ As more users join {% data variables.product.product_location %}, you may need t
4043
### Increasing the root partition size using a new appliance
4144

4245
1. Set up a new {% data variables.product.prodname_ghe_server %} instance with a larger root disk using the same version as your current appliance. For more information, see "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-github-enterprise-server-instance)."
43-
2. Shut down the current appliance.
46+
2. Shut down the current appliance:
47+
```shell
48+
$ sudo poweroff
49+
```
4450
3. Detach the data disk from the current appliance using your virtualization platform's tools.
4551
4. Attach the data disk to the new appliance with the larger root disk.
4652

@@ -57,6 +63,9 @@ As more users join {% data variables.product.product_location %}, you may need t
5763
```shell
5864
$ ghe-upgrade PACKAGE-NAME.pkg -s -t /dev/xvdg1
5965
```
60-
4. Shut down the appliance.
66+
4. Shut down the appliance:
67+
```shell
68+
$ sudo poweroff
69+
```
6170
5. In the hypervisor, remove the old root disk and attach the new root disk at the same location as the old root disk.
6271
6. Start the appliance.

content/admin/github-actions/enabling-automatic-access-to-githubcom-actions-using-github-connect.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ topics:
1313

1414
{% data reusables.actions.enterprise-beta %}
1515
{% data reusables.actions.enterprise-github-hosted-runners %}
16+
{% data reusables.actions.enterprise-github-connect-warning %}
1617
{% data reusables.actions.ae-beta %}
1718

1819
By default, {% data variables.product.prodname_actions %} workflows on {% data variables.product.product_name %} cannot use actions directly from {% data variables.product.prodname_dotcom_the_website %} or [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions).

content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,38 @@ For more information, see "[Managing the publication of {% data variables.produc
482482
| `update_linear_history_requirement_enforcement_level ` | Triggered when required linear commit history is enabled or disabled for a protected branch.
483483
{% endif %}
484484

485+
{% if currentVersion == "free-pro-team@latest" %}
486+
#### `pull_request` category actions
487+
488+
| Action | Description
489+
|------------------|-------------------
490+
| `create` | Triggered when a pull request is created.
491+
| `close` | Triggered when a pull request is closed without being merged.
492+
| `reopen` | Triggered when a pull request is reopened after previously being closed.
493+
| `merge` | Triggered when a pull request is merged.
494+
| `indirect_merge` | Triggered when a pull request is considered merged because its commits were merged into the target branch.
495+
| `ready_for_review` | Triggered when a pull request is marked as ready for review.
496+
| `converted_to_draft` | Triggered when a pull request is converted to a draft.
497+
| `create_review_request` | Triggered when a review is requested.
498+
| `remove_review_request` | Triggered when a review request is removed.
499+
500+
#### `pull_request_review` category actions
501+
502+
| Action | Description
503+
|------------------|-------------------
504+
| `submit` | Triggered when a review is submitted.
505+
| `dismiss` | Triggered when a review is dismissed.
506+
| `delete` | Triggered when a review is deleted.
507+
508+
#### `pull_request_review_comment` category actions
509+
510+
| Action | Description
511+
|------------------|-------------------
512+
| `create` | Triggered when a review comment is added.
513+
| `update` | Triggered when a review comment is changed.
514+
| `delete` | Triggered when a review comment is deleted.
515+
{% endif %}
516+
485517
#### `repo` category actions
486518

487519
| Action | Description

content/pages/getting-started-with-github-pages/about-github-pages.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@ Project site owned by organization account | `http(s)://pages.<hostname>/<orgnam
6868
For more information, see "[Enabling subdomain isolation](/enterprise/{{ currentVersion }}/admin/installation/enabling-subdomain-isolation)" or contact your site administrator.
6969
{% endif %}
7070

71-
{% if currentVersion == "free-pro-team@latest" %}
72-
{% note %}
73-
74-
**Note:** Repositories using the legacy `<username>.github.com` naming scheme will still be published, but visitors will be redirected from `http(s)://<username>.github.com` to `http(s)://<username>.github.io`. If both a `<username>.github.com` and `<username>.github.io` repository exist, only the `<username>.github.io` repository will be published.
75-
76-
{% endnote %}
77-
{% endif %}
78-
7971
### Publishing sources for {% data variables.product.prodname_pages %} sites
8072

8173
The publishing source for your {% data variables.product.prodname_pages %} site is the branch and folder where the source files for your site are stored.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}
2+
{% note %}
3+
4+
**Note:** With {% data variables.product.prodname_github_connect %} enabled, {% data variables.product.prodname_actions %} will try to find the repository on your {% data variables.product.prodname_ghe_server %} instance first before falling back to {% data variables.product.prodname_dotcom %}. If a user creates an organization and repository in your enterprise that matches an organization and repository name on {% data variables.product.prodname_dotcom %}, the repository on your enterprise will be used in place of the {% data variables.product.prodname_dotcom %} repository. A malicious user could take advantage of this behavior to run code as part of a workflow.
5+
6+
{% endnote %}
7+
{% endif %}

data/reusables/secret-scanning/partner-secret-list-public-repo.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ PyPI | PyPI API Token
5353
RubyGems | RubyGems API Key
5454
Samsara | Samsara API Token
5555
Samsara | Samsara OAuth Access Token
56+
SendGrid | SendGrid API Key
5657
Shopify | Shopify App Shared Secret
5758
Shopify | Shopify Access Token
5859
Shopify | Shopify Custom App Access Token

0 commit comments

Comments
 (0)