Skip to content

Commit 80e83b2

Browse files
authored
Merge pull request #35943 from github/repo-sync
Repo sync
2 parents 5a72146 + 87776f2 commit 80e83b2

File tree

51 files changed

+49
-168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+49
-168
lines changed

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md

+3-7
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Anytime you comment in a conversation or when someone @mentions your username, y
7979

8080
For conversations you're watching or participating in, you can choose whether you want to receive notifications by email or through the notifications inbox. For more information, see [Choosing your notification settings](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#choosing-your-notification-settings).
8181

82-
![Screenshot of the "Notification settings" page. The "Participating" and "Watching" settings are shown, each with two checkbox options, titled "Email" and "Web and Mobile".](/assets/images/help/notifications-v2/participating-and-watching-options.png){% endif %}
82+
![Screenshot of the "Notification settings" page. "Participating" and "Watching" each have two checkbox options: "Email" and "Web and Mobile".](/assets/images/help/notifications-v2/participating-and-watching-options.png){% endif %}
8383

8484
For example, on your "Notification settings" page:
8585
* If you don't want notifications to be sent to your email, deselect **email** for participating and watching notifications.
@@ -236,16 +236,14 @@ For more information about the notification delivery methods available to you, a
236236

237237
For more information on how to configure notifications for {% data variables.secret-scanning.alerts %}, see [AUTOTITLE](/code-security/secret-scanning/managing-alerts-from-secret-scanning/monitoring-alerts).
238238

239-
{% ifversion update-notification-settings-22 or ghes %}
240-
241239
## {% data variables.product.prodname_actions %} notification options
242240

243241
For repositories that are set up with {% data variables.product.prodname_actions %} and that you are watching, you can choose how you want to receive workflow run updates.
244242

245243
{% ifversion update-notification-settings-22 %}
246244
1. On the "Notification settings" page, under "System", then under "Actions", select the **Don't notify** dropdown menu.
247245

248-
![Screenshot of the "System" section of the notification settings. Under "Actions," a dropdown menu, titled "Don't notify", is highlighted with an orange outline.](/assets/images/help/notifications/github-actions-customize-notifications.png)
246+
![Screenshot of the "System" section of the notification settings. Under "Actions," a dropdown menu, titled "Don't notify", is outlined in orange.](/assets/images/help/notifications/github-actions-customize-notifications.png)
249247
1. To opt into web notifications, from the dropdown menu, select "On {% data variables.product.prodname_dotcom %}."
250248

251249
To opt into email notifications, from the dropdown menu, select "Email."
@@ -254,9 +252,7 @@ For repositories that are set up with {% data variables.product.prodname_actions
254252
{% ifversion ghes %}
255253
On the "Notification settings" page, select "Email" or "Web" notifications. Optionally, to only receive notifications for failed workflow runs, select "Send notifications for failed workflows only".
256254

257-
![Screenshot of the "Actions" section on the "Notification settings" page. Three checkboxes, titled "Email", "Web", and "Send notifications for failed workflows only", are shown.](/assets/images/help/notifications-v2/github-actions-notification-options.png){% endif %}
258-
259-
{% endif %}
255+
![Screenshot of the "Actions" section of "Notification settings" with checkboxes: "Email", "Web", and "Send notifications for failed workflows only."](/assets/images/help/notifications-v2/github-actions-notification-options.png){% endif %}
260256

261257
## Organization alerts notification options
262258

content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md

-4
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ Add pronouns to your public user profile to share information about yourself wit
9292

9393
{% endif %}
9494

95-
{% ifversion profile-time-zone %}
96-
9795
## Setting your location and time zone
9896

9997
You can set a location and time zone on your profile to show other people your local time. Your location and time zone will be visible:
@@ -111,8 +109,6 @@ When you view your profile, you will see your location, local time, and your tim
111109
* Select the **Time zone** dropdown menu, then click your local time zone.
112110
{% data reusables.profile.update-profile %}
113111

114-
{% endif %}
115-
116112
{% ifversion profile-social-links %}
117113

118114
## Adding links to your social accounts

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/maintaining-ownership-continuity-of-your-personal-accounts-repositories.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The person you invite to be your successor must have a {% data variables.product
3636

3737
1. Under "Successor settings", to invite a successor, begin typing a username, full name, or email address, then click their name when it appears.
3838

39-
![Screenshot of the "Successor settings" section. The string "octocat" is entered in a search field, and Octocat's profile is listed in a dropdown below.](/assets/images/help/settings/settings-invite-successor-search-field.png)
39+
![Screenshot of the "Successor settings" section. The string "octocat" is entered in a search field, and Octocat's profile is listed in a dropdown.](/assets/images/help/settings/settings-invite-successor-search-field.png)
4040

4141
1. Click **Add successor**.
4242
{% data reusables.user-settings.sudo-mode-popup %}

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/managing-accessibility-settings.md

-4
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ By default, all keyboard shortcuts are enabled on {% data variables.product.prod
4848
* To customize the keyboard shortcuts for triggering the command palette, under "Command palette", use the drop-down menus to choose a keyboard shortcut. For more information, see [AUTOTITLE](/get-started/accessibility/github-command-palette).
4949
{%- endif %}
5050

51-
{% ifversion motion-management %}
52-
5351
## Managing motion
5452

5553
You can control how {% data variables.product.product_name %} displays animated _.gif_ images.
@@ -61,5 +59,3 @@ By default, {% data variables.product.product_name %} syncs with your system-lev
6159
1. Under "Motion", manage settings for motion.
6260

6361
* To control how {% data variables.product.product_name %} displays animated images, under "Autoplay animated images", select **Sync with system**, **Enabled**, or **Disabled**.
64-
65-
{% endif %}

content/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.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ For an overview of repository-level security, see [AUTOTITLE](/code-security/get
3535
1. Under {% ifversion code-security-wording-only %}"Code security"{% else %}"Code security and analysis"{% endif %}, to the right of the feature, click **Disable all** or **Enable all**.
3636
1. Optionally, enable the feature by default for new repositories that you own.{% ifversion not ghes %}
3737

38-
![Screenshot of the "Enable FEATURE" modal dialog, with the "Enable by default for new private repositories" option highlighted with a dark orange outline.](/assets/images/help/settings/security-and-analysis-enable-by-default-in-modal.png){% endif %}
38+
![Screenshot of the "Enable FEATURE" modal dialog, with the "Enable by default for new private repositories" option outlined in dark orange.](/assets/images/help/settings/security-and-analysis-enable-by-default-in-modal.png){% endif %}
3939

4040
1. Click **Disable FEATURE** or **Enable FEATURE** to disable or enable the feature for all the repositories you own.
4141

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/managing-your-cookie-preferences-for-githubs-enterprise-marketing-pages.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ You can customize how non-essential cookies behave on any {% data variables.prod
2727

2828
1. Under "Manage cookie preferences," to accept or reject each non-essential cookie, click **Accept** or **Reject**.
2929

30-
![Screenshot of the "Manage cookie preferences" dialog window. Under "Analytics," two radio buttons, labeled "Accept" and "Reject," are outlined in orange.](/assets/images/help/settings/cookie-settings-accept-or-reject.png)
30+
![Screenshot of the "Manage cookie preferences" dialog. Under "Analytics", two radio buttons, labeled "Accept" and "Reject," are outlined.](/assets/images/help/settings/cookie-settings-accept-or-reject.png)
3131

3232
1. Click **Save changes**.

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/managing-your-scheduled-reminders.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You can set scheduled reminders for personal or team-level review requests for p
2828
{% data reusables.reminders.scheduled-reminders %}
2929
1. Next to the organization you'd like to schedule reminders for, click {% octicon "pencil" aria-label="Edit reminder" %}.
3030

31-
![Screenshot of the settings for a personal account showing the name of a GitHub organization. An edit button with a pencil icon is outlined in dark orange.](/assets/images/help/settings/scheduled-reminders-org-choice.png)
31+
![Screenshot of the settings for a personal account showing the name of a GitHub organization. An edit button with a pencil icon is outlined in orange.](/assets/images/help/settings/scheduled-reminders-org-choice.png)
3232

3333
{% data reusables.reminders.authorize-slack %}
3434
{% data reusables.reminders.days-dropdown %}
@@ -45,7 +45,7 @@ You can set scheduled reminders for personal or team-level review requests for p
4545
{% data reusables.reminders.scheduled-reminders %}
4646
1. Next to the organization you'd like to edit scheduled reminders for, click {% octicon "pencil" aria-label="Edit reminder" %}.
4747

48-
![Screenshot of the settings for a personal account showing the name of a GitHub organization. An edit button with a pencil icon is outlined in dark orange.](/assets/images/help/settings/scheduled-reminders-org-choice.png)
48+
![Screenshot of the settings for a personal account showing the name of a GitHub organization. An edit button with a pencil icon is outlined in orange.](/assets/images/help/settings/scheduled-reminders-org-choice.png)
4949

5050
{% data reusables.reminders.edit-page %}
5151
{% data reusables.reminders.update-buttons %}
@@ -57,7 +57,7 @@ You can set scheduled reminders for personal or team-level review requests for p
5757
{% data reusables.reminders.scheduled-reminders %}
5858
1. Next to the organization you'd like to delete reminders for, click {% octicon "pencil" aria-label="Edit reminder" %}.
5959

60-
![Screenshot of the settings for a personal account showing the name of a GitHub organization. An edit button with a pencil icon is outlined in dark orange.](/assets/images/help/settings/scheduled-reminders-org-choice.png)
60+
![Screenshot of the settings for a personal account showing the name of a GitHub organization. An edit button with a pencil icon is outlined in orange.](/assets/images/help/settings/scheduled-reminders-org-choice.png)
6161

6262
{% data reusables.reminders.delete %}
6363

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/publicizing-or-hiding-organization-membership.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ shortTitle: Show or hide membership
2727
* To publicize your membership, choose **Public**.
2828
* To hide your membership, choose **Private**.
2929

30-
![Screenshot of an entry in the list of organization members. To the right of the username, a dropdown menu, labeled "Private", is outlined in dark orange.](/assets/images/help/organizations/member-visibility-link.png)
30+
![Screenshot of an entry in the list of organization members. Next to the username, a dropdown menu, labeled "Private", is outlined in dark orange.](/assets/images/help/organizations/member-visibility-link.png)

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/requesting-organization-approval-for-oauth-apps.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ shortTitle: Request {% data variables.product.prodname_oauth_app %} approval
1818

1919
## About requesting organization approval for an {% data variables.product.prodname_oauth_app %}
2020

21-
Organization members can always request owner approval for {% data variables.product.prodname_oauth_apps %} they'd like to use, and organization owners receive a notification of pending requests.{% ifversion limit-app-access-requests %} Outside collaborators can request owner approval for {% data variables.product.prodname_oauth_apps %} they'd like to use if integration access requests are enabled. For more information, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/limiting-oauth-app-and-github-app-access-requests).{% endif %}
21+
Organization members can always request owner approval for {% data variables.product.prodname_oauth_apps %} they'd like to use, and organization owners receive a notification of pending requests. Outside collaborators can request owner approval for {% data variables.product.prodname_oauth_apps %} they'd like to use if integration access requests are enabled. For more information, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/limiting-oauth-app-and-github-app-access-requests).
2222

2323
## Requesting organization approval for an {% data variables.product.prodname_oauth_app %} you've already authorized for your personal account
2424

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ shortTitle: User into an organization
3232
> * Since organizations cannot star repositories, you will no longer have access to your original list of starred repositories.
3333
> * You will no longer have access to the list of users you were following from your user account.
3434
> * Any followers of your user account will not automatically follow the new organization.
35-
{% ifversion projects-v2 %}> * Any existing collaborators on your projects will still have access to those projects in the new organization.{% endif %}
35+
> * Any existing collaborators on your projects will still have access to those projects in the new organization.
3636
> * {% data variables.product.prodname_actions %} is not automatically enabled on the account after converting it to an organization, and will have to be re-enabled. To re-enable {% data variables.product.prodname_actions %}, create a new workflow file in the `.github/workflows` directory of your repository.
3737
3838
## Prerequisites

content/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners.md

-4
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@ For information on supported operating systems for self-hosted runners, or using
2828
2929
You can set up automation to scale the number of self-hosted runners. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/autoscaling-with-self-hosted-runners).
3030

31-
{% ifversion actions-single-use-tokens %}
32-
3331
You can register ephemeral runners that perform a single job before the registration is cleaned up by using just-in-time runner registration. For more information, see [AUTOTITLE](/actions/security-guides/security-hardening-for-github-actions#using-just-in-time-runners).
3432

35-
{% endif %}
36-
3733
## Prerequisites
3834

3935
{% data reusables.actions.self-hosted-runners-prerequisites %}

content/actions/hosting-your-own-runners/managing-self-hosted-runners/autoscaling-with-self-hosted-runners.md

-4
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,8 @@ The {% data variables.product.prodname_actions %} service will then automaticall
4848
> [!NOTE]
4949
> If a job is labeled for a certain type of runner, but none matching that type are available, the job does not immediately fail at the time of queueing. Instead, the job will remain queued until the 24 hour timeout period expires.
5050
51-
{% ifversion actions-single-use-tokens %}
52-
5351
Alternatively, you can create ephemeral, just-in-time runners using the REST API. For more information, see [AUTOTITLE](/rest/actions/self-hosted-runners).
5452

55-
{% endif %}
56-
5753
## Controlling runner software updates on self-hosted runners
5854

5955
By default, self-hosted runners will automatically perform a software update whenever a new version of the runner software is available. If you use ephemeral runners in containers then this can lead to repeated software updates when a new runner version is released. Turning off automatic updates allows you to update the runner version on the container image directly on your own schedule.

content/actions/hosting-your-own-runners/managing-self-hosted-runners/removing-self-hosted-runners.md

-7
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ shortTitle: Remove self-hosted runners
2020
> [!NOTE]
2121
> * {% data reusables.actions.self-hosted-runner-removal-impact %}
2222
> * {% data reusables.actions.self-hosted-runner-auto-removal %}
23-
{%- ifversion actions-single-use-tokens %}
2423
> * {% data reusables.actions.jit-runner-removal %}
25-
{%- endif %}
2624
2725
To remove a self-hosted runner from a user repository you must be the repository owner. Organization owners{% ifversion custom-org-roles %} and users with the "Manage organization runners and runner groups" permission{% endif %} can remove a runner from a repository in the organization. {% ifversion custom-org-roles %}For more information about custom organization roles, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles).{% endif %}
2826

@@ -42,9 +40,7 @@ For information about how to remove a self-hosted runner with the REST API, see
4240
> [!NOTE]
4341
> * {% data reusables.actions.self-hosted-runner-removal-impact %}
4442
> * {% data reusables.actions.self-hosted-runner-auto-removal %}
45-
{%- ifversion actions-single-use-tokens %}
4643
> * {% data reusables.actions.jit-runner-removal %}
47-
{%- endif %}
4844
4945
To remove a self-hosted runner from an organization, you must be an organization owner{% ifversion custom-org-roles %} or have the "Manage organization runners and runner groups" permission{% endif %}. We recommend that you also have access to the self-hosted runner machine. For information about how to remove a self-hosted runner with the REST API, see [AUTOTITLE](/rest/actions/self-hosted-runners).
5046

@@ -67,11 +63,8 @@ If you use {% data variables.product.prodname_ghe_cloud %}, you can also remove
6763
> [!NOTE]
6864
> * {% data reusables.actions.self-hosted-runner-removal-impact %}
6965
> * {% data reusables.actions.self-hosted-runner-auto-removal %}
70-
{%- ifversion actions-single-use-tokens %}
7166
> * {% data reusables.actions.jit-runner-removal %}
7267
73-
{%- endif %}
74-
7568
To remove a self-hosted runner from an enterprise, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine. For information about how to remove a self-hosted runner with the REST API, see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/actions/self-hosted-runners).
7669

7770
{% data reusables.actions.self-hosted-runner-reusing %}

content/actions/security-for-github-actions/security-guides/automatic-token-authentication.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ The following table shows the permissions granted to the `GITHUB_TOKEN` by defau
9292
| {% endif %} |
9393
| issues | read/write | none | read |
9494
| metadata | read | read | read |
95-
| packages | read/write | {% ifversion actions-default-workflow-permissions-restrictive %}read{% else %}none{% endif %} | read |
95+
| packages | read/write | read | read |
9696
| pages | read/write | none | read |
9797
| pull-requests | read/write | none | read |
9898
| repository-projects | read/write | none | read |

content/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions.md

-4
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,6 @@ You should also consider the environment of the self-hosted runner machines:
352352

353353
Some customers might attempt to partially mitigate these risks by implementing systems that automatically destroy the self-hosted runner after each job execution. However, this approach might not be as effective as intended, as there is no way to guarantee that a self-hosted runner only runs one job. Some jobs will use secrets as command-line arguments which can be seen by another job running on the same runner, such as `ps x -w`. This can lead to secret leakages.
354354

355-
{% ifversion actions-single-use-tokens %}
356-
357355
### Using just-in-time runners
358356

359357
To improve runner registration security, you can use the REST API to create ephemeral, just-in-time (JIT) runners. These self-hosted runners perform at most one job before being automatically removed from the repository, organization, or enterprise. For more information about configuring JIT runners, see [AUTOTITLE](/rest/actions/self-hosted-runners#create-configuration-for-a-just-in-time-runner-for-an-organization).
@@ -367,8 +365,6 @@ Once you have the config file from the REST API response, you can pass it to the
367365
./run.sh --jitconfig ${encoded_jit_config}
368366
```
369367

370-
{% endif %}
371-
372368
### Planning your management strategy for self-hosted runners
373369

374370
A self-hosted runner can be added to various levels in your {% data variables.product.prodname_dotcom %} hierarchy: the enterprise, organization, or repository level. This placement determines who will be able to manage the runner:

0 commit comments

Comments
 (0)