diff --git a/.github/actions/rendered-content-link-checker.js b/.github/actions/rendered-content-link-checker.js index d2b49b5524..f60324e8b5 100755 --- a/.github/actions/rendered-content-link-checker.js +++ b/.github/actions/rendered-content-link-checker.js @@ -140,6 +140,7 @@ if (import.meta.url.endsWith(process.argv[1])) { * verbose {boolean} - Set to true for more verbose logging * random {boolean} - Randomize page order for debugging when true * patient {boolean} - Wait longer and retry more times for rate-limited external URLS + * bail {boolean} - Throw an error on the first page (not permalink) that has >0 flaws * */ async function main(core, octokit, uploadArtifact, opts = {}) { @@ -529,7 +530,7 @@ function getPages(pageList, languages, filters, files, max) { } async function processPage(core, page, pageMap, redirects, opts) { - const { verbose, verboseUrl } = opts + const { verbose, verboseUrl, bail } = opts const allFlawsEach = await Promise.all( page.permalinks.map((permalink) => { @@ -543,6 +544,13 @@ async function processPage(core, page, pageMap, redirects, opts) { if (verbose) { printFlaws(core, allFlaws, { verboseUrl }) } + + if (bail) { + if (!verbose) { + console.warn('Use --verbose to see the flaws before it exits') + } + throw new Error(`More than one flaw in ${page.relativePath}`) + } } return allFlaws diff --git a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md index dfbb52b360..477a01b0a1 100644 --- a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md +++ b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md @@ -43,7 +43,8 @@ The events listed in your security log are triggered by your actions. Actions ar | [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | [`marketplace_listing`](#marketplace_listing-category-actions) | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %} | [`oauth_access`](#oauth_access-category-actions) | Contains all activities related to [{% data variables.product.prodname_oauth_apps %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-oauth-apps) you've connected with.{% ifversion fpt or ghec %} -| [`payment_method`](#payment_method-category-actions) | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %} +| [`payment_method`](#payment_method-category-actions) | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %}{% ifversion pat-v2%} +| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."{% endif %} | [`profile_picture`](#profile_picture-category-actions) | Contains all activities related to your profile picture. | [`project`](#project-category-actions) | Contains all activities related to project boards. | [`public_key`](#public_key-category-actions) | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). @@ -121,6 +122,23 @@ An overview of some of the most common actions that are recorded as events in th {% endif %} +{% ifversion pat-v2 %} + +### `personal_access_token` category actions + +| Action | Description +|------------------|------------------- +| `access_granted` | Triggered when a {% data variables.product.pat_v2 %} that you created is granted access to resources. +| `access_revoked` | Triggered when a {% data variables.product.pat_v2 %} that you created is revoked. The token can still read public organization resources. +| `create` | Triggered when you create a {% data variables.product.pat_v2 %}. +| `credential_regenerated` | Triggered when you regenerate a {% data variables.product.pat_v2 %}. +| `destroy` | Triggered when you delete a {% data variables.product.pat_v2 %}. +| `request_cancelled` | Triggered when you cancel a pending request for your {% data variables.product.pat_v2 %} to access organization resources. +| `request_created` | Triggered when you create a {% data variables.product.pat_v2 %} to access organization resources and the organization requires approval before a {% data variables.product.pat_v2 %} can access organization resources. +| `request_denied` | Triggered when your request for a {% data variables.product.pat_v2 %} to access organization resources is denied. For more information, see "[Managing requests for {% data variables.product.pat_generic %} in your organization](/organizations/managing-programmatic-access-to-your-organization/managing-requests-for-personal-access-tokens-in-your-organization)." + +{% endif %} + ### `profile_picture` category actions | Action | Description 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 322dadf5f3..38b4b62926 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 @@ -686,8 +686,8 @@ Available update strategies | `lockfile-only` | `bundler`, `cargo`, `composer`, `mix`, `npm`, `pip` | Only create pull requests to update lockfiles. Ignore any new versions that would require package manifest changes. | | `auto` | `bundler`, `cargo`, `composer`, `mix`, `npm`, `pip` | Follow the default strategy described above.| | `widen`| `composer`, `npm` | Relax the version requirement to include both the new and old version, when possible. | -| `increase`| `bundler`, `composer`, `npm` | Always increase the version requirement to match the new version. | -| `increase-if-necessary` | `bundler`, `composer`, `npm` | Increase the version requirement only when required by the new version. | +| `increase`| `bundler`, `composer`, `npm`{% ifversion dependabot-increase-version-pip-support %}, `pip`{% endif %} | Always increase the version requirement to match the new version. | +| `increase-if-necessary` | `bundler`, `composer`, `npm`{% ifversion dependabot-increase-version-pip-support %}, `pip`{% endif %} | Increase the version requirement only when required by the new version. | ```yaml # Customize the manifest version strategy diff --git a/content/developers/github-marketplace/using-the-github-marketplace-api-in-your-app/webhook-events-for-the-github-marketplace-api.md b/content/developers/github-marketplace/using-the-github-marketplace-api-in-your-app/webhook-events-for-the-github-marketplace-api.md index 5665ae13d3..9bf3cbff3b 100644 --- a/content/developers/github-marketplace/using-the-github-marketplace-api-in-your-app/webhook-events-for-the-github-marketplace-api.md +++ b/content/developers/github-marketplace/using-the-github-marketplace-api-in-your-app/webhook-events-for-the-github-marketplace-api.md @@ -52,7 +52,7 @@ Key | Type | Description `description` | `string` | This plan's description. `monthly_price_in_cents` | `integer` | The monthly price of this plan in cents (US currency). For example, a listing that costs 10 US dollars per month will be 1000 cents. `yearly_price_in_cents` | `integer` | The yearly price of this plan in cents (US currency). For example, a listing that costs 100 US dollars per month will be 120000 cents. -`price_model` | `string` | The pricing model for this listing. Can be one of `flat-rate`, `per-unit`, or `free`. +`price_model` | `string` | The pricing model for this listing. Can be one of `FLAT_RATE`, `PER_UNIT`, or `FREE`. `has_free_trial` | `boolean` | `true` when this listing offers a free trial. `unit_name` | `string` | The name of the unit. If the pricing model is not `per-unit` this will be `nil`. `bullet` | `array of strings` | The names of the bullets set in the pricing plan. diff --git a/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md b/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md index d8b5a39119..0caacccdd8 100644 --- a/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md +++ b/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md @@ -963,8 +963,6 @@ Key | Type | Description {{ webhookPayloadsForCurrentVersion.project.created }} -{% ifversion fpt or ghes or ghec %} - ## project_card {% data reusables.webhooks.project_card_short_desc %} @@ -1080,7 +1078,7 @@ Key | Type | Description ### Webhook payload example {{ webhookPayloadsForCurrentVersion.public }} -{% endif %} + ## pull_request {% data reusables.webhooks.pull_request_short_desc %} diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md index 1bdf328430..8ab11cb17b 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md @@ -37,11 +37,11 @@ To search for specific events, use the `action` qualifier in your query. Actions | Category name | Description |------------------|-------------------{% ifversion fpt or ghec %} -| [`account`](#account-category-actions) | Contains all activities related to your organization account. -| [`advisory_credit`](#advisory_credit-category-actions) | Contains all activities related to crediting a contributor for a security advisory in the {% data variables.product.prodname_advisory_database %}. For more information, see "[About {% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)." -| [`auto_approve_personal_access_token_requests`](#auto_approve_personal_access_token_requests-category-actions) | Contains activities related to your organization's approval policy for {% data variables.product.pat_v2 %}s. For more information, see "[Setting a {% data variables.product.pat_generic %} policy for your organization](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization)." -| [`billing`](#billing-category-actions) | Contains all activities related to your organization's billing. -| [`business`](#business-category-actions) | Contains activities related to business settings for an enterprise. | +| [`account`](#account-category-actions) | Contains all activities related to your organization account.{% endif %}{% ifversion fpt or ghec %} +| [`advisory_credit`](#advisory_credit-category-actions) | Contains all activities related to crediting a contributor for a security advisory in the {% data variables.product.prodname_advisory_database %}. For more information, see "[About {% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."{% endif %}{% ifversion pat-v2%} +| [`auto_approve_personal_access_token_requests`](#auto_approve_personal_access_token_requests-category-actions) | Contains activities related to your organization's approval policy for {% data variables.product.pat_v2 %}s. For more information, see "[Setting a {% data variables.product.pat_generic %} policy for your organization](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization)."{% endif %}{% ifversion fpt or ghec %} +| [`billing`](#billing-category-actions) | Contains all activities related to your organization's billing.{% endif %}{% ifversion fpt or ghec %} +| [`business`](#business-category-actions) | Contains activities related to business settings for an enterprise. |{% endif %}{% ifversion fpt or ghec %} | [`codespaces`](#codespaces-category-actions) | Contains all activities related to your organization's codespaces. |{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae %} | [`dependabot_alerts`](#dependabot_alerts-category-actions) | Contains organization-level configuration activities for {% data variables.product.prodname_dependabot_alerts %} in existing repositories. For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." | [`dependabot_alerts_new_repos`](#dependabot_alerts_new_repos-category-actions) | Contains organization-level configuration activities for {% data variables.product.prodname_dependabot_alerts %} in new repositories created in the organization.{% endif %}{% ifversion fpt or ghec or ghes > 3.2 %} @@ -67,8 +67,8 @@ To search for specific events, use the `action` qualifier in your query. Actions | [`organization_default_label`](#organization_default_label-category-actions) | Contains all activities related to default labels for repositories in your organization. | [`oauth_application`](#oauth_application-category-actions) | Contains all activities related to OAuth Apps. | [`packages`](#packages-category-actions) | Contains all activities related to {% data variables.product.prodname_registry %}.{% ifversion fpt or ghec %} -| [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %} -| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)." +| [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %}{% ifversion pat-v2%} +| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."{% endif %} | [`profile_picture`](#profile_picture-category-actions) | Contains all activities related to your organization's profile picture. | [`project`](#project-category-actions) | Contains all activities related to project boards. | [`protected_branch`](#protected_branch-category-actions) | Contains all activities related to protected branches. diff --git a/data/features/dependabot-increase-version-pip-support.yml b/data/features/dependabot-increase-version-pip-support.yml new file mode 100644 index 0000000000..954cb6f195 --- /dev/null +++ b/data/features/dependabot-increase-version-pip-support.yml @@ -0,0 +1,7 @@ +# Reference: issue #8372 +# Adding pip support for increase-if-necessary and increase versioning strategies for Dependabot version updates +versions: + fpt: '*' + ghec: '*' + ghes: '>= 3.8' + ghae: '>= 3.8' diff --git a/data/graphql/ghae/schema.docs-ghae.graphql b/data/graphql/ghae/schema.docs-ghae.graphql index 235cb881b6..343387fba6 100644 --- a/data/graphql/ghae/schema.docs-ghae.graphql +++ b/data/graphql/ghae/schema.docs-ghae.graphql @@ -14857,6 +14857,11 @@ type IssueTemplate { """ body: String + """ + The template filename. + """ + filename: String! + """ The template name. """ diff --git a/data/graphql/ghec/schema.docs.graphql b/data/graphql/ghec/schema.docs.graphql index bf6252ff95..07aea8e81e 100644 --- a/data/graphql/ghec/schema.docs.graphql +++ b/data/graphql/ghec/schema.docs.graphql @@ -16782,6 +16782,11 @@ type IssueTemplate { """ body: String + """ + The template filename. + """ + filename: String! + """ The template name. """ diff --git a/data/graphql/schema.docs.graphql b/data/graphql/schema.docs.graphql index bf6252ff95..07aea8e81e 100644 --- a/data/graphql/schema.docs.graphql +++ b/data/graphql/schema.docs.graphql @@ -16782,6 +16782,11 @@ type IssueTemplate { """ body: String + """ + The template filename. + """ + filename: String! + """ The template name. """ diff --git a/lib/excluded-links.js b/lib/excluded-links.js index 0f659d66c4..0f80af68d3 100644 --- a/lib/excluded-links.js +++ b/lib/excluded-links.js @@ -14,6 +14,13 @@ export default [ new RegExp('https://github\\.com/search\\?'), new RegExp('https://github\\.com/github/gitignore/search\\?'), + // https://github.com/contact always redirects to support.github.com that + // is heavily protected by rate limiting. + new RegExp('https://github\\.com/contact'), + // All support.github.com links are currently firewalled and you get a + // "403 Forbidden" every time. + new RegExp('https://support\\.github\\.com'), + // These links require auth. new RegExp('https://github\\.com/settings/profile'), new RegExp('https://github\\.com/github/docs/edit'), diff --git a/lib/graphql/static/changelog.json b/lib/graphql/static/changelog.json index 7b85767a62..2e8061d85b 100644 --- a/lib/graphql/static/changelog.json +++ b/lib/graphql/static/changelog.json @@ -1,4 +1,17 @@ [ + { + "schemaChanges": [ + { + "title": "The GraphQL schema includes these changes:", + "changes": [ + "

Field filename was added to object type IssueTemplate

" + ] + } + ], + "previewChanges": [], + "upcomingChanges": [], + "date": "2022-10-24" + }, { "schemaChanges": [ { diff --git a/lib/graphql/static/schema-dotcom.json b/lib/graphql/static/schema-dotcom.json index bad4f737b3..e8ef11d1b3 100644 --- a/lib/graphql/static/schema-dotcom.json +++ b/lib/graphql/static/schema-dotcom.json @@ -26996,6 +26996,14 @@ "kind": "scalars", "href": "/graphql/reference/scalars#string" }, + { + "name": "filename", + "description": "

The template filename.

", + "type": "String!", + "id": "string", + "kind": "scalars", + "href": "/graphql/reference/scalars#string" + }, { "name": "name", "description": "

The template name.

", diff --git a/lib/graphql/static/schema-ghae.json b/lib/graphql/static/schema-ghae.json index 63345c1dc6..33ff30bee2 100644 --- a/lib/graphql/static/schema-ghae.json +++ b/lib/graphql/static/schema-ghae.json @@ -23595,6 +23595,14 @@ "kind": "scalars", "href": "/graphql/reference/scalars#string" }, + { + "name": "filename", + "description": "

The template filename.

", + "type": "String!", + "id": "string", + "kind": "scalars", + "href": "/graphql/reference/scalars#string" + }, { "name": "name", "description": "

The template name.

", diff --git a/lib/graphql/static/schema-ghec.json b/lib/graphql/static/schema-ghec.json index bad4f737b3..e8ef11d1b3 100644 --- a/lib/graphql/static/schema-ghec.json +++ b/lib/graphql/static/schema-ghec.json @@ -26996,6 +26996,14 @@ "kind": "scalars", "href": "/graphql/reference/scalars#string" }, + { + "name": "filename", + "description": "

The template filename.

", + "type": "String!", + "id": "string", + "kind": "scalars", + "href": "/graphql/reference/scalars#string" + }, { "name": "name", "description": "

The template name.

", diff --git a/lib/webhooks/static/dotcom/marketplace_purchase.cancelled.payload.json b/lib/webhooks/static/dotcom/marketplace_purchase.cancelled.payload.json index b1153310d5..38400a4bfc 100644 --- a/lib/webhooks/static/dotcom/marketplace_purchase.cancelled.payload.json +++ b/lib/webhooks/static/dotcom/marketplace_purchase.cancelled.payload.json @@ -40,7 +40,7 @@ "description":"Premium Plan", "monthly_price_in_cents":10000, "yearly_price_in_cents":100000, - "price_model":"flat-rate", + "price_model":"FLAT_RATE", "has_free_trial":true, "unit_name":null, "bullets":[ diff --git a/lib/webhooks/static/dotcom/marketplace_purchase.changed.payload.json b/lib/webhooks/static/dotcom/marketplace_purchase.changed.payload.json index 25d288b959..431671982d 100644 --- a/lib/webhooks/static/dotcom/marketplace_purchase.changed.payload.json +++ b/lib/webhooks/static/dotcom/marketplace_purchase.changed.payload.json @@ -40,7 +40,7 @@ "description":"Basic Plan", "monthly_price_in_cents":1000, "yearly_price_in_cents":10000, - "price_model":"per-unit", + "price_model":"PER_UNIT", "has_free_trial":true, "unit_name":"seat", "bullets":[ @@ -67,7 +67,7 @@ "description":"Basic Plan", "monthly_price_in_cents":1000, "yearly_price_in_cents":10000, - "price_model":"per-unit", + "price_model":"PER_UNIT", "has_free_trial":true, "unit_name":"seat", "bullets":[ diff --git a/lib/webhooks/static/dotcom/marketplace_purchase.purchased.payload.json b/lib/webhooks/static/dotcom/marketplace_purchase.purchased.payload.json index cfbeabb71d..6ef1688fc5 100644 --- a/lib/webhooks/static/dotcom/marketplace_purchase.purchased.payload.json +++ b/lib/webhooks/static/dotcom/marketplace_purchase.purchased.payload.json @@ -40,7 +40,7 @@ "description":"Basic Plan", "monthly_price_in_cents":1000, "yearly_price_in_cents":10000, - "price_model":"per-unit", + "price_model":"PER_UNIT", "has_free_trial":true, "unit_name":"seat", "bullets":[ diff --git a/script/rendered-content-link-checker.js b/script/rendered-content-link-checker.js index 8261735962..afa54806c1 100755 --- a/script/rendered-content-link-checker.js +++ b/script/rendered-content-link-checker.js @@ -10,7 +10,6 @@ import fs from 'fs' import path from 'path' import { program, Option, InvalidArgumentError } from 'commander' -import { languageKeys } from '../lib/languages.js' import renderedContentLinkChecker from '../.github/actions/rendered-content-link-checker.js' import { getCoreInject, getUploadArtifactInject } from './helpers/action-injections.js' import github from './helpers/github.js' @@ -28,21 +27,13 @@ Object.entries(STATIC_PREFIXES).forEach(([key, value]) => { program .description('Analyze all checked content files, render them, and check for flaws.') - .addOption( - new Option('-L, --level ', 'Filter of flaw level').choices([ - 'all', - 'warning', - 'critical', - ]) - ) .addOption( new Option( - '-l, --language ', - 'Which languages to focus on. (default: "en")' - ).choices(languageKeys) + '-L, --level ', + 'Level of broken link to be marked as a flaw (default: "warning")' + ).choices(['all', 'warning', 'critical']) ) .option('-f, --filter ', 'Search filter(s) on the paths') - .option('-l, --level', 'Level of broken link to be marked as a flaw. (default: "critical")') .option('-v, --verbose', 'Verbose outputs') .option( '--create-report', @@ -75,6 +66,7 @@ program .option('--debug', "Loud about everything it's doing") .option('--patient', 'Give external link checking longer timeouts and more retries') .option('--random', 'Load pages in a random order (useful for debugging)') + .option('--bail', 'Exit on the first possible flaw') .option('--verbose-url ', 'Print the absolute URL if set') .option('--fail-on-flaw', 'Throw error on link flaws (default: false)') .option('--max ', 'integer argument (default: none)', (value) => { diff --git a/translations/es-ES/content/actions/guides.md b/translations/es-ES/content/actions/guides.md index 3ff954e97f..45ea3fad5a 100644 --- a/translations/es-ES/content/actions/guides.md +++ b/translations/es-ES/content/actions/guides.md @@ -10,9 +10,6 @@ versions: ghec: '*' learningTracks: - getting_started - - continuous_integration - - continuous_deployment - - deploy_to_the_cloud - adopting_github_actions_for_your_enterprise_ghec - adopting_github_actions_for_your_enterprise_ghes_and_ghae - hosting_your_own_runners diff --git a/translations/es-ES/content/actions/index.md b/translations/es-ES/content/actions/index.md index 5672bdf9c5..9d78659b52 100644 --- a/translations/es-ES/content/actions/index.md +++ b/translations/es-ES/content/actions/index.md @@ -26,14 +26,6 @@ featuredLinks: - /actions/learn-github-actions/expressions - /actions/learn-github-actions/environment-variables - /actions/security-guides/encrypted-secrets - videos: - - title: 'Inside GitHub: How we use GitHub Actions – Brian Douglas' - href: 'https://www.youtube-nocookie.com/embed/MW0V5Q9WJu4' - - title: Advanced GitHub Actions – Jennifer Schelkopf - href: 'https://www.youtube-nocookie.com/embed/wWOH44Lscoc' - - title: GitHub Actions in action – Karan MV - href: 'https://www.youtube-nocookie.com/embed/4SWO0Pc76CU' - videosHeading: GitHub Universe 2021 videos product_video: 'https://www.youtube-nocookie.com/embed/cP0I9w2coGU' redirect_from: - /articles/automating-your-workflow-with-github-actions diff --git a/translations/es-ES/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md b/translations/es-ES/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md index dfbb52b360..477a01b0a1 100644 --- a/translations/es-ES/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md +++ b/translations/es-ES/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md @@ -43,7 +43,8 @@ The events listed in your security log are triggered by your actions. Actions ar | [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | [`marketplace_listing`](#marketplace_listing-category-actions) | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %} | [`oauth_access`](#oauth_access-category-actions) | Contains all activities related to [{% data variables.product.prodname_oauth_apps %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-oauth-apps) you've connected with.{% ifversion fpt or ghec %} -| [`payment_method`](#payment_method-category-actions) | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %} +| [`payment_method`](#payment_method-category-actions) | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %}{% ifversion pat-v2%} +| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."{% endif %} | [`profile_picture`](#profile_picture-category-actions) | Contains all activities related to your profile picture. | [`project`](#project-category-actions) | Contains all activities related to project boards. | [`public_key`](#public_key-category-actions) | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). @@ -121,6 +122,23 @@ An overview of some of the most common actions that are recorded as events in th {% endif %} +{% ifversion pat-v2 %} + +### `personal_access_token` category actions + +| Action | Description +|------------------|------------------- +| `access_granted` | Triggered when a {% data variables.product.pat_v2 %} that you created is granted access to resources. +| `access_revoked` | Triggered when a {% data variables.product.pat_v2 %} that you created is revoked. The token can still read public organization resources. +| `create` | Triggered when you create a {% data variables.product.pat_v2 %}. +| `credential_regenerated` | Triggered when you regenerate a {% data variables.product.pat_v2 %}. +| `destroy` | Triggered when you delete a {% data variables.product.pat_v2 %}. +| `request_cancelled` | Triggered when you cancel a pending request for your {% data variables.product.pat_v2 %} to access organization resources. +| `request_created` | Triggered when you create a {% data variables.product.pat_v2 %} to access organization resources and the organization requires approval before a {% data variables.product.pat_v2 %} can access organization resources. +| `request_denied` | Triggered when your request for a {% data variables.product.pat_v2 %} to access organization resources is denied. For more information, see "[Managing requests for {% data variables.product.pat_generic %} in your organization](/organizations/managing-programmatic-access-to-your-organization/managing-requests-for-personal-access-tokens-in-your-organization)." + +{% endif %} + ### `profile_picture` category actions | Action | Description diff --git a/translations/es-ES/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md b/translations/es-ES/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md index 29711c895e..bc3828f634 100644 --- a/translations/es-ES/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md +++ b/translations/es-ES/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md @@ -44,7 +44,7 @@ If you enable prebuilding of codespaces this will incur additional charges. For ## About billing for {% data variables.product.prodname_github_codespaces %} -{% data variables.product.prodname_github_codespaces %} is billed in US dollars (USD) according to their compute and storage usage. {% data reusables.codespaces.codespaces-monthly-billing %} xxx +{% data variables.product.prodname_github_codespaces %} is billed in US dollars (USD) according to the amount of compute time and storage space your codespaces use. {% data reusables.codespaces.codespaces-monthly-billing %} Your {% data variables.product.prodname_github_codespaces %} usage shares your organization or enterprise account's existing payment method, and receipt. For more information, see "[Viewing your subscriptions and billing date](/articles/viewing-your-subscriptions-and-billing-date)." @@ -60,7 +60,7 @@ As an example, if a codespace is active for 1 hour and 15 minutes, then the comp You can restrict compute usage by stopping your codespaces. For information, see "[Stopping and starting a codespace](/codespaces/developing-in-codespaces/stopping-and-starting-a-codespace)." Codespaces are stopped automatically after a configurable period of inactivity. The timeout period can be configured by the user, or at the organization level. For more information, see "[Setting your timeout period for {% data variables.product.prodname_github_codespaces %}](/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces)" and "[Restricting the idle timeout period](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)." ### Billing for storage usage -For {% data variables.product.prodname_github_codespaces %} billing purposes, this includes all storage used by all codespaces and prebuilds in your account. This includes any files used by the codespaces, such as cloned repositories, configuration files, and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or stopped. The storage billing for a codespace ends when it is deleted. +For {% data variables.product.prodname_github_codespaces %} billing purposes, storage compromises the disk space used by all of the codespaces and prebuilds in your account. This includes any files used by the codespaces, such as cloned repositories, configuration files, and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or stopped. The storage billing for a codespace ends when it is deleted. Codespace storage is reported in GB-months. Your billing month runs from a fixed day in one month until the same day in the next month. In most cases the day of the month is determined by the day you started on your current {% data variables.product.prodname_dotcom %} plan. Your GB-month storage, is calculated as follows. Once every hour, the storage used by all of your currently active and stopped codespaces is assessed. This figure is then divided by the number of hours in the current billing month: `total storage size / hours this month`. The result is added to the running total for codespace storage for the month. @@ -93,7 +93,7 @@ In addition to {% data variables.product.prodname_actions %} minutes, you will a The storage cost for a prebuild in a single region will be similar to the storage cost that will be incurred for storing a single codespace created from that prebuild. The storage cost for the generated codespace may be more than the cost for the prebuild if, for example, the `updateContentCommand` and `postCreateCommand` commands are used during codespace creation to download more files to the dev container. -The total storage costs associated with a prebuild template will depend on: +The total storage costs associated with a prebuild will depend on: * The price of storage per GB. See the table above. * The size of the generated prebuild in GB. @@ -134,9 +134,9 @@ Organization owners can create a policy to restrict the machine types that are a To incur charges to an organization account (or to an enterprise account, if the organization belongs to an enterprise), the user must be a member or collaborator of that organization, otherwise they cannot create a codespace for which the organization, or its parent enterprise, would be billed. -For example, a user in an organization can fork a repository within that organization, and can subsequently use a codespace billed to the organization; this is because the organization is the owner of the parent repository, which can remove the user's access, the forked repository, and the codespace. +For example, a user in an organization can fork a repository within that organization, and can subsequently use a codespace billed to the organization. This is because the organization is the owner of the parent repository, and can remove the user's access, the forked repository, and the codespace. -## How billing is handled when a repository is transferred +## How billing is handled when a repository is transferred to another organization Usage is calculated every hour. An organization pays for usage of codespaces created from any repository owned by the organization, where the organization settings permit the organization to be billed. For more information, see "[Enabling GitHub Codespaces for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization#choose-who-can-create-codespaces-that-are-billed-to-your-organization)." When a repository is transferred out of your organization, ownership and billing responsibility for any codespaces associated with that repository will change accordingly. diff --git a/translations/es-ES/content/codespaces/index.md b/translations/es-ES/content/codespaces/index.md index b9824c6a46..62d1ee1595 100644 --- a/translations/es-ES/content/codespaces/index.md +++ b/translations/es-ES/content/codespaces/index.md @@ -12,25 +12,17 @@ featuredLinks: - /codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project - /codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces - /billing/managing-billing-for-github-codespaces/about-billing-for-codespaces - popular: - - /codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project - videos: - - title: 'Inside GitHub: Moving GitHub''s Development to Codespaces – Cory Wilkerson' - href: 'https://www.youtube-nocookie.com/embed/Lj_RpjEuESE' - - title: 'Making Codespaces Work for You – Allison Weins, Bailey Brooks' - href: 'https://www.youtube-nocookie.com/embed/X9Z-rUixnzk' - - title: Coding in the cloud with GitHub Codespaces and VS Code – Damian Brady - href: 'https://www.youtube-nocookie.com/embed/xWr_yH_AGVs' - videosHeading: GitHub Universe 2021 videos guideCards: - /codespaces/getting-started/deep-dive - /codespaces/developing-in-codespaces/creating-a-codespace - /codespaces/developing-in-codespaces/opening-an-existing-codespace - /codespaces/developing-in-codespaces/using-codespaces-in-visual-studio-code - /codespaces/setting-up-your-codespace/personalizing-codespaces-for-your-account + popular: + - /codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project popularHeading: Set up your project product_video: 'https://www.youtube-nocookie.com/embed/_W9B7qc9lVc' communityRedirect: diff --git a/translations/es-ES/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md b/translations/es-ES/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md index d8b5a39119..0caacccdd8 100644 --- a/translations/es-ES/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md +++ b/translations/es-ES/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md @@ -963,8 +963,6 @@ Key | Type | Description {{ webhookPayloadsForCurrentVersion.project.created }} -{% ifversion fpt or ghes or ghec %} - ## project_card {% data reusables.webhooks.project_card_short_desc %} @@ -1080,7 +1078,7 @@ Key | Type | Description ### Webhook payload example {{ webhookPayloadsForCurrentVersion.public }} -{% endif %} + ## pull_request {% data reusables.webhooks.pull_request_short_desc %} diff --git a/translations/es-ES/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/translations/es-ES/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md index 1bdf328430..8ab11cb17b 100644 --- a/translations/es-ES/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md +++ b/translations/es-ES/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md @@ -37,11 +37,11 @@ To search for specific events, use the `action` qualifier in your query. Actions | Category name | Description |------------------|-------------------{% ifversion fpt or ghec %} -| [`account`](#account-category-actions) | Contains all activities related to your organization account. -| [`advisory_credit`](#advisory_credit-category-actions) | Contains all activities related to crediting a contributor for a security advisory in the {% data variables.product.prodname_advisory_database %}. For more information, see "[About {% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)." -| [`auto_approve_personal_access_token_requests`](#auto_approve_personal_access_token_requests-category-actions) | Contains activities related to your organization's approval policy for {% data variables.product.pat_v2 %}s. For more information, see "[Setting a {% data variables.product.pat_generic %} policy for your organization](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization)." -| [`billing`](#billing-category-actions) | Contains all activities related to your organization's billing. -| [`business`](#business-category-actions) | Contains activities related to business settings for an enterprise. | +| [`account`](#account-category-actions) | Contains all activities related to your organization account.{% endif %}{% ifversion fpt or ghec %} +| [`advisory_credit`](#advisory_credit-category-actions) | Contains all activities related to crediting a contributor for a security advisory in the {% data variables.product.prodname_advisory_database %}. For more information, see "[About {% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."{% endif %}{% ifversion pat-v2%} +| [`auto_approve_personal_access_token_requests`](#auto_approve_personal_access_token_requests-category-actions) | Contains activities related to your organization's approval policy for {% data variables.product.pat_v2 %}s. For more information, see "[Setting a {% data variables.product.pat_generic %} policy for your organization](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization)."{% endif %}{% ifversion fpt or ghec %} +| [`billing`](#billing-category-actions) | Contains all activities related to your organization's billing.{% endif %}{% ifversion fpt or ghec %} +| [`business`](#business-category-actions) | Contains activities related to business settings for an enterprise. |{% endif %}{% ifversion fpt or ghec %} | [`codespaces`](#codespaces-category-actions) | Contains all activities related to your organization's codespaces. |{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae %} | [`dependabot_alerts`](#dependabot_alerts-category-actions) | Contains organization-level configuration activities for {% data variables.product.prodname_dependabot_alerts %} in existing repositories. For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." | [`dependabot_alerts_new_repos`](#dependabot_alerts_new_repos-category-actions) | Contains organization-level configuration activities for {% data variables.product.prodname_dependabot_alerts %} in new repositories created in the organization.{% endif %}{% ifversion fpt or ghec or ghes > 3.2 %} @@ -67,8 +67,8 @@ To search for specific events, use the `action` qualifier in your query. Actions | [`organization_default_label`](#organization_default_label-category-actions) | Contains all activities related to default labels for repositories in your organization. | [`oauth_application`](#oauth_application-category-actions) | Contains all activities related to OAuth Apps. | [`packages`](#packages-category-actions) | Contains all activities related to {% data variables.product.prodname_registry %}.{% ifversion fpt or ghec %} -| [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %} -| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)." +| [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %}{% ifversion pat-v2%} +| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."{% endif %} | [`profile_picture`](#profile_picture-category-actions) | Contains all activities related to your organization's profile picture. | [`project`](#project-category-actions) | Contains all activities related to project boards. | [`protected_branch`](#protected_branch-category-actions) | Contains all activities related to protected branches. diff --git a/translations/es-ES/data/learning-tracks/actions.yml b/translations/es-ES/data/learning-tracks/actions.yml index 83e46f1463..8e6d54e871 100644 --- a/translations/es-ES/data/learning-tracks/actions.yml +++ b/translations/es-ES/data/learning-tracks/actions.yml @@ -9,33 +9,6 @@ getting_started: - /actions/learn-github-actions/reusing-workflows - /actions/security-guides/security-hardening-for-github-actions featured_track: true -continuous_integration: - title: 'Build and test code' - description: 'You can create custom continuous integration (CI) workflows right in your repository.' - guides: - - /actions/automating-builds-and-tests/about-continuous-integration - - /actions/automating-builds-and-tests/building-and-testing-powershell - - /actions/automating-builds-and-tests/building-and-testing-ruby - - /actions/automating-builds-and-tests/building-and-testing-java-with-maven - - /actions/automating-builds-and-tests/building-and-testing-java-with-gradle - - /actions/automating-builds-and-tests/building-and-testing-java-with-ant - - /actions/automating-builds-and-tests/building-and-testing-swift -continuous_deployment: - title: 'Automate your deployments' - description: 'Learn how to automate release publishing for your project with a custom continuous deployment (CD) workflow in {% data variables.product.prodname_actions %}.' - guides: - - /actions/publishing-packages/about-packaging-with-github-actions - - /actions/publishing-packages/publishing-nodejs-packages - - /actions/publishing-packages/publishing-java-packages-with-maven - - /actions/publishing-packages/publishing-java-packages-with-gradle - - /actions/publishing-packages/publishing-docker-images -deploy_to_the_cloud: - title: 'Deploy to the cloud' - description: 'Learn how to use {% data variables.product.prodname_actions %} to build an application and deploy it to various cloud-based platforms.' - guides: - - /actions/deployment/deploying-to-amazon-elastic-container-service - - /actions/deployment/deploying-to-azure-app-service - - /actions/deployment/deploying-to-google-kubernetes-engine adopting_github_actions_for_your_enterprise_ghec: title: 'Adopt GitHub Actions for your enterprise' description: 'Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise.' diff --git a/translations/ja-JP/content/actions/guides.md b/translations/ja-JP/content/actions/guides.md index 7c62b10d4e..e2ae6ea42a 100644 --- a/translations/ja-JP/content/actions/guides.md +++ b/translations/ja-JP/content/actions/guides.md @@ -10,9 +10,6 @@ versions: ghec: '*' learningTracks: - getting_started - - continuous_integration - - continuous_deployment - - deploy_to_the_cloud - adopting_github_actions_for_your_enterprise_ghec - adopting_github_actions_for_your_enterprise_ghes_and_ghae - hosting_your_own_runners diff --git a/translations/ja-JP/content/actions/index.md b/translations/ja-JP/content/actions/index.md index 8a694ef57b..21ee7935b1 100644 --- a/translations/ja-JP/content/actions/index.md +++ b/translations/ja-JP/content/actions/index.md @@ -26,14 +26,6 @@ featuredLinks: - /actions/learn-github-actions/expressions - /actions/learn-github-actions/environment-variables - /actions/security-guides/encrypted-secrets - videos: - - title: 'Inside GitHub: How we use GitHub Actions – Brian Douglas' - href: 'https://www.youtube-nocookie.com/embed/MW0V5Q9WJu4' - - title: Advanced GitHub Actions – Jennifer Schelkopf - href: 'https://www.youtube-nocookie.com/embed/wWOH44Lscoc' - - title: GitHub Actions in action – Karan MV - href: 'https://www.youtube-nocookie.com/embed/4SWO0Pc76CU' - videosHeading: GitHub Universe 2021 videos product_video: 'https://www.youtube-nocookie.com/embed/cP0I9w2coGU' redirect_from: - /articles/automating-your-workflow-with-github-actions diff --git a/translations/ja-JP/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md b/translations/ja-JP/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md index dfbb52b360..477a01b0a1 100644 --- a/translations/ja-JP/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md +++ b/translations/ja-JP/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md @@ -43,7 +43,8 @@ The events listed in your security log are triggered by your actions. Actions ar | [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | [`marketplace_listing`](#marketplace_listing-category-actions) | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %} | [`oauth_access`](#oauth_access-category-actions) | Contains all activities related to [{% data variables.product.prodname_oauth_apps %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-oauth-apps) you've connected with.{% ifversion fpt or ghec %} -| [`payment_method`](#payment_method-category-actions) | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %} +| [`payment_method`](#payment_method-category-actions) | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %}{% ifversion pat-v2%} +| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."{% endif %} | [`profile_picture`](#profile_picture-category-actions) | Contains all activities related to your profile picture. | [`project`](#project-category-actions) | Contains all activities related to project boards. | [`public_key`](#public_key-category-actions) | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). @@ -121,6 +122,23 @@ An overview of some of the most common actions that are recorded as events in th {% endif %} +{% ifversion pat-v2 %} + +### `personal_access_token` category actions + +| Action | Description +|------------------|------------------- +| `access_granted` | Triggered when a {% data variables.product.pat_v2 %} that you created is granted access to resources. +| `access_revoked` | Triggered when a {% data variables.product.pat_v2 %} that you created is revoked. The token can still read public organization resources. +| `create` | Triggered when you create a {% data variables.product.pat_v2 %}. +| `credential_regenerated` | Triggered when you regenerate a {% data variables.product.pat_v2 %}. +| `destroy` | Triggered when you delete a {% data variables.product.pat_v2 %}. +| `request_cancelled` | Triggered when you cancel a pending request for your {% data variables.product.pat_v2 %} to access organization resources. +| `request_created` | Triggered when you create a {% data variables.product.pat_v2 %} to access organization resources and the organization requires approval before a {% data variables.product.pat_v2 %} can access organization resources. +| `request_denied` | Triggered when your request for a {% data variables.product.pat_v2 %} to access organization resources is denied. For more information, see "[Managing requests for {% data variables.product.pat_generic %} in your organization](/organizations/managing-programmatic-access-to-your-organization/managing-requests-for-personal-access-tokens-in-your-organization)." + +{% endif %} + ### `profile_picture` category actions | Action | Description diff --git a/translations/ja-JP/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md b/translations/ja-JP/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md index 29711c895e..bc3828f634 100644 --- a/translations/ja-JP/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md +++ b/translations/ja-JP/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md @@ -44,7 +44,7 @@ If you enable prebuilding of codespaces this will incur additional charges. For ## About billing for {% data variables.product.prodname_github_codespaces %} -{% data variables.product.prodname_github_codespaces %} is billed in US dollars (USD) according to their compute and storage usage. {% data reusables.codespaces.codespaces-monthly-billing %} xxx +{% data variables.product.prodname_github_codespaces %} is billed in US dollars (USD) according to the amount of compute time and storage space your codespaces use. {% data reusables.codespaces.codespaces-monthly-billing %} Your {% data variables.product.prodname_github_codespaces %} usage shares your organization or enterprise account's existing payment method, and receipt. For more information, see "[Viewing your subscriptions and billing date](/articles/viewing-your-subscriptions-and-billing-date)." @@ -60,7 +60,7 @@ As an example, if a codespace is active for 1 hour and 15 minutes, then the comp You can restrict compute usage by stopping your codespaces. For information, see "[Stopping and starting a codespace](/codespaces/developing-in-codespaces/stopping-and-starting-a-codespace)." Codespaces are stopped automatically after a configurable period of inactivity. The timeout period can be configured by the user, or at the organization level. For more information, see "[Setting your timeout period for {% data variables.product.prodname_github_codespaces %}](/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces)" and "[Restricting the idle timeout period](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)." ### Billing for storage usage -For {% data variables.product.prodname_github_codespaces %} billing purposes, this includes all storage used by all codespaces and prebuilds in your account. This includes any files used by the codespaces, such as cloned repositories, configuration files, and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or stopped. The storage billing for a codespace ends when it is deleted. +For {% data variables.product.prodname_github_codespaces %} billing purposes, storage compromises the disk space used by all of the codespaces and prebuilds in your account. This includes any files used by the codespaces, such as cloned repositories, configuration files, and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or stopped. The storage billing for a codespace ends when it is deleted. Codespace storage is reported in GB-months. Your billing month runs from a fixed day in one month until the same day in the next month. In most cases the day of the month is determined by the day you started on your current {% data variables.product.prodname_dotcom %} plan. Your GB-month storage, is calculated as follows. Once every hour, the storage used by all of your currently active and stopped codespaces is assessed. This figure is then divided by the number of hours in the current billing month: `total storage size / hours this month`. The result is added to the running total for codespace storage for the month. @@ -93,7 +93,7 @@ In addition to {% data variables.product.prodname_actions %} minutes, you will a The storage cost for a prebuild in a single region will be similar to the storage cost that will be incurred for storing a single codespace created from that prebuild. The storage cost for the generated codespace may be more than the cost for the prebuild if, for example, the `updateContentCommand` and `postCreateCommand` commands are used during codespace creation to download more files to the dev container. -The total storage costs associated with a prebuild template will depend on: +The total storage costs associated with a prebuild will depend on: * The price of storage per GB. See the table above. * The size of the generated prebuild in GB. @@ -134,9 +134,9 @@ Organization owners can create a policy to restrict the machine types that are a To incur charges to an organization account (or to an enterprise account, if the organization belongs to an enterprise), the user must be a member or collaborator of that organization, otherwise they cannot create a codespace for which the organization, or its parent enterprise, would be billed. -For example, a user in an organization can fork a repository within that organization, and can subsequently use a codespace billed to the organization; this is because the organization is the owner of the parent repository, which can remove the user's access, the forked repository, and the codespace. +For example, a user in an organization can fork a repository within that organization, and can subsequently use a codespace billed to the organization. This is because the organization is the owner of the parent repository, and can remove the user's access, the forked repository, and the codespace. -## How billing is handled when a repository is transferred +## How billing is handled when a repository is transferred to another organization Usage is calculated every hour. An organization pays for usage of codespaces created from any repository owned by the organization, where the organization settings permit the organization to be billed. For more information, see "[Enabling GitHub Codespaces for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization#choose-who-can-create-codespaces-that-are-billed-to-your-organization)." When a repository is transferred out of your organization, ownership and billing responsibility for any codespaces associated with that repository will change accordingly. diff --git a/translations/ja-JP/content/codespaces/index.md b/translations/ja-JP/content/codespaces/index.md index 463a1feeaf..890a60e13d 100644 --- a/translations/ja-JP/content/codespaces/index.md +++ b/translations/ja-JP/content/codespaces/index.md @@ -12,25 +12,17 @@ featuredLinks: - /codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project - /codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces - /billing/managing-billing-for-github-codespaces/about-billing-for-codespaces - popular: - - /codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project - videos: - - title: 'Inside GitHub: Moving GitHub''s Development to Codespaces – Cory Wilkerson' - href: 'https://www.youtube-nocookie.com/embed/Lj_RpjEuESE' - - title: 'Making Codespaces Work for You – Allison Weins, Bailey Brooks' - href: 'https://www.youtube-nocookie.com/embed/X9Z-rUixnzk' - - title: Coding in the cloud with GitHub Codespaces and VS Code – Damian Brady - href: 'https://www.youtube-nocookie.com/embed/xWr_yH_AGVs' - videosHeading: GitHub Universe 2021 videos guideCards: - /codespaces/getting-started/deep-dive - /codespaces/developing-in-codespaces/creating-a-codespace - /codespaces/developing-in-codespaces/opening-an-existing-codespace - /codespaces/developing-in-codespaces/using-codespaces-in-visual-studio-code - /codespaces/setting-up-your-codespace/personalizing-codespaces-for-your-account + popular: + - /codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project popularHeading: Set up your project product_video: 'https://www.youtube-nocookie.com/embed/_W9B7qc9lVc' communityRedirect: diff --git a/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md b/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md index d8b5a39119..0caacccdd8 100644 --- a/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md +++ b/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md @@ -963,8 +963,6 @@ Key | Type | Description {{ webhookPayloadsForCurrentVersion.project.created }} -{% ifversion fpt or ghes or ghec %} - ## project_card {% data reusables.webhooks.project_card_short_desc %} @@ -1080,7 +1078,7 @@ Key | Type | Description ### Webhook payload example {{ webhookPayloadsForCurrentVersion.public }} -{% endif %} + ## pull_request {% data reusables.webhooks.pull_request_short_desc %} diff --git a/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md index 1bdf328430..8ab11cb17b 100644 --- a/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md +++ b/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md @@ -37,11 +37,11 @@ To search for specific events, use the `action` qualifier in your query. Actions | Category name | Description |------------------|-------------------{% ifversion fpt or ghec %} -| [`account`](#account-category-actions) | Contains all activities related to your organization account. -| [`advisory_credit`](#advisory_credit-category-actions) | Contains all activities related to crediting a contributor for a security advisory in the {% data variables.product.prodname_advisory_database %}. For more information, see "[About {% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)." -| [`auto_approve_personal_access_token_requests`](#auto_approve_personal_access_token_requests-category-actions) | Contains activities related to your organization's approval policy for {% data variables.product.pat_v2 %}s. For more information, see "[Setting a {% data variables.product.pat_generic %} policy for your organization](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization)." -| [`billing`](#billing-category-actions) | Contains all activities related to your organization's billing. -| [`business`](#business-category-actions) | Contains activities related to business settings for an enterprise. | +| [`account`](#account-category-actions) | Contains all activities related to your organization account.{% endif %}{% ifversion fpt or ghec %} +| [`advisory_credit`](#advisory_credit-category-actions) | Contains all activities related to crediting a contributor for a security advisory in the {% data variables.product.prodname_advisory_database %}. For more information, see "[About {% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."{% endif %}{% ifversion pat-v2%} +| [`auto_approve_personal_access_token_requests`](#auto_approve_personal_access_token_requests-category-actions) | Contains activities related to your organization's approval policy for {% data variables.product.pat_v2 %}s. For more information, see "[Setting a {% data variables.product.pat_generic %} policy for your organization](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization)."{% endif %}{% ifversion fpt or ghec %} +| [`billing`](#billing-category-actions) | Contains all activities related to your organization's billing.{% endif %}{% ifversion fpt or ghec %} +| [`business`](#business-category-actions) | Contains activities related to business settings for an enterprise. |{% endif %}{% ifversion fpt or ghec %} | [`codespaces`](#codespaces-category-actions) | Contains all activities related to your organization's codespaces. |{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae %} | [`dependabot_alerts`](#dependabot_alerts-category-actions) | Contains organization-level configuration activities for {% data variables.product.prodname_dependabot_alerts %} in existing repositories. For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." | [`dependabot_alerts_new_repos`](#dependabot_alerts_new_repos-category-actions) | Contains organization-level configuration activities for {% data variables.product.prodname_dependabot_alerts %} in new repositories created in the organization.{% endif %}{% ifversion fpt or ghec or ghes > 3.2 %} @@ -67,8 +67,8 @@ To search for specific events, use the `action` qualifier in your query. Actions | [`organization_default_label`](#organization_default_label-category-actions) | Contains all activities related to default labels for repositories in your organization. | [`oauth_application`](#oauth_application-category-actions) | Contains all activities related to OAuth Apps. | [`packages`](#packages-category-actions) | Contains all activities related to {% data variables.product.prodname_registry %}.{% ifversion fpt or ghec %} -| [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %} -| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)." +| [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %}{% ifversion pat-v2%} +| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."{% endif %} | [`profile_picture`](#profile_picture-category-actions) | Contains all activities related to your organization's profile picture. | [`project`](#project-category-actions) | Contains all activities related to project boards. | [`protected_branch`](#protected_branch-category-actions) | Contains all activities related to protected branches. diff --git a/translations/ja-JP/data/learning-tracks/actions.yml b/translations/ja-JP/data/learning-tracks/actions.yml index 017fe2add8..8e6d54e871 100644 --- a/translations/ja-JP/data/learning-tracks/actions.yml +++ b/translations/ja-JP/data/learning-tracks/actions.yml @@ -1,6 +1,6 @@ getting_started: - title: '{% data variables.product.prodname_actions %} を使ってみる' - description: '最初のワークフローを作成して、{% data variables.product.prodname_actions %} の可能性を発見してください。' + title: 'Get started with {% data variables.product.prodname_actions %}' + description: 'Discover the possibilities of {% data variables.product.prodname_actions %} by creating your first workflow.' guides: - /actions/learn-github-actions/introduction-to-github-actions - /actions/learn-github-actions/finding-and-customizing-actions @@ -9,36 +9,9 @@ getting_started: - /actions/learn-github-actions/reusing-workflows - /actions/security-guides/security-hardening-for-github-actions featured_track: true -continuous_integration: - title: 'コードのビルドとテスト' - description: 'カスタムの継続的インテグレーション (CI) ワークフローをリポジトリ内に作成できます。' - guides: - - /actions/automating-builds-and-tests/about-continuous-integration - - /actions/automating-builds-and-tests/building-and-testing-powershell - - /actions/automating-builds-and-tests/building-and-testing-ruby - - /actions/automating-builds-and-tests/building-and-testing-java-with-maven - - /actions/automating-builds-and-tests/building-and-testing-java-with-gradle - - /actions/automating-builds-and-tests/building-and-testing-java-with-ant - - /actions/automating-builds-and-tests/building-and-testing-swift -continuous_deployment: - title: 'デプロイを自動化する' - description: '{% data variables.product.prodname_actions %} でカスタムの継続的デプロイ (CD) ワークフローを使ってプロジェクトのリリース公開を自動化する方法について説明します。' - guides: - - /actions/publishing-packages/about-packaging-with-github-actions - - /actions/publishing-packages/publishing-nodejs-packages - - /actions/publishing-packages/publishing-java-packages-with-maven - - /actions/publishing-packages/publishing-java-packages-with-gradle - - /actions/publishing-packages/publishing-docker-images -deploy_to_the_cloud: - title: 'クラウドにデプロイする' - description: '{% data variables.product.prodname_actions %} を使ってアプリケーションをビルドして、さまざまなクラウドベースのプラットフォームにデプロイする方法について説明します。' - guides: - - /actions/deployment/deploying-to-amazon-elastic-container-service - - /actions/deployment/deploying-to-azure-app-service - - /actions/deployment/deploying-to-google-kubernetes-engine adopting_github_actions_for_your_enterprise_ghec: - title: 'Enterprise に GitHub を採用する' - description: 'Enterprise で {% data variables.product.prodname_actions %} のロールアウトを計画して実装する方法について説明します。' + title: 'Adopt GitHub Actions for your enterprise' + description: 'Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise.' versions: ghec: '*' guides: @@ -50,8 +23,8 @@ adopting_github_actions_for_your_enterprise_ghec: - /actions/security-guides/security-hardening-for-github-actions - /billing/managing-billing-for-github-actions/about-billing-for-github-actions adopting_github_actions_for_your_enterprise_ghes_and_ghae: - title: 'Enterprise に GitHub を採用する' - description: 'Enterprise で {% data variables.product.prodname_actions %} のロールアウトを計画して実装する方法について説明します。' + title: 'Adopt GitHub Actions for your enterprise' + description: 'Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise.' versions: ghes: '*' ghae: '*' @@ -66,8 +39,8 @@ adopting_github_actions_for_your_enterprise_ghes_and_ghae: - /actions/security-guides/security-hardening-for-github-actions - /billing/managing-billing-for-github-actions/about-billing-for-github-actions hosting_your_own_runners: - title: '自分のランナーをホストする' - description: 'セルフ ホステッド ランナーを作成して、非常にカスタマイズ性の高い環境でワークフローを実行できます。' + title: 'Host your own runners' + description: 'You can create self-hosted runners to run workflows in a highly customizable environment.' guides: - /actions/hosting-your-own-runners/about-self-hosted-runners - /actions/hosting-your-own-runners/adding-self-hosted-runners @@ -78,8 +51,8 @@ hosting_your_own_runners: - /actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups - /actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners create_actions: - title: 'アクションを作成する' - description: '新しいアクションのアイデアはありますか?自分のプロジェクトに何かをカスタムに作成したことはありますか?共有できるアクションをビルドして、GitHub Marketplace に公開する方法について説明します。' + title: 'Create an action' + description: 'Do you have an idea for a new action? Have you built something custom for your project? Learn how to build shareable actions and publish them to GitHub Marketplace.' guides: - /actions/creating-actions/about-custom-actions - /actions/creating-actions/creating-a-docker-container-action diff --git a/translations/log/msft-cn-resets.csv b/translations/log/msft-cn-resets.csv index 8d129c128b..816db35d97 100644 --- a/translations/log/msft-cn-resets.csv +++ b/translations/log/msft-cn-resets.csv @@ -900,6 +900,7 @@ translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponso translations/zh-CN/content/support/contacting-github-support/providing-data-to-github-support.md,broken liquid tags translations/zh-CN/content/support/learning-about-github-support/about-github-premium-support.md,rendering error translations/zh-CN/content/support/learning-about-github-support/about-github-support.md,rendering error +translations/zh-CN/data/learning-tracks/actions.yml,broken liquid tags translations/zh-CN/data/learning-tracks/admin.yml,broken liquid tags translations/zh-CN/data/release-notes/enterprise-server/2-20/15.yml,rendering error translations/zh-CN/data/release-notes/enterprise-server/2-21/17.yml,rendering error diff --git a/translations/log/msft-ja-resets.csv b/translations/log/msft-ja-resets.csv index 32ffcf8564..7d33807a19 100644 --- a/translations/log/msft-ja-resets.csv +++ b/translations/log/msft-ja-resets.csv @@ -911,6 +911,7 @@ translations/ja-JP/content/sponsors/receiving-sponsorships-through-github-sponso translations/ja-JP/content/support/contacting-github-support/providing-data-to-github-support.md,broken liquid tags translations/ja-JP/content/support/learning-about-github-support/about-github-premium-support.md,rendering error translations/ja-JP/content/support/learning-about-github-support/about-github-support.md,rendering error +translations/ja-JP/data/learning-tracks/actions.yml,broken liquid tags translations/ja-JP/data/learning-tracks/admin.yml,broken liquid tags translations/ja-JP/data/release-notes/enterprise-server/2-20/15.yml,rendering error translations/ja-JP/data/release-notes/enterprise-server/2-21/17.yml,rendering error diff --git a/translations/log/msft-pt-resets.csv b/translations/log/msft-pt-resets.csv index ff2b95c3da..fe16791746 100644 --- a/translations/log/msft-pt-resets.csv +++ b/translations/log/msft-pt-resets.csv @@ -904,6 +904,7 @@ translations/pt-BR/content/support/contacting-github-support/providing-data-to-g translations/pt-BR/content/support/learning-about-github-support/about-github-premium-support.md,rendering error translations/pt-BR/content/support/learning-about-github-support/about-github-support.md,rendering error translations/pt-BR/data/glossaries/external.yml,broken liquid tags +translations/pt-BR/data/learning-tracks/actions.yml,broken liquid tags translations/pt-BR/data/learning-tracks/admin.yml,broken liquid tags translations/pt-BR/data/release-notes/enterprise-server/2-20/13.yml,broken liquid tags translations/pt-BR/data/release-notes/enterprise-server/2-20/15.yml,rendering error diff --git a/translations/pt-BR/content/actions/guides.md b/translations/pt-BR/content/actions/guides.md index bd8e2f569c..c28703720e 100644 --- a/translations/pt-BR/content/actions/guides.md +++ b/translations/pt-BR/content/actions/guides.md @@ -10,9 +10,6 @@ versions: ghec: '*' learningTracks: - getting_started - - continuous_integration - - continuous_deployment - - deploy_to_the_cloud - adopting_github_actions_for_your_enterprise_ghec - adopting_github_actions_for_your_enterprise_ghes_and_ghae - hosting_your_own_runners diff --git a/translations/pt-BR/content/actions/index.md b/translations/pt-BR/content/actions/index.md index 1ad9044c42..c5c4c7f7ae 100644 --- a/translations/pt-BR/content/actions/index.md +++ b/translations/pt-BR/content/actions/index.md @@ -26,14 +26,6 @@ featuredLinks: - /actions/learn-github-actions/expressions - /actions/learn-github-actions/environment-variables - /actions/security-guides/encrypted-secrets - videos: - - title: 'Inside GitHub: How we use GitHub Actions – Brian Douglas' - href: 'https://www.youtube-nocookie.com/embed/MW0V5Q9WJu4' - - title: Advanced GitHub Actions – Jennifer Schelkopf - href: 'https://www.youtube-nocookie.com/embed/wWOH44Lscoc' - - title: GitHub Actions in action – Karan MV - href: 'https://www.youtube-nocookie.com/embed/4SWO0Pc76CU' - videosHeading: GitHub Universe 2021 videos product_video: 'https://www.youtube-nocookie.com/embed/cP0I9w2coGU' redirect_from: - /articles/automating-your-workflow-with-github-actions diff --git a/translations/pt-BR/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md b/translations/pt-BR/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md index dfbb52b360..477a01b0a1 100644 --- a/translations/pt-BR/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md +++ b/translations/pt-BR/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md @@ -43,7 +43,8 @@ The events listed in your security log are triggered by your actions. Actions ar | [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | [`marketplace_listing`](#marketplace_listing-category-actions) | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %} | [`oauth_access`](#oauth_access-category-actions) | Contains all activities related to [{% data variables.product.prodname_oauth_apps %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-oauth-apps) you've connected with.{% ifversion fpt or ghec %} -| [`payment_method`](#payment_method-category-actions) | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %} +| [`payment_method`](#payment_method-category-actions) | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %}{% ifversion pat-v2%} +| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."{% endif %} | [`profile_picture`](#profile_picture-category-actions) | Contains all activities related to your profile picture. | [`project`](#project-category-actions) | Contains all activities related to project boards. | [`public_key`](#public_key-category-actions) | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). @@ -121,6 +122,23 @@ An overview of some of the most common actions that are recorded as events in th {% endif %} +{% ifversion pat-v2 %} + +### `personal_access_token` category actions + +| Action | Description +|------------------|------------------- +| `access_granted` | Triggered when a {% data variables.product.pat_v2 %} that you created is granted access to resources. +| `access_revoked` | Triggered when a {% data variables.product.pat_v2 %} that you created is revoked. The token can still read public organization resources. +| `create` | Triggered when you create a {% data variables.product.pat_v2 %}. +| `credential_regenerated` | Triggered when you regenerate a {% data variables.product.pat_v2 %}. +| `destroy` | Triggered when you delete a {% data variables.product.pat_v2 %}. +| `request_cancelled` | Triggered when you cancel a pending request for your {% data variables.product.pat_v2 %} to access organization resources. +| `request_created` | Triggered when you create a {% data variables.product.pat_v2 %} to access organization resources and the organization requires approval before a {% data variables.product.pat_v2 %} can access organization resources. +| `request_denied` | Triggered when your request for a {% data variables.product.pat_v2 %} to access organization resources is denied. For more information, see "[Managing requests for {% data variables.product.pat_generic %} in your organization](/organizations/managing-programmatic-access-to-your-organization/managing-requests-for-personal-access-tokens-in-your-organization)." + +{% endif %} + ### `profile_picture` category actions | Action | Description diff --git a/translations/pt-BR/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md b/translations/pt-BR/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md index 29711c895e..bc3828f634 100644 --- a/translations/pt-BR/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md +++ b/translations/pt-BR/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md @@ -44,7 +44,7 @@ If you enable prebuilding of codespaces this will incur additional charges. For ## About billing for {% data variables.product.prodname_github_codespaces %} -{% data variables.product.prodname_github_codespaces %} is billed in US dollars (USD) according to their compute and storage usage. {% data reusables.codespaces.codespaces-monthly-billing %} xxx +{% data variables.product.prodname_github_codespaces %} is billed in US dollars (USD) according to the amount of compute time and storage space your codespaces use. {% data reusables.codespaces.codespaces-monthly-billing %} Your {% data variables.product.prodname_github_codespaces %} usage shares your organization or enterprise account's existing payment method, and receipt. For more information, see "[Viewing your subscriptions and billing date](/articles/viewing-your-subscriptions-and-billing-date)." @@ -60,7 +60,7 @@ As an example, if a codespace is active for 1 hour and 15 minutes, then the comp You can restrict compute usage by stopping your codespaces. For information, see "[Stopping and starting a codespace](/codespaces/developing-in-codespaces/stopping-and-starting-a-codespace)." Codespaces are stopped automatically after a configurable period of inactivity. The timeout period can be configured by the user, or at the organization level. For more information, see "[Setting your timeout period for {% data variables.product.prodname_github_codespaces %}](/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces)" and "[Restricting the idle timeout period](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)." ### Billing for storage usage -For {% data variables.product.prodname_github_codespaces %} billing purposes, this includes all storage used by all codespaces and prebuilds in your account. This includes any files used by the codespaces, such as cloned repositories, configuration files, and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or stopped. The storage billing for a codespace ends when it is deleted. +For {% data variables.product.prodname_github_codespaces %} billing purposes, storage compromises the disk space used by all of the codespaces and prebuilds in your account. This includes any files used by the codespaces, such as cloned repositories, configuration files, and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or stopped. The storage billing for a codespace ends when it is deleted. Codespace storage is reported in GB-months. Your billing month runs from a fixed day in one month until the same day in the next month. In most cases the day of the month is determined by the day you started on your current {% data variables.product.prodname_dotcom %} plan. Your GB-month storage, is calculated as follows. Once every hour, the storage used by all of your currently active and stopped codespaces is assessed. This figure is then divided by the number of hours in the current billing month: `total storage size / hours this month`. The result is added to the running total for codespace storage for the month. @@ -93,7 +93,7 @@ In addition to {% data variables.product.prodname_actions %} minutes, you will a The storage cost for a prebuild in a single region will be similar to the storage cost that will be incurred for storing a single codespace created from that prebuild. The storage cost for the generated codespace may be more than the cost for the prebuild if, for example, the `updateContentCommand` and `postCreateCommand` commands are used during codespace creation to download more files to the dev container. -The total storage costs associated with a prebuild template will depend on: +The total storage costs associated with a prebuild will depend on: * The price of storage per GB. See the table above. * The size of the generated prebuild in GB. @@ -134,9 +134,9 @@ Organization owners can create a policy to restrict the machine types that are a To incur charges to an organization account (or to an enterprise account, if the organization belongs to an enterprise), the user must be a member or collaborator of that organization, otherwise they cannot create a codespace for which the organization, or its parent enterprise, would be billed. -For example, a user in an organization can fork a repository within that organization, and can subsequently use a codespace billed to the organization; this is because the organization is the owner of the parent repository, which can remove the user's access, the forked repository, and the codespace. +For example, a user in an organization can fork a repository within that organization, and can subsequently use a codespace billed to the organization. This is because the organization is the owner of the parent repository, and can remove the user's access, the forked repository, and the codespace. -## How billing is handled when a repository is transferred +## How billing is handled when a repository is transferred to another organization Usage is calculated every hour. An organization pays for usage of codespaces created from any repository owned by the organization, where the organization settings permit the organization to be billed. For more information, see "[Enabling GitHub Codespaces for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization#choose-who-can-create-codespaces-that-are-billed-to-your-organization)." When a repository is transferred out of your organization, ownership and billing responsibility for any codespaces associated with that repository will change accordingly. diff --git a/translations/pt-BR/content/codespaces/index.md b/translations/pt-BR/content/codespaces/index.md index ebac40f597..c59df823ef 100644 --- a/translations/pt-BR/content/codespaces/index.md +++ b/translations/pt-BR/content/codespaces/index.md @@ -12,25 +12,17 @@ featuredLinks: - /codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project - /codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces - /billing/managing-billing-for-github-codespaces/about-billing-for-codespaces - popular: - - /codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project - videos: - - title: 'Inside GitHub: Moving GitHub''s Development to Codespaces – Cory Wilkerson' - href: 'https://www.youtube-nocookie.com/embed/Lj_RpjEuESE' - - title: 'Making Codespaces Work for You – Allison Weins, Bailey Brooks' - href: 'https://www.youtube-nocookie.com/embed/X9Z-rUixnzk' - - title: Coding in the cloud with GitHub Codespaces and VS Code – Damian Brady - href: 'https://www.youtube-nocookie.com/embed/xWr_yH_AGVs' - videosHeading: GitHub Universe 2021 videos guideCards: - /codespaces/getting-started/deep-dive - /codespaces/developing-in-codespaces/creating-a-codespace - /codespaces/developing-in-codespaces/opening-an-existing-codespace - /codespaces/developing-in-codespaces/using-codespaces-in-visual-studio-code - /codespaces/setting-up-your-codespace/personalizing-codespaces-for-your-account + popular: + - /codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project popularHeading: Set up your project product_video: 'https://www.youtube-nocookie.com/embed/_W9B7qc9lVc' communityRedirect: diff --git a/translations/pt-BR/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md b/translations/pt-BR/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md index d8b5a39119..0caacccdd8 100644 --- a/translations/pt-BR/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md +++ b/translations/pt-BR/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md @@ -963,8 +963,6 @@ Key | Type | Description {{ webhookPayloadsForCurrentVersion.project.created }} -{% ifversion fpt or ghes or ghec %} - ## project_card {% data reusables.webhooks.project_card_short_desc %} @@ -1080,7 +1078,7 @@ Key | Type | Description ### Webhook payload example {{ webhookPayloadsForCurrentVersion.public }} -{% endif %} + ## pull_request {% data reusables.webhooks.pull_request_short_desc %} diff --git a/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md index 1bdf328430..8ab11cb17b 100644 --- a/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md +++ b/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md @@ -37,11 +37,11 @@ To search for specific events, use the `action` qualifier in your query. Actions | Category name | Description |------------------|-------------------{% ifversion fpt or ghec %} -| [`account`](#account-category-actions) | Contains all activities related to your organization account. -| [`advisory_credit`](#advisory_credit-category-actions) | Contains all activities related to crediting a contributor for a security advisory in the {% data variables.product.prodname_advisory_database %}. For more information, see "[About {% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)." -| [`auto_approve_personal_access_token_requests`](#auto_approve_personal_access_token_requests-category-actions) | Contains activities related to your organization's approval policy for {% data variables.product.pat_v2 %}s. For more information, see "[Setting a {% data variables.product.pat_generic %} policy for your organization](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization)." -| [`billing`](#billing-category-actions) | Contains all activities related to your organization's billing. -| [`business`](#business-category-actions) | Contains activities related to business settings for an enterprise. | +| [`account`](#account-category-actions) | Contains all activities related to your organization account.{% endif %}{% ifversion fpt or ghec %} +| [`advisory_credit`](#advisory_credit-category-actions) | Contains all activities related to crediting a contributor for a security advisory in the {% data variables.product.prodname_advisory_database %}. For more information, see "[About {% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."{% endif %}{% ifversion pat-v2%} +| [`auto_approve_personal_access_token_requests`](#auto_approve_personal_access_token_requests-category-actions) | Contains activities related to your organization's approval policy for {% data variables.product.pat_v2 %}s. For more information, see "[Setting a {% data variables.product.pat_generic %} policy for your organization](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization)."{% endif %}{% ifversion fpt or ghec %} +| [`billing`](#billing-category-actions) | Contains all activities related to your organization's billing.{% endif %}{% ifversion fpt or ghec %} +| [`business`](#business-category-actions) | Contains activities related to business settings for an enterprise. |{% endif %}{% ifversion fpt or ghec %} | [`codespaces`](#codespaces-category-actions) | Contains all activities related to your organization's codespaces. |{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae %} | [`dependabot_alerts`](#dependabot_alerts-category-actions) | Contains organization-level configuration activities for {% data variables.product.prodname_dependabot_alerts %} in existing repositories. For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." | [`dependabot_alerts_new_repos`](#dependabot_alerts_new_repos-category-actions) | Contains organization-level configuration activities for {% data variables.product.prodname_dependabot_alerts %} in new repositories created in the organization.{% endif %}{% ifversion fpt or ghec or ghes > 3.2 %} @@ -67,8 +67,8 @@ To search for specific events, use the `action` qualifier in your query. Actions | [`organization_default_label`](#organization_default_label-category-actions) | Contains all activities related to default labels for repositories in your organization. | [`oauth_application`](#oauth_application-category-actions) | Contains all activities related to OAuth Apps. | [`packages`](#packages-category-actions) | Contains all activities related to {% data variables.product.prodname_registry %}.{% ifversion fpt or ghec %} -| [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %} -| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)." +| [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %}{% ifversion pat-v2%} +| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."{% endif %} | [`profile_picture`](#profile_picture-category-actions) | Contains all activities related to your organization's profile picture. | [`project`](#project-category-actions) | Contains all activities related to project boards. | [`protected_branch`](#protected_branch-category-actions) | Contains all activities related to protected branches. diff --git a/translations/pt-BR/data/learning-tracks/actions.yml b/translations/pt-BR/data/learning-tracks/actions.yml index a013f03c02..8e6d54e871 100644 --- a/translations/pt-BR/data/learning-tracks/actions.yml +++ b/translations/pt-BR/data/learning-tracks/actions.yml @@ -1,6 +1,6 @@ getting_started: - title: 'Introdução ao {% data variables.product.prodname_actions %}' - description: 'Descubra as possibilidades de {% data variables.product.prodname_actions %} criando seu primeiro fluxo de trabalho.' + title: 'Get started with {% data variables.product.prodname_actions %}' + description: 'Discover the possibilities of {% data variables.product.prodname_actions %} by creating your first workflow.' guides: - /actions/learn-github-actions/introduction-to-github-actions - /actions/learn-github-actions/finding-and-customizing-actions @@ -9,36 +9,9 @@ getting_started: - /actions/learn-github-actions/reusing-workflows - /actions/security-guides/security-hardening-for-github-actions featured_track: true -continuous_integration: - title: 'Criar e testar código' - description: 'É possível criar fluxos de trabalho personalizados de integração contínua (CI) diretamente no seu repositório.' - guides: - - /actions/automating-builds-and-tests/about-continuous-integration - - /actions/automating-builds-and-tests/building-and-testing-powershell - - /actions/automating-builds-and-tests/building-and-testing-ruby - - /actions/automating-builds-and-tests/building-and-testing-java-with-maven - - /actions/automating-builds-and-tests/building-and-testing-java-with-gradle - - /actions/automating-builds-and-tests/building-and-testing-java-with-ant - - /actions/automating-builds-and-tests/building-and-testing-swift -continuous_deployment: - title: 'Automatizar implantações' - description: 'Saiba como automatizar a publicação de versões para o seu projeto com um fluxo de trabalho personalizado de implantação contínua (CD) em {% data variables.product.prodname_actions %}.' - guides: - - /actions/publishing-packages/about-packaging-with-github-actions - - /actions/publishing-packages/publishing-nodejs-packages - - /actions/publishing-packages/publishing-java-packages-with-maven - - /actions/publishing-packages/publishing-java-packages-with-gradle - - /actions/publishing-packages/publishing-docker-images -deploy_to_the_cloud: - title: 'Implantar na nuvem' - description: 'Saiba como usar {% data variables.product.prodname_actions %} para criar um aplicativo e implantá-lo em várias plataformas baseadas em nuvem.' - guides: - - /actions/deployment/deploying-to-amazon-elastic-container-service - - /actions/deployment/deploying-to-azure-app-service - - /actions/deployment/deploying-to-google-kubernetes-engine adopting_github_actions_for_your_enterprise_ghec: - title: 'Adote o GitHub Actions para a sua empresa' - description: 'Saiba como planejar e implementar uma implantação de {% data variables.product.prodname_actions %} na sua empresa.' + title: 'Adopt GitHub Actions for your enterprise' + description: 'Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise.' versions: ghec: '*' guides: @@ -50,8 +23,8 @@ adopting_github_actions_for_your_enterprise_ghec: - /actions/security-guides/security-hardening-for-github-actions - /billing/managing-billing-for-github-actions/about-billing-for-github-actions adopting_github_actions_for_your_enterprise_ghes_and_ghae: - title: 'Adote o GitHub Actions para a sua empresa' - description: 'Saiba como planejar e implementar uma implantação de {% data variables.product.prodname_actions %} na sua empresa.' + title: 'Adopt GitHub Actions for your enterprise' + description: 'Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise.' versions: ghes: '*' ghae: '*' @@ -66,8 +39,8 @@ adopting_github_actions_for_your_enterprise_ghes_and_ghae: - /actions/security-guides/security-hardening-for-github-actions - /billing/managing-billing-for-github-actions/about-billing-for-github-actions hosting_your_own_runners: - title: 'Hospede seus próprios executores' - description: 'Você pode criar executores auto-hospedados para executar fluxos de trabalho em um ambiente altamente personalizável.' + title: 'Host your own runners' + description: 'You can create self-hosted runners to run workflows in a highly customizable environment.' guides: - /actions/hosting-your-own-runners/about-self-hosted-runners - /actions/hosting-your-own-runners/adding-self-hosted-runners @@ -78,8 +51,8 @@ hosting_your_own_runners: - /actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups - /actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners create_actions: - title: 'Criar uma ação' - description: 'Você tem uma ideia para uma nova ação? Você criou algo personalizado para o seu projeto? Saiba como criar ações compartilháveis e publicá-las no GitHub Marketplace.' + title: 'Create an action' + description: 'Do you have an idea for a new action? Have you built something custom for your project? Learn how to build shareable actions and publish them to GitHub Marketplace.' guides: - /actions/creating-actions/about-custom-actions - /actions/creating-actions/creating-a-docker-container-action diff --git a/translations/zh-CN/content/actions/guides.md b/translations/zh-CN/content/actions/guides.md index a08a4489e3..805f18191c 100644 --- a/translations/zh-CN/content/actions/guides.md +++ b/translations/zh-CN/content/actions/guides.md @@ -10,9 +10,6 @@ versions: ghec: '*' learningTracks: - getting_started - - continuous_integration - - continuous_deployment - - deploy_to_the_cloud - adopting_github_actions_for_your_enterprise_ghec - adopting_github_actions_for_your_enterprise_ghes_and_ghae - hosting_your_own_runners diff --git a/translations/zh-CN/content/actions/index.md b/translations/zh-CN/content/actions/index.md index 0f778768ac..8974e8db33 100644 --- a/translations/zh-CN/content/actions/index.md +++ b/translations/zh-CN/content/actions/index.md @@ -26,14 +26,6 @@ featuredLinks: - /actions/learn-github-actions/expressions - /actions/learn-github-actions/environment-variables - /actions/security-guides/encrypted-secrets - videos: - - title: 'Inside GitHub: How we use GitHub Actions – Brian Douglas' - href: 'https://www.youtube-nocookie.com/embed/MW0V5Q9WJu4' - - title: Advanced GitHub Actions – Jennifer Schelkopf - href: 'https://www.youtube-nocookie.com/embed/wWOH44Lscoc' - - title: GitHub Actions in action – Karan MV - href: 'https://www.youtube-nocookie.com/embed/4SWO0Pc76CU' - videosHeading: GitHub Universe 2021 videos product_video: 'https://www.youtube-nocookie.com/embed/cP0I9w2coGU' redirect_from: - /articles/automating-your-workflow-with-github-actions diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md index dfbb52b360..477a01b0a1 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md @@ -43,7 +43,8 @@ The events listed in your security log are triggered by your actions. Actions ar | [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | [`marketplace_listing`](#marketplace_listing-category-actions) | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %} | [`oauth_access`](#oauth_access-category-actions) | Contains all activities related to [{% data variables.product.prodname_oauth_apps %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-oauth-apps) you've connected with.{% ifversion fpt or ghec %} -| [`payment_method`](#payment_method-category-actions) | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %} +| [`payment_method`](#payment_method-category-actions) | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %}{% ifversion pat-v2%} +| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."{% endif %} | [`profile_picture`](#profile_picture-category-actions) | Contains all activities related to your profile picture. | [`project`](#project-category-actions) | Contains all activities related to project boards. | [`public_key`](#public_key-category-actions) | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). @@ -121,6 +122,23 @@ An overview of some of the most common actions that are recorded as events in th {% endif %} +{% ifversion pat-v2 %} + +### `personal_access_token` category actions + +| Action | Description +|------------------|------------------- +| `access_granted` | Triggered when a {% data variables.product.pat_v2 %} that you created is granted access to resources. +| `access_revoked` | Triggered when a {% data variables.product.pat_v2 %} that you created is revoked. The token can still read public organization resources. +| `create` | Triggered when you create a {% data variables.product.pat_v2 %}. +| `credential_regenerated` | Triggered when you regenerate a {% data variables.product.pat_v2 %}. +| `destroy` | Triggered when you delete a {% data variables.product.pat_v2 %}. +| `request_cancelled` | Triggered when you cancel a pending request for your {% data variables.product.pat_v2 %} to access organization resources. +| `request_created` | Triggered when you create a {% data variables.product.pat_v2 %} to access organization resources and the organization requires approval before a {% data variables.product.pat_v2 %} can access organization resources. +| `request_denied` | Triggered when your request for a {% data variables.product.pat_v2 %} to access organization resources is denied. For more information, see "[Managing requests for {% data variables.product.pat_generic %} in your organization](/organizations/managing-programmatic-access-to-your-organization/managing-requests-for-personal-access-tokens-in-your-organization)." + +{% endif %} + ### `profile_picture` category actions | Action | Description diff --git a/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md b/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md index 29711c895e..bc3828f634 100644 --- a/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md +++ b/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md @@ -44,7 +44,7 @@ If you enable prebuilding of codespaces this will incur additional charges. For ## About billing for {% data variables.product.prodname_github_codespaces %} -{% data variables.product.prodname_github_codespaces %} is billed in US dollars (USD) according to their compute and storage usage. {% data reusables.codespaces.codespaces-monthly-billing %} xxx +{% data variables.product.prodname_github_codespaces %} is billed in US dollars (USD) according to the amount of compute time and storage space your codespaces use. {% data reusables.codespaces.codespaces-monthly-billing %} Your {% data variables.product.prodname_github_codespaces %} usage shares your organization or enterprise account's existing payment method, and receipt. For more information, see "[Viewing your subscriptions and billing date](/articles/viewing-your-subscriptions-and-billing-date)." @@ -60,7 +60,7 @@ As an example, if a codespace is active for 1 hour and 15 minutes, then the comp You can restrict compute usage by stopping your codespaces. For information, see "[Stopping and starting a codespace](/codespaces/developing-in-codespaces/stopping-and-starting-a-codespace)." Codespaces are stopped automatically after a configurable period of inactivity. The timeout period can be configured by the user, or at the organization level. For more information, see "[Setting your timeout period for {% data variables.product.prodname_github_codespaces %}](/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces)" and "[Restricting the idle timeout period](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)." ### Billing for storage usage -For {% data variables.product.prodname_github_codespaces %} billing purposes, this includes all storage used by all codespaces and prebuilds in your account. This includes any files used by the codespaces, such as cloned repositories, configuration files, and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or stopped. The storage billing for a codespace ends when it is deleted. +For {% data variables.product.prodname_github_codespaces %} billing purposes, storage compromises the disk space used by all of the codespaces and prebuilds in your account. This includes any files used by the codespaces, such as cloned repositories, configuration files, and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or stopped. The storage billing for a codespace ends when it is deleted. Codespace storage is reported in GB-months. Your billing month runs from a fixed day in one month until the same day in the next month. In most cases the day of the month is determined by the day you started on your current {% data variables.product.prodname_dotcom %} plan. Your GB-month storage, is calculated as follows. Once every hour, the storage used by all of your currently active and stopped codespaces is assessed. This figure is then divided by the number of hours in the current billing month: `total storage size / hours this month`. The result is added to the running total for codespace storage for the month. @@ -93,7 +93,7 @@ In addition to {% data variables.product.prodname_actions %} minutes, you will a The storage cost for a prebuild in a single region will be similar to the storage cost that will be incurred for storing a single codespace created from that prebuild. The storage cost for the generated codespace may be more than the cost for the prebuild if, for example, the `updateContentCommand` and `postCreateCommand` commands are used during codespace creation to download more files to the dev container. -The total storage costs associated with a prebuild template will depend on: +The total storage costs associated with a prebuild will depend on: * The price of storage per GB. See the table above. * The size of the generated prebuild in GB. @@ -134,9 +134,9 @@ Organization owners can create a policy to restrict the machine types that are a To incur charges to an organization account (or to an enterprise account, if the organization belongs to an enterprise), the user must be a member or collaborator of that organization, otherwise they cannot create a codespace for which the organization, or its parent enterprise, would be billed. -For example, a user in an organization can fork a repository within that organization, and can subsequently use a codespace billed to the organization; this is because the organization is the owner of the parent repository, which can remove the user's access, the forked repository, and the codespace. +For example, a user in an organization can fork a repository within that organization, and can subsequently use a codespace billed to the organization. This is because the organization is the owner of the parent repository, and can remove the user's access, the forked repository, and the codespace. -## How billing is handled when a repository is transferred +## How billing is handled when a repository is transferred to another organization Usage is calculated every hour. An organization pays for usage of codespaces created from any repository owned by the organization, where the organization settings permit the organization to be billed. For more information, see "[Enabling GitHub Codespaces for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization#choose-who-can-create-codespaces-that-are-billed-to-your-organization)." When a repository is transferred out of your organization, ownership and billing responsibility for any codespaces associated with that repository will change accordingly. diff --git a/translations/zh-CN/content/codespaces/index.md b/translations/zh-CN/content/codespaces/index.md index 5c688c57bf..c5922493eb 100644 --- a/translations/zh-CN/content/codespaces/index.md +++ b/translations/zh-CN/content/codespaces/index.md @@ -12,25 +12,17 @@ featuredLinks: - /codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project - /codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces - /billing/managing-billing-for-github-codespaces/about-billing-for-codespaces - popular: - - /codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces - - /codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project - videos: - - title: 'Inside GitHub: Moving GitHub''s Development to Codespaces – Cory Wilkerson' - href: 'https://www.youtube-nocookie.com/embed/Lj_RpjEuESE' - - title: 'Making Codespaces Work for You – Allison Weins, Bailey Brooks' - href: 'https://www.youtube-nocookie.com/embed/X9Z-rUixnzk' - - title: Coding in the cloud with GitHub Codespaces and VS Code – Damian Brady - href: 'https://www.youtube-nocookie.com/embed/xWr_yH_AGVs' - videosHeading: GitHub Universe 2021 videos guideCards: - /codespaces/getting-started/deep-dive - /codespaces/developing-in-codespaces/creating-a-codespace - /codespaces/developing-in-codespaces/opening-an-existing-codespace - /codespaces/developing-in-codespaces/using-codespaces-in-visual-studio-code - /codespaces/setting-up-your-codespace/personalizing-codespaces-for-your-account + popular: + - /codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces + - /codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project popularHeading: Set up your project product_video: 'https://www.youtube-nocookie.com/embed/_W9B7qc9lVc' communityRedirect: diff --git a/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md b/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md index d8b5a39119..0caacccdd8 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md @@ -963,8 +963,6 @@ Key | Type | Description {{ webhookPayloadsForCurrentVersion.project.created }} -{% ifversion fpt or ghes or ghec %} - ## project_card {% data reusables.webhooks.project_card_short_desc %} @@ -1080,7 +1078,7 @@ Key | Type | Description ### Webhook payload example {{ webhookPayloadsForCurrentVersion.public }} -{% endif %} + ## pull_request {% data reusables.webhooks.pull_request_short_desc %} diff --git a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md index 1bdf328430..8ab11cb17b 100644 --- a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md +++ b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md @@ -37,11 +37,11 @@ To search for specific events, use the `action` qualifier in your query. Actions | Category name | Description |------------------|-------------------{% ifversion fpt or ghec %} -| [`account`](#account-category-actions) | Contains all activities related to your organization account. -| [`advisory_credit`](#advisory_credit-category-actions) | Contains all activities related to crediting a contributor for a security advisory in the {% data variables.product.prodname_advisory_database %}. For more information, see "[About {% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)." -| [`auto_approve_personal_access_token_requests`](#auto_approve_personal_access_token_requests-category-actions) | Contains activities related to your organization's approval policy for {% data variables.product.pat_v2 %}s. For more information, see "[Setting a {% data variables.product.pat_generic %} policy for your organization](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization)." -| [`billing`](#billing-category-actions) | Contains all activities related to your organization's billing. -| [`business`](#business-category-actions) | Contains activities related to business settings for an enterprise. | +| [`account`](#account-category-actions) | Contains all activities related to your organization account.{% endif %}{% ifversion fpt or ghec %} +| [`advisory_credit`](#advisory_credit-category-actions) | Contains all activities related to crediting a contributor for a security advisory in the {% data variables.product.prodname_advisory_database %}. For more information, see "[About {% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."{% endif %}{% ifversion pat-v2%} +| [`auto_approve_personal_access_token_requests`](#auto_approve_personal_access_token_requests-category-actions) | Contains activities related to your organization's approval policy for {% data variables.product.pat_v2 %}s. For more information, see "[Setting a {% data variables.product.pat_generic %} policy for your organization](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization)."{% endif %}{% ifversion fpt or ghec %} +| [`billing`](#billing-category-actions) | Contains all activities related to your organization's billing.{% endif %}{% ifversion fpt or ghec %} +| [`business`](#business-category-actions) | Contains activities related to business settings for an enterprise. |{% endif %}{% ifversion fpt or ghec %} | [`codespaces`](#codespaces-category-actions) | Contains all activities related to your organization's codespaces. |{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae %} | [`dependabot_alerts`](#dependabot_alerts-category-actions) | Contains organization-level configuration activities for {% data variables.product.prodname_dependabot_alerts %} in existing repositories. For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." | [`dependabot_alerts_new_repos`](#dependabot_alerts_new_repos-category-actions) | Contains organization-level configuration activities for {% data variables.product.prodname_dependabot_alerts %} in new repositories created in the organization.{% endif %}{% ifversion fpt or ghec or ghes > 3.2 %} @@ -67,8 +67,8 @@ To search for specific events, use the `action` qualifier in your query. Actions | [`organization_default_label`](#organization_default_label-category-actions) | Contains all activities related to default labels for repositories in your organization. | [`oauth_application`](#oauth_application-category-actions) | Contains all activities related to OAuth Apps. | [`packages`](#packages-category-actions) | Contains all activities related to {% data variables.product.prodname_registry %}.{% ifversion fpt or ghec %} -| [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %} -| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)." +| [`payment_method`](#payment_method-category-actions) | Contains all activities related to how your organization pays for GitHub.{% endif %}{% ifversion pat-v2%} +| [`personal_access_token`](#personal_access_token-category-actions) | Contains activities related to {% data variables.product.pat_v2 %}s in your organization. For more information, see "[Creating a {% data variables.product.pat_generic %}](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."{% endif %} | [`profile_picture`](#profile_picture-category-actions) | Contains all activities related to your organization's profile picture. | [`project`](#project-category-actions) | Contains all activities related to project boards. | [`protected_branch`](#protected_branch-category-actions) | Contains all activities related to protected branches. diff --git a/translations/zh-CN/data/learning-tracks/actions.yml b/translations/zh-CN/data/learning-tracks/actions.yml index a22ad998cd..8e6d54e871 100644 --- a/translations/zh-CN/data/learning-tracks/actions.yml +++ b/translations/zh-CN/data/learning-tracks/actions.yml @@ -1,6 +1,6 @@ getting_started: - title: '{% data variables.product.prodname_actions %} 入门' - description: '通过创建第一个工作流来发现 {% data variables.product.prodname_actions %} 的可能性。' + title: 'Get started with {% data variables.product.prodname_actions %}' + description: 'Discover the possibilities of {% data variables.product.prodname_actions %} by creating your first workflow.' guides: - /actions/learn-github-actions/introduction-to-github-actions - /actions/learn-github-actions/finding-and-customizing-actions @@ -9,36 +9,9 @@ getting_started: - /actions/learn-github-actions/reusing-workflows - /actions/security-guides/security-hardening-for-github-actions featured_track: true -continuous_integration: - title: '生成和测试代码' - description: '可以在存储库中创建自定义持续集成 (CI) 工作流。' - guides: - - /actions/automating-builds-and-tests/about-continuous-integration - - /actions/automating-builds-and-tests/building-and-testing-powershell - - /actions/automating-builds-and-tests/building-and-testing-ruby - - /actions/automating-builds-and-tests/building-and-testing-java-with-maven - - /actions/automating-builds-and-tests/building-and-testing-java-with-gradle - - /actions/automating-builds-and-tests/building-and-testing-java-with-ant - - /actions/automating-builds-and-tests/building-and-testing-swift -continuous_deployment: - title: '自动部署' - description: '了解如何使用 {% data variables.product.prodname_actions %} 中的自定义持续部署 (CD) 工作流自动发布项目。' - guides: - - /actions/publishing-packages/about-packaging-with-github-actions - - /actions/publishing-packages/publishing-nodejs-packages - - /actions/publishing-packages/publishing-java-packages-with-maven - - /actions/publishing-packages/publishing-java-packages-with-gradle - - /actions/publishing-packages/publishing-docker-images -deploy_to_the_cloud: - title: '部署到云端' - description: '了解如何使用 {% data variables.product.prodname_actions %} 生成应用程序并将其部署到各种基于云的平台。' - guides: - - /actions/deployment/deploying-to-amazon-elastic-container-service - - /actions/deployment/deploying-to-azure-app-service - - /actions/deployment/deploying-to-google-kubernetes-engine adopting_github_actions_for_your_enterprise_ghec: - title: '为企业采用 GitHub Actions' - description: '了解如何在企业中计划和实现 {% data variables.product.prodname_actions %} 的推出。' + title: 'Adopt GitHub Actions for your enterprise' + description: 'Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise.' versions: ghec: '*' guides: @@ -50,8 +23,8 @@ adopting_github_actions_for_your_enterprise_ghec: - /actions/security-guides/security-hardening-for-github-actions - /billing/managing-billing-for-github-actions/about-billing-for-github-actions adopting_github_actions_for_your_enterprise_ghes_and_ghae: - title: '为企业采用 GitHub Actions' - description: '了解如何在企业中计划和实现 {% data variables.product.prodname_actions %} 的推出。' + title: 'Adopt GitHub Actions for your enterprise' + description: 'Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise.' versions: ghes: '*' ghae: '*' @@ -66,8 +39,8 @@ adopting_github_actions_for_your_enterprise_ghes_and_ghae: - /actions/security-guides/security-hardening-for-github-actions - /billing/managing-billing-for-github-actions/about-billing-for-github-actions hosting_your_own_runners: - title: '托管自己的运行器' - description: '可以创建自托管运行器,以便在高度可自定义的环境中运行工作流。' + title: 'Host your own runners' + description: 'You can create self-hosted runners to run workflows in a highly customizable environment.' guides: - /actions/hosting-your-own-runners/about-self-hosted-runners - /actions/hosting-your-own-runners/adding-self-hosted-runners @@ -78,8 +51,8 @@ hosting_your_own_runners: - /actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups - /actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners create_actions: - title: '创建操作' - description: '是否对新操作有想法?是否为项目生成了自定义内容?了解如何构建可共享操作并将其发布到 GitHub 市场。' + title: 'Create an action' + description: 'Do you have an idea for a new action? Have you built something custom for your project? Learn how to build shareable actions and publish them to GitHub Marketplace.' guides: - /actions/creating-actions/about-custom-actions - /actions/creating-actions/creating-a-docker-container-action