From 035dfeddb729e3a9ebb568e09dbe7267b9685719 Mon Sep 17 00:00:00 2001 From: Lucas Alves Date: Wed, 17 Mar 2021 00:21:00 -0300 Subject: [PATCH 1/5] Correction within the About apps page --- content/developers/apps/about-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/developers/apps/about-apps.md b/content/developers/apps/about-apps.md index fff85efbab..9f7b0c1aad 100644 --- a/content/developers/apps/about-apps.md +++ b/content/developers/apps/about-apps.md @@ -14,7 +14,7 @@ versions: Apps on {% data variables.product.prodname_dotcom %} allow you to automate and improve your workflow. You can build apps to improve your workflow.{% if currentVersion == "free-pro-team@latest" %} You can also share or sell apps in [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace). To learn how to list an app on {% data variables.product.prodname_marketplace %}, see "[Getting started with GitHub Marketplace](/marketplace/getting-started/)."{% endif %} -{% data reusables.marketplace.github_apps_preferred %}, but GitHub supports both {% data variables.product.prodname_oauth_app %}s and {% data variables.product.prodname_github_apps %}. For information on choosing a type of app, see "[About apps](/apps/about-apps/)" and "[Differences between apps](/apps/differences-between-apps/)." +{% data reusables.marketplace.github_apps_preferred %}, but GitHub supports both {% data variables.product.prodname_oauth_app %}s and {% data variables.product.prodname_github_apps %}. For information on choosing a type of app, see "[Differences between GitHub Apps and OAuth Apps](/apps/differences-between-github-apps-and-oauth-apps/)." {% data reusables.apps.general-apps-restrictions %} From 2fc921b61a75ed2e47f1111d55b8816fe98ada20 Mon Sep 17 00:00:00 2001 From: Bobby Dresser Date: Thu, 18 Mar 2021 13:56:38 -0700 Subject: [PATCH 2/5] add discussions to contribution graph --- .../viewing-contributions-on-your-profile.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md b/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md index 08de8cfc3e..f35f1c45ed 100644 --- a/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md +++ b/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md @@ -27,6 +27,8 @@ On your profile page, certain actions count as contributions: - Committing to a repository's default branch or `gh-pages` branch - Opening an issue +- Opening a discussion +- Answering a discussion - Proposing a pull request - Submitting a pull request review{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %} - Co-authoring commits in a repository's default branch or `gh-pages` branch{% endif %} From 2dfd3b3538bb5a8d12c0a1d374fa79cbf7e0f9fc Mon Sep 17 00:00:00 2001 From: Lucas Alves Date: Fri, 19 Mar 2021 00:38:24 -0300 Subject: [PATCH 3/5] Update the relative link Co-authored-by: Janice --- content/developers/apps/about-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/developers/apps/about-apps.md b/content/developers/apps/about-apps.md index 9f7b0c1aad..956c7be61f 100644 --- a/content/developers/apps/about-apps.md +++ b/content/developers/apps/about-apps.md @@ -14,7 +14,7 @@ versions: Apps on {% data variables.product.prodname_dotcom %} allow you to automate and improve your workflow. You can build apps to improve your workflow.{% if currentVersion == "free-pro-team@latest" %} You can also share or sell apps in [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace). To learn how to list an app on {% data variables.product.prodname_marketplace %}, see "[Getting started with GitHub Marketplace](/marketplace/getting-started/)."{% endif %} -{% data reusables.marketplace.github_apps_preferred %}, but GitHub supports both {% data variables.product.prodname_oauth_app %}s and {% data variables.product.prodname_github_apps %}. For information on choosing a type of app, see "[Differences between GitHub Apps and OAuth Apps](/apps/differences-between-github-apps-and-oauth-apps/)." +{% data reusables.marketplace.github_apps_preferred %}, but GitHub supports both {% data variables.product.prodname_oauth_app %}s and {% data variables.product.prodname_github_apps %}. For information on choosing a type of app, see "[Differences between GitHub Apps and OAuth Apps](/developers/github-marketplace/about-github-marketplace)." {% data reusables.apps.general-apps-restrictions %} From aa165ea8f345534d90d9e6dd1f6a1ca59791159a Mon Sep 17 00:00:00 2001 From: Darius Wiles Date: Fri, 19 Mar 2021 09:25:30 -0700 Subject: [PATCH 4/5] Fix minor grammar "helps the minimize risks" --- .../security-hardening-for-github-actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/content/actions/learn-github-actions/security-hardening-for-github-actions.md index d5b53f25cf..9e6ea648c4 100644 --- a/content/actions/learn-github-actions/security-hardening-for-github-actions.md +++ b/content/actions/learn-github-actions/security-hardening-for-github-actions.md @@ -26,7 +26,7 @@ This guide explains how to configure security hardening for certain {% data vari Sensitive values should never be stored as plaintext in workflow files, but rather as secrets. [Secrets](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets) can be configured at the organization{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@latest" %}, repository, or environment{% else %} or repository{% endif %} level, and allow you to store sensitive information in {% data variables.product.product_name %}. -Secrets use [Libsodium sealed boxes](https://libsodium.gitbook.io/doc/public-key_cryptography/sealed_boxes), so that they are encrypted before reaching {% data variables.product.product_name %}. This occurs when the secret is submitted [using the UI](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository) or through the [REST API](/rest/reference/actions#secrets). This client-side encryption helps the minimize risks related to accidental logging (for example, exception logs and request logs, among others) within {% data variables.product.product_name %}'s infrastructure. Once the secret is uploaded, {% data variables.product.product_name %} is then able to decrypt it so that it can be injected into the workflow runtime. +Secrets use [Libsodium sealed boxes](https://libsodium.gitbook.io/doc/public-key_cryptography/sealed_boxes), so that they are encrypted before reaching {% data variables.product.product_name %}. This occurs when the secret is submitted [using the UI](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository) or through the [REST API](/rest/reference/actions#secrets). This client-side encryption helps minimize the risks related to accidental logging (for example, exception logs and request logs, among others) within {% data variables.product.product_name %}'s infrastructure. Once the secret is uploaded, {% data variables.product.product_name %} is then able to decrypt it so that it can be injected into the workflow runtime. To help prevent accidental disclosure, {% data variables.product.product_name %} uses a mechanism that attempts to redact any secrets that appear in run logs. This redaction looks for exact matches of any configured secrets, as well as common encodings of the values, such as Base64. However, because there are multiple ways a secret value can be transformed, this redaction is not guaranteed. As a result, there are certain proactive steps and good practices you should follow to help ensure secrets are redacted, and to limit other risks associated with secrets: From 4a5fd97c705ef16ecfd1c6d000a667c1ea050d1e Mon Sep 17 00:00:00 2001 From: Janice Date: Fri, 19 Mar 2021 12:45:37 -0700 Subject: [PATCH 5/5] Update content/developers/apps/about-apps.md --- content/developers/apps/about-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/developers/apps/about-apps.md b/content/developers/apps/about-apps.md index 956c7be61f..93bb9537b2 100644 --- a/content/developers/apps/about-apps.md +++ b/content/developers/apps/about-apps.md @@ -14,7 +14,7 @@ versions: Apps on {% data variables.product.prodname_dotcom %} allow you to automate and improve your workflow. You can build apps to improve your workflow.{% if currentVersion == "free-pro-team@latest" %} You can also share or sell apps in [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace). To learn how to list an app on {% data variables.product.prodname_marketplace %}, see "[Getting started with GitHub Marketplace](/marketplace/getting-started/)."{% endif %} -{% data reusables.marketplace.github_apps_preferred %}, but GitHub supports both {% data variables.product.prodname_oauth_app %}s and {% data variables.product.prodname_github_apps %}. For information on choosing a type of app, see "[Differences between GitHub Apps and OAuth Apps](/developers/github-marketplace/about-github-marketplace)." +{% data reusables.marketplace.github_apps_preferred %}, but GitHub supports both {% data variables.product.prodname_oauth_app %}s and {% data variables.product.prodname_github_apps %}. For information on choosing a type of app, see "[Differences between GitHub Apps and OAuth Apps](/developers/apps/differences-between-github-apps-and-oauth-apps)." {% data reusables.apps.general-apps-restrictions %}