[pull] main from github:main

.github/workflows/repo-sync.yml

@@ -163,6 +163,36 @@ jobs:
               console.log(`Branch is already up-to-date`)
             }
 
+      - name: Enable GitHub auto-merge
+        if: ${{ steps.find-pull-request.outputs.number }}
+        uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const pull = await github.pulls.get({
+              ...context.repo,
+              pull_number: parseInt(${{ steps.find-pull-request.outputs.number }})
+            })
+            const pullNodeId = pull.data.node_id
+            console.log(`Pull request GraphQL Node ID: ${pullNodeId}`)
+            const mutation = `mutation ($id: ID!) {
+              enablePullRequestAutoMerge(input: {
+                pullRequestId: $id,
+                mergeMethod: MERGE
+              }) {
+                clientMutationId
+              }
+            }`
+            const variables = {
+              id: pullNodeId
+            }
+            const graph = await github.graphql(mutation, variables)
+            if (graph.errors && graph.errors.length > 0) {
+              console.error('ERROR! Failed to enable auto-merge:\n - ', graph.errors.map(error => error.message).join('\n - '))
+            } else {
+              console.log('Auto-merge enabled!')
+            }
+
       - name: Send Slack notification if workflow fails
         uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd
         if: failure()

.github/workflows/send-issues-to-how-how-we-work-boards.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - if: contains(github.event.issue.labels.*.name, 'engineering') && !contains(github.event.issue.labels.*.name, 'feature') && !contains(github.event.issue.labels.*.name, 'epic')
+      - if: (github.repository == 'github/docs-internal') && contains(github.event.issue.labels.*.name, 'engineering') && !contains(github.event.issue.labels.*.name, 'feature') && !contains(github.event.issue.labels.*.name, 'epic')
         uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
         with:
           github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
@@ -31,7 +31,7 @@ jobs:
             } catch (error) {
               console.log(error);
             }
-      - if: contains(github.event.issue.labels.*.name, 'engineering') && contains(github.event.issue.labels.*.name, 'feature')
+      - if: (github.repository == 'github/docs-internal') && contains(github.event.issue.labels.*.name, 'engineering') && contains(github.event.issue.labels.*.name, 'feature')
         uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
         with:
           github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
@@ -46,7 +46,7 @@ jobs:
             } catch (error) {
               console.log(error);
             }
-      - if: contains(github.event.issue.labels.*.name, 'engineering') && contains(github.event.issue.labels.*.name, 'epic')
+      - if: (github.repository == 'github/docs-internal') && contains(github.event.issue.labels.*.name, 'engineering') && contains(github.event.issue.labels.*.name, 'epic')
         uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
         with:
           github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}

.github/workflows/send-prs-to-how-how-we-work-boards.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - if: (github.repository == 'github/docs-internal' || github.repository == 'github/docs') && contains(github.event.pull_request.labels.*.name, 'feature')
+      - if: (github.repository == 'github/docs-internal') && contains(github.event.pull_request.labels.*.name, 'feature')
         uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
         with:
           github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}

content/actions/learn-github-actions/sharing-workflows-with-your-organization.md

@@ -21,13 +21,13 @@ If you need to share workflows and other {% data variables.product.prodname_acti
 
 ### Creating a workflow template
 
-Workflow templates can be created by users with write access to the organization's `.github` repository. The templates can then be used by organization members who have permission to create workflows. Workflow templates can be used to create new workflows in an organizations' public repositories; to use templates to create workflows in private repositories, the organization must be part of an enterprise or GitHub One plan.
+Workflow templates can be created by users with write access to the organization's `.github` repository. The templates can then be used by organization members who have permission to create workflows. Workflow templates can be used to create new workflows in an organizations' public repositories; to use templates to create workflows in private repositories, the organization must be part of an enterprise plan.
 
 This procedure demonstrates how to create a workflow template and metadata file. The metadata file describes how the template is presented to users when they are creating a new workflow.
 
 1. If it doesn't already exist, create a new public repository named `.github` in your organization.
-1. Create a directory named `workflow-templates`.
-1. Create your new workflow file inside the `workflow-templates` directory.
+2. Create a directory named `workflow-templates`.
+3. Create your new workflow file inside the `workflow-templates` directory.
 
    If you need to refer to a repository's default branch, you can use the `$default-branch` placeholder. When a workflow is created using your template, the placeholder will be automatically replaced with the name of the repository's default branch.
 
@@ -52,7 +52,7 @@ This procedure demonstrates how to create a workflow template and metadata file.
          - name: Run a one-line script
            run: echo Hello from Octo Organization
    ```
-1. Create a metadata file inside the `workflow-templates` directory. The metadata file must have the same name as the workflow file, but instead of the `.yml` extension, it must be appended with `.properties.json`. For example, this file named `octo-organization-ci.properties.json` contains the metadata for a workflow file named `octo-organization-ci.yml`:
+4. Create a metadata file inside the `workflow-templates` directory. The metadata file must have the same name as the workflow file, but instead of the `.yml` extension, it must be appended with `.properties.json`. For example, this file named `octo-organization-ci.properties.json` contains the metadata for a workflow file named `octo-organization-ci.yml`:
    ```yaml
    {
        "name": "Octo Organization Workflow",

content/github/getting-started-with-github/githubs-products.md

@@ -98,15 +98,4 @@ In addition to the features available with {% data variables.product.prodname_te
 
 You can set up a trial to evaluate {% data variables.product.prodname_ghe_cloud %}. For more information, see "<a href="/articles/setting-up-a-trial-of-github-enterprise-cloud" class="dotcom-only">Setting up a trial of {% data variables.product.prodname_ghe_cloud %}</a>."
 
-For more information about hosting your own instance of [{% data variables.product.prodname_ghe_server %}](https://enterprise.github.com), contact {% data variables.contact.contact_enterprise_sales %}. {% data reusables.enterprise_installation.request-a-trial %}
-
-### {% data variables.product.prodname_ghe_one %}
-
-{% data variables.product.prodname_ghe_one %} includes [{% data variables.product.prodname_enterprise %}](#github-enterprise), plus:
-
-- {% data variables.contact.github_support %} {% data variables.product.premium_plus_support_plan %}
-- {% data variables.product.prodname_insights %}
-- {% data variables.product.prodname_GH_advanced_security %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}. For more information, see "[About {% data variables.product.prodname_GH_advanced_security %}](/github/getting-started-with-github/about-github-advanced-security)."{% endif %}{% if enterpriseServerVersions contains currentVersion and currentVersion == "[email protected]" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)."{% endif %}
-- [{% data variables.product.prodname_learning %} for organizations](https://lab.github.com/organizations)
-
-For more information about signing up for {% data variables.product.prodname_ghe_one %}, contact {% data variables.contact.contact_enterprise_sales %}.
+For more information about hosting your own instance of [{% data variables.product.prodname_ghe_server %}](https://enterprise.github.com), contact {% data variables.contact.contact_enterprise_sales %}. {% data reusables.enterprise_installation.request-a-trial %}

content/github/working-with-github-support/about-github-premium-support-for-github-enterprise-cloud.md

@@ -1,6 +1,6 @@
 ---
 title: About GitHub Premium Support for GitHub Enterprise Cloud
-intro: '{% data variables.contact.premium_support %} is a paid, supplemental support offering for {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_one %} customers.'
+intro: '{% data variables.contact.premium_support %} is a paid, supplemental support offering for {% data variables.product.prodname_ghe_cloud %} customers.'
 redirect_from:
   - /articles/about-github-premium-support
   - /articles/about-github-premium-support-for-github-enterprise-cloud

content/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights.md

@@ -1,6 +1,5 @@
 ---
 title: Metrics available with GitHub Insights
-product: '{% data reusables.gated-features.github-insights %}'
 intro: '{% data variables.product.prodname_insights %} includes a variety of metrics to give you visibility into your team''s software delivery process.'
 redirect_from:
   - /github/installing-and-configuring-github-insights/metrics-available-with-github-insights

content/insights/exploring-your-usage-of-github-enterprise/navigating-between-github-enterprise-and-github-insights.md

@@ -1,7 +1,6 @@
 ---
 title: Navigating between GitHub Enterprise and GitHub Insights
 intro: ''
-product: '{% data reusables.gated-features.github-insights %}'
 permissions: 'Anyone with access to {% data variables.product.prodname_insights %} can navigate between {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_insights %}.'
 versions:
   enterprise-server: '*'

content/insights/exploring-your-usage-of-github-enterprise/setting-your-timezone-for-github-insights.md

@@ -1,7 +1,6 @@
 ---
 title: Setting your timezone for GitHub Insights
 intro: 'You can set the timezone for metrics you view in {% data variables.product.prodname_insights %}.'
-product: '{% data reusables.gated-features.github-insights %}'
 permissions: 'Anyone with access to {% data variables.product.prodname_insights %} can set their own timezone.'
 versions:
   enterprise-server: '*'

content/insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports.md

@@ -1,7 +1,6 @@
 ---
 title: Viewing key metrics and reports
 intro: You can view and filter key metrics and reports to help you understand and improve your software delivery process through data.
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/viewing-and-filtering-key-metrics-and-reports
 permissions: 'Anyone with access to {% data variables.product.prodname_insights %} can view key metrics and reports.'

content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md

@@ -1,7 +1,6 @@
 ---
 title: About data in GitHub Insights
 intro: 'The data included in {% data variables.product.prodname_insights %} metrics is highly customizable.'
-product: '{% data reusables.gated-features.github-insights %}'
 permissions: ''
 versions:
   enterprise-server: '*'

content/insights/installing-and-configuring-github-insights/about-github-insights.md

@@ -1,7 +1,6 @@
 ---
 title: About GitHub Insights
 intro: '{% data variables.product.prodname_insights %} provides metrics and analytical reports to help engineering teams understand and improve their software delivery process.'
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/about-github-insights
 versions:

content/insights/installing-and-configuring-github-insights/configuring-the-connection-between-github-insights-and-github-enterprise.md

@@ -1,7 +1,6 @@
 ---
 title: Configuring the connection between GitHub Insights and GitHub Enterprise
 intro: 'You can manage how {% data variables.product.prodname_insights %} connects to {% data variables.product.prodname_enterprise %}.'
-product: '{% data reusables.gated-features.github-insights %}'
 permissions: 'People with admin permissions to {% data variables.product.prodname_insights %} can configure the connection to {% data variables.product.prodname_enterprise %}.'
 versions:
   enterprise-server: '*'

content/insights/installing-and-configuring-github-insights/enabling-a-link-between-github-insights-and-github-enterprise.md

@@ -1,7 +1,6 @@
 ---
 title: Enabling a link between GitHub Insights and GitHub Enterprise
 intro: 'You can enable a link that will allow users to navigate from {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_insights %}.'
-product: '{% data reusables.gated-features.github-insights %}'
 permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} can enable a link between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_insights %}.'
 redirect_from:
   - /github/installing-and-configuring-github-insights/navigating-between-github-insights-and-github-enterprise

content/insights/installing-and-configuring-github-insights/installing-github-insights.md

@@ -1,7 +1,6 @@
 ---
 title: Installing GitHub Insights
 intro: 'You can install {% data variables.product.prodname_insights %} and connect the standalone application to {% data variables.product.prodname_ghe_server %}.'
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/installing-github-insights
 permissions: 'Organization owners in {% data variables.product.prodname_enterprise %} with read permissions to the `github/insights-releases` repository and administrative access to the application server can install {% data variables.product.prodname_insights %}.'

content/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports.md

@@ -1,7 +1,6 @@
 ---
 title: Managing available metrics and reports
 intro: 'You can enable and disable specific metrics across {% data variables.product.prodname_insights %}.'
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/managing-settings-in-github-insights
 permissions: 'People with admin permissions to {% data variables.product.prodname_insights %} can manage available metrics and reports.'

content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md

@@ -1,7 +1,6 @@
 ---
 title: Managing contributors and teams
 intro: You can manage the people and teams included in metrics and reports.
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/managing-contributors-and-teams
 permissions: 'People with admin permissions in {% data variables.product.prodname_insights %} can manage contributors and teams.'

content/insights/installing-and-configuring-github-insights/managing-events.md

@@ -1,7 +1,6 @@
 ---
 title: Managing events
 intro: '{% data reusables.github-insights.events %}'
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/creating-and-managing-events
 permissions: 'People with admin permissions to {% data variables.product.prodname_insights %} can manage events.'

content/insights/installing-and-configuring-github-insights/managing-goals.md

@@ -1,7 +1,6 @@
 ---
 title: Managing goals
 intro: You can use goals to set targets for key metrics and measure success reaching those targets.
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/creating-and-managing-goals
 permissions: 'Anyone with access to {% data variables.product.prodname_insights %} can manage goals.'

content/insights/installing-and-configuring-github-insights/managing-organizations.md

@@ -1,7 +1,6 @@
 ---
 title: Managing organizations
 intro: 'You can manage the {% data variables.product.prodname_enterprise %} organizations that are included in metrics.'
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/managing-organizations
 permissions: 'People with admin permissions in {% data variables.product.prodname_insights %} can manage organizations.'

content/insights/installing-and-configuring-github-insights/managing-permissions-in-github-insights.md

@@ -1,7 +1,6 @@
 ---
 title: Managing permissions in GitHub Insights
 intro: 'You can update a user''s permissions in {% data variables.product.prodname_insights %}.'
-product: '{% data reusables.gated-features.github-insights %}'
 permissions: 'People with admin permissions to {% data variables.product.prodname_insights %} can manage permissions.'
 versions:
   enterprise-server: '*'

content/insights/installing-and-configuring-github-insights/managing-repositories.md

@@ -1,7 +1,6 @@
 ---
 title: Managing repositories
 intro: 'You can manage the repositories connected to {% data variables.product.prodname_insights %} and the data included in metrics for each repository.'
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/managing-repositories
 permissions: 'People with admin permissions in {% data variables.product.prodname_insights %} can manage repositories. '

content/insights/installing-and-configuring-github-insights/system-overview-for-github-insights.md

@@ -1,7 +1,6 @@
 ---
 title: System overview for GitHub Insights
 intro: '{% data variables.product.prodname_insights %} is a standalone application which interfaces with {% data variables.product.prodname_enterprise %}.'
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/system-overview-for-github-insights
 versions:

content/insights/installing-and-configuring-github-insights/updating-github-insights.md

@@ -1,7 +1,6 @@
 ---
 title: Updating GitHub Insights
 intro: 'You can update to the latest version of {% data variables.product.prodname_insights %} to benefit from improvements and bug fixes.'
-product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/updating-github-insights
 permissions: 'People with read permissions to the `github/insights-releases` repository and administrative access to the application server can update {% data variables.product.prodname_insights %}.'

data/reusables/gated-features/actions-shared.md

@@ -1 +1 @@
-{% data variables.product.prodname_actions %} is available with {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %}, {% data variables.product.prodname_ghe_one %}, and {% data variables.product.prodname_ghe_managed %}. {% data variables.product.prodname_actions %} is not available for private repositories owned by accounts using legacy per-repository plans. 
+{% data variables.product.prodname_actions %} is available with {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %}, and {% data variables.product.prodname_ghe_managed %}. {% data variables.product.prodname_actions %} is not available for private repositories owned by accounts using legacy per-repository plans. 

data/reusables/gated-features/ghas.md

@@ -1 +1 @@
-{% data variables.product.prodname_GH_advanced_security %} licenses are available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% if currentVersion == "github-ae@latest" %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_GH_advanced_security %} is also included in {% data variables.product.prodname_ghe_one %}{% if currentVersion == "free-pro-team@latest" %} and in all public repositories on {% data variables.product.prodname_dotcom_the_website %}{% endif %}. For more information, see "[About GitHub's products](/github/getting-started-with-github/githubs-products)."
+{% data variables.product.prodname_GH_advanced_security %} licenses are available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% if currentVersion == "github-ae@latest" %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_GH_advanced_security %} is also included in all public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[About GitHub's products](/github/getting-started-with-github/githubs-products)."