From 924d688ae435824f35e314cb3313a24c88c6a4ef Mon Sep 17 00:00:00 2001 From: Andrew McCoy Date: Thu, 21 Jan 2021 09:50:22 -0500 Subject: [PATCH 01/11] updating doc with links for licenses The experiance for new users is not very obvious as to `where` they will receive their license. I've included links for Download and Install to help the user find the information. I will be adding another commit when I have fleshed out the various ways that users get the GHES license. --- .../admin/overview/managing-your-github-enterprise-license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index 701d4e32d5..496cd4bd86 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -18,7 +18,7 @@ versions: ### About {% data variables.product.prodname_enterprise %} licenses -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. +When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you [download](https://enterprise.github.com/releases/) and [install](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance) {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. From fe03b0b1fb09e914a81f276b74361e7a401c9bda Mon Sep 17 00:00:00 2001 From: Andrew McCoy Date: Thu, 21 Jan 2021 10:02:36 -0500 Subject: [PATCH 02/11] Update managing-your-github-enterprise-license.md --- .../admin/overview/managing-your-github-enterprise-license.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index 496cd4bd86..4c710de910 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -24,6 +24,8 @@ You can allocate the user licenses included in your {% data variables.product.pr If your {% data variables.product.prodname_ghe_server %} license expires, you won't be able to access {% data variables.product.product_location_enterprise %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)." If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}. +You can download your {% data variables.product.prodname_ghe_server %} license from your [Enterprise Account](https://docs.github.com/en/enterprise-server/admin/overview/managing-your-github-enterprise-license#uploading-a-new-license-to-github-enterprise-server), if you do not have an Enterprise Account you can login to our [Enterprise Portal](https://enterprise.github.com/download) and download your license. + ### Uploading a new license to {% data variables.product.prodname_ghe_server %} After you purchase a new license or upgrade an existing license from {% data variables.contact.contact_enterprise_sales %}, you must download your new license file, then upload the file to {% data variables.product.prodname_ghe_server %} to unlock your new user licenses. From a41a4500baa30d2e36268dc43e1a634445618815 Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Wed, 3 Mar 2021 16:05:34 +0000 Subject: [PATCH 03/11] Apply suggestions from code review --- .../overview/managing-your-github-enterprise-license.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index 8bb8cc46e1..edbdef1c5b 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -18,13 +18,14 @@ versions: ### About {% data variables.product.prodname_enterprise %} licenses -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you [download](https://enterprise.github.com/releases/) and [install](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance) {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. +When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.prodname_enterprise %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." + You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. If your {% data variables.product.prodname_ghe_server %} license expires, you won't be able to access {% data variables.product.product_location_enterprise %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)." If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}. -You can download your {% data variables.product.prodname_ghe_server %} license from your [Enterprise Account](https://docs.github.com/en/enterprise-server/admin/overview/managing-your-github-enterprise-license#uploading-a-new-license-to-github-enterprise-server), if you do not have an Enterprise Account you can login to our [Enterprise Portal](https://enterprise.github.com/download) and download your license. +You can download your {% data variables.product.prodname_ghe_server %} license from your [Enterprise Account](https://docs.github.com/en/enterprise-server/admin/overview/managing-your-github-enterprise-license#uploading-a-new-license-to-github-enterprise-server), if you do not have an Enterprise Account you can log in to our [Enterprise Portal](https://enterprise.github.com/download) and download your license. ### Uploading a new license to {% data variables.product.prodname_ghe_server %} From 2bea63038afb77818dd4cb844cedba2e5f79e2ee Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Wed, 3 Mar 2021 16:20:20 +0000 Subject: [PATCH 04/11] Update content/admin/overview/managing-your-github-enterprise-license.md --- .../admin/overview/managing-your-github-enterprise-license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index edbdef1c5b..c8a9811df1 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -18,7 +18,7 @@ versions: ### About {% data variables.product.prodname_enterprise %} licenses -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.prodname_enterprise %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." +When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product_location_enterprise %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. From 19cbc391e5b4e47244e07b0ace56472b402b9ea7 Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Wed, 3 Mar 2021 16:28:38 +0000 Subject: [PATCH 05/11] Update content/admin/overview/managing-your-github-enterprise-license.md --- .../admin/overview/managing-your-github-enterprise-license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index c8a9811df1..d542622b5e 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -18,7 +18,7 @@ versions: ### About {% data variables.product.prodname_enterprise %} licenses -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product_location_enterprise %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." +When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.product_location %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. From 3e16e7063ae1ccad0420c986dc70cbf9afbbce72 Mon Sep 17 00:00:00 2001 From: "James M. Greene" Date: Wed, 3 Mar 2021 15:17:39 -0600 Subject: [PATCH 06/11] Add step timeouts to pupper-container steps (#18071) --- .github/workflows/browser-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/browser-test.yml b/.github/workflows/browser-test.yml index 752c100f6e..e9d51dbee3 100644 --- a/.github/workflows/browser-test.yml +++ b/.github/workflows/browser-test.yml @@ -40,11 +40,13 @@ jobs: - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Install uses: ianwalter/puppeteer-container@2466ba8ecf689ccf4e5dfadeff3ac2db227b2e17 + timeout-minutes: 5 with: args: npm ci - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} name: Test + timeout-minutes: 10 uses: ianwalter/puppeteer-container@2466ba8ecf689ccf4e5dfadeff3ac2db227b2e17 with: args: npm run browser-test From 0385842d22a1cd6a2bc5e7e3eb9321a5c398f428 Mon Sep 17 00:00:00 2001 From: Sarah Edwards Date: Wed, 3 Mar 2021 13:24:06 -0800 Subject: [PATCH 07/11] Delete projectStatus.yml --- .github/commands/projectStatus.yml | 34 ------------------------------ 1 file changed, 34 deletions(-) delete mode 100644 .github/commands/projectStatus.yml diff --git a/.github/commands/projectStatus.yml b/.github/commands/projectStatus.yml deleted file mode 100644 index 4a151089fe..0000000000 --- a/.github/commands/projectStatus.yml +++ /dev/null @@ -1,34 +0,0 @@ -trigger: project_status -title: Project status -description: Update the team on your project's status. -surfaces: -- issue -steps: -- type: menu - id: project - label: Project name - options: - - Technical Debt - - Add Widget - - Bug Bash -- type: form - style: embedded - body: - - type: dropdown - attributes: - label: Color - description: What's the status of your project? - options: - - label: 🟢 Green - value: 🟢 - - label: 🟡 Yellow - value: 🟡 - - label: 🔴 Red - value: 🔴 - - type: textarea - attributes: - label: Details - description: What should the team know about the status of your project? - placeholder: Recent achievements, blockers, requests for help, etc. -- type: fill - template: "The {{ data.project }} project is status {{ data.Color }}. {{ data.Details }}" From b5815e554746aebb41ff1dd706b5fcf28a890b85 Mon Sep 17 00:00:00 2001 From: Meg Bird Date: Wed, 3 Mar 2021 14:44:43 -0700 Subject: [PATCH 08/11] Update content/admin/overview/managing-your-github-enterprise-license.md --- .../admin/overview/managing-your-github-enterprise-license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index d542622b5e..d1fbc6bf44 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -18,7 +18,7 @@ versions: ### About {% data variables.product.prodname_enterprise %} licenses -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.product_location %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." +When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.product_location %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](/admin/installation/setting-up-a-github-enterprise-server-instance)." You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. From 457d2ee5d1358284e7bc6624312342461731ac98 Mon Sep 17 00:00:00 2001 From: Meg Bird Date: Wed, 3 Mar 2021 14:44:49 -0700 Subject: [PATCH 09/11] Update content/admin/overview/managing-your-github-enterprise-license.md --- .../admin/overview/managing-your-github-enterprise-license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index d1fbc6bf44..b5c69a8999 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -25,7 +25,7 @@ You can allocate the user licenses included in your {% data variables.product.pr If your {% data variables.product.prodname_ghe_server %} license expires, you won't be able to access {% data variables.product.product_location_enterprise %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)." If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}. -You can download your {% data variables.product.prodname_ghe_server %} license from your [Enterprise Account](https://docs.github.com/en/enterprise-server/admin/overview/managing-your-github-enterprise-license#uploading-a-new-license-to-github-enterprise-server), if you do not have an Enterprise Account you can log in to our [Enterprise Portal](https://enterprise.github.com/download) and download your license. +You can download your {% data variables.product.prodname_ghe_server %} license from your [enterprise account](https://enterprise.github.com/download). For more information, see "[Managing your {% data variables.product.prodname_enterprise %} license](/admin/overview/managing-your-github-enterprise-license#uploading-a-new-license-to-github-enterprise-server)." ### Uploading a new license to {% data variables.product.prodname_ghe_server %} From 9234b29eae634d34def36160208dd881966df736 Mon Sep 17 00:00:00 2001 From: John Poulin Date: Wed, 3 Mar 2021 17:10:25 -0500 Subject: [PATCH 10/11] Added notes for silent fix to address kramdown vulnerability (#18011) * Added notes for silent fix to address kramdown vulnerability https://github.com/github/products-cna/pull/15#issuecomment-784526977 * Update 0.yml * added note about bug bounty program * Updated Verbiage * Update 0.yml * Update data/release-notes/3-0/0.yml Co-authored-by: Brent Johnson <6415223+brentjo@users.noreply.github.com> Co-authored-by: Meg Bird --- data/release-notes/3-0/0.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/release-notes/3-0/0.yml b/data/release-notes/3-0/0.yml index 0ba564dd7f..e9c29178ca 100644 --- a/data/release-notes/3-0/0.yml +++ b/data/release-notes/3-0/0.yml @@ -1,6 +1,8 @@ date: '2021-02-16' intro: The minimum infrastructure requirements have increased for {% data variables.product.prodname_ghe_server %} 3.0+. For more information, see "[About minimum requirements for GitHub Enterprise Server 3.0 and later](/admin/enterprise-management/upgrading-github-enterprise-server#about-minimum-requirements-for-github-enterprise-server-30-and-later)." sections: + security_fixes: + - '**HIGH:** A remote code execution vulnerability was identified in {% data variables.product.prodname_ghe_server %} that could be exploited when building a {% data variables.product.prodname_pages %} site. User-controlled configuration of the underlying parsers used by {% data variables.product.prodname_pages %} were not sufficiently restricted and made it possible to execute commands on the {% data variables.product.prodname_ghe_server %} instance. To exploit this vulnerability, an attacker would need permission to create and build a {% data variables.product.prodname_pages %} site on the {% data variables.product.prodname_ghe_server %} instance. This vulnerability has been assigned CVE-2020-10519 and was reported via the [GitHub Bug Bounty Program](https://bounty.github.com).' features: - heading: GitHub Actions notes: From 9f38d57e932c3daa914f82e33ae2b51fd1f53bf8 Mon Sep 17 00:00:00 2001 From: Laura Gerhardt Date: Wed, 3 Mar 2021 17:35:02 -0500 Subject: [PATCH 11/11] reference ruby/setup-ruby for cache (#2464) Co-authored-by: Lucas Costi --- .../guides/caching-dependencies-to-speed-up-workflows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/guides/caching-dependencies-to-speed-up-workflows.md b/content/actions/guides/caching-dependencies-to-speed-up-workflows.md index 1b85fb9f5b..963e410b3e 100644 --- a/content/actions/guides/caching-dependencies-to-speed-up-workflows.md +++ b/content/actions/guides/caching-dependencies-to-speed-up-workflows.md @@ -22,7 +22,7 @@ Workflow runs often reuse the same outputs or downloaded dependencies from one r Jobs on {% data variables.product.prodname_dotcom %}-hosted runners start in a clean virtual environment and must download dependencies each time, causing increased network utilization, longer runtime, and increased cost. To help speed up the time it takes to recreate these files, {% data variables.product.prodname_dotcom %} can cache dependencies you frequently use in workflows. -To cache dependencies for a job, you'll need to use {% data variables.product.prodname_dotcom %}'s `cache` action. The action retrieves a cache identified by a unique key. For more information, see [`actions/cache`](https://github.com/actions/cache). +To cache dependencies for a job, you'll need to use {% data variables.product.prodname_dotcom %}'s `cache` action. The action retrieves a cache identified by a unique key. For more information, see [`actions/cache`](https://github.com/actions/cache). If you are caching Ruby gems, instead consider using the Ruby maintained action, which can cache bundle installs on initiation. For more information, see [`ruby/setup-ruby`](https://github.com/ruby/setup-ruby#caching-bundle-install-automatically). {% warning %}