From 035dfeddb729e3a9ebb568e09dbe7267b9685719 Mon Sep 17 00:00:00 2001 From: Lucas Alves Date: Wed, 17 Mar 2021 00:21:00 -0300 Subject: [PATCH 1/6] 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 fff85efbab0d..9f7b0c1aaddf 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/6] 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 08de8cfc3e6f..f35f1c45ed3b 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/6] 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 9f7b0c1aaddf..956c7be61f08 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 053d183273a90736d1f538898db550cc6d09a261 Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Fri, 19 Mar 2021 19:38:53 +0000 Subject: [PATCH 4/6] Update info on CodeQL action availability for GHES admins (#18255) --- ...guring-code-scanning-for-your-appliance.md | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/content/admin/configuration/configuring-code-scanning-for-your-appliance.md b/content/admin/configuration/configuring-code-scanning-for-your-appliance.md index 152e36452ec1..65c147cfb7ef 100644 --- a/content/admin/configuration/configuring-code-scanning-for-your-appliance.md +++ b/content/admin/configuration/configuring-code-scanning-for-your-appliance.md @@ -52,25 +52,35 @@ For the users of {% data variables.product.product_location %} to be able to ena You must ensure that Git is in the PATH variable on any self-hosted runners you use to run {% data variables.product.prodname_codeql %} actions. -{% if currentVersion == "enterprise-server@2.22" %} #### Provisioning the actions + +{% if currentVersion ver_gt "enterprise-server@2.22" %} +If you want to use actions to run {% data variables.product.prodname_code_scanning %} on {% data variables.product.prodname_ghe_server %}, the actions must be available on your appliance. + +The {% data variables.product.prodname_codeql %} action is included in your installation of {% data variables.product.prodname_ghe_server %}. If {% data variables.product.prodname_ghe_server %} has access to the internet, the action will automatically download the {% data variables.product.prodname_codeql %} bundle required to perform analysis. Alternatively, you can use a synchronization tool to make the {% data variables.product.prodname_codeql %} analysis bundle available locally. For more information, see "[Configuring {% data variables.product.prodname_codeql %} analysis on a server without internet access](#configuring-codeql-analysis-on-a-server-without-internet-access)" below. + +You can also make third-party actions available to users for {% data variables.product.prodname_code_scanning %}, by setting up {% data variables.product.prodname_github_connect %}. For more information, see "[Configuring {% data variables.product.prodname_github_connect %} to sync {% data variables.product.prodname_actions %}](/enterprise/admin/configuration/configuring-code-scanning-for-your-appliance#configuring-github-connect-to-sync-github-actions)" below. + +#### Configuring {% data variables.product.prodname_codeql %} analysis on a server without internet access +If the server on which you are running {% data variables.product.prodname_ghe_server %} is not connected to the internet, and you want to allow users to enable {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} for their repositories, you must use the {% data variables.product.prodname_codeql %} action sync tool to copy the {% data variables.product.prodname_codeql %} analysis bundle from {% data variables.product.prodname_dotcom_the_website %} to your server. The tool, and details of how to use it, are available at [https://github.com/github/codeql-action-sync-tool](https://github.com/github/codeql-action-sync-tool/). + +If you set up the {% data variables.product.prodname_codeql %} action sync tool, you can use it to sync the latest releases of the {% data variables.product.prodname_codeql %} action and associated {% data variables.product.prodname_codeql %} analysis bundle. These are compatible with {% data variables.product.prodname_ghe_server %}. + +{% endif %} + +{% if currentVersion == "enterprise-server@2.22" %} To run {% data variables.product.prodname_code_scanning %} on {% data variables.product.prodname_ghe_server %} with {% data variables.product.prodname_actions %}, the appropriate actions must be available locally. You can make the actions available in three ways. - **Recommended**: You can use [{% data variables.product.prodname_github_connect %}](/enterprise/admin/configuration/connecting-github-enterprise-server-to-github-enterprise-cloud) to automatically download actions from {% data variables.product.prodname_dotcom_the_website %}. The machine that hosts your instance must be able to access {% data variables.product.prodname_dotcom_the_website %}. This approach ensures that you get the latest software automatically. For more information, see "[Configuring {% data variables.product.prodname_github_connect %} to sync {% data variables.product.prodname_actions %}](/enterprise/admin/configuration/configuring-code-scanning-for-your-appliance#configuring-github-connect-to-sync-github-actions)." - If you want to use the {% data variables.product.prodname_codeql_workflow %}, you can sync the repository from {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.prodname_ghe_server %}, by using the {% data variables.product.prodname_codeql %} Action sync tool available at [https://github.com/github/codeql-action-sync-tool](https://github.com/github/codeql-action-sync-tool/). You can use this tool regardless of whether {% data variables.product.product_location %} or your {% data variables.product.prodname_actions %} runners have access to the internet, as long as you can access both {% data variables.product.product_location %} and {% data variables.product.prodname_dotcom_the_website %} simultaneously on your computer. -- You can create a local copy of an action's repository on your server, by cloning the {% data variables.product.prodname_dotcom_the_website %} repository that contains the action. For example, if you want to use the actions for {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %}, you can create a repository in your instance called `github/codeql-action`, then clone the [repository](https://github.com/github/codeql-action) from {% data variables.product.prodname_dotcom_the_website %}, and then push that repository to your instance's `github/codeql-action` repository. You will also need to download any of the releases from the repository on {% data variables.product.prodname_dotcom_the_website %} and upload them to your instance's `github/codeql-action` repository as releases. +- You can create a local copy of an action's repository on your server, by cloning the {% data variables.product.prodname_dotcom_the_website %} repository that contains the action. For example, if you want to use the actions for {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %}, you can create a repository in your instance called `github/codeql-action`, then clone the [repository](https://github.com/github/codeql-action) from {% data variables.product.prodname_dotcom_the_website %}, and then push that repository to your instance's `github/codeql-action` repository. You will also need to download any of the releases from the repository on {% data variables.product.prodname_dotcom_the_website %} and upload them to your instance's `github/codeql-action` repository as releases. +{% endif %} -##### Configuring {% data variables.product.prodname_github_connect %} to sync {% data variables.product.prodname_actions %} +#### Configuring {% data variables.product.prodname_github_connect %} to sync {% data variables.product.prodname_actions %} 1. If you want to download action workflows on demand from {% data variables.product.prodname_dotcom_the_website %}, you need to enable {% data variables.product.prodname_github_connect %}. For more information, see "[Enabling {% data variables.product.prodname_github_connect %}](/enterprise/admin/configuration/connecting-github-enterprise-server-to-github-enterprise-cloud#enabling-github-connect)." 2. You'll also need to enable {% data variables.product.prodname_actions %} for {% data variables.product.product_location %}. For more information, see "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/getting-started-with-github-actions-for-github-enterprise-server)." 3. The next step is to configure access to actions on {% data variables.product.prodname_dotcom_the_website %} using {% data variables.product.prodname_github_connect %}. For more information, see "[Enabling automatic access to {% data variables.product.prodname_dotcom_the_website %} actions using {% data variables.product.prodname_github_connect %}](/enterprise/admin/github-actions/enabling-automatic-access-to-githubcom-actions-using-github-connect)." 4. Add a self-hosted runner to your repository, organization, or enterprise account. For more information, see "[Adding self-hosted runners](/actions/hosting-your-own-runners/adding-self-hosted-runners)." -{% endif %} - -{% if currentVersion ver_gt "enterprise-server@2.22" %} -#### Configuring {% data variables.product.prodname_codeql %} on a server without internet access -If the server on which you are running {% data variables.product.prodname_ghe_server %} is not connected to the internet, and you want to allow users to enable {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} for their repositories, you must use the {% data variables.product.prodname_codeql %} Action sync tool to copy the {% data variables.product.prodname_codeql %} actions and query bundle from {% data variables.product.prodname_dotcom_the_website %} to your server. The tool, and details of how to use it, are available at [https://github.com/github/codeql-action-sync-tool](https://github.com/github/codeql-action-sync-tool/). -{% endif %} #### Enabling code scanning for individual repositories After you configure a self-hosted runner, {% if currentVersion == "enterprise-server@2.22" %}and provision the actions,{% endif %} users can enable {% data variables.product.prodname_code_scanning %} for individual repositories on {% data variables.product.product_location %}. For more information, see "[Setting up {% data variables.product.prodname_code_scanning %} for a repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/setting-up-code-scanning-for-a-repository)." From 73b2f649b8b59c3caaf1c95f03439385b71f617a Mon Sep 17 00:00:00 2001 From: Janice Date: Fri, 19 Mar 2021 12:44:38 -0700 Subject: [PATCH 5/6] Add an ask to partner issue template (#18312) * Add an ask to partner issue template * Update .github/ISSUE_TEMPLATE/partner-contributed-documentation.md Co-authored-by: Steve Winton Co-authored-by: Steve Winton --- .github/ISSUE_TEMPLATE/partner-contributed-documentation.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/partner-contributed-documentation.md b/.github/ISSUE_TEMPLATE/partner-contributed-documentation.md index bcc8053160e2..825dc55db8fb 100644 --- a/.github/ISSUE_TEMPLATE/partner-contributed-documentation.md +++ b/.github/ISSUE_TEMPLATE/partner-contributed-documentation.md @@ -21,6 +21,9 @@ Please be sure to complete all items in the checklists that follow, and feel fre - [ ] Prior to submitting documentation, please apply to join the GitHub Technology Partner Program: [partner.github.com/apply](https://partner.github.com/apply?partnershipType=Technology+Partner). Please feel free to proceed once your application is approved. +## What information would you like to add to docs.github.com? + + ## Tasks Please be sure to complete each of the following: From 4a5fd97c705ef16ecfd1c6d000a667c1ea050d1e Mon Sep 17 00:00:00 2001 From: Janice Date: Fri, 19 Mar 2021 12:45:37 -0700 Subject: [PATCH 6/6] 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 956c7be61f08..93bb9537b28c 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 %}