From e883bd75188c10baae369d1ecc5e02ff746762f6 Mon Sep 17 00:00:00 2001 From: Zbynek Konecny Date: Tue, 14 Sep 2021 18:44:26 +0200 Subject: [PATCH 01/12] Mention dependency files update for Gradle --- data/reusables/dependabot/supported-package-managers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/dependabot/supported-package-managers.md b/data/reusables/dependabot/supported-package-managers.md index 93fd6bea27..91f3179007 100644 --- a/data/reusables/dependabot/supported-package-managers.md +++ b/data/reusables/dependabot/supported-package-managers.md @@ -26,7 +26,7 @@ poetry | `pip` | v1 | | **✓** | | Terraform | `terraform` | >= 0.13, <= 1.0 | **✓** | **✓** | | yarn | `npm` | v1 | **✓** | **✓** | | -[1] {% data variables.product.prodname_dependabot %} doesn't run Gradle but supports updates to the following files: `build.gradle` and `build.gradle.kts` (for Kotlin projects). +[1] {% data variables.product.prodname_dependabot %} doesn't run Gradle but supports updates to the following files: `build.gradle`, `build.gradle.kts` (for Kotlin projects) and files included via the `apply` declaration that have `dependencies` in the filename. [2] {% data variables.product.prodname_dependabot %} doesn't run Maven but supports updates to `pom.xml` files. From cea3cdb06831699c8c5644334086c971e6855b20 Mon Sep 17 00:00:00 2001 From: Zbynek Konecny Date: Fri, 17 Sep 2021 00:36:13 +0200 Subject: [PATCH 02/12] Adding more specific caveats of apply support. Co-authored-by: Mike McDonald <2575327+asciimike@users.noreply.github.com> --- data/reusables/dependabot/supported-package-managers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/dependabot/supported-package-managers.md b/data/reusables/dependabot/supported-package-managers.md index 91f3179007..8db62345d8 100644 --- a/data/reusables/dependabot/supported-package-managers.md +++ b/data/reusables/dependabot/supported-package-managers.md @@ -26,7 +26,7 @@ poetry | `pip` | v1 | | **✓** | | Terraform | `terraform` | >= 0.13, <= 1.0 | **✓** | **✓** | | yarn | `npm` | v1 | **✓** | **✓** | | -[1] {% data variables.product.prodname_dependabot %} doesn't run Gradle but supports updates to the following files: `build.gradle`, `build.gradle.kts` (for Kotlin projects) and files included via the `apply` declaration that have `dependencies` in the filename. +[1] {% data variables.product.prodname_dependabot %} doesn't run Gradle but supports updates to the following files: `build.gradle`, `build.gradle.kts` (for Kotlin projects) and files included via the `apply` declaration that have `dependencies` in the filename. Note that `apply` does not support `apply to`, recursion, or advanced syntaxes (e.g. Kotlin's `apply` with `mapOf`, filenames defined by property). [2] {% data variables.product.prodname_dependabot %} doesn't run Maven but supports updates to `pom.xml` files. From 17305006653161d878a8cce6da5c0c6d5bdd2258 Mon Sep 17 00:00:00 2001 From: Gerwald Oberleitner Date: Tue, 28 Sep 2021 12:09:39 +0200 Subject: [PATCH 03/12] Update backing-up-a-repository.md Add Azure Blob Storage as potential backup or storage service to have more options and especially also call out a non-consumer service with SLAs. --- .../archiving-a-github-repository/backing-up-a-repository.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/repositories/archiving-a-github-repository/backing-up-a-repository.md b/content/repositories/archiving-a-github-repository/backing-up-a-repository.md index 8346b22105..b20d4b0156 100644 --- a/content/repositories/archiving-a-github-repository/backing-up-a-repository.md +++ b/content/repositories/archiving-a-github-repository/backing-up-a-repository.md @@ -35,7 +35,7 @@ When you clone a repository or wiki, only Git data, such as project files and co - [Projects](/rest/reference/projects#list-repository-projects) {% endif %} -Once you have {% ifversion ghes or ghae %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). +Once you have {% ifversion ghes or ghae %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup or storage service such as [Azure Blob Storage](https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blobs-overview/), [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). {% ifversion fpt %} ## Third-party backup tools From 1c2523c8219e2ffa42f585574d210a647ffbdb60 Mon Sep 17 00:00:00 2001 From: Rob Cowsill <42620235+rcowsill@users.noreply.github.com> Date: Tue, 28 Sep 2021 21:02:57 +0100 Subject: [PATCH 04/12] Add missing "Open Git Bash" step --- .../associating-text-editors-with-git.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/get-started/getting-started-with-git/associating-text-editors-with-git.md b/content/get-started/getting-started-with-git/associating-text-editors-with-git.md index d27042af7b..82fb135e9d 100644 --- a/content/get-started/getting-started-with-git/associating-text-editors-with-git.md +++ b/content/get-started/getting-started-with-git/associating-text-editors-with-git.md @@ -60,6 +60,7 @@ shortTitle: Associate text editors ## Using Atom as your editor 1. Install [Atom](https://atom.io/). For more information, see "[Installing Atom](https://flight-manual.atom.io/getting-started/sections/installing-atom/)" in the Atom documentation. +{% data reusables.command_line.open_the_multi_os_terminal %} 3. Type this command: ```shell $ git config --global core.editor "atom --wait" From 0aaf25d375a51aa25754e1c686e36849b9d089cc Mon Sep 17 00:00:00 2001 From: Ethan Palm <56270045+ethanpalm@users.noreply.github.com> Date: Wed, 29 Sep 2021 11:20:29 -0700 Subject: [PATCH 05/12] Update data/reusables/dependabot/supported-package-managers.md --- data/reusables/dependabot/supported-package-managers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/dependabot/supported-package-managers.md b/data/reusables/dependabot/supported-package-managers.md index 8db62345d8..fee2f5ebeb 100644 --- a/data/reusables/dependabot/supported-package-managers.md +++ b/data/reusables/dependabot/supported-package-managers.md @@ -26,7 +26,7 @@ poetry | `pip` | v1 | | **✓** | | Terraform | `terraform` | >= 0.13, <= 1.0 | **✓** | **✓** | | yarn | `npm` | v1 | **✓** | **✓** | | -[1] {% data variables.product.prodname_dependabot %} doesn't run Gradle but supports updates to the following files: `build.gradle`, `build.gradle.kts` (for Kotlin projects) and files included via the `apply` declaration that have `dependencies` in the filename. Note that `apply` does not support `apply to`, recursion, or advanced syntaxes (e.g. Kotlin's `apply` with `mapOf`, filenames defined by property). +[1] {% data variables.product.prodname_dependabot %} doesn't run Gradle but supports updates to the following files: `build.gradle`, `build.gradle.kts` (for Kotlin projects), and files included via the `apply` declaration that have `dependencies` in the filename. Note that `apply` does not support `apply to`, recursion, or advanced syntaxes (for example, Kotlin's `apply` with `mapOf`, filenames defined by property). [2] {% data variables.product.prodname_dependabot %} doesn't run Maven but supports updates to `pom.xml` files. From 37ee8d9a5991494670c5024824e087c41ab86b07 Mon Sep 17 00:00:00 2001 From: Andre Kolodochka <59625655+andrekolodochka@users.noreply.github.com> Date: Thu, 30 Sep 2021 07:25:20 +1000 Subject: [PATCH 06/12] Update about-linked-identities.md --- data/reusables/saml/about-linked-identities.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/saml/about-linked-identities.md b/data/reusables/saml/about-linked-identities.md index f879d16402..c32794caa0 100644 --- a/data/reusables/saml/about-linked-identities.md +++ b/data/reusables/saml/about-linked-identities.md @@ -1,3 +1,3 @@ -You can view the single sign-on identity that a member has linked to their {% data variables.product.product_name %} account. When available, the entry will include SCIM data. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." +You can view the single sign-on identity that a member has linked to their {% data variables.product.product_name %} account. If SAML SSO is configured on organisation, when available, the entry will include SCIM data. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." If a member links the wrong identity to their {% data variables.product.product_name %} account, you can revoke the linked identity to allow the member to try again. From 5f2d487dac8b1b15c126d546ee6af26320429c6e Mon Sep 17 00:00:00 2001 From: Andre Kolodochka <59625655+andrekolodochka@users.noreply.github.com> Date: Thu, 30 Sep 2021 07:30:02 +1000 Subject: [PATCH 07/12] Update viewing-and-managing-a-members-saml-access-to-your-organization.md --- ...aging-a-members-saml-access-to-your-organization.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md index 241f12b23d..4f2e25a879 100644 --- a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md @@ -25,6 +25,16 @@ You can view and revoke each member's linked identity, active sessions, and auth {% data reusables.saml.about-linked-identities %} +{% warning %} + +**Warning:** For organizations using SCIM: +- Revoking a linked user identity on {% data variables.product.product_name %} will also remove the SAML and SCIM metadata. As a result, the identity provider will not be able to synchronize or deprovision the linked user identity. +- An admin must revoke a linked identity through the identity provider. +- To revoke a linked identity and link a different account through the identity provider, an admin can remove and re-assign the user to the {% data variables.product.product_name %} application. For more information, see your identity provider's docs. + +{% endwarning %} + + {% data reusables.identity-and-permissions.revoking-identity-team-sync %} {% data reusables.profile.access_org %} From cfb446347adae0fea88a741ed0c8c0038ea12494 Mon Sep 17 00:00:00 2001 From: Andre Kolodochka <59625655+andrekolodochka@users.noreply.github.com> Date: Thu, 30 Sep 2021 07:30:48 +1000 Subject: [PATCH 08/12] Update viewing-and-managing-a-users-saml-access-to-your-enterprise.md --- ...nd-managing-a-users-saml-access-to-your-enterprise.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md b/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md index 50f13c7dac..f0ebe1f507 100644 --- a/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md +++ b/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md @@ -21,15 +21,6 @@ When you enable SAML single sign-on for your enterprise account, each enterprise {% data reusables.saml.about-linked-identities %} -{% warning %} - -**Warning:** For organizations using SCIM: -- Revoking a linked user identity on {% data variables.product.product_name %} will also remove the SAML and SCIM metadata. As a result, the identity provider will not be able to synchronize or deprovision the linked user identity. -- An admin must revoke a linked identity through the identity provider. -- To revoke a linked identity and link a different account through the identity provider, an admin can remove and re-assign the user to the {% data variables.product.product_name %} application. For more information, see your identity provider's docs. - -{% endwarning %} - {% data reusables.identity-and-permissions.revoking-identity-team-sync %} {% data reusables.enterprise-accounts.access-enterprise %} From b5247a3be18d85176f3460f4c02b62ef673f3ef4 Mon Sep 17 00:00:00 2001 From: Abshar Mohammed Aslam Date: Thu, 30 Sep 2021 07:47:49 +0400 Subject: [PATCH 09/12] Fix workflow command for toolkit function (#10249) --- .../workflow-commands-for-github-actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/learn-github-actions/workflow-commands-for-github-actions.md b/content/actions/learn-github-actions/workflow-commands-for-github-actions.md index 5c8554edf1..05a4745f53 100644 --- a/content/actions/learn-github-actions/workflow-commands-for-github-actions.md +++ b/content/actions/learn-github-actions/workflow-commands-for-github-actions.md @@ -84,7 +84,7 @@ The following table shows which toolkit functions are available within a workflo | `core.setOutput` | `set-output` | | `core.setSecret` | `add-mask` | | `core.startGroup` | `group` | -| `core.warning` | `warning file` | +| `core.warning` | `warning` | {% ifversion ghes < 3.0 %} ## Setting an environment variable From 73429c150b0425041d2e621d26c3c9853c6372d3 Mon Sep 17 00:00:00 2001 From: Laura Coursen Date: Fri, 1 Oct 2021 09:36:07 -0500 Subject: [PATCH 10/12] Add :nail_care: --- ...g-and-managing-a-members-saml-access-to-your-organization.md | 2 +- data/reusables/saml/about-linked-identities.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md index 4f2e25a879..2b65e238f6 100644 --- a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md @@ -30,7 +30,7 @@ You can view and revoke each member's linked identity, active sessions, and auth **Warning:** For organizations using SCIM: - Revoking a linked user identity on {% data variables.product.product_name %} will also remove the SAML and SCIM metadata. As a result, the identity provider will not be able to synchronize or deprovision the linked user identity. - An admin must revoke a linked identity through the identity provider. -- To revoke a linked identity and link a different account through the identity provider, an admin can remove and re-assign the user to the {% data variables.product.product_name %} application. For more information, see your identity provider's docs. +- To revoke a linked identity and link a different account through the identity provider, an admin can remove and re-assign the user to the {% data variables.product.product_name %} application. For more information, see your identity provider's documentation. {% endwarning %} diff --git a/data/reusables/saml/about-linked-identities.md b/data/reusables/saml/about-linked-identities.md index c32794caa0..25747fe629 100644 --- a/data/reusables/saml/about-linked-identities.md +++ b/data/reusables/saml/about-linked-identities.md @@ -1,3 +1,3 @@ -You can view the single sign-on identity that a member has linked to their {% data variables.product.product_name %} account. If SAML SSO is configured on organisation, when available, the entry will include SCIM data. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." +You can view the single sign-on identity that a member has linked to their {% data variables.product.product_name %} account. If a member links the wrong identity to their {% data variables.product.product_name %} account, you can revoke the linked identity to allow the member to try again. From dcee1b76ef15637423312acbb0fa93e6807511da Mon Sep 17 00:00:00 2001 From: Laura Coursen Date: Fri, 1 Oct 2021 09:39:58 -0500 Subject: [PATCH 11/12] Move mention of SCIM --- ...g-and-managing-a-members-saml-access-to-your-organization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md index 2b65e238f6..30b91c6673 100644 --- a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md @@ -23,7 +23,7 @@ You can view and revoke each member's linked identity, active sessions, and auth ## Viewing and revoking a linked identity -{% data reusables.saml.about-linked-identities %} +{% data reusables.saml.about-linked-identities %} When available, the entry will include SCIM data. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." {% warning %} From 2743a5ec86475000f71c9db60398f9768bf2a37b Mon Sep 17 00:00:00 2001 From: Laura Coursen Date: Fri, 1 Oct 2021 09:55:08 -0500 Subject: [PATCH 12/12] Add newline --- ...and-managing-a-members-saml-access-to-your-organization.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md index 30b91c6673..6fac15b475 100644 --- a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md @@ -23,7 +23,9 @@ You can view and revoke each member's linked identity, active sessions, and auth ## Viewing and revoking a linked identity -{% data reusables.saml.about-linked-identities %} When available, the entry will include SCIM data. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." +{% data reusables.saml.about-linked-identities %} + +When available, the entry will include SCIM data. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." {% warning %}