Skip to content

repo sync #24832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 %}
Expand Down
4 changes: 3 additions & 1 deletion data/reusables/dotcom_billing/actions-minutes.md
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 1 addition & 2 deletions data/reusables/dotcom_billing/change_plan_duration.md
Original file line number Diff line number Diff line change
@@ -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**.
2 changes: 1 addition & 1 deletion data/reusables/dotcom_billing/confirm_duration_change.md
Original file line number Diff line number Diff line change
@@ -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**.
2 changes: 1 addition & 1 deletion data/reusables/marketplace/cancel-app-billing-settings.md
Original file line number Diff line number Diff line change
@@ -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**.
Original file line number Diff line number Diff line change
@@ -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**.
Original file line number Diff line number Diff line change
@@ -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**.
2 changes: 1 addition & 1 deletion data/reusables/marketplace/upgrade-app-billing-settings.md
Original file line number Diff line number Diff line change
@@ -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**.
2 changes: 1 addition & 1 deletion data/reusables/user-settings/billing_plans.md
Original file line number Diff line number Diff line change
@@ -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**.
1 change: 1 addition & 0 deletions data/reusables/user-settings/billing_plans_payment.md
Original file line number Diff line number Diff line change
@@ -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**.
1 change: 1 addition & 0 deletions data/reusables/user-settings/billing_plans_spending.md
Original file line number Diff line number Diff line change
@@ -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**.