From eb91af01a513bc01cdbd1a68cabb7ab0663592a1 Mon Sep 17 00:00:00 2001 From: hubwriter Date: Tue, 30 Nov 2021 14:25:35 +0000 Subject: [PATCH 1/3] Remove previous test --- .devcontainer/devcontainer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e27b6f657b..51c9f3a0f9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -34,10 +34,4 @@ // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "node", - // Test hostRequirements setting for machine types - currently undocumented - "hostRequirements": { - "cpus": 8, - "memory": "8gb", // otherwise is bytes - allows for other units like mb, or k - "storage": "32gb" // otherwise is bytes - allows for other units like tb, or mb, or k - } } From bded8135427a32b05e78d7513d840b92cad7d9b3 Mon Sep 17 00:00:00 2001 From: hubwriter Date: Tue, 30 Nov 2021 14:25:49 +0000 Subject: [PATCH 2/3] Update devcontainer.json --- .devcontainer/devcontainer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 51c9f3a0f9..d5a61ceb8f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -32,6 +32,5 @@ "postCreateCommand": "npm ci && npm run build", // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "node", - + "remoteUser": "node" } From fa68738fdfdcccb3ae3ab65d3f739866a779ae3d Mon Sep 17 00:00:00 2001 From: Emma Makinson Date: Tue, 30 Nov 2021 14:39:50 +0000 Subject: [PATCH 3/3] Add note about organization alerts notifications (#23131) --- .../configuring-notifications.md | 10 +++++++++- .../reviewing-your-deploy-keys.md | 3 +++ content/developers/overview/managing-deploy-keys.md | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md b/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md index 336375911a..0075ffaf32 100644 --- a/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md +++ b/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md @@ -147,7 +147,8 @@ Email notifications from {% data variables.product.product_location %} contain t - There are updates in repositories or team discussions you're watching or in a conversation you're participating in. For more information, see "[About participating and watching notifications](#about-participating-and-watching-notifications)." - You gain access to a new repository or you've joined a new team. For more information, see "[Automatic watching](#automatic-watching)."{% ifversion fpt or ghes or ghae-issue-4864 or ghec %} - There are new {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[{% data variables.product.prodname_dependabot_alerts %} notification options](#dependabot-alerts-notification-options)." {% endif %} {% ifversion fpt or ghec %} - - There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %} + - There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5668 %} + - There are new deploy keys added to repositories that belong to organizations that you're an owner of. For more information, see "[Organization alerts notification options](#organization-alerts-notification-options)."{% endif %} ## Automatic watching @@ -218,6 +219,13 @@ Choose how you want to receive workflow run updates for repositories that you ar {% endif %} +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5668 %} +## Organization alerts notification options + +If you're an organization owner, you'll receive email notifications by default when organization members add new deploy keys to repositories within the organization. You can unsubscribe from these notifications. On the notification settings page, under "Organization alerts", unselect **Email**. + +{% endif %} + {% ifversion fpt or ghes or ghec %} ## Managing your notification settings with {% data variables.product.prodname_mobile %} diff --git a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md index fad96d0b4f..b3629bba82 100644 --- a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md +++ b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md @@ -23,3 +23,6 @@ shortTitle: Deploy keys ![Deploy key list](/assets/images/help/settings/settings-deploy-key-review.png) For more information, see "[Managing deploy keys](/guides/managing-deploy-keys)." + +## Further reading +- [Configuring notifications](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#organization-alerts-notification-options) diff --git a/content/developers/overview/managing-deploy-keys.md b/content/developers/overview/managing-deploy-keys.md index 3fb0226641..b651619a2c 100644 --- a/content/developers/overview/managing-deploy-keys.md +++ b/content/developers/overview/managing-deploy-keys.md @@ -185,3 +185,7 @@ This means that you cannot automate the creation of accounts. But if you want to [collaborator]: /articles/inviting-collaborators-to-a-personal-repository [outside-collaborator]: /articles/adding-outside-collaborators-to-repositories-in-your-organization [team]: /articles/adding-organization-members-to-a-team + +## Further reading +- [Configuring notifications](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#organization-alerts-notification-options) +