diff --git a/.github/actions-scripts/rendered-content-link-checker.js b/.github/actions-scripts/rendered-content-link-checker.js index 6e8e41b540..44bce75a09 100755 --- a/.github/actions-scripts/rendered-content-link-checker.js +++ b/.github/actions-scripts/rendered-content-link-checker.js @@ -1186,9 +1186,11 @@ async function renderInnerHTML(page, permalink) { req.context.relativePath = page.relativePath + const guts = [page.rawIntro, page.rawPermissions, page.markdown].filter(Boolean).join('\n').trim() + // These lines do what the ubiquitous `renderContent` function does, // but at an absolute minimum to get a string of HTML. - const markdown = await liquid.parseAndRender(page.markdown, req.context) + const markdown = await liquid.parseAndRender(guts, req.context) const processor = createMinimalProcessor(req.context) const vFile = await processor.process(markdown) return vFile.toString() diff --git a/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md b/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md index e93e405fe4..9bad8d6e35 100644 --- a/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md +++ b/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md @@ -76,12 +76,14 @@ The following example OIDC token uses a subject (`sub`) that references a job en "repository_owner_id": "65", "run_id": "example-run-id", "run_number": "10", - "run_attempt": "2", + "run_attempt": "2",{% ifversion actions-OIDC-custom-claim-runner-environment %} + "runner_environment": "github-hosted"{% endif %} "actor": "octocat", "workflow": "example-workflow", "head_ref": "", "base_ref": "", - "event_name": "workflow_dispatch", + "event_name": "workflow_dispatch",{% ifversion actions-OIDC-custom-claim-enterprise %} + "enterprise": "avocado-corp"{% endif %} "ref_type": "branch", "job_workflow_ref": "octo-org/octo-automation/.github/workflows/oidc.yml@refs/heads/main", "iss": "{% ifversion ghes %}https://HOSTNAME/_services/token{% else %}https://token.actions.githubusercontent.com{% endif %}", @@ -121,6 +123,9 @@ The token also includes custom claims provided by {% data variables.product.prod | `actor`| The personal account that initiated the workflow run. | | `actor_id`| The ID of personal account that initiated the workflow run. | | `base_ref`| The target branch of the pull request in a workflow run. | +{%- ifversion actions-OIDC-custom-claim-enterprise %} +| `enterprise`| The name of the enterprise that contains the repository from where the workflow is running. | +{%- endif %} | `environment`| The name of the environment used by the job. | | `event_name`| The name of the event that triggered the workflow run. | | `head_ref`| The source branch of the pull request in a workflow run. | @@ -138,6 +143,9 @@ The token also includes custom claims provided by {% data variables.product.prod | `run_id`| The ID of the workflow run that triggered the workflow. | | `run_number`| The number of times this workflow has been run. | | `run_attempt`| The number of times this workflow run has been retried. | +{%- ifversion actions-OIDC-custom-claim-runner-environment %} +| `runner_environment`| The type of runner used by the job. Accepts the following values: `github-hosted` or `self-hosted`. | +{%- endif %} | `workflow`| The name of the workflow. | {%- ifversion actions-oidc-custom-claims %} | `workflow_ref`| {% data reusables.actions.workflow-ref-description %} | diff --git a/content/apps/creating-github-apps/creating-github-apps/making-a-github-app-public-or-private.md b/content/apps/creating-github-apps/creating-github-apps/making-a-github-app-public-or-private.md index f5c1ebd12d..32c2383f46 100644 --- a/content/apps/creating-github-apps/creating-github-apps/making-a-github-app-public-or-private.md +++ b/content/apps/creating-github-apps/creating-github-apps/making-a-github-app-public-or-private.md @@ -1,6 +1,6 @@ --- title: Making a GitHub App public or private -intro: '{% data reusables.shortdesc.making-a-github-app-public-or-private %}' +intro: 'When setting up a {% data variables.product.prodname_github_app %}, you can make it public so that other GitHub users or organizations can install the app, or private so that you can only install it on the account that owns the app.' redirect_from: - /apps/building-integrations/setting-up-and-registering-github-apps/about-installation-options-for-github-apps - /apps/building-github-apps/installation-options-for-github-apps @@ -18,24 +18,29 @@ topics: - GitHub Apps shortTitle: Manage app visibility --- -For authentication information, see "[AUTOTITLE](/apps/creating-github-apps/authenticating-with-a-github-app/about-authentication-with-a-github-app)." -## Public installation flow +## About visibility for {% data variables.product.prodname_github_app %}s -Public installation flows have a landing page to enable other people besides the app owner to install the app in their repositories. This link is provided in the "Public link" field when setting up your GitHub App. For more information, see "[AUTOTITLE](/apps/maintaining-github-apps/installing-github-apps)." +You can make your {% data variables.product.prodname_github_app %} public or private. {% ifversion fpt %}If you set your {% data variables.product.prodname_github_app %} to public, any user on {% data variables.product.prodname_dotcom_the_website %} or {% data variables.product.prodname_ghe_cloud %} can install it. If you set your {% data variables.product.prodname_github_app %} to private, it can only be installed on the account that owns the app. -## Private installation flow +{% elsif ghes %}If you set your {% data variables.product.prodname_github_app %} to public, anyone on your {% data variables.product.prodname_ghe_server %} instance can install it, but the app is not available outside of your instance. If you set your {% data variables.product.prodname_github_app %} to private, it can only be installed on the account that owns the app. -Private installation flows allow only the owner of a GitHub App to install it. Limited information about the GitHub App will still exist on a public page, but the **Install** button will only be available to organization administrators or the personal account if the GitHub App is owned by an individual account. Private GitHub Apps can only be installed on the user or organization account of the owner. +{% elsif ghec %}If you set your {% data variables.product.prodname_github_app %} to public, and the {% data variables.product.prodname_github_app %} is owned by an {% data variables.product.prodname_emu %} account, accounts owned by your enterprise can install it, but the app cannot be installed on accounts outside of your enterprise. If a {% data variables.product.prodname_github_app %} is owned by an account that is not an {% data variables.product.prodname_emu %}, and the app is set to public, any user on {% data variables.product.prodname_dotcom_the_website %} or {% data variables.product.prodname_ghe_cloud %} can install the app. If you set your {% data variables.product.prodname_github_app %} to private, it can only be installed on the account that owns the app.{% endif %} -## Changing who can install your GitHub App +{% ifversion fpt or ghec %}You can create a {% data variables.product.prodname_github_app %} from your individual user account and make it available for organization accounts to install. You do not need an enterprise plan or an organization account to create a {% data variables.product.prodname_github_app %} for organizations even if the organization is owned by an enterprise on {% data variables.product.prodname_ghe_cloud %}.{% endif %} -To change who can install the GitHub App: +If you want to make your app available to {% ifversion ghes %}other {% endif %}{% data variables.product.prodname_ghe_server %} instances, then you need to use an app manifest. The {% data variables.product.prodname_ghe_server %} instance will create the app from the manifest and provide you with the required information. For more information, see "[AUTOTITLE](/developers/apps/building-github-apps/creating-a-github-app-from-a-manifest)." -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.developer_settings %} -{% data reusables.user-settings.github_apps %} -3. Select the GitHub App whose installation option you want to change. -{% data reusables.user-settings.github_apps_advanced %} -5. Depending on the installation option of your GitHub App, click either **Make public** or **Make private**. -6. Depending on the installation option of your GitHub App, click either **Yes, make this GitHub App public** or **Yes, make this GitHub App {% ifversion fpt or ghec %}internal{% else %}private{% endif %}**. +If it is important for {% ifversion ghes %}other {% endif %}{% data variables.product.prodname_ghe_server %} users to be able to use your tool, consider using {% data variables.product.prodname_actions %} instead of a {% data variables.product.prodname_github_app %}. Public actions are available on {% data variables.product.prodname_ghe_server %} instances with GitHub Connect. For more information, see "[AUTOTITLE](/github-ae@latest/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect)" and "[AUTOTITLE](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises)." + +For information about changing the visibility of an existing {% data variables.product.prodname_github_app %}, see "[AUTOTITLE](/apps/maintaining-github-apps/modifying-a-github-app)." + +### Public installation flow + +Public {% data variables.product.prodname_github_apps %} have a landing page with an **Install** button, so that other people can install the app in their repositories. If you don't want to use the default landing page, you can modify the "Public link" field on the settings page for your {% data variables.product.prodname_github_app %}. For more information, see "[AUTOTITLE](/apps/maintaining-github-apps/modifying-a-github-app)." + +{% ifversion fpt or ghec %}If your {% data variables.product.prodname_github_app %} is public to all users on {% data variables.product.prodname_dotcom_the_website %}, you can also choose to publish it to {% data variables.product.prodname_marketplace %}. For more information, see "[AUTOTITLE](/apps/publishing-apps-to-github-marketplace/github-marketplace-overview/about-github-marketplace)."{% endif %} + +### Private installation flow + +Private {% data variables.product.prodname_github_apps %} can only be installed on the user or organization account of the app owner. Limited information about the app will exist on a landing page for the app, but the **Install** button will only be available to organization owners and app managers for the organization that owns the app, or the personal account if the {% data variables.product.prodname_github_app %} is owned by an individual account. \ No newline at end of file diff --git a/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md b/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md index 5e1b3659a6..bd3b373c76 100644 --- a/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md +++ b/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md @@ -37,7 +37,7 @@ Because you have not enabled overages, your next attempt to create a workflow ar Anyone can manage the spending limit for {% data variables.product.prodname_actions %} for their own personal account. {% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} +{% data reusables.user-settings.billing_plans_spending %} {% data reusables.dotcom_billing.manage-spending-limit %} {% data reusables.dotcom_billing.monthly-spending-limit %} {% data reusables.dotcom_billing.update-spending-limit %} diff --git a/content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md b/content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md index 51172012fc..f1f4b76d7f 100644 --- a/content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md +++ b/content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md @@ -50,7 +50,10 @@ Enterprise owners and billing managers can view {% data variables.product.prodna {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} -1. Under "Actions", view your usage minutes. +1. Under "Actions monthly usage," view your usage minutes. + + You can expand this section to show a breakdown of the usage by runner type. + 1. Under your usage minutes, view details of usage of data transfer by each organization in your enterprise account. {% data reusables.dotcom_billing.actions-packages-storage-enterprise-account %} {% data reusables.enterprise-accounts.actions-packages-report-download-enterprise-accounts %} diff --git a/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md b/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md index 3001631ce4..0dd4bc6b08 100644 --- a/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md +++ b/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md @@ -36,7 +36,7 @@ If you purchased {% data variables.product.prodname_enterprise %} through a Micr You can set a spending limit for {% data variables.product.prodname_github_codespaces %} for your own personal account. {% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} +{% data reusables.user-settings.billing_plans_spending %} {% data reusables.dotcom_billing.manage-spending-limit %} {% data reusables.codespaces.monthly-spending-limit-codespaces %} {% data reusables.dotcom_billing.update-spending-limit %} diff --git a/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md b/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md index f2d21a4ad4..9d448d579e 100644 --- a/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md +++ b/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md @@ -25,15 +25,26 @@ You can set up a {% data variables.product.prodname_copilot_for_business %} subs Before you can start using {% data variables.product.prodname_copilot_business_short %} in your enterprise, you will need to set up a subscription. +### Customers under a Microsoft Enterprise Agreement + +{% data reusables.copilot.signup-procedure-enterprise-msft-ea %} + +### Customers under a direct GitHub contract + {% data reusables.copilot.signup-procedure-enterprise %} {% endif %} + +{% ifversion fpt %} + ## Setting up a {% data variables.product.prodname_copilot_business_short %} subscription for your organization Before you can start using {% data variables.product.prodname_copilot %} in your organization account, you will need to set up a subscription. {% data reusables.copilot.signup-procedure-org %} +{% endif %} + ## Modifying your {% data variables.product.prodname_copilot_business_short %} subscription {% ifversion ghec %} diff --git a/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md b/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md index c0844cc1c6..56541592fa 100644 --- a/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md +++ b/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md @@ -1,6 +1,6 @@ --- title: Connecting an Azure subscription to your enterprise -intro: 'You can use your Microsoft Enterprise Agreement to enable and pay for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, and {% data variables.product.prodname_github_codespaces %} usage.' +intro: 'You can use your Microsoft Enterprise Agreement to enable and pay for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, {% data variables.product.prodname_github_codespaces %} usage and {% data variables.product.prodname_copilot_business_short %}.' redirect_from: - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/connecting-an-azure-subscription-to-your-enterprise - /github/setting-up-and-managing-billing-and-payments-on-github/connecting-an-azure-subscription-to-your-enterprise @@ -11,11 +11,11 @@ shortTitle: Connect an Azure subscription --- ## About Azure subscriptions and {% data variables.product.product_name %} -{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions) and "[AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages)." +{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)," "[AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages)," and "[AUTOTITLE](/billing/managing-billing-for-github-copilot)." {% note %} -**Note:** If your enterprise account is on a Microsoft Enterprise Agreement, connecting an Azure subscription is the only way to use {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} beyond the included amounts, or to use {% data variables.product.prodname_github_codespaces %} at all. +**Note:** If your enterprise account is on a Microsoft Enterprise Agreement, connecting an Azure subscription is the only way to use {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} beyond the included amounts, or to use {% data variables.product.prodname_github_codespaces %} and {% data variables.product.prodname_copilot_business_short %} at all. {% endnote %} @@ -36,7 +36,7 @@ To connect your Azure subscription, you must have owner permissions to the subsc 1. Under "Payment Information", click **Add Azure Subscription**. 1. To sign in to your Microsoft account, follow the prompts. 1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**. -1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your enterprise. +1. Under "Select a subscription", select the Azure subscription ID that you want to connect to your enterprise. {% note %} diff --git a/content/billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india.md b/content/billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india.md index 62d875923d..1b2d3ec1e8 100644 --- a/content/billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india.md +++ b/content/billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india.md @@ -58,7 +58,7 @@ Existing sponsorships will remain in place during this period and maintainers wi {% endnote %} {% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} +{% data reusables.user-settings.billing_plans_payment %} 1. At the top of the page, click **Pay now**. 1. Review your billing and payment information. 1. Optionally, if you need to make an edit, click **Edit** next to the relevant section. diff --git a/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md b/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md index bf522afa35..020a334f54 100644 --- a/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md +++ b/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md @@ -34,8 +34,7 @@ Your receipts include your {% data variables.product.prodname_dotcom %} subscrip ## Adding information to your personal account's receipts {% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} -{% data reusables.user-settings.payment-info-link %} +{% data reusables.user-settings.billing_plans_payment %} 1. At the bottom of the page, next to "Additional information," click **Add information**. ![Screenshot of the "Additional information" section. A link, labeled "Add information", is highlighted with an orange outline.](/assets/images/help/billing/settings_billing_personal_add_extra.png) diff --git a/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md b/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md index cc3277885f..c6184a8eb3 100644 --- a/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md +++ b/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md @@ -23,7 +23,7 @@ shortTitle: View history & receipts ## Viewing receipts for your personal account {% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} +{% data reusables.user-settings.billing_plans_payment %} {% data reusables.dotcom_billing.view-payment-history %} {% data reusables.dotcom_billing.download_receipt %} diff --git a/content/code-security/codeql-cli/using-the-codeql-cli/creating-codeql-databases.md b/content/code-security/codeql-cli/using-the-codeql-cli/creating-codeql-databases.md index 94f77e619e..f9d3f6335c 100644 --- a/content/code-security/codeql-cli/using-the-codeql-cli/creating-codeql-databases.md +++ b/content/code-security/codeql-cli/using-the-codeql-cli/creating-codeql-databases.md @@ -170,7 +170,7 @@ The following examples are designed to give you an idea of some of the build com - C/C++ project built using `make`: ``` - {% data variables.product.prodname_codeql %} database create cpp-database --language=cpp --command=make + codeql database create cpp-database --language=cpp --command=make ``` - C# project built using `dotnet build`: @@ -178,37 +178,38 @@ The following examples are designed to give you an idea of some of the build com It is a good idea to add `/t:rebuild` to ensure that all code will be built, or do a prior `dotnet clean` (code that is not built will not be included in the {% data variables.product.prodname_codeql %} database): ``` - {% data variables.product.prodname_codeql %} database create csharp-database --language=csharp --command='dotnet build /t:rebuild' + codeql database create csharp-database --language=csharp --command='dotnet build /t:rebuild' ``` - Go project built using the `CODEQL_EXTRACTOR_GO_BUILD_TRACING=on` environment variable: ``` - CODEQL_EXTRACTOR_GO_BUILD_TRACING=on {% data variables.product.prodname_codeql %} database create go-database --language=go + CODEQL_EXTRACTOR_GO_BUILD_TRACING=on codeql database create go-database --language=go ``` - Go project built using a custom build script: ``` - {% data variables.product.prodname_codeql %} database create go-database --language=go --command='./scripts/build.sh' + codeql database create go-database --language=go --command='./scripts/build.sh' ``` - Java project built using Gradle: ``` - # Use `--no-daemon` because a build delegated to an existing daemon cannot be detected by CodeQL: {% data variables.product.prodname_codeql %} database create java-database --language=java --command='gradle --no-daemon clean test' + # Use `--no-daemon` because a build delegated to an existing daemon cannot be detected by CodeQL: + codeql database create java-database --language=java --command='gradle --no-daemon clean test' ``` - Java project built using Maven: ``` - {% data variables.product.prodname_codeql %} database create java-database --language=java --command='mvn clean install' + codeql database create java-database --language=java --command='mvn clean install' ``` - Java project built using Ant: ``` - {% data variables.product.prodname_codeql %} database create java-database --language=java --command='ant -f build.xml' + codeql database create java-database --language=java --command='ant -f build.xml' ``` - Project built using Bazel: @@ -224,7 +225,7 @@ The following examples are designed to give you an idea of some of the build com # `--spawn_strategy=local`: build locally, instead of using a distributed build # `--nouse_action_cache`: turn off build caching, which might prevent recompilation of source code # `--noremote_accept_cached`, `--noremote_upload_local_results`: avoid using a remote cache - {% data variables.product.prodname_codeql %} database create new-database --language= \ + codeql database create new-database --language= \ --command='bazel build --spawn_strategy=local --nouse_action_cache --noremote_accept_cached --noremote_upload_local_results //path/to/package:target' # After building, stop all running Bazel server processes. @@ -236,7 +237,7 @@ The following examples are designed to give you an idea of some of the build com - Project built using a custom build script: ``` - {% data variables.product.prodname_codeql %} database create new-database --language= --command='./scripts/build.sh' + codeql database create new-database --language= --command='./scripts/build.sh' ``` This command runs a custom script that contains all of the commands required to build the project. diff --git a/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md b/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md index 92f6a1c536..51889512ab 100644 --- a/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md +++ b/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md @@ -376,8 +376,6 @@ updates: Package managers with the `package-ecosystem` values `bundler`, `mix`, and `pip` may execute external code in the manifest as part of the version update process. This might allow a compromised package to steal credentials or gain access to configured registries. When you add a [`registries`](#registries) setting within an `updates` configuration, {% data variables.product.prodname_dependabot %} automatically prevents external code execution, in which case the version update may fail. You can choose to override this behavior and allow external code execution for `bundler`, `mix`, and `pip` package managers by setting `insecure-external-code-execution` to `allow`. -You can explicitly deny external code execution, irrespective of whether there is a `registries` setting for this update configuration, by setting `insecure-external-code-execution` to `deny`. - {% raw %} ```yaml # Allow external code execution when updating dependencies from private registries @@ -398,6 +396,40 @@ updates: ``` {% endraw %} +If you define a `registries` setting to allow {% data variables.product.prodname_dependabot %} to access a private package registry, and you set `insecure-external-code-execution` to `allow` in the same `updates` configuration, external code execution that occurs will only have access to the package managers in the registries associated with that `updates`setting. There is no access allowed to any of the registries defined in the top level `registries` configuration. + +In this example, the configuration file allows {% data variables.product.prodname_dependabot %} to access the `ruby-github` private package registry. In the same `updates`setting, `insecure-external-code-execution`is set to `allow`, which means that the code executed by dependencies will only access the `ruby-github` registry, and not the `dockerhub` registry. + +{% raw %} +```yaml +# Using `registries` in conjunction with `insecure-external-code-execution:allow` +# in the same `updates` setting + +version: 2 +registries: + ruby-github: + type: rubygems-server + url: https://rubygems.pkg.github.com/octocat/github_api + token: ${{secrets.MY_GITHUB_PERSONAL_TOKEN}} + dockerhub: + type: docker-registry + url: registry.hub.docker.com + username: octocat + password: ${{secrets.DOCKERHUB_PASSWORD}} +updates: + - package-ecosystem: "bundler" + directory: "/rubygems-server" + insecure-external-code-execution: allow + registries: + - ruby-github # only access to registries associated with this ecosystem/directory + schedule: + interval: "monthly" + +``` +{% endraw %} + +You can explicitly deny external code execution, regardless of whether there is a `registries` setting for this update configuration, by setting `insecure-external-code-execution` to `deny`. + ### `labels` {% data reusables.dependabot.default-labels %} diff --git a/content/code-security/security-overview/filtering-alerts-in-security-overview.md b/content/code-security/security-overview/filtering-alerts-in-security-overview.md index 7f19e2c90b..9062f1c53c 100644 --- a/content/code-security/security-overview/filtering-alerts-in-security-overview.md +++ b/content/code-security/security-overview/filtering-alerts-in-security-overview.md @@ -107,10 +107,9 @@ These qualifiers are available in the enterprise-level view. | `secret-scanning:NUMBER` | Display repositories that have NUMBER {% data variables.secret-scanning.alerts %}. This qualifier can use `=`, `>` and `<` comparison operators. | | `dependabot:NUMBER` | Display repositories that have NUMBER {% data variables.product.prodname_dependabot_alerts %}. This qualifier can use `=`, `>` and `<` comparison operators. | - ## Filter by team -These qualifiers are available in the main summary views. +These qualifiers are available in the main summary views{% ifversion security-overview-acv-filters %} and the alert-centric views for {% data variables.product.prodname_dependabot %}, {% data variables.product.prodname_code_scanning %}, and {% data variables.product.prodname_secret_scanning %}{% endif %}. | Qualifier | Description | | -------- | -------- | @@ -118,11 +117,11 @@ These qualifiers are available in the main summary views. ## Filter by topic -These qualifiers are available in the main summary views. +These qualifiers are available in the main summary views{% ifversion security-overview-acv-filters %} and the alert-centric views for {% data variables.product.prodname_dependabot %}, {% data variables.product.prodname_code_scanning %}, and {% data variables.product.prodname_secret_scanning %}{% endif %}. | Qualifier | Description | | -------- | -------- | -| `topic:TOPIC-NAME` | Displays repositories that are classified with TOPIC-NAME. | +| `topic:TOPIC-NAME` | Displays repositories that are classified with TOPIC-NAME. For more information on repository topics, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics)." | {% ifversion security-overview-alert-views %} diff --git a/content/copilot/quickstart.md b/content/copilot/quickstart.md index 2d93c3f2bc..8a1d1f6b97 100644 --- a/content/copilot/quickstart.md +++ b/content/copilot/quickstart.md @@ -29,19 +29,42 @@ Before you can start using {% data variables.product.prodname_copilot %}, you wi **Note:** As a member of an organization owned by a {% data variables.product.prodname_ghe_cloud %} account with a {% data variables.product.prodname_copilot %} subscription, you must be assigned a {% data variables.product.prodname_copilot %} seat by your organization before you can use {% data variables.product.prodname_copilot %}. {% endnote %} -## Signing up for {% data variables.product.prodname_copilot %} for your organization{% ifversion ghec %} or enterprise{% endif %} account +{% ifversion fpt %} -{% ifversion ghec%} -### Signing up for {% data variables.product.prodname_copilot %} for your enterprise account +## Signing up for {% data variables.product.prodname_copilot %} for your organization account -{% data reusables.copilot.signup-procedure-enterprise %} - -### Signing up for {% data variables.product.prodname_copilot %} for your organization account -{% endif %} Before you can start using {% data variables.product.prodname_copilot %} in your organization account, you will need to set up a subscription. {% data reusables.copilot.signup-procedure-org %} +{% endif %} + +{% ifversion ghec %} + +## Signing up for {% data variables.product.prodname_copilot %} for your enterprise account + +{% note %} + +**Note:** If you already have a payment method set up for your enterprise account and are billed by {% data variables.product.prodname_dotcom %}, you can skip this section. + +{% endnote %} + +### Customers under a Microsoft Enterprise Agreement + +{% data reusables.copilot.signup-procedure-enterprise-msft-ea %} + +### Customers under a direct GitHub contract + +{% data reusables.copilot.signup-procedure-enterprise %} + +## Enabling {% data variables.product.prodname_copilot %} for your enterprise account + +{% data reusables.copilot.enabling-in-enterprise %} + +For more information, see "[AUTOTITLE](/copilot/overview-of-github-copilot/enabling-and-setting-up-github-copilot-for-business)." + +{% endif %} + ## Installing the {% data variables.product.prodname_copilot %} extension for {% data variables.product.prodname_vscode %} @@ -77,7 +100,6 @@ You successfully installed {% data variables.product.prodname_copilot %} and rec - [{% data variables.product.prodname_copilot %}](https://copilot.github.com/): See practical examples of how {% data variables.product.prodname_copilot %} can help you work. - [Configuring {% data variables.product.prodname_copilot %}](/copilot/configuring-github-copilot): These guides provide details on how to configure {% data variables.product.prodname_copilot %} to your personal preferences. - ## Further reading - [AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-individuals) diff --git a/content/migrations/overview/planning-your-migration-to-github.md b/content/migrations/overview/planning-your-migration-to-github.md index 2d2a0479c6..47b0e4aa70 100644 --- a/content/migrations/overview/planning-your-migration-to-github.md +++ b/content/migrations/overview/planning-your-migration-to-github.md @@ -156,13 +156,13 @@ For some migration paths, we offer specialist tools that allow you to migrate so Bitbucket Server -
  • bbs-exporter (expert-led migrations only)
  • {% data variables.product.prodname_importer_proper_name %} (private beta)
- `bbs-exporter` (expert-led migrations only) +
  • bbs-exporter (expert-led migrations only)
  • {% data variables.product.prodname_importer_proper_name %} (private beta)
+ bbs-exporter (expert-led migrations only) GitLab (self-managed or SaaS) - gl-exporter (expert-led migrations only) - gl-exporter (expert-led migrations only) + gl-exporter (expert-led migrations only) + gl-exporter (expert-led migrations only) {% data variables.product.prodname_dotcom_the_website %}, including {% data variables.product.prodname_ghe_cloud %} diff --git a/data/features/actions-OIDC-custom-claim-enterprise.yml b/data/features/actions-OIDC-custom-claim-enterprise.yml new file mode 100644 index 0000000000..ab44ede4d6 --- /dev/null +++ b/data/features/actions-OIDC-custom-claim-enterprise.yml @@ -0,0 +1,5 @@ +# Reference: #9725 +# Adding new OIDC claim - enterprise +versions: + ghec: '*' + ghes: '>=3.8' diff --git a/data/features/actions-OIDC-custom-claim-runner-environment.yml b/data/features/actions-OIDC-custom-claim-runner-environment.yml new file mode 100644 index 0000000000..513ae1e370 --- /dev/null +++ b/data/features/actions-OIDC-custom-claim-runner-environment.yml @@ -0,0 +1,6 @@ +# Reference: #9725 +# Adding new OIDC claim - runner environment +versions: + fpt: '*' + ghec: '*' + ghes: '>=3.9' diff --git a/data/features/security-overview-acv-filters.yml b/data/features/security-overview-acv-filters.yml new file mode 100644 index 0000000000..f0bdd7eaeb --- /dev/null +++ b/data/features/security-overview-acv-filters.yml @@ -0,0 +1,6 @@ +# Reference: #9214 +# Documentation for the addition of repo topic and team filters to the alert-centric views (Dependabot, code scanning, and secret scanning) of the security overview +versions: + ghes: '>3.8' + ghae: '>3.8' + ghec: '*' diff --git a/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml b/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml index e1677460a7..f16f51076b 100644 --- a/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml +++ b/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml @@ -172,6 +172,12 @@ upcoming_changes: date: '2023-04-01T00:00:00+00:00' criticality: breaking owner: jamestran201 + - location: Commit.pushedDate + description: '`pushedDate` will be removed.' + reason: '`pushedDate` is no longer supported.' + date: '2023-07-01T00:00:00+00:00' + criticality: breaking + owner: darthwillis - location: MergeQueue.headOid description: '`headOid` will be removed. Use `entry.headOid` instead.' reason: '`headOid` will be removed.' diff --git a/data/graphql/ghae/schema.docs-ghae.graphql b/data/graphql/ghae/schema.docs-ghae.graphql index ca1d254986..77b8905678 100644 --- a/data/graphql/ghae/schema.docs-ghae.graphql +++ b/data/graphql/ghae/schema.docs-ghae.graphql @@ -4229,7 +4229,7 @@ type Commit implements GitObject & Node & Subscribable & UniformResourceLocatabl """ The datetime when this commit was pushed. """ - pushedDate: DateTime + pushedDate: DateTime @deprecated(reason: "`pushedDate` is no longer supported. Removal on 2023-07-01 UTC.") """ The Repository this commit belongs to @@ -8932,6 +8932,11 @@ enum DeploymentState { """ QUEUED + """ + The deployment was successful. + """ + SUCCESS + """ The deployment is waiting. """ @@ -36363,7 +36368,7 @@ input RequestReviewsInput { """ Add users to the set rather than replace. """ - union: Boolean + union: Boolean = false """ The Node IDs of the user to request. diff --git a/data/graphql/ghec/graphql_upcoming_changes.public.yml b/data/graphql/ghec/graphql_upcoming_changes.public.yml index b1289039cf..f9b8efb3e4 100644 --- a/data/graphql/ghec/graphql_upcoming_changes.public.yml +++ b/data/graphql/ghec/graphql_upcoming_changes.public.yml @@ -192,6 +192,12 @@ upcoming_changes: date: '2023-04-01T00:00:00+00:00' criticality: breaking owner: jamestran201 + - location: Commit.pushedDate + description: '`pushedDate` will be removed.' + reason: '`pushedDate` is no longer supported.' + date: '2023-07-01T00:00:00+00:00' + criticality: breaking + owner: darthwillis - location: MergeQueue.headOid description: '`headOid` will be removed. Use `entry.headOid` instead.' reason: '`headOid` will be removed.' diff --git a/data/graphql/ghec/schema.docs.graphql b/data/graphql/ghec/schema.docs.graphql index 9310717796..f92e272c5e 100644 --- a/data/graphql/ghec/schema.docs.graphql +++ b/data/graphql/ghec/schema.docs.graphql @@ -4622,7 +4622,7 @@ type Commit implements GitObject & Node & Subscribable & UniformResourceLocatabl """ The datetime when this commit was pushed. """ - pushedDate: DateTime + pushedDate: DateTime @deprecated(reason: "`pushedDate` is no longer supported. Removal on 2023-07-01 UTC.") """ The Repository this commit belongs to @@ -9982,6 +9982,11 @@ enum DeploymentState { """ QUEUED + """ + The deployment was successful. + """ + SUCCESS + """ The deployment is waiting. """ @@ -43299,7 +43304,7 @@ input RequestReviewsInput { """ Add users to the set rather than replace. """ - union: Boolean + union: Boolean = false """ The Node IDs of the user to request. diff --git a/data/graphql/graphql_upcoming_changes.public.yml b/data/graphql/graphql_upcoming_changes.public.yml index b1289039cf..f9b8efb3e4 100644 --- a/data/graphql/graphql_upcoming_changes.public.yml +++ b/data/graphql/graphql_upcoming_changes.public.yml @@ -192,6 +192,12 @@ upcoming_changes: date: '2023-04-01T00:00:00+00:00' criticality: breaking owner: jamestran201 + - location: Commit.pushedDate + description: '`pushedDate` will be removed.' + reason: '`pushedDate` is no longer supported.' + date: '2023-07-01T00:00:00+00:00' + criticality: breaking + owner: darthwillis - location: MergeQueue.headOid description: '`headOid` will be removed. Use `entry.headOid` instead.' reason: '`headOid` will be removed.' diff --git a/data/graphql/schema.docs.graphql b/data/graphql/schema.docs.graphql index 9310717796..f92e272c5e 100644 --- a/data/graphql/schema.docs.graphql +++ b/data/graphql/schema.docs.graphql @@ -4622,7 +4622,7 @@ type Commit implements GitObject & Node & Subscribable & UniformResourceLocatabl """ The datetime when this commit was pushed. """ - pushedDate: DateTime + pushedDate: DateTime @deprecated(reason: "`pushedDate` is no longer supported. Removal on 2023-07-01 UTC.") """ The Repository this commit belongs to @@ -9982,6 +9982,11 @@ enum DeploymentState { """ QUEUED + """ + The deployment was successful. + """ + SUCCESS + """ The deployment is waiting. """ @@ -43299,7 +43304,7 @@ input RequestReviewsInput { """ Add users to the set rather than replace. """ - union: Boolean + union: Boolean = false """ The Node IDs of the user to request. diff --git a/data/reusables/copilot/enabling-in-enterprise.md b/data/reusables/copilot/enabling-in-enterprise.md new file mode 100644 index 0000000000..beff751e5b --- /dev/null +++ b/data/reusables/copilot/enabling-in-enterprise.md @@ -0,0 +1,11 @@ +{% data reusables.enterprise-accounts.policies-tab %} +{% data reusables.enterprise-accounts.copilot-tab %} +1. Under "Suggestions matching public code," click the dropdown menu and select the policy for managing the use of {% data variables.product.prodname_copilot %} suggestions that match public code in your enterprise. You can change the policy later by returning to your {% data variables.product.prodname_copilot_for_business %} settings. + - To allow {% data variables.product.prodname_copilot %} suggestions matching public code, select **Allowed**. + - To block {% data variables.product.prodname_copilot %} suggestions matching public code, select **Blocked**. + - To allow each of your organizations to set their own policy on the use of {% data variables.product.prodname_copilot %} suggestions matching public code, select **No policy (let each organization decide)**. +1. Under "Manage organization access to {% data variables.product.prodname_copilot %}," configure the access for your {% data variables.product.prodname_copilot %} subscription. + - To enable {% data variables.product.prodname_copilot %} for all organizations in your enterprise, both current and future, select **Allow for all organizations**. + - To enable {% data variables.product.prodname_copilot %} for specific organizations, select **Allow for specific organizations**. +1. If you selected **Allow for specific organizations**, select the organizations you want to enable {% data variables.product.prodname_copilot %} for. Alternatively, you can select the organizations you want to disable {% data variables.product.prodname_copilot %} access for. +1. To finish setting up your {% data variables.product.prodname_copilot_for_business %} subscription, click **Save**. Organization administrators will receive an email with instructions on how to add members to {% data variables.product.prodname_copilot %}. diff --git a/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md b/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md new file mode 100644 index 0000000000..f1632e7828 --- /dev/null +++ b/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md @@ -0,0 +1 @@ +As a customer under a Microsoft Enterprise Agreement, you need to connect your Azure subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_copilot %}, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise)." diff --git a/data/reusables/copilot/signup-procedure-enterprise.md b/data/reusables/copilot/signup-procedure-enterprise.md index 60967ce8ef..ad6c652f42 100644 --- a/data/reusables/copilot/signup-procedure-enterprise.md +++ b/data/reusables/copilot/signup-procedure-enterprise.md @@ -4,14 +4,3 @@ 4. Follow the steps to confirm your payment details, then click **Save**. If you don't have a payment method on file, you'll be prompted to add one. - -5. Click the dropdown menu and select the policy for managing the use of {% data variables.product.prodname_copilot %} suggestions that match public code in your enterprise. You can change the policy later by returning to your {% data variables.product.prodname_copilot_for_business %} settings. - - To allow {% data variables.product.prodname_copilot %} suggestions matching public code, select **Allowed**. - - To block {% data variables.product.prodname_copilot %} suggestions matching public code, select **Blocked**. - - To allow each of your organizations to set their own policy on the use of {% data variables.product.prodname_copilot %} suggestions matching public code, select **No policy (let each organization decide)**. -6. Configure the access for your {% data variables.product.prodname_copilot %} subscription. - - To enable {% data variables.product.prodname_copilot %} for all organizations in your enterprise, both current and future, select **Enable for all organizations**. - - To enable {% data variables.product.prodname_copilot %} for specific organizations, select **Enable for specific organizations**. -7. If you selected **Enable for specific organizations**, select the organizations you want to enable {% data variables.product.prodname_copilot %} for. Alternatively, you can select the organizations you want to disable {% data variables.product.prodname_copilot %} access for. - - Click **Set organization permissions** and select **Enable** or **Disable** to grant or deny {% data variables.product.prodname_copilot %} access for the specified organizations. -8. To finish setting up your {% data variables.product.prodname_copilot_for_business %} subscription, click **Save and finish**. Organization administrators will receive an email with instructions on how to add members to {% data variables.product.prodname_copilot %}. \ No newline at end of file diff --git a/data/reusables/dotcom_billing/actions-minutes.md b/data/reusables/dotcom_billing/actions-minutes.md index da7d30dc58..bafee292f7 100644 --- a/data/reusables/dotcom_billing/actions-minutes.md +++ b/data/reusables/dotcom_billing/actions-minutes.md @@ -1 +1,3 @@ -1. Under "Usage this month", under "Actions", view details of your minutes used. +1. Under "Usage this month", in the "Actions" section, view details of your minutes used. + + You can expand this section to show a breakdown of your usage by runner type. diff --git a/data/reusables/dotcom_billing/change_plan_duration.md b/data/reusables/dotcom_billing/change_plan_duration.md index c208119719..c49e1faee2 100644 --- a/data/reusables/dotcom_billing/change_plan_duration.md +++ b/data/reusables/dotcom_billing/change_plan_duration.md @@ -1,2 +1 @@ -1. Under "Current monthly bill" or "Current yearly bill", click **Switch to yearly billing** or **Switch to monthly billing**. -![Screenshot of a billing summary. Under "Current monthly bill: $0", a link, labeled "Switch to yearly billing", is highlighted with an orange outline.](/assets/images/help/billing/change-plan-duration-link.png) +1. Under "Billing summary," click **Switch to yearly billing** or **Switch to monthly billing**. diff --git a/data/reusables/dotcom_billing/confirm_duration_change.md b/data/reusables/dotcom_billing/confirm_duration_change.md index cd7cfadb3f..22a3b6e939 100644 --- a/data/reusables/dotcom_billing/confirm_duration_change.md +++ b/data/reusables/dotcom_billing/confirm_duration_change.md @@ -1 +1 @@ -1. Review your new payment details, then click **Change plan duration**. +1. Review your new payment details, then click **Change your account's billing cycle**. diff --git a/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md b/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md index aa68b51f58..135951db1a 100644 --- a/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md +++ b/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md @@ -1 +1 @@ -If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for any {% data variables.product.prodname_github_codespaces %} usage, and for {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} usage beyond the amounts included with your account. +If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure subscription ID to your enterprise account to enable and pay for any {% data variables.product.prodname_github_codespaces %} usage, for {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} usage beyond the amounts included with your account, and {% data variables.product.prodname_copilot_business_short %}. diff --git a/data/reusables/marketplace/cancel-app-billing-settings.md b/data/reusables/marketplace/cancel-app-billing-settings.md index 24cb17805f..4025c8ed35 100644 --- a/data/reusables/marketplace/cancel-app-billing-settings.md +++ b/data/reusables/marketplace/cancel-app-billing-settings.md @@ -1 +1 @@ -1. Next to the app you want to cancel, select the **Edit** {% octicon "triangle-down" aria-hidden="true" %} dropdown menu, then click **Cancel plan**. +1. Under "{% data variables.product.prodname_marketplace %}," next to the app you want to cancel, select the **Edit** {% octicon "triangle-down" aria-hidden="true" %} dropdown menu, then click **Cancel plan**. diff --git a/data/reusables/marketplace/cancel-free-trial-billing-settings.md b/data/reusables/marketplace/cancel-free-trial-billing-settings.md index b9901ac4a8..cd66737e3f 100644 --- a/data/reusables/marketplace/cancel-free-trial-billing-settings.md +++ b/data/reusables/marketplace/cancel-free-trial-billing-settings.md @@ -1 +1 @@ -1. Next to the free trial you'd like to cancel, use the **Edit** drop-down and click **Cancel plan**. +1. Under "{% data variables.product.prodname_marketplace %}," next to the free trial you'd like to cancel, use the **Edit** drop-down and click **Cancel plan**. diff --git a/data/reusables/marketplace/downgrade-app-billing-settings.md b/data/reusables/marketplace/downgrade-app-billing-settings.md index c7950566af..201a62ff13 100644 --- a/data/reusables/marketplace/downgrade-app-billing-settings.md +++ b/data/reusables/marketplace/downgrade-app-billing-settings.md @@ -1 +1 @@ -1. Next to the app you'd like to downgrade, select the **Edit** {% octicon "triangle-down" aria-hidden="true" %} dropdown menu, then click **Change plan** or **Cancel plan**. +1. Under "{% data variables.product.prodname_marketplace %}," next to the app you'd like to downgrade, select the **Edit** {% octicon "triangle-down" aria-hidden="true" %} dropdown menu, then click **Change plan** or **Cancel plan**. diff --git a/data/reusables/marketplace/upgrade-app-billing-settings.md b/data/reusables/marketplace/upgrade-app-billing-settings.md index e056f59f04..53ba21548d 100644 --- a/data/reusables/marketplace/upgrade-app-billing-settings.md +++ b/data/reusables/marketplace/upgrade-app-billing-settings.md @@ -1 +1 @@ -1. Next to the app you want to upgrade, select the **Edit** {% octicon "triangle-down" aria-hidden="true" %} dropdown menu, then click **Change plan**. +1. Under "{% data variables.product.prodname_marketplace %}," next to the app you want to upgrade, select the **Edit** {% octicon "triangle-down" aria-hidden="true" %} dropdown menu, then click **Change plan**. diff --git a/data/reusables/security-overview/permissions.md b/data/reusables/security-overview/permissions.md index 616a0bdd14..083a4325f9 100644 --- a/data/reusables/security-overview/permissions.md +++ b/data/reusables/security-overview/permissions.md @@ -3,7 +3,7 @@ Security overview for an organization is available to all members of the organization. The views and data displayed are determined by your role in the organization, and by your permissions for individual repositories within the organization. {% ifversion security-overview-org-risk-coverage %}For more information, see "[Permission to view data in security overview](/code-security/security-overview/about-security-overview#permission-to-view-data-in-security-overview)."{% endif %} {% ifversion ghec or ghes > 3.4 or ghae %} -Security overview for an enterprise shows organization owners and security managers data for the organizations they have access to. Enterprise owners can only view data for organizations where they are added as an organization owner or security manager. For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise)." +Security overview for an enterprise shows organization owners and security managers data for the organizations they have access to. Enterprise owners can only view data for organizations where they are added as an organization owner or security manager. {% ifversion enterprise-owner-join-org %}For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise)."{% endif %} {% endif %} {% endif %} diff --git a/data/reusables/shortdesc/making-a-github-app-public-or-private.md b/data/reusables/shortdesc/making-a-github-app-public-or-private.md deleted file mode 100644 index b715bb3db7..0000000000 --- a/data/reusables/shortdesc/making-a-github-app-public-or-private.md +++ /dev/null @@ -1 +0,0 @@ -When setting up a GitHub App, you can make its installation public so any GitHub user or organization can install the app, or private so you can only install it on the account that created it. diff --git a/data/reusables/user-settings/billing_plans.md b/data/reusables/user-settings/billing_plans.md index 333102205b..8e2fe9c7d4 100644 --- a/data/reusables/user-settings/billing_plans.md +++ b/data/reusables/user-settings/billing_plans.md @@ -1 +1 @@ -1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="The credit-card icon" %} Billing and plans**. +1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="The credit-card icon" %} Billing and plans**, then click **Plans and usage**. diff --git a/data/reusables/user-settings/billing_plans_payment.md b/data/reusables/user-settings/billing_plans_payment.md new file mode 100644 index 0000000000..8c7f471a0d --- /dev/null +++ b/data/reusables/user-settings/billing_plans_payment.md @@ -0,0 +1 @@ +1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="The credit-card icon" %} Billing and plans**, then click **Payment information**. diff --git a/data/reusables/user-settings/billing_plans_spending.md b/data/reusables/user-settings/billing_plans_spending.md new file mode 100644 index 0000000000..3aea44c19a --- /dev/null +++ b/data/reusables/user-settings/billing_plans_spending.md @@ -0,0 +1 @@ +1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="The credit-card icon" %} Billing and plans**, then click **Spending limits**. diff --git a/data/variables/product.yml b/data/variables/product.yml index 6a9178e039..6c24659d50 100644 --- a/data/variables/product.yml +++ b/data/variables/product.yml @@ -138,6 +138,7 @@ prodname_discussions: 'GitHub Discussions' prodname_emu_idp_application: 'GitHub Enterprise Managed User' prodname_emu_idp_oidc_application: 'GitHub Enterprise Managed User (OIDC)' prodname_emus: 'Enterprise Managed Users' +prodname_emu: 'Enterprise Managed User' # GitHub Issues prodname_github_issues: 'GitHub Issues' diff --git a/src/graphql/data/dotcom/changelog.json b/src/graphql/data/dotcom/changelog.json index 0019828bd8..d21732c94a 100644 --- a/src/graphql/data/dotcom/changelog.json +++ b/src/graphql/data/dotcom/changelog.json @@ -1,4 +1,24 @@ [ + { + "schemaChanges": [ + { + "title": "The GraphQL schema includes these changes:", + "changes": [ + "

Enum value SUCCESS was added to enum DeploymentState

" + ] + } + ], + "previewChanges": [], + "upcomingChanges": [ + { + "title": "The following changes will be made to the schema:", + "changes": [ + "

On member Commit.pushedDate:pushedDate will be removed. Effective 2023-07-01.

" + ] + } + ], + "date": "2023-04-01" + }, { "schemaChanges": [ { diff --git a/src/graphql/data/dotcom/schema.json b/src/graphql/data/dotcom/schema.json index 2cc08d3752..3a4d89ca56 100644 --- a/src/graphql/data/dotcom/schema.json +++ b/src/graphql/data/dotcom/schema.json @@ -12890,7 +12890,9 @@ "type": "DateTime", "id": "datetime", "kind": "scalars", - "href": "/graphql/reference/scalars#datetime" + "href": "/graphql/reference/scalars#datetime", + "isDeprecated": true, + "deprecationReason": "

pushedDate is no longer supported. Removal on 2023-07-01 UTC.

" }, { "name": "repository", @@ -75911,6 +75913,10 @@ "name": "QUEUED", "description": "

The deployment has queued.

" }, + { + "name": "SUCCESS", + "description": "

The deployment was successful.

" + }, { "name": "WAITING", "description": "

The deployment is waiting.

" diff --git a/src/graphql/data/dotcom/upcoming-changes.json b/src/graphql/data/dotcom/upcoming-changes.json index 0977a21e48..f99d7b31cd 100644 --- a/src/graphql/data/dotcom/upcoming-changes.json +++ b/src/graphql/data/dotcom/upcoming-changes.json @@ -169,6 +169,14 @@ "date": "2023-07-01", "criticality": "breaking", "owner": "github/merge_queue" + }, + { + "location": "Commit.pushedDate", + "description": "

pushedDate will be removed.

", + "reason": "

pushedDate is no longer supported.

", + "date": "2023-07-01", + "criticality": "breaking", + "owner": "darthwillis" } ], "2023-04-01": [ diff --git a/src/graphql/data/ghae/schema.json b/src/graphql/data/ghae/schema.json index fbec4c3ed4..59cd423870 100644 --- a/src/graphql/data/ghae/schema.json +++ b/src/graphql/data/ghae/schema.json @@ -10807,7 +10807,9 @@ "type": "DateTime", "id": "datetime", "kind": "scalars", - "href": "/graphql/reference/scalars#datetime" + "href": "/graphql/reference/scalars#datetime", + "isDeprecated": true, + "deprecationReason": "

pushedDate is no longer supported. Removal on 2023-07-01 UTC.

" }, { "name": "repository", @@ -63252,6 +63254,10 @@ "name": "QUEUED", "description": "

The deployment has queued.

" }, + { + "name": "SUCCESS", + "description": "

The deployment was successful.

" + }, { "name": "WAITING", "description": "

The deployment is waiting.

" diff --git a/src/graphql/data/ghae/upcoming-changes.json b/src/graphql/data/ghae/upcoming-changes.json index 22c918923d..001ce54ac0 100644 --- a/src/graphql/data/ghae/upcoming-changes.json +++ b/src/graphql/data/ghae/upcoming-changes.json @@ -169,6 +169,14 @@ "date": "2023-07-01", "criticality": "breaking", "owner": "github/merge_queue" + }, + { + "location": "Commit.pushedDate", + "description": "

pushedDate will be removed.

", + "reason": "

pushedDate is no longer supported.

", + "date": "2023-07-01", + "criticality": "breaking", + "owner": "darthwillis" } ], "2023-04-01": [ diff --git a/src/graphql/data/ghec/schema.json b/src/graphql/data/ghec/schema.json index 2cc08d3752..3a4d89ca56 100644 --- a/src/graphql/data/ghec/schema.json +++ b/src/graphql/data/ghec/schema.json @@ -12890,7 +12890,9 @@ "type": "DateTime", "id": "datetime", "kind": "scalars", - "href": "/graphql/reference/scalars#datetime" + "href": "/graphql/reference/scalars#datetime", + "isDeprecated": true, + "deprecationReason": "

pushedDate is no longer supported. Removal on 2023-07-01 UTC.

" }, { "name": "repository", @@ -75911,6 +75913,10 @@ "name": "QUEUED", "description": "

The deployment has queued.

" }, + { + "name": "SUCCESS", + "description": "

The deployment was successful.

" + }, { "name": "WAITING", "description": "

The deployment is waiting.

" diff --git a/src/graphql/data/ghec/upcoming-changes.json b/src/graphql/data/ghec/upcoming-changes.json index 0977a21e48..f99d7b31cd 100644 --- a/src/graphql/data/ghec/upcoming-changes.json +++ b/src/graphql/data/ghec/upcoming-changes.json @@ -169,6 +169,14 @@ "date": "2023-07-01", "criticality": "breaking", "owner": "github/merge_queue" + }, + { + "location": "Commit.pushedDate", + "description": "

pushedDate will be removed.

", + "reason": "

pushedDate is no longer supported.

", + "date": "2023-07-01", + "criticality": "breaking", + "owner": "darthwillis" } ], "2023-04-01": [