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 5e1b3659a6aa..bd3b373c762f 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 51172012fc60..f1f4b76d7f42 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 3001631ce45e..0dd4bc6b0870 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-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 62d875923de6..1b2d3ec1e8b9 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 bf522afa3571..020a334f54be 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 cc3277885f0a..c6184a8eb31d 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/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 92f6a1c53625..51889512abc1 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/data/reusables/dotcom_billing/actions-minutes.md b/data/reusables/dotcom_billing/actions-minutes.md index da7d30dc58d5..bafee292f7a6 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 c2081197195f..c49e1faee22a 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 cd7cfadb3fd4..22a3b6e93939 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/marketplace/cancel-app-billing-settings.md b/data/reusables/marketplace/cancel-app-billing-settings.md index 24cb17805f24..4025c8ed355c 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 b9901ac4a831..cd66737e3faa 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 c7950566af65..201a62ff13bc 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 e056f59f04df..53ba21548dad 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/user-settings/billing_plans.md b/data/reusables/user-settings/billing_plans.md index 333102205bc0..8e2fe9c7d411 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 000000000000..8c7f471a0da1 --- /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 000000000000..3aea44c19a02 --- /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**.