diff --git a/assets/images/help/repository/dependabot-alerts-dismissal-comment.png b/assets/images/help/repository/dependabot-alerts-dismissal-comment.png new file mode 100644 index 0000000000..392cbf96ea Binary files /dev/null and b/assets/images/help/repository/dependabot-alerts-dismissal-comment.png differ diff --git a/assets/images/help/repository/publish-github-action-to-markeplace-button.png b/assets/images/help/repository/publish-github-action-to-markeplace-button.png deleted file mode 100644 index ef22246e9e..0000000000 Binary files a/assets/images/help/repository/publish-github-action-to-markeplace-button.png and /dev/null differ diff --git a/assets/images/help/repository/publish-github-action-to-marketplace-button.png b/assets/images/help/repository/publish-github-action-to-marketplace-button.png new file mode 100644 index 0000000000..275768be40 Binary files /dev/null and b/assets/images/help/repository/publish-github-action-to-marketplace-button.png differ diff --git a/content/actions/creating-actions/metadata-syntax-for-github-actions.md b/content/actions/creating-actions/metadata-syntax-for-github-actions.md index 56b069acf1..e8b5b83607 100644 --- a/content/actions/creating-actions/metadata-syntax-for-github-actions.md +++ b/content/actions/creating-actions/metadata-syntax-for-github-actions.md @@ -354,7 +354,7 @@ runs: #### `runs.steps[*].with` -**Optional** A `map` of the input parameters defined by the action. Each input parameter is a key/value pair. Input parameters are set as environment variables. The variable is prefixed with INPUT_ and converted to upper case. +**Optional** A `map` of the input parameters defined by the action. Each input parameter is a key/value pair. For more information, see [Example: Specifying inputs](#example-specifying-inputs). ```yaml runs: diff --git a/content/actions/creating-actions/publishing-actions-in-github-marketplace.md b/content/actions/creating-actions/publishing-actions-in-github-marketplace.md index e264f2a72e..66ee2080e3 100644 --- a/content/actions/creating-actions/publishing-actions-in-github-marketplace.md +++ b/content/actions/creating-actions/publishing-actions-in-github-marketplace.md @@ -38,9 +38,10 @@ You can add the action you've created to {% data variables.product.prodname_mark To draft a new release and publish the action to {% data variables.product.prodname_marketplace %}, follow these instructions: {% data reusables.repositories.navigate-to-repo %} -1. When a repository contains an action metadata file (`action.yml` or `action.yaml`), you'll see a banner to publish the action to {% data variables.product.prodname_marketplace %}. Click **Draft a release**. -![Publish this action to markeplace button](/assets/images/help/repository/publish-github-action-to-markeplace-button.png) -1. Select **Publish this action to the {% data variables.product.prodname_marketplace %}**. If you can't select the **Publish this action to the {% data variables.product.prodname_marketplace %}** checkbox, you'll need to read and accept the {% data variables.product.prodname_marketplace %} agreement first. +1. Navigate to the action metadata file in your repository (`action.yml` or `action.yaml`), and you'll see a banner to publish the action to {% data variables.product.prodname_marketplace %}. Click **Draft a release**. + + ![Publish this action to marketplace button](/assets/images/help/repository/publish-github-action-to-marketplace-button.png) +1. Under "Release Action", select the checkbox to publish the action to the {% data variables.product.prodname_marketplace %}. If you can't select the checkbox, you must first click the link to read and accept the {% data variables.product.prodname_marketplace %} Developer Agreement. ![Select publish to Marketplace](/assets/images/help/repository/marketplace_actions_publish.png) 1. If the labels in your metadata file contain any problems, you will see an error message. ![See notification](/assets/images/help/repository/marketplace_actions_fixerrors.png) diff --git a/content/actions/learn-github-actions/contexts.md b/content/actions/learn-github-actions/contexts.md index 2cd8c3d9ac..7a93d901be 100644 --- a/content/actions/learn-github-actions/contexts.md +++ b/content/actions/learn-github-actions/contexts.md @@ -87,7 +87,7 @@ The following table indicates where each context and special function can be use | jobs.<job_id>.name | github, needs, strategy, matrix, inputs | | | jobs.<job_id>.outputs.<output_id> | github, needs, strategy, matrix, job, runner, env, secrets, steps, inputs | | | jobs.<job_id>.runs-on | github, needs, strategy, matrix, inputs | | -| jobs.<job_id>.secrets.<secrets_id> | github, needs, secrets{% ifversion actions-unified-inputs %}, inputs{% endif %} | | +| jobs.<job_id>.secrets.<secrets_id> | github, needs,{% ifversion actions-reusable-workflow-matrix %} strategy, matrix,{% endif %} secrets{% ifversion actions-unified-inputs %}, inputs{% endif %} | | | jobs.<job_id>.services | github, needs, strategy, matrix, inputs | | | jobs.<job_id>.services.<service_id>.credentials | github, needs, strategy, matrix, env, secrets, inputs | | | jobs.<job_id>.services.<service_id>.env.<env_id> | github, needs, strategy, matrix, job, runner, env, secrets, inputs | | @@ -101,7 +101,7 @@ The following table indicates where each context and special function can be use | jobs.<job_id>.steps.working-directory | github, needs, strategy, matrix, job, runner, env, secrets, steps, inputs | hashFiles | | jobs.<job_id>.strategy | github, needs, inputs | | | jobs.<job_id>.timeout-minutes | github, needs, strategy, matrix, inputs | | -| jobs.<job_id>.with.<with_id> | github, needs{% ifversion actions-unified-inputs %}, inputs{% endif %} | | +| jobs.<job_id>.with.<with_id> | github, needs{% ifversion actions-reusable-workflow-matrix %}, strategy, matrix{% endif %}{% ifversion actions-unified-inputs %}, inputs{% endif %} | | | on.workflow_call.inputs.<inputs_id>.default | github{% ifversion actions-unified-inputs %}, inputs{% endif %} | | | on.workflow_call.outputs.<output_id>.value | github, jobs, inputs | | {% else %} diff --git a/content/actions/using-workflows/events-that-trigger-workflows.md b/content/actions/using-workflows/events-that-trigger-workflows.md index b46d076984..bacda6f228 100644 --- a/content/actions/using-workflows/events-that-trigger-workflows.md +++ b/content/actions/using-workflows/events-that-trigger-workflows.md @@ -812,6 +812,8 @@ Runs your workflow when activity on a pull request in the workflow's repository This event runs in the context of the base of the pull request, rather than in the context of the merge commit, as the `pull_request` event does. This prevents execution of unsafe code from the head of the pull request that could alter your repository or steal any secrets you use in your workflow. This event allows your workflow to do things like label or comment on pull requests from forks. Avoid using this event if you need to build or run code from the pull request. +To ensure repository security, branches with names that match certain patterns (such as those which look similar to SHAs) may not trigger workflows with the `pull_request_target` event. + {% warning %} **Warning:** For workflows that are triggered by the `pull_request_target` event, the `GITHUB_TOKEN` is granted read/write repository permission unless the `permissions` key is specified and the workflow can access secrets, even when it is triggered from a fork. Although the workflow runs in the context of the base of the pull request, you should make sure that you do not check out, build, or run untrusted code from the pull request with this event. Additionally, any caches share the same scope as the base branch. To help prevent cache poisoning, you should not save the cache if there is a possibility that the cache contents were altered. For more information, see "[Keeping your GitHub Actions and workflows secure: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests)" on the GitHub Security Lab website. diff --git a/content/actions/using-workflows/reusing-workflows.md b/content/actions/using-workflows/reusing-workflows.md index 54c07393ae..bbdf28e7fe 100644 --- a/content/actions/using-workflows/reusing-workflows.md +++ b/content/actions/using-workflows/reusing-workflows.md @@ -39,7 +39,7 @@ You can view the reused workflows referenced in your {% data variables.product.p ### Reusable workflows and starter workflows -Starter workflows allow everyone in your organization who has permission to create workflows to do so more quickly and easily. When people create a new workflow, they can choose a starter workflow and some or all of the work of writing the workflow will be done for them. Within a starter workflow, you can also reference reusable workflows to make it easy for people to benefit from reusing centrally managed workflow code. If you use a tag or branch name when referencing the reusable workflow, you can ensure that everyone who reuses that workflow will always be using the same YAML code. However, if you reference a reusable workflow by a tag or branch, be sure that you can trust that version of the workflow. For more information, see "[Security hardening for {% data variables.product.prodname_actions %}](/actions/security-guides/security-hardening-for-github-actions#reusing-third-party-workflows)." +Starter workflows allow everyone in your organization who has permission to create workflows to do so more quickly and easily. When people create a new workflow, they can choose a starter workflow and some or all of the work of writing the workflow will be done for them. Within a starter workflow, you can also reference reusable workflows to make it easy for people to benefit from reusing centrally managed workflow code. If you use a commit SHA when referencing the reusable workflow, you can ensure that everyone who reuses that workflow will always be using the same YAML code. However, if you reference a reusable workflow by a tag or branch, be sure that you can trust that version of the workflow. For more information, see "[Security hardening for {% data variables.product.prodname_actions %}](/actions/security-guides/security-hardening-for-github-actions#reusing-third-party-workflows)." For more information, see "[Creating starter workflows for your organization](/actions/learn-github-actions/creating-starter-workflows-for-your-organization)." @@ -69,10 +69,14 @@ Called workflows that are owned by the same user or organization{% ifversion ghe ## Limitations +{% ifversion nested-reusable-workflow %} +* You can connect up to four levels of workflows. For more information, see "[Calling a nested reusable workflow](#calling-a-nested-reusable-workflow)." +{% else %} * Reusable workflows can't call other reusable workflows. +{% endif %} * Reusable workflows stored within a private repository can only be used by workflows within the same repository. -* Any environment variables set in an `env` context defined at the workflow level in the caller workflow are not propagated to the called workflow. For more information about the `env` context, see "[Context and expression syntax for GitHub Actions](/actions/reference/context-and-expression-syntax-for-github-actions#env-context)." -* The `strategy` property is not supported in any job that calls a reusable workflow. +* Any environment variables set in an `env` context defined at the workflow level in the caller workflow are not propagated to the called workflow. For more information about the `env` context, see "[Context and expression syntax for GitHub Actions](/actions/reference/context-and-expression-syntax-for-github-actions#env-context)."{% ifversion actions-reusable-workflow-matrix %}{% else %} +* The `strategy` property is not supported in any job that calls a reusable workflow.{% endif %} ## Creating a reusable workflow @@ -105,7 +109,13 @@ You can define inputs and secrets, which can be passed from the caller workflow {% endraw %} For details of the syntax for defining inputs and secrets, see [`on.workflow_call.inputs`](/actions/reference/workflow-syntax-for-github-actions#onworkflow_callinputs) and [`on.workflow_call.secrets`](/actions/reference/workflow-syntax-for-github-actions#onworkflow_callsecrets). {% ifversion actions-inherit-secrets-reusable-workflows %} -1. In the reusable workflow, reference the input or secret that you defined in the `on` key in the previous step. If the secrets are inherited using `secrets: inherit`, you can reference them even if they are not defined in the `on` key. +1. In the reusable workflow, reference the input or secret that you defined in the `on` key in the previous step. + + {% note %} + + **Note**: If the secrets are inherited by using `secrets: inherit` in the calling workflow, you can reference them even if they are not explicitly defined in the `on` key. For more information, see "[Workflow syntax for GitHub Actions](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idsecretsinherit)." + + {% endnote %} {%- else %} 1. In the reusable workflow, reference the input or secret that you defined in the `on` key in the previous step. {%- endif %} @@ -164,7 +174,36 @@ jobs: token: ${{ secrets.token }} ``` {% endraw %} +{% ifversion actions-reusable-workflow-matrix %} +## Using a matrix strategy with a reusable workflow +Jobs using the matrix strategy can call a reusable workflow. + +A matrix strategy lets you use variables in a single job definition to automatically create multiple job runs that are based on the combinations of the variables. For example, you can use a matrix strategy to pass different inputs to a reusable workflow. For more information about matrices, see "[Using a matrix for your jobs](/actions/using-jobs/using-a-matrix-for-your-jobs)." + +### Example matrix strategy with a reusable workflow + +This workflow file references the matrix context by defining the variable `target` with the values `[dev, stage, prod]`. The workflow will run three jobs, one for each value in the variable. The workflow file also calls a reusable workflow by using the `uses` keyword. + +{% raw %} +```yaml{:copy} +name: Reusable workflow with matrix strategy + +on: + push: + +jobs: + ReuseableMatrixJobForDeployment: + strategy: + matrix: + target: [dev, stage, prod] + uses: octocat/octo-repo/.github/workflows/deployment.yml@main + with: + target: ${{ matrix.target }} +``` +{% endraw %} + +{% endif %} ## Calling a reusable workflow You call a reusable workflow by using the `uses` keyword. Unlike when you are using actions within a workflow, you call reusable workflows directly within a job, and not from within job steps. @@ -234,9 +273,62 @@ jobs: ``` {% endraw %} +{% ifversion nested-reusable-workflow %} +## Nesting reusable workflows + +You can connect a maximum of four levels of workflows - that is, the top-level caller workflow and up to three levels of reusable workflows. For example: _caller-workflow.yml_ → _called-workflow-1.yml_ → _called-workflow-2.yml_ → _called-workflow-3.yml_. Loops in the workflow tree are not permitted. + +From within a reusable workflow you can call another reusable workflow. + +{% raw %} +```yaml{:copy} +name: Reusable workflow + +on: + workflow_call: + +jobs: + call-another-reusable: + uses: octo-org/example-repo/.github/workflows/another-reusable.yml@v1 +``` +{% endraw %} + +### Passing secrets to nested workflows + +You can use `jobs..secrets` in a calling workflow to pass named secrets to a directly called workflow. Alternatively, you can use `jobs..secrets.inherit` to pass all of the calling workflow's secrets to a directly called workflow. For more information, see the section "[Passing inputs and secrets to a reusable workflow](/actions/using-workflows/reusing-workflows#passing-inputs-and-secrets-to-a-reusable-workflow)" above, and the reference article "[Workflow syntax for GitHub Actions](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idsecretsinherit)." Secrets are only passed to directly called workflow, so in the workflow chain A > B > C, workflow C will only receive secrets from A if they have been passed from A to B, and then from B to C. + +In the following example, workflow A passes all of its secrets to workflow B, by using the `inherit` keyword, but workflow B only passes one secret to workflow C. Any of the other secrets passed to workflow B are not available to workflow C. + +{% raw %} +```yaml +jobs: + workflowA-calls-workflowB: + uses: octo-org/example-repo/.github/workflows/B.yml@main + secrets: inherit # pass all secrets +``` + +```yaml +jobs: + workflowB-calls-workflowC: + uses: different-org/example-repo/.github/workflows/C.yml@main + secrets: + envPAT: ${{ secrets.envPAT }} # pass just this secret +``` +{% endraw %} + +### Access and permissions + +A workflow that contains nested reusable workflows will fail if any of the nested workflows is inaccessible to the initial caller workflow. For more information, see "[Access to reusable workflows](/actions/using-workflows/reusing-workflows#access-to-reusable-workflows)." + +`GITHUB_TOKEN` permissions can only be the same or more restrictive in nested workflows. For example, in the workflow chain A > B > C, if workflow A has `package: read` token permission, then B and C cannot have `package: write` permission. For more information, see "[Automatic token authentication](/actions/security-guides/automatic-token-authentication)." +{% endif %} + ## Using outputs from a reusable workflow -A reusable workflow may generate data that you want to use in the caller workflow. To use these outputs, you must specify them as the outputs of the reusable workflow. +A reusable workflow may generate data that you want to use in the caller workflow. To use these outputs, you must specify them as the outputs of the reusable workflow.{% ifversion actions-reusable-workflow-matrix %} + +If a reusable workflow that sets an output is executed with a matrix strategy, the output will be the output set by the last successful completing reusable workflow of the matrix which actually sets a value. +That means if the last successful completing reusable workflow sets an empty string for its output, and the second last successful completing reusable workflow sets an actual value for its output, the output will contain the value of the second last completing reusable workflow.{% endif %} The following reusable workflow has a single job containing two steps. In each of these steps we set a single word as the output: "hello" and "world." In the `outputs` section of the job, we map these step outputs to job outputs called: `output1` and `output2`. In the `on.workflow_call.outputs` section we then define two outputs for the workflow itself, one called `firstword` which we map to `output1`, and one called `secondword` which we map to `output2`. diff --git a/content/actions/using-workflows/workflow-syntax-for-github-actions.md b/content/actions/using-workflows/workflow-syntax-for-github-actions.md index 2607f856d8..40ab7684fb 100644 --- a/content/actions/using-workflows/workflow-syntax-for-github-actions.md +++ b/content/actions/using-workflows/workflow-syntax-for-github-actions.md @@ -1037,15 +1037,23 @@ You can use special characters in path, branch, and tag filters. - `[]` Matches one character listed in the brackets or included in ranges. Ranges can only include `a-z`, `A-Z`, and `0-9`. For example, the range`[0-9a-z]` matches any digit or lowercase letter. For example, `[CB]at` matches `Cat` or `Bat` and `[1-2]00` matches `100` and `200`. - `!`: At the start of a pattern makes it negate previous positive patterns. It has no special meaning if not the first character. -The characters `*`, `[`, and `!` are special characters in YAML. If you start a pattern with `*`, `[`, or `!`, you must enclose the pattern in quotes. +The characters `*`, `[`, and `!` are special characters in YAML. If you start a pattern with `*`, `[`, or `!`, you must enclose the pattern in quotes. Also, if you use a [flow sequence](https://yaml.org/spec/1.2.2/#flow-sequences) with a pattern containing `[` and/or `]`, the pattern must be enclosed in quotes. ```yaml # Valid -- '**/README.md' +branches: + - '**/README.md' # Invalid - creates a parse error that # prevents your workflow from running. -- **/README.md +branches: + - **/README.md + +# Valid +branches: [ main, 'release/v[0-9].[0-9]' ] + +# Invalid - creates a parse error +branches: [ main, release/v[0-9].[0-9] ] ``` For more information about branch, tag, and path filter syntax, see "[`on..`](#onpushbranchestagsbranches-ignoretags-ignore)", "[`on..`](#onpull_requestpull_request_targetbranchesbranches-ignore)", and "[`on..paths`](#onpushpull_requestpull_request_targetpathspaths-ignore)." diff --git a/content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md b/content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md index ccf5272e1b..c210522595 100644 --- a/content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md +++ b/content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md @@ -19,7 +19,7 @@ shortTitle: Create HA replica ## Creating a high availability replica 1. Set up a new {% data variables.product.prodname_ghe_server %} appliance on your desired platform. The replica appliance should mirror the primary appliance's CPU, RAM, and storage settings. We recommend that you install the replica appliance in an independent environment. The underlying hardware, software, and network components should be isolated from those of the primary appliance. If you are a using a cloud provider, use a separate region or zone. For more information, see ["Setting up a {% data variables.product.prodname_ghe_server %} instance"](/enterprise/admin/guides/installation/setting-up-a-github-enterprise-server-instance). -1. Ensure that both the primary appliance and the new replica appliance can communicate with each other over ports 122/TCP and 1194/UDP. For more information, see "[Network ports](/admin/configuration/configuring-network-settings/network-ports#administrative-ports)." +1. Ensure that the new appliance can communicate with all other appliances in this high availability environment over ports 122/TCP and 1194/UDP. For more information, see "[Network ports](/admin/configuration/configuring-network-settings/network-ports#administrative-ports)." 1. In a browser, navigate to the new replica appliance's IP address and upload your {% data variables.product.prodname_enterprise %} license. {% data reusables.enterprise_installation.replica-steps %} 1. Connect to the replica appliance's IP address using SSH. diff --git a/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md b/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md index f7ece2d3dc..146c44a368 100644 --- a/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md +++ b/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md @@ -37,21 +37,40 @@ You can enable automatic security updates for any repository that uses {% data v {% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect that your codebase is using dependencies with known security risks. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency in the default branch, {% data variables.product.prodname_dependabot %} creates a pull request to fix it. The pull request will upgrade the dependency to the minimum possible secure version needed to avoid the vulnerability. -{% ifversion dependabot-most-important-sort-option %} By default, {% data variables.product.prodname_dependabot_alerts %} are displayed in the {% data variables.product.prodname_dependabot_alerts %} tab in order of importance, but you can sort alerts by other criteria. {% endif %}{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5638 %}You can sort and filter {% data variables.product.prodname_dependabot_alerts %} with the dropdown menus in the {% data variables.product.prodname_dependabot_alerts %} tab or by typing filters as `key:value` pairs into the search bar. The available filters are repository (for example, `repo:my-repository`), package (for example, `package:django`), ecosystem (for example, `ecosystem:npm`), manifest (for example, `manifest:webwolf/pom.xml`), state (for example, `is:open`), and whether an advisory has a patch (for example, `has: patch`).{% ifversion dependabot-alerts-development-label %} You can also filter alerts with dependency scope data using `scope`, for example: `scope:development` or `scope:runtime`. With `scope:development`, the list of alerts will only show dependencies used during development, not production.{% endif %} - Each {% data variables.product.prodname_dependabot %} alert has a unique numeric identifier and the {% data variables.product.prodname_dependabot_alerts %} tab lists an alert for every detected vulnerability. Legacy {% data variables.product.prodname_dependabot_alerts %} grouped vulnerabilities by dependency and generated a single alert per dependency. If you navigate to a legacy {% data variables.product.prodname_dependabot %} alert, you will be redirected to a {% data variables.product.prodname_dependabot_alerts %} tab filtered for that package. {% endif %} + +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5638 %} +You can filter and sort {% data variables.product.prodname_dependabot_alerts %} using a variety of filters and sort options available on the user interface. For more information, see "[Prioritizing {% data variables.product.prodname_dependabot_alerts %}](#prioritizing-across--data-variablesproductprodname_dependabot_alerts-)" below. + +## Prioritizing {% data variables.product.prodname_dependabot_alerts %} + +{% data variables.product.company_short %} helps you prioritize fixing {% data variables.product.prodname_dependabot_alerts %}. {% ifversion dependabot-most-important-sort-option %} By default, {% data variables.product.prodname_dependabot_alerts %} are sorted by importance. The "Most important" sort order helps you prioritize which {% data variables.product.prodname_dependabot_alerts %} to focus on first. Alerts are ranked based on their potential impact, actionability, and relevance. Our prioritization calculation is constantly being improved and includes factors like CVSS score, dependency scope, and whether vulnerable function calls are found for the alert. + +![Screenshot of Sort dropdown with "Most important" sort](/assets/images/help/dependabot/dependabot-alerts-sort-dropdown.png) {% endif %} +{% data reusables.dependabot.dependabot-alerts-filters %} + +In addition to the filters available via the search bar, you can sort and filter {% data variables.product.prodname_dependabot_alerts %} using the dropdown menus at the top of the alert list. The search bar also allows for full text searching of alerts and related security advisories. You can search for part of a security advisory name or description to return the alerts in your repository that relate to that security advisory. For example, searching for `yaml.load() API could execute arbitrary code` will return {% data variables.product.prodname_dependabot_alerts %} linked to "[PyYAML insecurely deserializes YAML strings leading to arbitrary code execution](https://github.com/advisories/GHSA-rprw-h62v-c2w7)" as the search string appears in the advisory description. + +{% endif %} + +{% ifversion dependabot-bulk-alerts %} + ![Screenshot of the filter and sort menus in the {% data variables.product.prodname_dependabot_alerts %} tab](/assets/images/help/graphs/dependabot-alerts-filters-checkbox.png){% elsif ghes = 3.5 %} +You can select a filter in a dropdown menu at the top of the list, then click the filter that you would like to apply. + ![Screenshot of the filter and sort menus in the {% data variables.product.prodname_dependabot_alerts %} tab](/assets/images/enterprise/3.5/dependabot/dependabot-alerts-filters.png){% endif %} + {% ifversion dependabot-alerts-development-label %} ## Supported ecosystems and manifests for dependency scope - {% data reusables.dependabot.dependabot-alerts-dependency-scope %} Alerts for packages listed as development dependencies are marked with the `Development` label on the {% data variables.product.prodname_dependabot_alerts %} page and are also available for filtering via the `scope` filter. + ![Screenshot showing the "Development" label in the list of alerts](/assets/images/help/repository/dependabot-alerts-development-label.png) The alert details page of alerts on development-scoped packages shows a "Tags" section containing a `Development` label. + ![Screenshot showing the "Tags" section in the alert details page](/assets/images/help/repository/dependabot-alerts-tags-section.png) {% endif %} @@ -92,20 +111,7 @@ For more information, see "[Reviewing and fixing alerts](#reviewing-and-fixing-a {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-dependabot-alerts %} -1. Optionally, to filter alerts, select the **Repository**, **Package**, **Ecosystem**, or **Manifest** dropdown menu then click the filter that you would like to apply. You can also type filters into the search bar. For example, `ecosystem:npm`{% ifversion ghes < 3.7 or ghae-issue-5638 %} or `has:patch`{% endif %}{% ifversion dependabot-alerts-development-label %}, `has:patch` or `scope:development`{% endif %}. To sort alerts, select the **Sort** dropdown menu then click the option that you would like to sort by, or type `sort:` into the search bar and choose an option from the suggestions (for example, `sort:newest`). - - {% ifversion dependabot-most-important-sort-option %} - {% note %} - - **Note:** By default, {% data variables.product.prodname_dependabot_alerts %} are sorted by importance. The "Most important" sort helps you prioritize which {% data variables.product.prodname_dependabot_alerts %} to focus on first. Alerts are ranked based on their potential impact, actionability, and relevance. Our prioritization calculation is constantly being improved and includes factors like CVSS score, dependency scope, and whether vulnerable function calls are found for the alert. - {% endnote %} - - ![Screenshot of Sort dropdown with "Most important" sort](/assets/images/help/dependabot/dependabot-alerts-sort-dropdown.png) - {% endif %} - - You can also click a label on an alert to only show alerts of that type.{% ifversion dependabot-alerts-development-label %} For example, clicking the `Development` label in the list of alerts will only show alerts relating to dependencies used in development, not production. For information about the list of ecosystems supported, see "[Supported ecosystems and manifests for dependency scope ](#supported-ecosystems-and-manifests-for-dependency-scope)." - -{% endif %} +1. Optionally, to filter alerts, select a filter in a dropdown menu then click the filter that you would like to apply. You can also type filters into the search bar. For more information about filtering and sorting alerts, see "[Prioritizing {% data variables.product.prodname_dependabot_alerts %}](#prioritizing-across--data-variablesproductprodname_dependabot_alerts-)." {%- ifversion dependabot-bulk-alerts %} ![Screenshot of the filter and sort menus in the {% data variables.product.prodname_dependabot_alerts %} tab](/assets/images/help/graphs/dependabot-alerts-filters-checkbox.png){% else %} ![Screenshot of the filter and sort menus in the {% data variables.product.prodname_dependabot_alerts %} tab](/assets/images/enterprise/3.5/dependabot/dependabot-alerts-filters.png){% endif %} @@ -162,7 +168,11 @@ If you schedule extensive work to upgrade a dependency, or decide that an alert 1. View the details for an alert. For more information, see "[Viewing vulnerable dependencies](#viewing-dependabot-alerts)" (above). 1. Select the "Dismiss" dropdown, and click a reason for dismissing the alert.{% ifversion reopen-dependabot-alerts %} Unfixed dismissed alerts can be reopened later.{% endif %} - ![Choosing reason for dismissing the alert via the "Dismiss" drop-down](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png) +{% ifversion dependabot-alerts-dismissal-comment %}1. Optionally, add a dismissal comment. The dismissal comment will be added to the alert timeline and can be used as justification during auditing and reporting. You can retrieve or set a comment by using the GraphQL API. The comment is contained in the `dismissComment` field. For more information, see "[{% data variables.product.prodname_dependabot_alerts %}](/graphql/reference/objects#repositoryvulnerabilityalert)" in the GraphQL API documentation. + ![Screenshot showing how to dismiss an alert via the "Dismiss" drop-down, with the option to add a dismissal comment](/assets/images/help/repository/dependabot-alerts-dismissal-comment.png) +1. Click **Dismiss alert**. +{% else %} + ![Choosing reason for dismissing the alert via the "Dismiss" drop-down](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png){% endif %} {% ifversion dependabot-bulk-alerts %} ### Dismissing multiple alerts at once diff --git a/content/developers/index.md b/content/developers/index.md index 742e708baf..ad686d6dcd 100644 --- a/content/developers/index.md +++ b/content/developers/index.md @@ -1,6 +1,29 @@ --- title: Developers -intro: 'Go deeper with {% data variables.product.prodname_dotcom %} by integrating with our APIs, customizing your {% data variables.product.prodname_dotcom %} workflow, and building and sharing apps with the community.' +intro: 'Go deeper with {% data variables.product.prodname_dotcom %} by integrating with our APIs and webhooks, customizing your {% data variables.product.prodname_dotcom %} workflow, and building and sharing apps with the community.' +introLinks: + "About apps": /developers/apps/getting-started-with-apps/about-apps +layout: product-landing +featuredLinks: + guides: + - /developers/apps/getting-started-with-apps/differences-between-github-apps-and-oauth-apps + - /developers/apps/building-github-apps/creating-a-github-app + - /developers/apps/building-github-apps/authenticating-with-github-apps + - /developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps + popular: + - /developers/webhooks-and-events/webhooks/webhook-events-and-payloads + - /developers/apps/building-github-apps/creating-a-github-app + - /developers/apps/building-github-apps/authenticating-with-github-apps + - /developers/webhooks-and-events/webhooks/about-webhooks + - /developers/apps/building-oauth-apps/creating-an-oauth-app + - /developers/apps/building-oauth-apps/authorizing-oauth-apps + - /developers/github-marketplace/github-marketplace-overview/about-github-marketplace + guideCards: + - /developers/webhooks-and-events/webhooks/creating-webhooks + - /developers/apps/guides/using-the-github-api-in-your-app + - /developers/apps/guides/creating-ci-tests-with-the-checks-api +changelog: + label: apps versions: fpt: '*' ghes: '*' diff --git a/data/features/actions-reusable-workflow-matrix.yml b/data/features/actions-reusable-workflow-matrix.yml new file mode 100644 index 0000000000..cf3b99d4f9 --- /dev/null +++ b/data/features/actions-reusable-workflow-matrix.yml @@ -0,0 +1,7 @@ +# Reference: #7094 +# Documentation for allowing matrix jobs to call reusable workflows. +versions: + fpt: '*' + ghec: '*' + ghes: '>=3.7' + ghae: 'issue-7094' diff --git a/data/features/dependabot-alerts-dismissal-comment.yml b/data/features/dependabot-alerts-dismissal-comment.yml new file mode 100644 index 0000000000..255ea4a959 --- /dev/null +++ b/data/features/dependabot-alerts-dismissal-comment.yml @@ -0,0 +1,7 @@ +# Reference: Issue #7673 - Dependabot alerts: optional comment with dismissal - [GA] + +versions: + fpt: '*' + ghec: '*' + ghes: '>3.6' + ghae: 'issue-7673' diff --git a/data/features/nested-reusable-workflow.yml b/data/features/nested-reusable-workflow.yml new file mode 100644 index 0000000000..702f7ac1c1 --- /dev/null +++ b/data/features/nested-reusable-workflow.yml @@ -0,0 +1,7 @@ +# Issues 7093 +# Reusable workflows can call other reusable workflows +versions: + fpt: '*' + ghec: '*' + ghes: '>=3.7' + ghae: 'issue-7093' diff --git a/data/graphql/ghec/graphql_upcoming_changes.public.yml b/data/graphql/ghec/graphql_upcoming_changes.public.yml index 8cde85c4b6..ed9ed69239 100644 --- a/data/graphql/ghec/graphql_upcoming_changes.public.yml +++ b/data/graphql/ghec/graphql_upcoming_changes.public.yml @@ -1385,6 +1385,16 @@ upcoming_changes: date: '2022-10-01T00:00:00+00:00' criticality: breaking owner: lukewar + - location: ProjectView.groupedItems + description: + '`groupedItems` will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, + to find a suitable replacement.' + reason: + The `ProjectNext` API is deprecated in favour of the more capable `ProjectV2` + API. + date: '2022-10-01T00:00:00+00:00' + criticality: breaking + owner: lukewar - location: ProjectView.items description: '`items` will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, diff --git a/data/graphql/graphql_upcoming_changes.public.yml b/data/graphql/graphql_upcoming_changes.public.yml index 8cde85c4b6..ed9ed69239 100644 --- a/data/graphql/graphql_upcoming_changes.public.yml +++ b/data/graphql/graphql_upcoming_changes.public.yml @@ -1385,6 +1385,16 @@ upcoming_changes: date: '2022-10-01T00:00:00+00:00' criticality: breaking owner: lukewar + - location: ProjectView.groupedItems + description: + '`groupedItems` will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, + to find a suitable replacement.' + reason: + The `ProjectNext` API is deprecated in favour of the more capable `ProjectV2` + API. + date: '2022-10-01T00:00:00+00:00' + criticality: breaking + owner: lukewar - location: ProjectView.items description: '`items` will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, diff --git a/data/reusables/dependabot/dependabot-alerts-filters.md b/data/reusables/dependabot/dependabot-alerts-filters.md new file mode 100644 index 0000000000..31056c274f --- /dev/null +++ b/data/reusables/dependabot/dependabot-alerts-filters.md @@ -0,0 +1,14 @@ +You can sort and filter {% data variables.product.prodname_dependabot_alerts %} by typing filters as `key:value` pairs into the search bar. + +| Option | Description | Example | +|:---|:---|:---| +| `ecosystem` | Displays alerts for the selected ecosystem | Use `ecosystem:npm` to show {% data variables.product.prodname_dependabot_alerts %} for npm |{% ifversion fpt or ghec or ghes > 3.5 %} +| `has` | Displays alerts meeting the selected filter criteria | Use `has:patch` to show alerts related to advisories that have a patch{% ifversion dependabot-alerts-vulnerable-calls %}
Use `has:vulnerable-calls` to show alerts relating to calls to vulnerable functions{% endif %} |{% endif %} +| `is` | Displays alerts based on their state | Use `is:open` to show open alerts | +| `manifest` | Displays alerts for the selected manifest | Use `manifest:webwolf/pom.xml` to show alerts on the pom.xml file of the webwolf application | +| `package` | Displays alerts for the selected package | Use `package:django` to show alerts for django | +| `resolution` | Displays alerts of the selected resolution status | Use `resolution:no-bandwidth` to show alerts previously parked due to lack of resources or time to fix them | +| `repo` | Displays alerts based on the repository they relate to
Note that this filter is only available on the security overview. For more information, see "[About the security overview](/code-security/security-overview/about-the-security-overview)" | Use `repo:octocat-repo` to show alerts in the repository called `octocat-repo` |{%- ifversion dependabot-alerts-development-label %} +| `scope` | Displays alerts based on the scope of the dependency they relate to | Use `scope:development` to show alerts for dependencies that are only used during development |{% endif %} +| `severity` | Displays alerts based on their level of severity | Use `severity:high` to show alerts with a severity of High |{%- ifversion dependabot-most-important-sort-option %} +| `sort` | Displays alerts according to the selected sort order | The default sorting option for alerts is `sort:most-important`, which ranks alerts by importance
Use `sort:newest` to show the latest alerts reported by {% data variables.product.prodname_dependabot %} |{% endif %} diff --git a/lib/failbot.js b/lib/failbot.js index 0189ff27a9..46ed67babd 100644 --- a/lib/failbot.js +++ b/lib/failbot.js @@ -33,9 +33,11 @@ async function retryingGot(url, args) { ) } -export async function report(error, metadata) { +export function report(error, metadata) { // If there's no HAYSTACK_URL set, bail early - if (!process.env.HAYSTACK_URL) return + if (!process.env.HAYSTACK_URL) { + return + } const backends = [ new HTTPBackend({ @@ -47,6 +49,7 @@ export async function report(error, metadata) { app: HAYSTACK_APP, backends, }) + return failbot.report(error, metadata) } diff --git a/lib/graphql/static/changelog.json b/lib/graphql/static/changelog.json index d7ad97e746..819ddc4eb8 100644 --- a/lib/graphql/static/changelog.json +++ b/lib/graphql/static/changelog.json @@ -1,4 +1,22 @@ [ + { + "schemaChanges": [ + { + "title": "The GraphQL schema includes these changes:", + "changes": [] + } + ], + "previewChanges": [], + "upcomingChanges": [ + { + "title": "The following changes will be made to the schema:", + "changes": [ + "

On member ProjectView.groupedItems:groupedItems will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement. Effective 2022-10-01.

" + ] + } + ], + "date": "2022-08-22" + }, { "schemaChanges": [ { diff --git a/lib/graphql/static/upcoming-changes.json b/lib/graphql/static/upcoming-changes.json index adb90ab1d9..f39dbb9963 100644 --- a/lib/graphql/static/upcoming-changes.json +++ b/lib/graphql/static/upcoming-changes.json @@ -273,6 +273,14 @@ "criticality": "breaking", "owner": "lukewar" }, + { + "location": "ProjectView.groupedItems", + "description": "

groupedItems will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement.

", + "reason": "

The ProjectNext API is deprecated in favour of the more capable ProjectV2 API.

", + "date": "2022-10-01", + "criticality": "breaking", + "owner": "lukewar" + }, { "location": "ProjectView.groupBy", "description": "

groupBy will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement.

", @@ -1703,6 +1711,14 @@ "criticality": "breaking", "owner": "lukewar" }, + { + "location": "ProjectView.groupedItems", + "description": "

groupedItems will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement.

", + "reason": "

The ProjectNext API is deprecated in favour of the more capable ProjectV2 API.

", + "date": "2022-10-01", + "criticality": "breaking", + "owner": "lukewar" + }, { "location": "ProjectView.groupBy", "description": "

groupBy will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement.

", diff --git a/lib/handle-exceptions.js b/lib/handle-exceptions.js index a6ce0adc57..dda3894c9a 100644 --- a/lib/handle-exceptions.js +++ b/lib/handle-exceptions.js @@ -10,7 +10,7 @@ process.on('uncaughtException', async (err) => { console.error(err) try { - await FailBot.report(err) + FailBot.report(err) } catch (failBotError) { console.warn('Even sending the uncaughtException error to FailBot failed!') console.error(failBotError) @@ -20,7 +20,7 @@ process.on('uncaughtException', async (err) => { process.on('unhandledRejection', async (err) => { console.error(err) try { - await FailBot.report(err) + FailBot.report(err) } catch (failBotError) { console.warn('Even sending the unhandledRejection error to FailBot failed!') console.error(failBotError) diff --git a/lib/rest/static/decorated/api.github.com.json b/lib/rest/static/decorated/api.github.com.json index 340e737ff6..ba1dd64204 100644 --- a/lib/rest/static/decorated/api.github.com.json +++ b/lib/rest/static/decorated/api.github.com.json @@ -544619,8 +544619,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -545351,8 +545351,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -546131,8 +546131,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -553319,8 +553319,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -554089,8 +554089,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -554778,8 +554778,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -561942,8 +561942,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/decorated/ghes-3.2.json b/lib/rest/static/decorated/ghes-3.2.json index 05e8629400..3c91f0c28b 100644 --- a/lib/rest/static/decorated/ghes-3.2.json +++ b/lib/rest/static/decorated/ghes-3.2.json @@ -430488,8 +430488,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -431204,8 +431204,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -431968,8 +431968,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -438934,8 +438934,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -439688,8 +439688,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -440361,8 +440361,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -447303,8 +447303,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/decorated/ghes-3.3.json b/lib/rest/static/decorated/ghes-3.3.json index 5ee849bbaf..01eedef3f3 100644 --- a/lib/rest/static/decorated/ghes-3.3.json +++ b/lib/rest/static/decorated/ghes-3.3.json @@ -428538,8 +428538,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -429254,8 +429254,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -430018,8 +430018,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -437000,8 +437000,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -437754,8 +437754,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -438427,8 +438427,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -445385,8 +445385,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/decorated/ghes-3.4.json b/lib/rest/static/decorated/ghes-3.4.json index c05ebed7f2..9d91d72a72 100644 --- a/lib/rest/static/decorated/ghes-3.4.json +++ b/lib/rest/static/decorated/ghes-3.4.json @@ -449507,8 +449507,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -450232,8 +450232,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -451005,8 +451005,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -457996,8 +457996,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -458759,8 +458759,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -459441,8 +459441,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -466408,8 +466408,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/decorated/ghes-3.5.json b/lib/rest/static/decorated/ghes-3.5.json index a1669aa8d2..970e9ccb20 100644 --- a/lib/rest/static/decorated/ghes-3.5.json +++ b/lib/rest/static/decorated/ghes-3.5.json @@ -459914,8 +459914,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -460639,8 +460639,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -461412,8 +461412,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -468417,8 +468417,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -469180,8 +469180,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -469862,8 +469862,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -476843,8 +476843,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/decorated/ghes-3.6.json b/lib/rest/static/decorated/ghes-3.6.json index 6cf4441923..b331159430 100644 --- a/lib/rest/static/decorated/ghes-3.6.json +++ b/lib/rest/static/decorated/ghes-3.6.json @@ -470051,8 +470051,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -470782,8 +470782,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -471561,8 +471561,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -478748,8 +478748,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -479517,8 +479517,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -480205,8 +480205,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -487368,8 +487368,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/decorated/github.ae.json b/lib/rest/static/decorated/github.ae.json index db54a01063..c6a8cd74a7 100644 --- a/lib/rest/static/decorated/github.ae.json +++ b/lib/rest/static/decorated/github.ae.json @@ -401709,8 +401709,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -402441,8 +402441,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -403221,8 +403221,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -410257,8 +410257,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -411027,8 +411027,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -411716,8 +411716,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -418728,8 +418728,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/dereferenced/api.github.com.deref.json b/lib/rest/static/dereferenced/api.github.com.deref.json index e5836d6b92..2201780686 100644 --- a/lib/rest/static/dereferenced/api.github.com.deref.json +++ b/lib/rest/static/dereferenced/api.github.com.deref.json @@ -127359,8 +127359,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -128181,8 +128181,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -128980,8 +128980,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -481678,8 +481678,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -482474,8 +482474,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -483153,8 +483153,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -569691,8 +569691,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/dereferenced/ghes-3.2.deref.json b/lib/rest/static/dereferenced/ghes-3.2.deref.json index aef31684f7..b2cbf155d8 100644 --- a/lib/rest/static/dereferenced/ghes-3.2.deref.json +++ b/lib/rest/static/dereferenced/ghes-3.2.deref.json @@ -102181,8 +102181,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -102987,8 +102987,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -103770,8 +103770,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -406390,8 +406390,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -407170,8 +407170,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -407833,8 +407833,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -448151,8 +448151,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/dereferenced/ghes-3.3.deref.json b/lib/rest/static/dereferenced/ghes-3.3.deref.json index 737547e51b..f81dad9fce 100644 --- a/lib/rest/static/dereferenced/ghes-3.3.deref.json +++ b/lib/rest/static/dereferenced/ghes-3.3.deref.json @@ -104077,8 +104077,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -104883,8 +104883,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -105666,8 +105666,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -409095,8 +409095,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -409875,8 +409875,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -410538,8 +410538,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -450855,8 +450855,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/dereferenced/ghes-3.4.deref.json b/lib/rest/static/dereferenced/ghes-3.4.deref.json index 13c3fdc384..630b559ef0 100644 --- a/lib/rest/static/dereferenced/ghes-3.4.deref.json +++ b/lib/rest/static/dereferenced/ghes-3.4.deref.json @@ -114260,8 +114260,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -115075,8 +115075,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -115867,8 +115867,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -425827,8 +425827,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -426616,8 +426616,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -427288,8 +427288,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -474013,8 +474013,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/dereferenced/ghes-3.5.deref.json b/lib/rest/static/dereferenced/ghes-3.5.deref.json index 8f04071743..3a950f885e 100644 --- a/lib/rest/static/dereferenced/ghes-3.5.deref.json +++ b/lib/rest/static/dereferenced/ghes-3.5.deref.json @@ -116623,8 +116623,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -117438,8 +117438,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -118230,8 +118230,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -436446,8 +436446,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -437235,8 +437235,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -437907,8 +437907,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -484664,8 +484664,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/dereferenced/ghes-3.6.deref.json b/lib/rest/static/dereferenced/ghes-3.6.deref.json index 76e197e7f6..eabe14731a 100644 --- a/lib/rest/static/dereferenced/ghes-3.6.deref.json +++ b/lib/rest/static/dereferenced/ghes-3.6.deref.json @@ -119096,8 +119096,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -119917,8 +119917,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -120715,8 +120715,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -445154,8 +445154,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -445949,8 +445949,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -446627,8 +446627,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -494548,8 +494548,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/rest/static/dereferenced/github.ae.deref.json b/lib/rest/static/dereferenced/github.ae.deref.json index 03b28814c4..5a23834416 100644 --- a/lib/rest/static/dereferenced/github.ae.deref.json +++ b/lib/rest/static/dereferenced/github.ae.deref.json @@ -80524,8 +80524,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -81346,8 +81346,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -82145,8 +82145,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -390262,8 +390262,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -391058,8 +391058,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -391737,8 +391737,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { @@ -436267,8 +436267,8 @@ ] }, "organization": { - "title": "Organization Full", - "description": "Organization Full", + "title": "Team Organization", + "description": "Team Organization", "type": "object", "properties": { "login": { diff --git a/lib/search/indexes/github-docs-3.2-cn-records.json.br b/lib/search/indexes/github-docs-3.2-cn-records.json.br index 509aaf6d33..5a9a384b87 100644 --- a/lib/search/indexes/github-docs-3.2-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.2-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a695ee10df91c4a4e1ddbb17e89c3da59c6819a4f6ae1e0561d4a6121477b080 -size 795234 +oid sha256:d2fa7a88b38ff673947d7dd5841d2e60ba27ee3a6b1080b1179ec84bbc42f56e +size 795473 diff --git a/lib/search/indexes/github-docs-3.2-cn.json.br b/lib/search/indexes/github-docs-3.2-cn.json.br index 767bfba933..1fa8becfd9 100644 --- a/lib/search/indexes/github-docs-3.2-cn.json.br +++ b/lib/search/indexes/github-docs-3.2-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce7dc1590b66729b5d3d998dbaaf894bfa55880823525550400111c187418e82 -size 1643063 +oid sha256:3b1ce6435e894d17bdc727deba93f57d325955e61e689dda50b0c0e213b82ede +size 1643774 diff --git a/lib/search/indexes/github-docs-3.2-en-records.json.br b/lib/search/indexes/github-docs-3.2-en-records.json.br index 34144e763f..6203567b8a 100644 --- a/lib/search/indexes/github-docs-3.2-en-records.json.br +++ b/lib/search/indexes/github-docs-3.2-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:caedf1593588769b026594fc740fb3d995f9c2fdd1d582b349961712ed11c05c -size 1091567 +oid sha256:2d92f455dd73ff649a77835005ee51361086329dec49fc82f375c10ea01dd543 +size 1091758 diff --git a/lib/search/indexes/github-docs-3.2-en.json.br b/lib/search/indexes/github-docs-3.2-en.json.br index d94b7959a1..004f236dc1 100644 --- a/lib/search/indexes/github-docs-3.2-en.json.br +++ b/lib/search/indexes/github-docs-3.2-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:777e7b45840d1087c48bd018eb077e08bb79f2568f8f24aeb7c496c054d92086 -size 4426457 +oid sha256:a02c7812aea6cb84f847536b6568cddae9defcb3b906b97b57e082786f1c93a8 +size 4427755 diff --git a/lib/search/indexes/github-docs-3.2-es-records.json.br b/lib/search/indexes/github-docs-3.2-es-records.json.br index af60f8c0b7..cddf83d38e 100644 --- a/lib/search/indexes/github-docs-3.2-es-records.json.br +++ b/lib/search/indexes/github-docs-3.2-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12e6b060937d1a3c444b3257140857e3711d55d7ffadd8659e7278297d4f5755 -size 734168 +oid sha256:376823aa9d3e3df40e8067ba41b65b33be5e8305bf5e6d5293e5200f91e70151 +size 733994 diff --git a/lib/search/indexes/github-docs-3.2-es.json.br b/lib/search/indexes/github-docs-3.2-es.json.br index 82124a191b..2f985c1316 100644 --- a/lib/search/indexes/github-docs-3.2-es.json.br +++ b/lib/search/indexes/github-docs-3.2-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5115cbde8d011087c9257d4ce665a6eef2dd7727bcad686465ea7e72dcbbd92 -size 3126793 +oid sha256:d767f8f5316de5a0560871ce4eef2e731fee5e629b98acdf53dd40308882dbbe +size 3126340 diff --git a/lib/search/indexes/github-docs-3.2-ja-records.json.br b/lib/search/indexes/github-docs-3.2-ja-records.json.br index c7d73a467a..f6754b5c6d 100644 --- a/lib/search/indexes/github-docs-3.2-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.2-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36716f4c6df20250432c71a72fae686b82cf0114799ed52e24e4e8014247ee37 -size 810832 +oid sha256:d89a80cfd8fec8697d60cf796fea3efdff42471cbe09be78e5c91ba81da3201d +size 810681 diff --git a/lib/search/indexes/github-docs-3.2-ja.json.br b/lib/search/indexes/github-docs-3.2-ja.json.br index a0b591732a..d0d9dce609 100644 --- a/lib/search/indexes/github-docs-3.2-ja.json.br +++ b/lib/search/indexes/github-docs-3.2-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f1e059284bc0e92c23a3651e448a66244b4e5d6b8bf7b17618c0e53bb07efff -size 4449934 +oid sha256:366f40ee90aa6df2621b562c53d57f1c9db409242f2728d0d10b5ebb38602d9f +size 4450054 diff --git a/lib/search/indexes/github-docs-3.2-pt-records.json.br b/lib/search/indexes/github-docs-3.2-pt-records.json.br index ca211a178a..d6d617b200 100644 --- a/lib/search/indexes/github-docs-3.2-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.2-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58fd72363874ec64abe012164357a41f1a52416642642c4314fe12d4e5cf6096 -size 722898 +oid sha256:06600d8304cbbab8dee7c749afcabb2fa109862f69bf81cd183144a4e61f4e76 +size 722999 diff --git a/lib/search/indexes/github-docs-3.2-pt.json.br b/lib/search/indexes/github-docs-3.2-pt.json.br index dd08a9ed5a..8874e2fc6b 100644 --- a/lib/search/indexes/github-docs-3.2-pt.json.br +++ b/lib/search/indexes/github-docs-3.2-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac3cfa54ff0caf5d1adb791ff8da29ee43ab07bbf66ff8348d101ff3552e335f -size 3022834 +oid sha256:f40bddaca58fe979876e14590a34251719af063507dca87978cc9488b9a54f64 +size 3022818 diff --git a/lib/search/indexes/github-docs-3.3-cn-records.json.br b/lib/search/indexes/github-docs-3.3-cn-records.json.br index 1e1214e33b..9979b3f12c 100644 --- a/lib/search/indexes/github-docs-3.3-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.3-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0665d8cdda3804809c69090723450a9da2c0470eecf9e21217a6f71a23fe499 -size 820493 +oid sha256:3e2e48abbe3e69ebda22c20a27a28a9624c9a5ca17a5b002d843b43b8f1961e6 +size 820825 diff --git a/lib/search/indexes/github-docs-3.3-cn.json.br b/lib/search/indexes/github-docs-3.3-cn.json.br index a4fa648d3b..b293bac9d8 100644 --- a/lib/search/indexes/github-docs-3.3-cn.json.br +++ b/lib/search/indexes/github-docs-3.3-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4dd881c487bce25fbfe9e4ea07f865fbc607c4c5f74e8a54cbbdd0b4eda96d6 -size 1690080 +oid sha256:653e1756ce50cfea6ed9767694866ed82059b94a4addf93015c26304906d0004 +size 1690826 diff --git a/lib/search/indexes/github-docs-3.3-en-records.json.br b/lib/search/indexes/github-docs-3.3-en-records.json.br index 67a7ec58fe..f6c6ba0fe1 100644 --- a/lib/search/indexes/github-docs-3.3-en-records.json.br +++ b/lib/search/indexes/github-docs-3.3-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:896c3ece7df19114d09f5b8b7460fecea2da72679c33e88fee03f13883144b97 -size 1126638 +oid sha256:81426084a1a1766a74718746a5d1eb931ae95330a49acdeb79a630b71b32a02c +size 1127137 diff --git a/lib/search/indexes/github-docs-3.3-en.json.br b/lib/search/indexes/github-docs-3.3-en.json.br index 5e51b2f464..92336c04b5 100644 --- a/lib/search/indexes/github-docs-3.3-en.json.br +++ b/lib/search/indexes/github-docs-3.3-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e0a7aff1c27a8f8e98d94826186da4f374abd8853207512b985be5a2e594ba8 -size 4530855 +oid sha256:f7c3a3231cd89e0a732912882820f52cdc4cf5cc684d455154ce79fbc1d29fb3 +size 4531413 diff --git a/lib/search/indexes/github-docs-3.3-es-records.json.br b/lib/search/indexes/github-docs-3.3-es-records.json.br index 1d99ba2d55..c76424ccc5 100644 --- a/lib/search/indexes/github-docs-3.3-es-records.json.br +++ b/lib/search/indexes/github-docs-3.3-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea1b99568484c71fd53b958e51c189daff4726d627adeb543dabdc1093bc7e7c -size 755215 +oid sha256:3d8870a7918b86cd7793571b56db9be7fbcdcb219c37f011b87d27d00bc57f89 +size 755220 diff --git a/lib/search/indexes/github-docs-3.3-es.json.br b/lib/search/indexes/github-docs-3.3-es.json.br index 3da86d90ae..de0e379019 100644 --- a/lib/search/indexes/github-docs-3.3-es.json.br +++ b/lib/search/indexes/github-docs-3.3-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dad5d7dff948b9c7212c38144f85ebd9d47fc2409c8e732ebb6ed64e53eec46c -size 3211845 +oid sha256:cf1a395dd7c25368c23d3ddefa98c5d3f1e63c099bcf125bcf55d9323245acf2 +size 3211835 diff --git a/lib/search/indexes/github-docs-3.3-ja-records.json.br b/lib/search/indexes/github-docs-3.3-ja-records.json.br index 23ff41a90f..cc7071dee5 100644 --- a/lib/search/indexes/github-docs-3.3-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.3-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae5840f4d56206e80c5a6c96f9f254a35e6183314911ba38be4103209fe7508c -size 835847 +oid sha256:9628b128d101da09943e7d872cae9cea3d89b5a835f9ad132e93be65d49db8e9 +size 836025 diff --git a/lib/search/indexes/github-docs-3.3-ja.json.br b/lib/search/indexes/github-docs-3.3-ja.json.br index c01b83163a..99ca53849d 100644 --- a/lib/search/indexes/github-docs-3.3-ja.json.br +++ b/lib/search/indexes/github-docs-3.3-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d165cd6fdc01fd7372b6fe7fba09fcc85e187d6d221ac19df6c359f780694b7 -size 4584015 +oid sha256:6bbc01dd53ec006901c75d0fcd544f7041ee3a6080ff6d6f86fe31abf49586de +size 4584277 diff --git a/lib/search/indexes/github-docs-3.3-pt-records.json.br b/lib/search/indexes/github-docs-3.3-pt-records.json.br index 1c712acf4d..b26e9813b6 100644 --- a/lib/search/indexes/github-docs-3.3-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.3-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:480feef2ab6957637486f7b4f6877557aebd014a99b2386453384c69871a5969 -size 744392 +oid sha256:70136d9675bfc27d985a1a82f5f8224ca5dadeeb40be6d7d020de47c8de06fcd +size 744370 diff --git a/lib/search/indexes/github-docs-3.3-pt.json.br b/lib/search/indexes/github-docs-3.3-pt.json.br index ec210bb2cb..0648181bbc 100644 --- a/lib/search/indexes/github-docs-3.3-pt.json.br +++ b/lib/search/indexes/github-docs-3.3-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94f40109657b9f19faa3cda717616d0222c83af28b1df449d7007f41a9eb7af2 -size 3106819 +oid sha256:0e26788555bb3849ead995f97a1e9f5ac461db71f45f14ebe710f7509d28a8f2 +size 3106958 diff --git a/lib/search/indexes/github-docs-3.4-cn-records.json.br b/lib/search/indexes/github-docs-3.4-cn-records.json.br index b614d8cf92..703adbe573 100644 --- a/lib/search/indexes/github-docs-3.4-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.4-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9fcef79adacc1d322130de9731032acbbb551570733cecb3e51c2a5dad08faf -size 823338 +oid sha256:11c6b6fff77ba341bf04d6a11db55b00006c968ac2604736418a79227a359b39 +size 823449 diff --git a/lib/search/indexes/github-docs-3.4-cn.json.br b/lib/search/indexes/github-docs-3.4-cn.json.br index c43365e367..a801435bcd 100644 --- a/lib/search/indexes/github-docs-3.4-cn.json.br +++ b/lib/search/indexes/github-docs-3.4-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba31c3ac2c4579bc837657cfe2eb5ab47779538310bc5aae7f5414f68399f986 -size 1705732 +oid sha256:5a26b097da4bcfefe01e97869ec55824571033126bcfb1d08b6d44d6617639a7 +size 1706238 diff --git a/lib/search/indexes/github-docs-3.4-en-records.json.br b/lib/search/indexes/github-docs-3.4-en-records.json.br index acdc81f916..fa7f29a746 100644 --- a/lib/search/indexes/github-docs-3.4-en-records.json.br +++ b/lib/search/indexes/github-docs-3.4-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c760678e7ea50a0896a92db31741426c76a2acb7d60474231b13f1eef6979c1 -size 1138071 +oid sha256:4ba1240045a0a81951a2183e2868ccbbd312b785d9fa6a418f0a7d60f35cff38 +size 1137736 diff --git a/lib/search/indexes/github-docs-3.4-en.json.br b/lib/search/indexes/github-docs-3.4-en.json.br index 84fd75b421..469be42a2d 100644 --- a/lib/search/indexes/github-docs-3.4-en.json.br +++ b/lib/search/indexes/github-docs-3.4-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94e12a1bbd148f87de0709090d6f080a76a0b09ffcd6303c827e1d557bc8e76a -size 4588269 +oid sha256:d995134771182a7b6e0b8e106c8e379414aa974b584907602ff66b4a5f9e8ca7 +size 4588010 diff --git a/lib/search/indexes/github-docs-3.4-es-records.json.br b/lib/search/indexes/github-docs-3.4-es-records.json.br index e657a82c50..9d594b654a 100644 --- a/lib/search/indexes/github-docs-3.4-es-records.json.br +++ b/lib/search/indexes/github-docs-3.4-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d5fbf7fe9eb6ca01a03c216375895fe966183ae3c52eb773004b3d94666bd8a -size 759960 +oid sha256:842f947e353ed510bf98142fbd94d99e3930c83d7732ca43df6a7b8e01a9ec13 +size 759921 diff --git a/lib/search/indexes/github-docs-3.4-es.json.br b/lib/search/indexes/github-docs-3.4-es.json.br index 0e90f5bba5..312c54f577 100644 --- a/lib/search/indexes/github-docs-3.4-es.json.br +++ b/lib/search/indexes/github-docs-3.4-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:121ebecdfd1da3f6574a63db0666edaacc5560cf3bc6b336112cc2f438323d32 -size 3234044 +oid sha256:7f875cc463a8d1b7c157afcb4b3abea6aaf05b78d6ab288140ea36ba38a91988 +size 3233998 diff --git a/lib/search/indexes/github-docs-3.4-ja-records.json.br b/lib/search/indexes/github-docs-3.4-ja-records.json.br index 358b4eb59d..ec16e6ab8b 100644 --- a/lib/search/indexes/github-docs-3.4-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.4-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9489974ba102202ec2e0e24778f219ef3806c184c4320ed40da3f9dcdcb1309 -size 839160 +oid sha256:3c44fdf46cda3c0b6f5c365e3eb81c42b33e8eaa2cd1de02f4e2de7593272572 +size 839220 diff --git a/lib/search/indexes/github-docs-3.4-ja.json.br b/lib/search/indexes/github-docs-3.4-ja.json.br index 39413e3aff..10897e79a8 100644 --- a/lib/search/indexes/github-docs-3.4-ja.json.br +++ b/lib/search/indexes/github-docs-3.4-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:049026c77f56d09068e601215e3daf8a20eef19d3055c19e95b29c81494afb08 -size 4618587 +oid sha256:6aa5d99308ed2c6140436bfd3807a46d12e88afb4b6c2d20d6cc626f16007412 +size 4619277 diff --git a/lib/search/indexes/github-docs-3.4-pt-records.json.br b/lib/search/indexes/github-docs-3.4-pt-records.json.br index 00e1b930ee..0c39785022 100644 --- a/lib/search/indexes/github-docs-3.4-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.4-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec4646d7411285b6acee9613211332e4ec3302f78c4625b20cba4b5960327bcd -size 748670 +oid sha256:ddc2b67051e837c4b2849b5edb5c0a57c32b5c5759ed8a13e9150772eaf78628 +size 748711 diff --git a/lib/search/indexes/github-docs-3.4-pt.json.br b/lib/search/indexes/github-docs-3.4-pt.json.br index 9f5cd36291..29c802d477 100644 --- a/lib/search/indexes/github-docs-3.4-pt.json.br +++ b/lib/search/indexes/github-docs-3.4-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d7558db412823fd8a918da5f2c87f27af799b13960a7721e471f128d6415141 -size 3132343 +oid sha256:45d038b6e37919faaa43a8670e2fd9d8746b0b8b970e6e24962c1958a95f39c3 +size 3132531 diff --git a/lib/search/indexes/github-docs-3.5-cn-records.json.br b/lib/search/indexes/github-docs-3.5-cn-records.json.br index 3142e13e61..d20fc2546d 100644 --- a/lib/search/indexes/github-docs-3.5-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.5-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad4856523718953e8d017556ff2fa1dcc1c58c5e7399275bfe4382c5156f92f5 -size 853658 +oid sha256:553219ae6002b3c1c603a65e86caa0bfee368578d7380a0e71111d4c8c63e4a1 +size 853854 diff --git a/lib/search/indexes/github-docs-3.5-cn.json.br b/lib/search/indexes/github-docs-3.5-cn.json.br index 7065831749..fd834d2c39 100644 --- a/lib/search/indexes/github-docs-3.5-cn.json.br +++ b/lib/search/indexes/github-docs-3.5-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e03e89e1d1b86cc3352b63abcf16d8da8c7d31c3ae81a87a5f20255856705ce -size 1768426 +oid sha256:84ec77a5e14b363b590aa122849b61c1f87d62ca3b012a72442ae39a32169256 +size 1769159 diff --git a/lib/search/indexes/github-docs-3.5-en-records.json.br b/lib/search/indexes/github-docs-3.5-en-records.json.br index 55b6bc4389..9c00eb817c 100644 --- a/lib/search/indexes/github-docs-3.5-en-records.json.br +++ b/lib/search/indexes/github-docs-3.5-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da1321d69f302d9e056a121d2b17585cfa2af679fe73a55d11221f8ee35c3fad -size 1177234 +oid sha256:fcbdb49cc64420419e7de43dfd085c730ba29c2b5222d47a18424446171d3634 +size 1177277 diff --git a/lib/search/indexes/github-docs-3.5-en.json.br b/lib/search/indexes/github-docs-3.5-en.json.br index ce3e77c7b7..8ed1b1e0e3 100644 --- a/lib/search/indexes/github-docs-3.5-en.json.br +++ b/lib/search/indexes/github-docs-3.5-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ad6ac585db248e0e974bda3cab04d4a50b7f9dd7078da42888244850f1e52cd -size 4749033 +oid sha256:036ee58f9394febd9c73bdb3939f71d5ac7f30c201dc2d339f394cf2d83beb28 +size 4751242 diff --git a/lib/search/indexes/github-docs-3.5-es-records.json.br b/lib/search/indexes/github-docs-3.5-es-records.json.br index 8c0730b40d..3abc8ea153 100644 --- a/lib/search/indexes/github-docs-3.5-es-records.json.br +++ b/lib/search/indexes/github-docs-3.5-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08144c604ec127c90910bb95c1f69156e6db14783913c001532fbc8482bed4c8 -size 784216 +oid sha256:198750bb88908ed4b53c1b70e3f354476236e94e98fd4cb7e7922c7c22f52684 +size 784178 diff --git a/lib/search/indexes/github-docs-3.5-es.json.br b/lib/search/indexes/github-docs-3.5-es.json.br index dd8de61bc8..e509f0361f 100644 --- a/lib/search/indexes/github-docs-3.5-es.json.br +++ b/lib/search/indexes/github-docs-3.5-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b871ac2c4887879d7424fc33a5410236b161a98bea1a54fdaa79aa1e3acc322c -size 3353653 +oid sha256:b98be10e69d6a32132572815b2a262d5887744bfa8ae3469e21d906e48ae9da1 +size 3353323 diff --git a/lib/search/indexes/github-docs-3.5-ja-records.json.br b/lib/search/indexes/github-docs-3.5-ja-records.json.br index dce7ce7c10..572d2a6219 100644 --- a/lib/search/indexes/github-docs-3.5-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.5-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c63218f58b798ae183aacd710952bbf12669f6dc87838484d72164fb4393e46b -size 867694 +oid sha256:f48e20b2f4a40b7463a65d6753c0962e9be0657808f0a816da81261af00c45c6 +size 868025 diff --git a/lib/search/indexes/github-docs-3.5-ja.json.br b/lib/search/indexes/github-docs-3.5-ja.json.br index 93f08df85b..24c5e3b5ca 100644 --- a/lib/search/indexes/github-docs-3.5-ja.json.br +++ b/lib/search/indexes/github-docs-3.5-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:916791b68b94ab6d84bcc1beaa2db70f25148d4c6d7ef9091f1f4800aec504cc -size 4791314 +oid sha256:62440d03eb9f514940ae6261166b6c8f4fd7a028a8b7ceda69ca4fe2d9358369 +size 4791302 diff --git a/lib/search/indexes/github-docs-3.5-pt-records.json.br b/lib/search/indexes/github-docs-3.5-pt-records.json.br index 7e55961834..dfb747beb8 100644 --- a/lib/search/indexes/github-docs-3.5-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.5-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afc1b29fd92b566251d2572485d4502977dd6c8434d58fd5e1e7ec582720299c -size 772674 +oid sha256:5ef4a914ced8b98283c0f689b840f04416e5727a2f504c3f18a39bda20fd7833 +size 772520 diff --git a/lib/search/indexes/github-docs-3.5-pt.json.br b/lib/search/indexes/github-docs-3.5-pt.json.br index fdca047d91..78e33cdbd4 100644 --- a/lib/search/indexes/github-docs-3.5-pt.json.br +++ b/lib/search/indexes/github-docs-3.5-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04ce4038f84fe554ae3fed0d1ff1df898fc28f9239b74fce76890fb511130cc4 -size 3245939 +oid sha256:a4d9b7d28dac1776928497a0905f431939fae52ee47fbdd0c41d2e202b42c890 +size 3245357 diff --git a/lib/search/indexes/github-docs-3.6-cn-records.json.br b/lib/search/indexes/github-docs-3.6-cn-records.json.br index 9203ab53ee..eebd74ef92 100644 --- a/lib/search/indexes/github-docs-3.6-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.6-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9f4a7e6752cf5d5a8e52e33f888805501267c42d136015e7db97697db070c73 -size 876438 +oid sha256:884b7d50235e59f577c997635e49d931bd574ff56b4ad1beaa00785e09b4ca36 +size 876592 diff --git a/lib/search/indexes/github-docs-3.6-cn.json.br b/lib/search/indexes/github-docs-3.6-cn.json.br index ec3002473d..fb5d129c69 100644 --- a/lib/search/indexes/github-docs-3.6-cn.json.br +++ b/lib/search/indexes/github-docs-3.6-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cf36ca76b9436b96a253df6e762ada8e5b9b8ebdcbe342e4f5f661b1a970c52 -size 1815053 +oid sha256:7f7c95ce3e115caea97448294960a642cb472caaf737a822ca688ec692d46b5a +size 1816191 diff --git a/lib/search/indexes/github-docs-3.6-en-records.json.br b/lib/search/indexes/github-docs-3.6-en-records.json.br index 2f2b3fc012..b85052ad9d 100644 --- a/lib/search/indexes/github-docs-3.6-en-records.json.br +++ b/lib/search/indexes/github-docs-3.6-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e7643505897dcc033f781b822a0fc70a64224e3ecc5d3434efc3e495f8717b0 -size 1205703 +oid sha256:6aeffc8b02cbb205601fb58d96e4e3fd81eb51a78fa55bdd39d5b52b065f0f39 +size 1206547 diff --git a/lib/search/indexes/github-docs-3.6-en.json.br b/lib/search/indexes/github-docs-3.6-en.json.br index f241aae38c..deebb5c1e2 100644 --- a/lib/search/indexes/github-docs-3.6-en.json.br +++ b/lib/search/indexes/github-docs-3.6-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e70460b2192bbd12348b164ccd852f836cc800b89fa9ded10e12d23492933f93 -size 4864683 +oid sha256:28a27b7cbc2c28758c6a01bdca01b8b5f76821a6100170fc9ad9fe0ceead5dc7 +size 4865535 diff --git a/lib/search/indexes/github-docs-3.6-es-records.json.br b/lib/search/indexes/github-docs-3.6-es-records.json.br index c1f20a5b22..c7aa4f12cb 100644 --- a/lib/search/indexes/github-docs-3.6-es-records.json.br +++ b/lib/search/indexes/github-docs-3.6-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01cf1dd66cacd5e35ba4c4fa972bdd005c9ba7af66d13cedb6e9d6d6c1e164e0 -size 804287 +oid sha256:5703d153b8e9b5d963f6f43ab6fa279febe4ec400d8f2b54ac436335d2b98752 +size 804324 diff --git a/lib/search/indexes/github-docs-3.6-es.json.br b/lib/search/indexes/github-docs-3.6-es.json.br index 7d2d06bab4..53e4eb3422 100644 --- a/lib/search/indexes/github-docs-3.6-es.json.br +++ b/lib/search/indexes/github-docs-3.6-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:811a1bb84088afb47727733e8f44cd618138bff22330202b23ff25051e7bf036 -size 3448327 +oid sha256:17d4c48338bb4ecb8db10ea311b03a5a123c10fdc592dd231c27d7eda3b23f43 +size 3448383 diff --git a/lib/search/indexes/github-docs-3.6-ja-records.json.br b/lib/search/indexes/github-docs-3.6-ja-records.json.br index 7a8137a8ab..fbd64fcbc6 100644 --- a/lib/search/indexes/github-docs-3.6-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.6-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2929fb34d9bf4124398ff9182a2bb0661185c083895868bea19fc4295e9d6a33 -size 890655 +oid sha256:6c46c4f1bb32c15f21bf68870b28be6aeb108e510d399454c5867c489efc2879 +size 890681 diff --git a/lib/search/indexes/github-docs-3.6-ja.json.br b/lib/search/indexes/github-docs-3.6-ja.json.br index 683d16b413..0aa05ebc6c 100644 --- a/lib/search/indexes/github-docs-3.6-ja.json.br +++ b/lib/search/indexes/github-docs-3.6-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8602402984a92aadb6443187af16c92604e8eaf5d2c7f0aa00bafc9b97b7e22a -size 4921329 +oid sha256:26fd24c929c61f1dda233f6c9d4e09708f8b2a7ee329c01e0e1ab66051c3cb7d +size 4921277 diff --git a/lib/search/indexes/github-docs-3.6-pt-records.json.br b/lib/search/indexes/github-docs-3.6-pt-records.json.br index 95301c0d98..5d1f10a25b 100644 --- a/lib/search/indexes/github-docs-3.6-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.6-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c36d74b5b68303ac49eb4d6a9acffae73454f6f2e8396a90a215e8d07a631c00 -size 792837 +oid sha256:703d50eac549737836813d0e6b921c849679d22734e5d0ba47803ccf48b9bbd1 +size 792858 diff --git a/lib/search/indexes/github-docs-3.6-pt.json.br b/lib/search/indexes/github-docs-3.6-pt.json.br index 420306eab7..1b80d1b7d9 100644 --- a/lib/search/indexes/github-docs-3.6-pt.json.br +++ b/lib/search/indexes/github-docs-3.6-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0b38aea7124c21edb25ad4682e3108e2a75ed18f6688e97a2483ae81ea3f56a -size 3339089 +oid sha256:26fa8718bc27327504aaf04cc947daeb70fa1b584c684111326db69d47b11fe9 +size 3339021 diff --git a/lib/search/indexes/github-docs-dotcom-cn-records.json.br b/lib/search/indexes/github-docs-dotcom-cn-records.json.br index e5b3630085..359028bb86 100644 --- a/lib/search/indexes/github-docs-dotcom-cn-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30e97c52712573147aeca9d256766b03631c0c0260cfce200a99ba5356adca06 -size 1038827 +oid sha256:dc461454d39a20feb90d3e358f25e6cc73832564ae38529ada40ede88e02e3e5 +size 1039106 diff --git a/lib/search/indexes/github-docs-dotcom-cn.json.br b/lib/search/indexes/github-docs-dotcom-cn.json.br index 98e3c48848..cd1d1ec63f 100644 --- a/lib/search/indexes/github-docs-dotcom-cn.json.br +++ b/lib/search/indexes/github-docs-dotcom-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d00488a4943afcf69ad78ae19a38417142f4037690073ef682a47adb98e60491 -size 1865606 +oid sha256:0510cede421b59c01eca22f4bd3a021bd551e170bafac0b4b0bc680980caec12 +size 1865798 diff --git a/lib/search/indexes/github-docs-dotcom-en-records.json.br b/lib/search/indexes/github-docs-dotcom-en-records.json.br index 88a88a3af0..a6751701c0 100644 --- a/lib/search/indexes/github-docs-dotcom-en-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca7c2a30fef5e59f1ced37f4c9cf176e5ac4c4674d7459249b3abf3511cb4bda -size 1449475 +oid sha256:073f0c7442964a131c977ca471dc5139d7e35b3f6f400fe36ab28e58fff09d9b +size 1443339 diff --git a/lib/search/indexes/github-docs-dotcom-en.json.br b/lib/search/indexes/github-docs-dotcom-en.json.br index 310bc75199..2c7c9941a1 100644 --- a/lib/search/indexes/github-docs-dotcom-en.json.br +++ b/lib/search/indexes/github-docs-dotcom-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0cbba908ffcf23cfe9e97231a75d4c11f4b77ee5d28962b2ed651ac3a8fec3a -size 5586386 +oid sha256:4ab20eb6c846a393a0dfc6fca6c7038921cdbea713cecd93c3f91629f2ac1aa0 +size 5588092 diff --git a/lib/search/indexes/github-docs-dotcom-es-records.json.br b/lib/search/indexes/github-docs-dotcom-es-records.json.br index a868a5a08b..2bbde10520 100644 --- a/lib/search/indexes/github-docs-dotcom-es-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40af8e281a8ebd64025e354ae56da2e5124b5c881e2a71fc8b5f23da1de7ca32 -size 936336 +oid sha256:3d595f0f69bdc051772ab61e4a66629401bc049c83c7e0d1e8bd6de2004e41a9 +size 936384 diff --git a/lib/search/indexes/github-docs-dotcom-es.json.br b/lib/search/indexes/github-docs-dotcom-es.json.br index 8992665114..affeba691e 100644 --- a/lib/search/indexes/github-docs-dotcom-es.json.br +++ b/lib/search/indexes/github-docs-dotcom-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdc62a242be7180a04a8d16c4b805c4d631718268e441d8b7ab23d96e2df5317 -size 3883990 +oid sha256:b42a59fce312074703cea13b5197739e330f1a4956cc87e80556a69c982b1d50 +size 3884410 diff --git a/lib/search/indexes/github-docs-dotcom-ja-records.json.br b/lib/search/indexes/github-docs-dotcom-ja-records.json.br index 69b3e8aa1e..10bdd21cb7 100644 --- a/lib/search/indexes/github-docs-dotcom-ja-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4f6ced9cda09bdf2dc8791a4b36d15a1a8337482a62521c0a3f88ff385ca543 -size 1045198 +oid sha256:c317e84870bcc83c706b252a7c5a63d5b54562e388c286ae07471e235e7342a7 +size 1045665 diff --git a/lib/search/indexes/github-docs-dotcom-ja.json.br b/lib/search/indexes/github-docs-dotcom-ja.json.br index 29dfc4baaf..aa6d9b4321 100644 --- a/lib/search/indexes/github-docs-dotcom-ja.json.br +++ b/lib/search/indexes/github-docs-dotcom-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2d428f340463695c58118de5b28a3012c743190d77ee4d8f5806d669754ffb0 -size 5613386 +oid sha256:c5b7b44f8fd6e11e36bae61cd55013c1f9a2ba728f3baeb68cbdc69115e137a2 +size 5614589 diff --git a/lib/search/indexes/github-docs-dotcom-pt-records.json.br b/lib/search/indexes/github-docs-dotcom-pt-records.json.br index cc6b250f98..46d953f256 100644 --- a/lib/search/indexes/github-docs-dotcom-pt-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f0a8e3305bb059325bd36a5661018a5b863d70e073df9383271258be7e20047 -size 924912 +oid sha256:79b06b0cfc1e345fa95d50061366ca484b4aa2e94762c4b618a3823b10c743fe +size 924978 diff --git a/lib/search/indexes/github-docs-dotcom-pt.json.br b/lib/search/indexes/github-docs-dotcom-pt.json.br index b3e9c247a0..e2a48eef21 100644 --- a/lib/search/indexes/github-docs-dotcom-pt.json.br +++ b/lib/search/indexes/github-docs-dotcom-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cb6046b125ec952c78d1017919d489c5771ee2215584353052745bacaf460e5 -size 3787919 +oid sha256:226d857cf280be03260a9296f3da205826da60f4126d039b8b38a1666c22aa94 +size 3787647 diff --git a/lib/search/indexes/github-docs-ghae-cn-records.json.br b/lib/search/indexes/github-docs-ghae-cn-records.json.br index eeebbdf6a9..a46f5525f4 100644 --- a/lib/search/indexes/github-docs-ghae-cn-records.json.br +++ b/lib/search/indexes/github-docs-ghae-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bc81858660510c3571d718a9aed37401ad12fafd966d3eefd7ff13feda2bfe6 -size 660064 +oid sha256:2e031f4f5e856dfc4deed7668039bd860fb8aedbe3cb90e6a276fe6bf03666a4 +size 660272 diff --git a/lib/search/indexes/github-docs-ghae-cn.json.br b/lib/search/indexes/github-docs-ghae-cn.json.br index 0f12c5434e..29a38bc8b4 100644 --- a/lib/search/indexes/github-docs-ghae-cn.json.br +++ b/lib/search/indexes/github-docs-ghae-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87087f06bf78979fd58caa1bc67117e80e211b77b1dea9a3c9fab83df83a238d -size 1315611 +oid sha256:58d5981898efa4b7ed9327d5c41fe9849fbd3dca06683639f326d7bcdb099226 +size 1316324 diff --git a/lib/search/indexes/github-docs-ghae-en-records.json.br b/lib/search/indexes/github-docs-ghae-en-records.json.br index 9f50c0ce4f..e8c7470e35 100644 --- a/lib/search/indexes/github-docs-ghae-en-records.json.br +++ b/lib/search/indexes/github-docs-ghae-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0896ed561c09138e636f46579a5946d704e333f03c6e139b6d2d5022bf3b2dfe -size 939204 +oid sha256:8b5daacd136372998dab68440691f9f6736de278c77067ac1f102d04cdec5e36 +size 939386 diff --git a/lib/search/indexes/github-docs-ghae-en.json.br b/lib/search/indexes/github-docs-ghae-en.json.br index 8a6f9a8f00..99a53e3787 100644 --- a/lib/search/indexes/github-docs-ghae-en.json.br +++ b/lib/search/indexes/github-docs-ghae-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5770eec97ad4ee7ee7cb42adb81a70e915d30381b51ef3bb17e9396360b9202a -size 3707792 +oid sha256:3895c0a82438fb0624753d9f0ea6f61f401e3bb11d2b84c2d5c0fc7011b52cf7 +size 3707969 diff --git a/lib/search/indexes/github-docs-ghae-es-records.json.br b/lib/search/indexes/github-docs-ghae-es-records.json.br index 1abe34a588..0778466232 100644 --- a/lib/search/indexes/github-docs-ghae-es-records.json.br +++ b/lib/search/indexes/github-docs-ghae-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f84f80a6318cb14923a1f5ceec20d629f1434236d58e67012eab1b01c8090d4c -size 613479 +oid sha256:8a1982b1f2464d09f9d5a40faf2c4641f398bdb448ad3137fb8fbbd2d914bce0 +size 613471 diff --git a/lib/search/indexes/github-docs-ghae-es.json.br b/lib/search/indexes/github-docs-ghae-es.json.br index 4f62fdb0d9..bc5f27d8de 100644 --- a/lib/search/indexes/github-docs-ghae-es.json.br +++ b/lib/search/indexes/github-docs-ghae-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb74ab481f5a38034295293cb2e477880ec5de94b64b7a5d2fc65e650aaa7b1e -size 2532761 +oid sha256:bdb7c359f384f0d06d2c058a3823d840c26b84593abd005c768a9a26af98e82f +size 2532859 diff --git a/lib/search/indexes/github-docs-ghae-ja-records.json.br b/lib/search/indexes/github-docs-ghae-ja-records.json.br index 58572ef59c..d1d28201a4 100644 --- a/lib/search/indexes/github-docs-ghae-ja-records.json.br +++ b/lib/search/indexes/github-docs-ghae-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3532995b571f2e005270393fb12cbfb58f45a95d23dbc0b55c57118503cc6ec3 -size 673244 +oid sha256:d5760946114d77be3dfeecb8b6f67add5fa2285e49c28ef55be83c87108d2da3 +size 673468 diff --git a/lib/search/indexes/github-docs-ghae-ja.json.br b/lib/search/indexes/github-docs-ghae-ja.json.br index 8948d393b4..a3d60d07f4 100644 --- a/lib/search/indexes/github-docs-ghae-ja.json.br +++ b/lib/search/indexes/github-docs-ghae-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b703c340253fc215e8a39fa2042c49af4e5a396d66ec540c02a931b8793b5ffc -size 3601867 +oid sha256:af3f111b79e0a8ec632251cb804b3b0eaed26efd0ebcf9977117abb8e8bfe39e +size 3601815 diff --git a/lib/search/indexes/github-docs-ghae-pt-records.json.br b/lib/search/indexes/github-docs-ghae-pt-records.json.br index 5ba11baa8e..25f6379643 100644 --- a/lib/search/indexes/github-docs-ghae-pt-records.json.br +++ b/lib/search/indexes/github-docs-ghae-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84b9ca03062f858a9c9166a396a17b8fcfdc7dfcbefc4375bbffaaa891bc133b -size 604936 +oid sha256:cf42b4fab1a76a73282a753eceaceb73b3fdf5dd41e47b28834fd0e2f89cc82d +size 604841 diff --git a/lib/search/indexes/github-docs-ghae-pt.json.br b/lib/search/indexes/github-docs-ghae-pt.json.br index ca4058660e..3e9dc71f3f 100644 --- a/lib/search/indexes/github-docs-ghae-pt.json.br +++ b/lib/search/indexes/github-docs-ghae-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bc7cd89fbd784e326778df4c820c4c4f9f07e862e6f896f58d681160576608f -size 2432561 +oid sha256:6a0d274febf503d7eb25eb4ff68f250dfb1d1a0190b3b15a6c6be97b98aa4a0f +size 2432172 diff --git a/lib/search/indexes/github-docs-ghec-cn-records.json.br b/lib/search/indexes/github-docs-ghec-cn-records.json.br index 395a13024b..002effb863 100644 --- a/lib/search/indexes/github-docs-ghec-cn-records.json.br +++ b/lib/search/indexes/github-docs-ghec-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ee87bb1fce84da7ee9931a62155b03cd40709359a6abb1677920fd150578b0e -size 1010312 +oid sha256:fdfe3ea7bebbfc53796bcf93ccbc0c0dcc0685563a91e6196f271693a027c0d2 +size 1010522 diff --git a/lib/search/indexes/github-docs-ghec-cn.json.br b/lib/search/indexes/github-docs-ghec-cn.json.br index 72e48cad9f..017e82381b 100644 --- a/lib/search/indexes/github-docs-ghec-cn.json.br +++ b/lib/search/indexes/github-docs-ghec-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa6bae41f155852ba98b2a5997ca77376b31ba1956b50ee6f13248c4974b9845 -size 1992303 +oid sha256:3399a97475c9f64db7bdb0ad410cfa67986fea6f859c1c6338d03a223e56a102 +size 1993973 diff --git a/lib/search/indexes/github-docs-ghec-en-records.json.br b/lib/search/indexes/github-docs-ghec-en-records.json.br index 6d7966f523..8ef0d01173 100644 --- a/lib/search/indexes/github-docs-ghec-en-records.json.br +++ b/lib/search/indexes/github-docs-ghec-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e92dadabf2d206b01a28d268a338b6d94a7aa05fb5a363348b05486562d5ecb4 -size 1383386 +oid sha256:6c6011dc4f16166c88c2e9836a3bfc64edae803fb48f7e468635b29587a1bd7f +size 1378988 diff --git a/lib/search/indexes/github-docs-ghec-en.json.br b/lib/search/indexes/github-docs-ghec-en.json.br index 44a6662b91..2020de8f2f 100644 --- a/lib/search/indexes/github-docs-ghec-en.json.br +++ b/lib/search/indexes/github-docs-ghec-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a6c59aaf02d08dde69cb0aa43f851544c05b581d9a4cebc3757f157621b5d83 -size 5596408 +oid sha256:25b728bcc2110d6e4df240094e6003de3eab953151e863ef850d7e2b006da96c +size 5599982 diff --git a/lib/search/indexes/github-docs-ghec-es-records.json.br b/lib/search/indexes/github-docs-ghec-es-records.json.br index 8faf897431..f83afa1274 100644 --- a/lib/search/indexes/github-docs-ghec-es-records.json.br +++ b/lib/search/indexes/github-docs-ghec-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e6f38ac5894d24dd9b7a3e07de58090a5df4d00b3c06880f2cb4ba43e393aa6 -size 934451 +oid sha256:f21bcb16c7de97da1e77fe63c079a5701223f3d102bd5a943c26e7443531235d +size 934625 diff --git a/lib/search/indexes/github-docs-ghec-es.json.br b/lib/search/indexes/github-docs-ghec-es.json.br index 99fdb8ee56..6147f2c56a 100644 --- a/lib/search/indexes/github-docs-ghec-es.json.br +++ b/lib/search/indexes/github-docs-ghec-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fafa0ef241b4b45751b3556006401bd0a99cd7e62fa8d8131e228dc2cf9d1c1 -size 4023323 +oid sha256:d232d91262e5716fe79532319f0540a071aa16ebf0f6aa79214e3c8036532091 +size 4022825 diff --git a/lib/search/indexes/github-docs-ghec-ja-records.json.br b/lib/search/indexes/github-docs-ghec-ja-records.json.br index de685f2145..74f21d1106 100644 --- a/lib/search/indexes/github-docs-ghec-ja-records.json.br +++ b/lib/search/indexes/github-docs-ghec-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ac3ea23c2018bd7302e3623e86688a24ed72364ce25b09e9f3bfca993fe29b6 -size 1023862 +oid sha256:1525ff9b72cf2e582acce8d001a4e8951a3163b2684b9ab6d4e77768863bad10 +size 1023823 diff --git a/lib/search/indexes/github-docs-ghec-ja.json.br b/lib/search/indexes/github-docs-ghec-ja.json.br index 4bdc5bc459..0c90d13156 100644 --- a/lib/search/indexes/github-docs-ghec-ja.json.br +++ b/lib/search/indexes/github-docs-ghec-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:656a84a100bdea858d440522cf6c0057cc230cddc834c7c6a3459e82391ff026 -size 5714506 +oid sha256:52f8ad896f63dbdd21788517520dd4baf4f5cab8bee9164a691c30ca4d6dadf8 +size 5713791 diff --git a/lib/search/indexes/github-docs-ghec-pt-records.json.br b/lib/search/indexes/github-docs-ghec-pt-records.json.br index 910d65756c..814d4cfffa 100644 --- a/lib/search/indexes/github-docs-ghec-pt-records.json.br +++ b/lib/search/indexes/github-docs-ghec-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41759ac0de8943910d5935417415f1da8b1899238b7aef4c08a87992f9df85e1 +oid sha256:7807cc8aef7b4f6e3b3b73a7fea34b0deea962fc4127da7a40e7eb729db7231b size 921675 diff --git a/lib/search/indexes/github-docs-ghec-pt.json.br b/lib/search/indexes/github-docs-ghec-pt.json.br index 43f930a3e5..5c20c028b5 100644 --- a/lib/search/indexes/github-docs-ghec-pt.json.br +++ b/lib/search/indexes/github-docs-ghec-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48f8e07202c5db5aad106848d87e823509fcbfe81aef12fb70d8cab89a1a165b -size 3913937 +oid sha256:2eebf2e13db12c41116b686593e3a9f3e0e529d1bafe84e8e6ea5b1db932bdb8 +size 3914286 diff --git a/middleware/anchor-redirect.js b/middleware/anchor-redirect.js index 92300fd624..0bc4b2c2d6 100644 --- a/middleware/anchor-redirect.js +++ b/middleware/anchor-redirect.js @@ -1,5 +1,7 @@ import express from 'express' + import { readCompressedJsonFileFallbackLazily } from '../lib/read-json-file.js' +import { defaultCacheControl } from './cache-control.js' const clientSideRestAPIRedirects = readCompressedJsonFileFallbackLazily( './lib/redirects/static/client-side-rest-api-redirects.json' @@ -15,6 +17,9 @@ router.get('/', function redirects(req, res, next) { if (!req.query.hash) { return res.status(400).send("Missing 'hash' query string") } + + defaultCacheControl(res) + const redirectFrom = `${req.query.path}#${req.query.hash}` res.status(200).send({ to: clientSideRestAPIRedirects()[redirectFrom] } || null) }) diff --git a/middleware/api/search.js b/middleware/api/search.js index 93422e33c8..3c08c45101 100644 --- a/middleware/api/search.js +++ b/middleware/api/search.js @@ -3,7 +3,7 @@ import express from 'express' import searchVersions from '../../lib/search/versions.js' import languages from '../../lib/languages.js' import { allVersions } from '../../lib/all-versions.js' -import { cacheControlFactory } from '../cache-control.js' +import { defaultCacheControl } from '../cache-control.js' import catchMiddlewareError from '../catch-middleware-error.js' import { getSearchResults, ELASTICSEARCH_URL } from './es-search.js' @@ -13,8 +13,6 @@ const languagesSet = new Set(Object.keys(languages)) const router = express.Router() -const cacheControl = cacheControlFactory(60 * 60 * 24) - const DEFAULT_SIZE = 10 const MAX_SIZE = 50 // How much you return has a strong impact on performance const DEFAULT_PAGE = 1 @@ -137,7 +135,7 @@ router.get( } }) if (process.env.NODE_ENV !== 'development') { - cacheControl(res) + defaultCacheControl(res) } res.setHeader('x-search-legacy', 'yes') @@ -227,7 +225,7 @@ router.get( // So the only distinguishing key is the request URL. // Because of that, it's safe to allow the reverse proxy (a.k.a the CDN) // cache and hold on to this. - cacheControl(res) + defaultCacheControl(res) } // The v1 version of the output matches perfectly what comes out diff --git a/middleware/archived-enterprise-versions.js b/middleware/archived-enterprise-versions.js index 6471f458db..e14d8bb70d 100644 --- a/middleware/archived-enterprise-versions.js +++ b/middleware/archived-enterprise-versions.js @@ -69,8 +69,11 @@ const cacheAggressively = (res) => { const retryConfiguration = { limit: 3 } // According to our Datadog metrics, the *average* time for the // the 'archive_enterprise_proxy' metric is ~70ms (excluding spikes) -// which much less than 500ms. -const timeoutConfiguration = { response: 500 } +// which much less than 1500ms. +// We have observed errors of timeout, in production, when it was +// set to 500ms. Let's try to be very conservative here to avoid +// unnecessary error reporting. +const timeoutConfiguration = { response: 1500 } async function getRemoteJSON(url, config) { if (_getRemoteJSONCache.has(url)) { diff --git a/middleware/cache-control.js b/middleware/cache-control.js index e9100c1c29..8b2aa91183 100644 --- a/middleware/cache-control.js +++ b/middleware/cache-control.js @@ -38,3 +38,20 @@ export function cacheControlFactory( res.set(key, directives) } } + +// 24 hours for CDN, we soft-purge this with each deploy +const defaultCDNCacheControl = cacheControlFactory(60 * 60 * 24, { + key: 'surrogate-control', +}) + +// Shorter because between deployments and their (sort) purges, +// we don't want the browser to overly cache because with them we +// can't control purging. +const defaultBrowserCacheControl = cacheControlFactory(60) + +// A general default configuration that is useful to almost all responses +// that can be cached. +export function defaultCacheControl(res) { + defaultCDNCacheControl(res) + defaultBrowserCacheControl(res) +} diff --git a/middleware/render-page.js b/middleware/render-page.js index 6f219eaf24..9edce60fba 100644 --- a/middleware/render-page.js +++ b/middleware/render-page.js @@ -1,5 +1,6 @@ import { get } from 'lodash-es' +import FailBot from '../lib/failbot.js' import patterns from '../lib/patterns.js' import getMiniTocItems from '../lib/get-mini-toc-items.js' import Page from '../lib/page.js' @@ -7,12 +8,7 @@ import statsd from '../lib/statsd.js' import { allVersions } from '../lib/all-versions.js' import { isConnectionDropped } from './halt-on-dropped-connection.js' import { nextApp, nextHandleRequest } from './next.js' -import { cacheControlFactory } from './cache-control.js' - -const browserCacheControl = cacheControlFactory(60) // 1 minute for browsers -const cdnCacheControl = cacheControlFactory(60 * 60 * 24, { - key: 'surrogate-control', -}) // 24 hours for CDN, we purge this with each deploy +import { defaultCacheControl } from './cache-control.js' async function buildRenderedPage(req) { const { context } = req @@ -40,10 +36,15 @@ async function buildMiniTocItems(req) { export default async function renderPage(req, res, next) { const { context } = req + + // This is a contextualizing the request so that when this `req` is + // ultimately passed into the `Error.getInitialProps` function, + // which NextJS executes at runtime on errors, so that we can + // from there send the error to Failbot. + req.FailBot = FailBot + const { page } = context const path = req.pagePath || req.path - browserCacheControl(res) - cdnCacheControl(res) // render a 404 page if (!page) { @@ -122,5 +123,7 @@ export default async function renderPage(req, res, next) { } } + defaultCacheControl(res) + return nextHandleRequest(req, res) } diff --git a/next.config.js b/next.config.js index e427ea4c61..bf3db7e254 100644 --- a/next.config.js +++ b/next.config.js @@ -1,6 +1,8 @@ import fs from 'fs' -import frontmatter from 'gray-matter' import path from 'path' + +import frontmatter from 'gray-matter' + const homepage = path.posix.join(process.cwd(), 'content/index.md') const { data } = frontmatter(fs.readFileSync(homepage, 'utf8')) const productIds = data.children diff --git a/pages/500.tsx b/pages/500.tsx deleted file mode 100644 index 0b75f32263..0000000000 --- a/pages/500.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { GenericError } from 'components/GenericError' - -export default function Custom500() { - return -} diff --git a/pages/_error.tsx b/pages/_error.tsx index 2f6fd315f8..11ab286483 100644 --- a/pages/_error.tsx +++ b/pages/_error.tsx @@ -1,10 +1,104 @@ -import { NextPage } from 'next' +import type { NextPageContext } from 'next' + import { GenericError } from 'components/GenericError' -type Props = {} - -const ErrorPage: NextPage = () => { +function Error() { return } -export default ErrorPage +Error.getInitialProps = async (ctx: NextPageContext) => { + // If this getInitialProps() is called in client-side rendering, + // you won't have a `.res` object. It's only present when it's + // rendered Node (SSR). That's our clue to know that, we should + // send this error to Failbot. + // In client-side, it's undefined. In server, it's a ServerResponse object. + const { err, req, res } = ctx + let statusCode = 500 + if (res?.statusCode) { + statusCode = res.statusCode + } + + // 'err' will by falsy if it's a 404 + // But note, at the time of writing this comment, we have a dedicated + // `pages/404.tsx` which takes care of 404 messages. + if (err && res && req) { + // This is a (necessary) hack! + // You can't import `../lib/failbot.js` here in this + // file because it gets imported by webpack to be used in the + // client-side JS bundle. It *could* be solved by overriding + // the webpack configuration in our `next.config.js` but this is prone + // to be fragile since ignoring code can be hard to get right + // and the more we override there, the harder it will become to + // upgrade NextJS in the future because of moving parts. + // So the solution is to essentially do what the contextualizers + // do which mutate the Express request object by attaching + // callables to it. This way it's only ever present in SSR executed + // code and doesn't need any custom webpack configuration. + const expressRequest = req as any + const FailBot = expressRequest.FailBot + if (FailBot) { + try { + // An inclusion-list of headers we're OK with sending because + // they don't contain an PII. + const OK_HEADER_KEYS = ['user-agent', 'referer', 'accept-encoding', 'accept-language'] + const reported = FailBot.report(err, { + path: req.url, + request: JSON.stringify( + { + method: expressRequest.method, + query: expressRequest.query, + language: expressRequest.language, + }, + undefined, + 2 + ), + headers: JSON.stringify( + Object.fromEntries( + Object.entries(req.headers).filter(([k]) => OK_HEADER_KEYS.includes(k)) + ), + undefined, + 2 + ), + }) + + // Within FailBot.report() (which is our wrapper for Failbot in + // the `@github/failbot` package), it might exit only because + // it has no configured backends to send to. I.e. it returns undefined. + // Otherwise, it should return `Array>`. + if (!reported) { + console.warn( + 'The FailBot.report() returned undefined which means the error was NOT sent to Failbot.' + ) + } else if ( + Array.isArray(reported) && + reported.length && + reported.every((thing) => thing instanceof Promise) + ) { + // Make sure we await the promises even though we don't care + // about the results. This makes the code cleaner rather than + // letting the eventloop take care of it which could result + // in cryptic error messages if the await does fail for some + // reason. + try { + await Promise.all(reported) + } catch (error) { + console.warn('Unable to await reported FailBot errors', error) + } + } + } catch (error) { + // This does not necessarily mean FailBot failed to send. It's + // most likely that we failed to *send to* FailBot before it + // even has a chance to use the network. This is because + // `FailBot.report` returns an array of Promises which themselves + // could go wrong, but that's a story for another try/catch. + // Basically, this catch it just to avoid other errors that + // might prevent the pretty error page to render at all. + console.warn('Failed to send error to FailBot.', error) + } + } + } + + return { statusCode, message: err?.message } +} + +export default Error diff --git a/tests/content/api-search.js b/tests/content/api-search.js index 1b326fadb5..5637df873f 100644 --- a/tests/content/api-search.js +++ b/tests/content/api-search.js @@ -15,6 +15,7 @@ import { jest, test, expect } from '@jest/globals' import { describeIfElasticsearchURL } from '../helpers/conditional-runs.js' import { get } from '../helpers/e2etest.js' +import { SURROGATE_ENUMS } from '../../middleware/set-fastly-surrogate-key.js' if (!process.env.ELASTICSEARCH_URL) { console.warn( @@ -62,7 +63,10 @@ describeIfElasticsearchURL('search middleware', () => { // Check that it can be cached at the CDN expect(res.headers['set-cookie']).toBeUndefined() expect(res.headers['cache-control']).toContain('public') - expect(res.headers['cache-control']).toMatch(/max-age=\d+/) + expect(res.headers['cache-control']).toMatch(/max-age=[1-9]/) + expect(res.headers['surrogate-control']).toContain('public') + expect(res.headers['surrogate-control']).toMatch(/max-age=[1-9]/) + expect(res.headers['surrogate-key']).toBe(SURROGATE_ENUMS.DEFAULT) }) test('debug search', async () => { diff --git a/tests/unit/anchor-redirect.js b/tests/unit/anchor-redirect.js index f7ae7819fe..cc77ed0e65 100644 --- a/tests/unit/anchor-redirect.js +++ b/tests/unit/anchor-redirect.js @@ -1,5 +1,7 @@ import { describe, expect } from '@jest/globals' + import { get } from '../helpers/e2etest.js' +import { SURROGATE_ENUMS } from '../../middleware/set-fastly-surrogate-key.js' import clientSideRedirects from '../../lib/redirects/static/client-side-rest-api-redirects.json' describe('anchor-redirect middleware', () => { @@ -41,4 +43,15 @@ describe('anchor-redirect middleware', () => { const { to } = JSON.parse(res.text) expect(to).toBe(undefined) }) + test('reasonably aggressive cache-control headers', async () => { + const sp = new URLSearchParams() + sp.set('path', 'foo') + sp.set('hash', 'bar') + const res = await get('/anchor-redirect?' + sp) + expect(res.headers['cache-control']).toContain('public') + expect(res.headers['cache-control']).toMatch(/max-age=[1-9]/) + expect(res.headers['surrogate-control']).toContain('public') + expect(res.headers['surrogate-control']).toMatch(/max-age=[1-9]/) + expect(res.headers['surrogate-key']).toBe(SURROGATE_ENUMS.DEFAULT) + }) }) diff --git a/translations/ja-JP/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/mapping-okta-groups-to-teams.md b/translations/ja-JP/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/mapping-okta-groups-to-teams.md index 0a5391066c..05d3d9eac7 100644 --- a/translations/ja-JP/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/mapping-okta-groups-to-teams.md +++ b/translations/ja-JP/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/mapping-okta-groups-to-teams.md @@ -98,4 +98,4 @@ Enterprise owners can use the site admin dashboard to check how Okta groups are {% data reusables.saml.external-identity-audit-events %} -For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization)." +詳しい情報については「[OrganizationのAudit logのレビュー](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization)」を参照してください。 diff --git a/translations/ja-JP/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md b/translations/ja-JP/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md index b4849f1302..a2576bd5cd 100644 --- a/translations/ja-JP/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md +++ b/translations/ja-JP/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md @@ -45,7 +45,7 @@ In all the search phrases below, replace ORGANIZATION with the name of the organ ### Restoring teams 1. To find each team name, search the audit log for `action:team.create org:ORGANIZATION`. -1. Manually recreate the team. For more information, see "[Creating a team](/organizations/organizing-members-into-teams/creating-a-team)." +1. Manually recreate the team. 詳しい情報については「[Teamの作成](/organizations/organizing-members-into-teams/creating-a-team)」を参照してください。 1. To find the members that have been added to each team, search for `action:team.add_member team:"ORGANIZATION/TEAM"`. 1. Manually re-add the team members. For more information, see "[Adding organization members to a team](/organizations/organizing-members-into-teams/adding-organization-members-to-a-team)." 1. To find the repositories that the team was granted access to, search for `action:team.add_repository team:"ORGANIZATION/TEAM"`. diff --git a/translations/ja-JP/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md b/translations/ja-JP/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md index bebf212082..841657afae 100644 --- a/translations/ja-JP/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md +++ b/translations/ja-JP/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md @@ -197,7 +197,7 @@ Members of your organization or enterprise can use tools from the {% data variab ### 4. Publishing and managing {% data variables.product.prodname_registry %} {% data reusables.getting-started.packages %} ### 5. {% data variables.product.prodname_pages %}を使用する -{% data variables.product.prodname_pages %} is a static site hosting service that takes HTML, CSS, and JavaScript files straight from a repository and publishes a website. You can manage the publication of {% data variables.product.prodname_pages %} sites at the organization level. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)" and "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages)." +{% data variables.product.prodname_pages %}は、HTML、CSS、JavaScriptファイルをリポジトリから直接取得してWebサイトを公開する、静的サイトホスティングサービスです。 You can manage the publication of {% data variables.product.prodname_pages %} sites at the organization level. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)" and "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages)." ## Part 7: Participating in {% data variables.product.prodname_dotcom %}'s community Members of your organization or enterprise can use GitHub's learning and support resources to get the help they need. You can also support the open source community. @@ -206,9 +206,9 @@ Members of your organization or enterprise can use GitHub's learning and support You can read documentation that reflects the features available with {% data variables.product.prodname_ghe_cloud %}. For more information, see "[About versions of {% data variables.product.prodname_docs %}](/get-started/learning-about-github/about-versions-of-github-docs)." ### 2. Learning with {% data variables.product.prodname_learning %} -Members of your organization or enterprise can learn new skills by completing fun, realistic projects in your very own GitHub repository with [{% data variables.product.prodname_learning %}](https://skills.github.com/). Each course is a hands-on lesson created by the GitHub community and taught by a friendly bot. +Members of your organization or enterprise can learn new skills by completing fun, realistic projects in your very own GitHub repository with [{% data variables.product.prodname_learning %}](https://skills.github.com/). 各コースは、GitHubのコミュニティが作成したハンズオンのレッスンで、親切なbotによって教えてもらえます。 -For more information, see "[Git and {% data variables.product.prodname_dotcom %} learning resources](/github/getting-started-with-github/quickstart/git-and-github-learning-resources)." +詳しい情報については「[Gitと{% data variables.product.prodname_dotcom %}の学習リソース](/github/getting-started-with-github/quickstart/git-and-github-learning-resources)」を参照してください。 ### 3. Supporting the open source community {% data reusables.getting-started.sponsors %} diff --git a/translations/ja-JP/content/get-started/using-github/github-command-palette.md b/translations/ja-JP/content/get-started/using-github/github-command-palette.md index 650351e96a..cff9bb5aa0 100644 --- a/translations/ja-JP/content/get-started/using-github/github-command-palette.md +++ b/translations/ja-JP/content/get-started/using-github/github-command-palette.md @@ -160,9 +160,9 @@ These commands are available from all scopes. These commands are available only within the scope of an organization. -| Command | Behavior | -|:---------- |:----------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `New team` | Create a new team in the current organization. For more information, see "[Creating a team](/organizations/organizing-members-into-teams/creating-a-team)." | +| Command | Behavior | +|:---------- |:-------------------------------------------------------------------------------------------------------------------------------------------- | +| `New team` | Create a new team in the current organization. 詳しい情報については「[Teamの作成](/organizations/organizing-members-into-teams/creating-a-team)」を参照してください。 | ### Repository commands diff --git a/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md b/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md index ff9c94d106..1acc884c51 100644 --- a/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md +++ b/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md @@ -92,10 +92,10 @@ Organization内では、ロールをOrganization、Team、リポジトリのレ - **Set interaction limits（インタラクションの制限を設定）**: 自分のパブリックリポジトリで特定のユーザによるコメント、Issueのオープン、Pull Requestの作成を一時的に制限し、アクティビティの制限期間を施行。 詳しい情報については「[リポジトリでの操作の制限](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)」を参照してください。 {%- endif %} - **Set the social preview（ソーシャルプレビューの設定）**: リポジトリがリンクされたときにソーシャルメディア上に表示される識別画像をリポジトリに追加。 詳細は「[リポジトリのソーシャルメディア向けプレビューをカスタマイズする](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview)」を参照してください。 -- **Push commits to protected branches（保護されたブランチにコミットをプッシュ）**: 保護されたブランチとしてマークされているブランチにプッシュ。 Branch protection rules will still apply and could result in a push being rejected. +- **Push commits to protected branches（保護されたブランチにコミットをプッシュ）**: 保護されたブランチとしてマークされているブランチにプッシュ。 ブランチ保護ルールは引き続き適用され、プッシュが拒否されることがあります。 - **Create protected tags（保護されたタグの作成）**: タグの保護ルールにマッチしたタグの作成。 詳しい情報については「[タグ保護ルールの設定](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)」を参照してください。 -- **Delete protected tags（タグ保護ルールの削除）**: タグ保護ルールにマッチしたタグの削除。 For more information, see "[Configuring tag protection rules](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)."{% ifversion bypass-branch-protections %} -- **Bypass branch protections**: Push to a protected branch without needing to comply with branch protection rules.{% endif %} +- **Delete protected tags（タグ保護ルールの削除）**: タグ保護ルールにマッチしたタグの削除。 詳しい情報については「[タグ保護ルールの設定](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)」を参照してください。{% ifversion bypass-branch-protections %} +- **ブランチ保護のバイパス**: 保護されたブランチにブランチ保護ルールに準拠せずにプッシュ。{% endif %} ### セキュリティ diff --git a/translations/ja-JP/data/reusables/actions/github_sha_description.md b/translations/ja-JP/data/reusables/actions/github_sha_description.md index b78af9b32a..d1f1daf768 100644 --- a/translations/ja-JP/data/reusables/actions/github_sha_description.md +++ b/translations/ja-JP/data/reusables/actions/github_sha_description.md @@ -1 +1 @@ -ワークフローをトリガーしたコミットSHA。 The value of this commit SHA depends on the event that triggered the workflow. 詳しい情報については「[ワークフローをトリガーするイベント](/actions/using-workflows/events-that-trigger-workflows)」 たとえば、`ffac537e6cbbf934b08745a378932722df287a53`です。 \ No newline at end of file +ワークフローをトリガーしたコミットSHA。 このコミットSHAの値は、ワークフローをトリガーしたイベントに依存します。 詳しい情報については「[ワークフローをトリガーするイベント](/actions/using-workflows/events-that-trigger-workflows)」 たとえば、`ffac537e6cbbf934b08745a378932722df287a53`です。 \ No newline at end of file diff --git a/translations/ja-JP/data/reusables/gated-features/code-review-assignment.md b/translations/ja-JP/data/reusables/gated-features/code-review-assignment.md index a3e4c21175..8afffd8722 100644 --- a/translations/ja-JP/data/reusables/gated-features/code-review-assignment.md +++ b/translations/ja-JP/data/reusables/gated-features/code-review-assignment.md @@ -1 +1 @@ -Code review settings are available in all public repositories owned by an organization, and all private repositories owned by organizations on {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_server %} 2.20+,{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_cloud %}. 詳しい情報については「[GitHubの製品](/articles/githubs-products)」を参照してください。 +コードレビュー設定は、Organizationが所有するすべてのパブリックリポジトリ、そして{% data variables.product.prodname_team %}、{% data variables.product.prodname_ghe_server %} 2.20+、{% ifversion ghae %}{% data variables.product.prodname_ghe_managed %}、{% endif %}{% data variables.product.prodname_ghe_cloud %}上のOrganizationが所有するすべてのプライベートリポジトリで利用できます。 詳しい情報については「[GitHubの製品](/articles/githubs-products)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/gated-features/copilot.md b/translations/ja-JP/data/reusables/gated-features/copilot.md index 84079410cc..4acb15a9e0 100644 --- a/translations/ja-JP/data/reusables/gated-features/copilot.md +++ b/translations/ja-JP/data/reusables/gated-features/copilot.md @@ -1 +1 @@ -{% data variables.product.prodname_copilot %} is available to {% data variables.product.company_short %} customers with a personal account on {% data variables.product.prodname_dotcom_the_website %}. {% data variables.product.prodname_copilot %} is free to use for verified students and maintainers of popular open source projects. If you are not a student or maintainer of a popular open source project, you can try {% data variables.product.prodname_copilot %} for free with a one-time 60 day trial. 無料のトライアルが終わったあと、継続して使うには有料プランが必要になります。 詳しい情報については、「[{% data variables.product.prodname_copilot %}の支払いについて](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot)」を参照してください。 +{% data variables.product.prodname_copilot %} is available to {% data variables.product.company_short %} customers with a personal account on {% data variables.product.prodname_dotcom_the_website %}. {% data variables.product.prodname_copilot %} is free to use for verified students and maintainers of popular open source projects. If you are not a student or maintainer of a popular open source project, you can try {% data variables.product.prodname_copilot %} for free with a one-time 60 day trial. After the free trial, you will need a paid subscription for continued use. For more information, see "[About billing for {% data variables.product.prodname_copilot %}](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot)." diff --git a/translations/ja-JP/data/reusables/gated-features/dependency-review.md b/translations/ja-JP/data/reusables/gated-features/dependency-review.md index ffcb443503..0fe0e69750 100644 --- a/translations/ja-JP/data/reusables/gated-features/dependency-review.md +++ b/translations/ja-JP/data/reusables/gated-features/dependency-review.md @@ -1,13 +1,13 @@ {%- ifversion fpt %} -Dependency review is enabled on public repositories. Dependency review is also available in private repositories owned by organizations that use {% data variables.product.prodname_ghe_cloud %} and have a license for {% data variables.product.prodname_GH_advanced_security %}. +依存関係レビューは、パブリックリポジトリで有効化されています。 依存関係レビューは、{% data variables.product.prodname_ghe_cloud %}を使い、{% data variables.product.prodname_GH_advanced_security %}のライセンスを持っているOrganizationが所有するプライベートリポジトリでも利用できます。 {%- elsif ghec %} -依存関係レビューは、パブリックリポジトリに対して{% data variables.product.product_name %}に含まれています。 To use dependency review in private repositories owned by organizations, you must have a license for {% data variables.product.prodname_GH_advanced_security %}. +依存関係レビューは、パブリックリポジトリに対して{% data variables.product.product_name %}に含まれています。 依存関係レビューをOrganizationが所有するプライベートリポジトリで使うには、{% data variables.product.prodname_GH_advanced_security %}のライセンスを持っていなければなりません。 {%- elsif ghes %} -Dependency review is available for organization-owned repositories in {% data variables.product.product_name %}. This feature requires a license for {% data variables.product.prodname_GH_advanced_security %}. +依存関係レビューは、{% data variables.product.product_name %}のOrganizationが所有するリポジトリで利用できます。 この機能には、{% data variables.product.prodname_GH_advanced_security %}のライセンスが必要です。 {%- elsif ghae %} -Dependency review is available for organization-owned repositories in {% data variables.product.product_name %}. This is a {% data variables.product.prodname_GH_advanced_security %} feature (free during the beta release). +依存関係レビューは、{% data variables.product.product_name %}のOrganizationが所有するリポジトリで利用できます。 これは{% data variables.product.prodname_GH_advanced_security %}の機能です（ベータリリースの期間中は無料）。 {%- endif %} {% data reusables.advanced-security.more-info-ghas %} diff --git a/translations/ja-JP/data/reusables/gated-features/dependency-vulnerable-calls.md b/translations/ja-JP/data/reusables/gated-features/dependency-vulnerable-calls.md index 88823ff80c..77ec887b45 100644 --- a/translations/ja-JP/data/reusables/gated-features/dependency-vulnerable-calls.md +++ b/translations/ja-JP/data/reusables/gated-features/dependency-vulnerable-calls.md @@ -1,13 +1,13 @@ {%- ifversion fpt %} -Detection of vulnerable calls is enabled on public repositories. This analysis is also available in private repositories owned by organizations that use {% data variables.product.prodname_ghe_cloud %} and have licensed {% data variables.product.prodname_GH_advanced_security %}. +脆弱性のある呼び出しの検出は、パブリックリポジトリで有効化されています。 この分析は、{% data variables.product.prodname_ghe_cloud %}を使用し、ライセンスされた{% data variables.product.prodname_GH_advanced_security %}を持つOrganizationが所有するプライベートリポジトリでも利用できます。 {%- elsif ghec %} -Detection of vulnerable calls is included in {% data variables.product.product_name %} for public repositories. To detect vulnerable calls in private repositories owned by organizations, your organization must have a license for {% data variables.product.prodname_GH_advanced_security %}. +脆弱性のある呼び出しの検出は、パブリックリポジトリで{% data variables.product.product_name %}に含まれています。 Organizationが所有するプライベートリポジトリで脆弱性のある呼び出しを検出するには、Organizationが{% data variables.product.prodname_GH_advanced_security %}のライセンスを持っていなければなりません。 {%- elsif ghes > 3.5 %} -Detection of vulnerable calls is available for organization-owned repositories in {% data variables.product.product_name %}. This feature requires a license for {% data variables.product.prodname_GH_advanced_security %}. +脆弱性のある呼び出しの検出は、{% data variables.product.product_name %}のOrganizationが所有するリポジトリで利用できます。 この機能には、{% data variables.product.prodname_GH_advanced_security %}のライセンスが必要です。 {%- elsif ghae-issue-6076 %} -Detection of vulnerable calls is available for organization-owned repositories in {% data variables.product.product_name %}. This is a {% data variables.product.prodname_GH_advanced_security %} feature (free during the beta release). +脆弱性のある呼び出しの検出は、{% data variables.product.product_name %}のOrganizationが所有するリポジトリで利用できます。 これは{% data variables.product.prodname_GH_advanced_security %}の機能です（ベータリリースの期間中は無料）。 {%- endif %} {% data reusables.advanced-security.more-info-ghas %} diff --git a/translations/ja-JP/data/reusables/gated-features/enterprise-accounts.md b/translations/ja-JP/data/reusables/gated-features/enterprise-accounts.md index c66cd82910..7953568f7e 100644 --- a/translations/ja-JP/data/reusables/gated-features/enterprise-accounts.md +++ b/translations/ja-JP/data/reusables/gated-features/enterprise-accounts.md @@ -1 +1 @@ -Enterpriseアカウントは、{% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}、{% data variables.product.prodname_ghe_managed %}{% endif %}、{% data variables.product.prodname_ghe_server %}で利用できます。 For more information, see "[About enterprise accounts]({% ifversion fpt %}/enterprise-cloud@latest{% endif %}/admin/overview/about-enterprise-accounts){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} +Enterprise accounts are available with {% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[About enterprise accounts]({% ifversion fpt %}/enterprise-cloud@latest{% endif %}/admin/overview/about-enterprise-accounts){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} diff --git a/translations/ja-JP/data/reusables/gated-features/environments.md b/translations/ja-JP/data/reusables/gated-features/environments.md index 2e58922759..c673dab144 100644 --- a/translations/ja-JP/data/reusables/gated-features/environments.md +++ b/translations/ja-JP/data/reusables/gated-features/environments.md @@ -1 +1 @@ -Environments, environment secrets, and environment protection rules are available in **public** repositories for all products. For access to environments, environment secrets, and deployment branches in **private** or **internal** repositories, you must use {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, or {% data variables.product.prodname_enterprise %}. For access to other environment protection rules in **private** or **internal** repositories, you must use {% data variables.product.prodname_enterprise %}. {% data reusables.gated-features.more-info %} +環境、環境シークレット、環境保護ルールはすべての製品の**パブリック**リポジトリで利用できます。 **プライベート**もしくは**インターナル**リポジトリの環境、環境シークレット、デプロイメントブランチへのアクセスには、{% data variables.product.prodname_pro %}、{% data variables.product.prodname_team %}、{% data variables.product.prodname_enterprise %}のいずれかを使用する必要があります。 **プライベート**もしくは**インターナル**リポジトリのその他の環境保護ルールにアクセスするには、{% data variables.product.prodname_enterprise %}を使わなければなりません。 {% data reusables.gated-features.more-info %} diff --git a/translations/ja-JP/data/reusables/gated-features/generated-health-checks.md b/translations/ja-JP/data/reusables/gated-features/generated-health-checks.md index 242ca1e599..6f7af2c2b2 100644 --- a/translations/ja-JP/data/reusables/gated-features/generated-health-checks.md +++ b/translations/ja-JP/data/reusables/gated-features/generated-health-checks.md @@ -1 +1 @@ -Generating a Health Check is available with {% data variables.contact.premium_support %}. 詳しい情報については、「[{% data variables.contact.premium_support %} について](/support/learning-about-github-support/about-github-premium-support)」を参照してください。 +ヘルスチェックの生成は、{% data variables.contact.premium_support %}で利用できます。 詳しい情報については、「[{% data variables.contact.premium_support %} について](/support/learning-about-github-support/about-github-premium-support)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/gated-features/ghas.md b/translations/ja-JP/data/reusables/gated-features/ghas.md index b6362ec2f9..66d02ec6dc 100644 --- a/translations/ja-JP/data/reusables/gated-features/ghas.md +++ b/translations/ja-JP/data/reusables/gated-features/ghas.md @@ -1 +1 @@ -{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[About GitHub's products](/github/getting-started-with-github/githubs-products)."{% else %} For more information about upgrading your {% data variables.product.prodname_ghe_server %} instance, see "[About upgrades to new releases](/admin/overview/about-upgrades-to-new-releases)" and refer to the [{% data variables.enterprise.upgrade_assistant %}](https://support.github.com/enterprise/server-upgrade) to find the upgrade path from your current release version.{% endif %} +{% data variables.product.prodname_GH_advanced_security %}は{% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}、{% data variables.product.prodname_ghe_managed %}{% endif %}、{% data variables.product.prodname_ghe_server %}のEntepriseアカウントで利用できます。{% ifversion fpt or ghec %}{% data variables.product.prodname_GH_advanced_security %}の一部の機能は、{% data variables.product.prodname_dotcom_the_website %}のパブリックリポジトリでも利用できます。 詳しい情報については「[GitHubの製品について](/github/getting-started-with-github/githubs-products)」を参照してください。{% else %}{% data variables.product.prodname_ghe_server %}インスタンスのアップグレードに関する詳しい情報については「[新しいリリースへのアップグレードについて](/admin/overview/about-upgrades-to-new-releases)」を参照し、現在のリリースバージョンからのアップグレードパスを見つけるには[{% data variables.enterprise.upgrade_assistant %}](https://support.github.com/enterprise/server-upgrade)を参照してください。{% endif %} diff --git a/translations/ja-JP/data/reusables/gated-features/historical-insights-for-projects.md b/translations/ja-JP/data/reusables/gated-features/historical-insights-for-projects.md index 07502e255f..21afa5fa32 100644 --- a/translations/ja-JP/data/reusables/gated-features/historical-insights-for-projects.md +++ b/translations/ja-JP/data/reusables/gated-features/historical-insights-for-projects.md @@ -1 +1 @@ -Historical charts are available with {% data variables.product.prodname_team %} and {% data variables.product.prodname_ghe_cloud %} for organizations. You can save unlimited charts in private projects with {% data variables.product.prodname_team %} and {% data variables.product.prodname_ghe_cloud %} for organizations and {% data variables.product.prodname_pro %} for users. Users and organizations using a public project can also save unlimited charts. Users and organizations using {% data variables.product.prodname_free_team %} or a legacy plan can save two charts in private projects. {% data reusables.gated-features.more-info %} \ No newline at end of file +履歴グラフは{% data variables.product.prodname_team %}及びOrganizationの{% data variables.product.prodname_ghe_cloud %}で利用できます。 {% data variables.product.prodname_team %}及びOrganizationの{% data variables.product.prodname_ghe_cloud %}及びユーザの{% data variables.product.prodname_pro %}で、プライベートプロジェクトに無制限にグラフを保存できます。 パブリックプロジェクトを利用するユーザ及びOrganizationも、無制限にグラフを保存できます。 {% data variables.product.prodname_free_team %}もしくはレガシープランを利用しているユーザ及びOrganizationは、プライベートプロジェクトに2つのグラフを保存できます。 {% data reusables.gated-features.more-info %} \ No newline at end of file diff --git a/translations/ja-JP/data/reusables/gated-features/multiple-pr-reviewers.md b/translations/ja-JP/data/reusables/gated-features/multiple-pr-reviewers.md index 275295cc25..40db88db11 100644 --- a/translations/ja-JP/data/reusables/gated-features/multiple-pr-reviewers.md +++ b/translations/ja-JP/data/reusables/gated-features/multiple-pr-reviewers.md @@ -1 +1 @@ -The ability to add multiple pull request reviewers or requests reviews from teams is available in public repositories with {% data variables.product.prodname_free_team %} for organizations and legacy per-repository billing plans, and in public and private repositories with {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_server %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% ifversion fpt or ghec %}{% data reusables.gated-features.more-info %}{% endif %} +複数のPull Requestレビュー担当者を追加する化、Teamからのレビューをリクエストする機能は、Organizationの{% data variables.product.prodname_free_team %}及びレガシーのリポジトリ単位の支払いプランのパブリックリポジトリ、そして{% data variables.product.prodname_team %}、{% data variables.product.prodname_ghe_server %}、{% ifversion ghae %}{% data variables.product.prodname_ghe_managed %}、{% endif %}{% data variables.product.prodname_ghe_cloud %}のパブリック及びプライベートリポジトリで利用できます。 {% ifversion fpt or ghec %}{% data reusables.gated-features.more-info %}{% endif %} diff --git a/translations/ja-JP/data/reusables/gated-features/packages.md b/translations/ja-JP/data/reusables/gated-features/packages.md index ae91fb6596..1f7954da8c 100644 --- a/translations/ja-JP/data/reusables/gated-features/packages.md +++ b/translations/ja-JP/data/reusables/gated-features/packages.md @@ -1,7 +1,7 @@ {% ifversion fpt or ghec or ghes < 3.5 %} -{% data variables.product.prodname_registry %} is available with {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %} 3.0 or higher, and {% data variables.product.prodname_ghe_managed %}.{% ifversion ghes %} For more information about upgrading your {% data variables.product.prodname_ghe_server %} instance, see "[About upgrades to new releases](/admin/overview/about-upgrades-to-new-releases)" and refer to the [{% data variables.enterprise.upgrade_assistant %}](https://support.github.com/enterprise/server-upgrade) to find the upgrade path from your current release version.{% endif %} +{% data variables.product.prodname_registry %}は、{% data variables.product.prodname_free_user %}、{% data variables.product.prodname_pro %}、Organizationの{% data variables.product.prodname_free_team %}、{% data variables.product.prodname_team %}、{% data variables.product.prodname_ghe_cloud %}、{% data variables.product.prodname_ghe_server %} 3.0以降、{% data variables.product.prodname_ghe_managed %}で利用できます。{% ifversion ghes %}{% data variables.product.prodname_ghe_server %}インスタンスのアップグレードに関する詳しい情報については「[新しいリリースへのアップグレードについて](/admin/overview/about-upgrades-to-new-releases)」を参照し、現在のリリースバージョンからのアップグレードパスを探すことについては[{% data variables.enterprise.upgrade_assistant %}](https://support.github.com/enterprise/server-upgrade)を参照してください。{% endif %} {% ifversion fpt or ghec %}
-{% data variables.product.prodname_registry %}は、レガシーのリポジトリごとのプランを使っているアカウントが所有しているプライベートリポジトリでは利用できません。 Also, accounts using legacy per-repository plans cannot access the {% data variables.product.prodname_container_registry %} since these accounts are billed by repository. {% data reusables.gated-features.more-info %} +{% data variables.product.prodname_registry %}は、レガシーのリポジトリごとのプランを使っているアカウントが所有しているプライベートリポジトリでは利用できません。 また、レガシーのリポジトリごとのプランを使っているアカウントは、リポジトリごとに課金されるため、{% data variables.product.prodname_container_registry %}にはアクセスできません。 {% data reusables.gated-features.more-info %} {% endif %} {% endif %} diff --git a/translations/ja-JP/data/reusables/gated-features/repository-insights.md b/translations/ja-JP/data/reusables/gated-features/repository-insights.md index 294c79fa86..3345152b1e 100644 --- a/translations/ja-JP/data/reusables/gated-features/repository-insights.md +++ b/translations/ja-JP/data/reusables/gated-features/repository-insights.md @@ -1 +1 @@ -This repository insights graph is available in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} For more information, see "[About repository graphs](/articles/about-repository-graphs)" and "[{% data variables.product.prodname_dotcom %}'s products](/articles/github-s-products)."{% endif %} +リポジトリインサイトグラフは、{% data variables.product.prodname_free_user %}及びOrganizationの{% data variables.product.prodname_free_team %}のパブリックリポジトリ、そして{% data variables.product.prodname_pro %}、{% data variables.product.prodname_team %}、{% data variables.product.prodname_ghe_cloud %}、{% ifversion ghae %}{% data variables.product.prodname_ghe_managed %}、{% endif %}{% data variables.product.prodname_ghe_server %}のパブリック及びプライベートリポジトリで利用できます。{% ifversion fpt or ghec %}詳しい情報については「[リポジトリグラフについて](/articles/about-repository-graphs)」及び「[{% data variables.product.prodname_dotcom %}の製品](/articles/github-s-products)」を参照してください。{% endif %} diff --git a/translations/ja-JP/data/reusables/gated-features/restrict-email-domain.md b/translations/ja-JP/data/reusables/gated-features/restrict-email-domain.md index c5349aab70..cc2e0801a2 100644 --- a/translations/ja-JP/data/reusables/gated-features/restrict-email-domain.md +++ b/translations/ja-JP/data/reusables/gated-features/restrict-email-domain.md @@ -1 +1 @@ -Restriction of email notifications to approved or verified domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. 詳しい情報については「[GitHubの製品](/articles/githubs-products)」を参照してください。 +承認済みもしくは検証済みドメインへのメール通知の制限は、{% data variables.product.prodname_ghe_cloud %}及び{% data variables.product.prodname_ghe_server %}で利用できます。 詳しい情報については「[GitHubの製品](/articles/githubs-products)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/gated-features/security-overview.md b/translations/ja-JP/data/reusables/gated-features/security-overview.md index 7a4f00d780..ec25070008 100644 --- a/translations/ja-JP/data/reusables/gated-features/security-overview.md +++ b/translations/ja-JP/data/reusables/gated-features/security-overview.md @@ -1,5 +1,5 @@ {% ifversion fpt %} -The security overview is available for organizations that use {% data variables.product.prodname_enterprise %}. 詳しい情報については「[GitHubの製品](/articles/githubs-products)」を参照してください。 +The security overview is available for organizations that use {% data variables.product.prodname_enterprise %}. For more information, see "[GitHub's products](/articles/githubs-products)." {% elsif security-overview-displayed-alerts %} All organizations and enterprises have a security overview. If you use {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghae %}, which is free during the beta release,{% endif %} you will see additional information. {% data reusables.advanced-security.more-info-ghas %} {% elsif ghes < 3.7 %} diff --git a/translations/ja-JP/data/reusables/gated-features/tag-protection-rules.md b/translations/ja-JP/data/reusables/gated-features/tag-protection-rules.md index 3f8d774374..ff4bba7ec7 100644 --- a/translations/ja-JP/data/reusables/gated-features/tag-protection-rules.md +++ b/translations/ja-JP/data/reusables/gated-features/tag-protection-rules.md @@ -1 +1 @@ -{% ifversion ghae %}Tag protection rules are available in internal and private repositories with {% data variables.product.prodname_ghe_managed %}, {% else%}Tag protection rules are available {% endif %}in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, and {% data variables.product.prodname_ghe_server %}. {% ifversion fpt or ghec %}{% data reusables.gated-features.more-info %}{% endif %} +{% ifversion ghae %}タグ保護ルールは、{% data variables.product.prodname_ghe_managed %}のインターナル及びプライベートリポジトリ、{% else%}タグ保護ルールは、{% endif %}{% data variables.product.prodname_free_user %}及びOrganizationの{% data variables.product.prodname_free_team %}のパブリックリポジトリ、{% data variables.product.prodname_pro %}、{% data variables.product.prodname_team %}、{% data variables.product.prodname_ghe_cloud %}、{% data variables.product.prodname_ghe_server %}のパブリック及びプライベートリポジトリで利用できます。 {% ifversion fpt or ghec %}{% data reusables.gated-features.more-info %}{% endif %} diff --git a/translations/ja-JP/data/reusables/gated-features/user-repo-collaborators.md b/translations/ja-JP/data/reusables/gated-features/user-repo-collaborators.md index 55f63f10ca..c3a3ee608a 100644 --- a/translations/ja-JP/data/reusables/gated-features/user-repo-collaborators.md +++ b/translations/ja-JP/data/reusables/gated-features/user-repo-collaborators.md @@ -1,4 +1,4 @@ {% ifversion fpt %} -If you're using -{% data variables.product.prodname_free_user %}, you can add unlimited collaborators on public and private repositories. +パブリック及びプライベートリポジトリには、 +{% data variables.product.prodname_free_user %}を使っているなら無制限にコラボレータを追加できます。 {% endif %} diff --git a/translations/ja-JP/data/reusables/gated-features/verify-and-approve-domain.md b/translations/ja-JP/data/reusables/gated-features/verify-and-approve-domain.md index 940912326c..d250041766 100644 --- a/translations/ja-JP/data/reusables/gated-features/verify-and-approve-domain.md +++ b/translations/ja-JP/data/reusables/gated-features/verify-and-approve-domain.md @@ -1 +1 @@ -Verification and approval of domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. 詳しい情報については「[GitHubの製品](/articles/githubs-products)」を参照してください。 +ドメインの検証と承認は、{% data variables.product.prodname_ghe_cloud %}及び{% data variables.product.prodname_ghe_server %}で利用できます。 詳しい情報については「[GitHubの製品](/articles/githubs-products)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/gcm-core/next-time-you-clone.md b/translations/ja-JP/data/reusables/gcm-core/next-time-you-clone.md index 06e9d9479b..ea3feed886 100644 --- a/translations/ja-JP/data/reusables/gcm-core/next-time-you-clone.md +++ b/translations/ja-JP/data/reusables/gcm-core/next-time-you-clone.md @@ -1 +1 @@ -The next time you clone an HTTPS URL that requires authentication, Git will prompt you to log in using a browser window. You may first be asked to authorize an OAuth app.{% ifversion not ghae %} If your account or organization requires [two-factor auth](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa), you'll also need to complete the 2FA challenge.{% endif %} +認証が必要なHTTPS URLを次にクローンするときに、Gitはブラウザのウィンドウを使ってログインするよう求めます。 最初にOAuthアプリケーションを承認するよう求められることがあります。{% ifversion not ghae %}アカウントもしくはOrganizationが[2要素認証](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)を要求するなら、2要素認証のチャレンジを完了させなければなりません。{% endif %} diff --git a/translations/ja-JP/data/reusables/getting-started/about-and-creating-teams.md b/translations/ja-JP/data/reusables/getting-started/about-and-creating-teams.md index 092db5a2a0..a2d54f631b 100644 --- a/translations/ja-JP/data/reusables/getting-started/about-and-creating-teams.md +++ b/translations/ja-JP/data/reusables/getting-started/about-and-creating-teams.md @@ -1,3 +1,3 @@ -Teams are groups of organization members that you can create to reflect your company or group's structure with cascading access permissions and mentions. Organization members can send notifications to a team or request reviews, and teams can be visible or secret. 詳細は「[Team について](/organizations/organizing-members-into-teams/about-teams)」を参照してください。 +TeamはOrganizationメンバーのグループで、カスケードしたアクセス権限やメンションを持たせて会社やグループの構造を反映させて作成できます。 Organizationのメンバーは、Teamに通知を送ったりレビューをリクエストしたりでき、Teamは見えるようにもシークレットにもできます。 詳細は「[Team について](/organizations/organizing-members-into-teams/about-teams)」を参照してください。 -You can create independent teams or have multiple levels of nested teams to reflect your group or company's hierarchy. For more information, see "[Creating a team](/organizations/organizing-members-into-teams/creating-a-team)." +独立したチームを作ることも、グループや会社の階層を反映した複数レベルの入れ子チームを持つこともできます。 詳しい情報については「[Teamの作成](/organizations/organizing-members-into-teams/creating-a-team)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/actions.md b/translations/ja-JP/data/reusables/getting-started/actions.md index 18f2611eb0..6fe3b20843 100644 --- a/translations/ja-JP/data/reusables/getting-started/actions.md +++ b/translations/ja-JP/data/reusables/getting-started/actions.md @@ -1 +1 @@ -With {% data variables.product.prodname_actions %}, you can automate and customize {% data variables.product.product_location %}'s development workflow on {% data variables.product.product_name %}. 独自のアクションを作成したり、{% data variables.product.prodname_dotcom %}コミュニティで共有されたアクションを利用したりカスタマイズしたりできます。 詳しい情報については、「[{% data variables.product.prodname_actions %} を学ぶ](/actions/learn-github-actions)」を参照してください。 +With {% data variables.product.prodname_actions %}, you can automate and customize {% data variables.product.product_location %}'s development workflow on {% data variables.product.product_name %}. You can create your own actions, and use and customize actions shared by the {% data variables.product.prodname_dotcom %} community. For more information, see "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)." diff --git a/translations/ja-JP/data/reusables/getting-started/adding-members-to-organizations.md b/translations/ja-JP/data/reusables/getting-started/adding-members-to-organizations.md index 7b4b952a80..03b26b9767 100644 --- a/translations/ja-JP/data/reusables/getting-started/adding-members-to-organizations.md +++ b/translations/ja-JP/data/reusables/getting-started/adding-members-to-organizations.md @@ -1 +1 @@ -You can add members to organizations in {% data variables.product.product_location %} as long as you are an organization owner in the organizations you want to manage. You can also configure visibility of organization membership. For more information, see "[Adding people to your organization](/organizations/managing-membership-in-your-organization/adding-people-to-your-organization)" and "[Configuring visibility for organization membership](/admin/user-management/managing-organizations-in-your-enterprise/configuring-visibility-for-organization-membership)." +管理したいOrganizationのオーナーであれば、{% data variables.product.product_location %}のOrganizationにメンバーを追加できます。 Organizationのメンバーシップの可視性を設定することもできます。 詳しい情報については「[Organizationへの人の追加](/organizations/managing-membership-in-your-organization/adding-people-to-your-organization)」及び「[Organizationのメンバーシップの可視性の設定](/admin/user-management/managing-organizations-in-your-enterprise/configuring-visibility-for-organization-membership)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/being-social.md b/translations/ja-JP/data/reusables/getting-started/being-social.md index 8b4ec363f8..547256324a 100644 --- a/translations/ja-JP/data/reusables/getting-started/being-social.md +++ b/translations/ja-JP/data/reusables/getting-started/being-social.md @@ -1 +1 @@ -Each repository on {% data variables.product.prodname_dotcom %} is owned by a person or an organization. You can interact with the people, repositories, and organizations by connecting and following them on {% data variables.product.product_name %}. For more information, see "[Be social](/articles/be-social)." +{% data variables.product.prodname_dotcom %}の各リポジトリは、個人もしくはOrganizationが所有しています。 人、リポジトリ、Organizationとは、{% data variables.product.product_name %}上で接続してフォローすることによってやりとりできます。 詳しい情報については「[ソーシャル機能](/articles/be-social)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/configuring-security-features.md b/translations/ja-JP/data/reusables/getting-started/configuring-security-features.md index 872e7b4ef6..c1142dd677 100644 --- a/translations/ja-JP/data/reusables/getting-started/configuring-security-features.md +++ b/translations/ja-JP/data/reusables/getting-started/configuring-security-features.md @@ -1 +1 @@ -To keep {% ifversion ghes or ghae %}the organizations in {% data variables.product.product_location %}{% else %}your organization{% endif %} secure, you can use a variety of {% data variables.product.prodname_dotcom %} security features, including security policies, dependency graphs, secret scanning and Dependabot security and version updates. For more information, see "[Securing your organization](/code-security/getting-started/securing-your-organization)" and "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." +{% ifversion ghes or ghae %}{% data variables.product.product_location %}内のOrganization{% else %}Organization{% endif %}を安全に保つには、セキュリティポリシー、依存関係グラフ、Secret scanning、Dependabotセキュリティ及びバージョンアップデートを含む、{% data variables.product.prodname_dotcom %}の様々なセキュリティ機能を利用できます。 詳しい情報については「[Organizationの保護](/code-security/getting-started/securing-your-organization)」及び「[Organizationのセキュリティ及び分析設定の管理](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/contact-support-enterprise.md b/translations/ja-JP/data/reusables/getting-started/contact-support-enterprise.md index ee9871562d..7f4a694d78 100644 --- a/translations/ja-JP/data/reusables/getting-started/contact-support-enterprise.md +++ b/translations/ja-JP/data/reusables/getting-started/contact-support-enterprise.md @@ -1 +1 @@ -{% data variables.product.product_name %} includes access to {% data variables.contact.enterprise_support %}. {% data variables.contact.enterprise_support %} can help you troubleshoot issues that come up on {% data variables.product.product_name %}. {% ifversion ghes %}You can also choose to sign up for {% data variables.product.prodname_dotcom %} Premium Support for additional features. {% endif %}For more information, see "[About {% data variables.contact.enterprise_support %}](/admin/enterprise-support/overview/about-github-enterprise-support)." +{% data variables.product.product_name %}には{% data variables.contact.enterprise_support %}へのアクセスが含まれています。 {% data variables.contact.enterprise_support %}は、{% data variables.product.product_name %}で発生した問題のトラブルシューティングを支援できます。 {% ifversion ghes %}追加の機能について{% data variables.product.prodname_dotcom %} Premium Supportにサインアップすることもできます。 {% endif %}詳しい情報については「[{% data variables.contact.enterprise_support %}について](/admin/enterprise-support/overview/about-github-enterprise-support)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/contributing-to-projects.md b/translations/ja-JP/data/reusables/getting-started/contributing-to-projects.md index 1e8c2006fa..318204b6e8 100644 --- a/translations/ja-JP/data/reusables/getting-started/contributing-to-projects.md +++ b/translations/ja-JP/data/reusables/getting-started/contributing-to-projects.md @@ -1 +1 @@ -{% data variables.product.prodname_dotcom %} connects users and allows you to interact with other projects. To learn more about contributing to someone else's project, see "[Contributing to projects](/get-started/quickstart/contributing-to-projects)." +{% data variables.product.prodname_dotcom %}はユーザ同士をつなぎ、他のプロジェクトとやりとりできるようにしてくれます。 他のユーザのプロジェクトに貢献することについてさらに学ぶには、「[プロジェクトへの貢献](/get-started/quickstart/contributing-to-projects)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/create-a-repository.md b/translations/ja-JP/data/reusables/getting-started/create-a-repository.md index 83343b0b29..70b973fa39 100644 --- a/translations/ja-JP/data/reusables/getting-started/create-a-repository.md +++ b/translations/ja-JP/data/reusables/getting-started/create-a-repository.md @@ -1 +1 @@ -Creating a repository for your project allows you to store code in {% data variables.product.prodname_dotcom %}. This provides a backup of your work that you can choose to share with other developers. For more information, see “[Create a repository](/get-started/quickstart/create-a-repo)." +プロジェクトにリポジトリを作成すると、{% data variables.product.prodname_dotcom %}にコードを保存できるようになります。 これは、他の開発者と共有できる作業のバックアップを提供します。 詳しい情報については「[リポジトリの作成](/get-started/quickstart/create-a-repo)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/creating-organizations.md b/translations/ja-JP/data/reusables/getting-started/creating-organizations.md index 501935125d..4ed5a26f99 100644 --- a/translations/ja-JP/data/reusables/getting-started/creating-organizations.md +++ b/translations/ja-JP/data/reusables/getting-started/creating-organizations.md @@ -1 +1 @@ -You can create new organizations in {% data variables.product.product_location %} to reflect your company or group's structure. 詳しい情報については、「[新しい Organization をゼロから作成する](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)」を参照してください。 +{% data variables.product.product_location %}に新しいOrganizationを作成し、会社もしくはグループの構造を反映させることができます。 詳しい情報については、「[新しい Organization をゼロから作成する](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/creating-teams.md b/translations/ja-JP/data/reusables/getting-started/creating-teams.md index a86eba853a..877177fc77 100644 --- a/translations/ja-JP/data/reusables/getting-started/creating-teams.md +++ b/translations/ja-JP/data/reusables/getting-started/creating-teams.md @@ -1 +1 @@ -Teams are groups of organization members that can be granted permissions to specific repositories as a group. You can create individual teams or multiple levels of nested teams in each of your organizations. For more information, see "[Creating teams](/organizations/organizing-members-into-teams/creating-a-team)" and "[Adding people to teams](/organizations/organizing-members-into-teams/adding-organization-members-to-a-team)." +TeamはOrganizationメンバーのグループで、グループとして特定のリポジトリへの権限を付与できます。 個別のTeam、もしくはそれぞれのOrganizationに複数レベルの入れ子チームを作成できます。 詳しい情報については「[Teamの作成](/organizations/organizing-members-into-teams/creating-a-team)」及び「[Teamへの人の追加](/organizations/organizing-members-into-teams/adding-organization-members-to-a-team)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/customizing-and-automating.md b/translations/ja-JP/data/reusables/getting-started/customizing-and-automating.md index 7d36893262..1411da6d7a 100644 --- a/translations/ja-JP/data/reusables/getting-started/customizing-and-automating.md +++ b/translations/ja-JP/data/reusables/getting-started/customizing-and-automating.md @@ -1 +1 @@ -You can use tools from the {% data variables.product.prodname_marketplace %}, the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, and existing {% data variables.product.product_name %} features to customize and automate your work. +{% data variables.product.prodname_marketplace %}からのツール、{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API、既存の{% data variables.product.product_name %}機能を使って作業をカスタマイズし、自動化できます。 diff --git a/translations/ja-JP/data/reusables/getting-started/enforcing-repo-management-policies.md b/translations/ja-JP/data/reusables/getting-started/enforcing-repo-management-policies.md index bdea95883e..c64a217c6e 100644 --- a/translations/ja-JP/data/reusables/getting-started/enforcing-repo-management-policies.md +++ b/translations/ja-JP/data/reusables/getting-started/enforcing-repo-management-policies.md @@ -1 +1 @@ -As an enterprise owner, you can set repository management policies for all organizations in {% data variables.product.product_location %}, or allow policies to be set separately in each organization. 詳しい情報については、「[Enterprise でのリポジトリ管理ポリシーを適用する](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise)」を参照してください。 +Enterpriseのオーナーは、{% data variables.product.product_location %}内のすべてのOrganizationにリポジトリ管理ポリシーを設定するか、各Organizationに個別のポリシーの設定を許可できます。 詳しい情報については、「[Enterprise でのリポジトリ管理ポリシーを適用する](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/enterprise-advanced-security.md b/translations/ja-JP/data/reusables/getting-started/enterprise-advanced-security.md index 12878bfda7..0629865d83 100644 --- a/translations/ja-JP/data/reusables/getting-started/enterprise-advanced-security.md +++ b/translations/ja-JP/data/reusables/getting-started/enterprise-advanced-security.md @@ -1 +1 @@ -If you have a GitHub Advanced Security license for your enterprise account, you can enforce policies to manage {% data variables.product.prodname_dotcom %} Advanced Security features for organizations owned by an enterprise account. For more information, see "[Enforcing policies for Advanced Security in your enterprise account](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise)." +EnterpriseアカウントでGitHub Advanced Securityライセンスを持っているなら、{% data variables.product.prodname_dotcom %}のAdvanced Securityの機能を管理するポリシーをEnterpriseが所有するOrganizationに適用できます。 詳しい情報については「[EnetrpriseアカウントでのAdvanced Securityのポリシーの適用](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/fork-a-repository.md b/translations/ja-JP/data/reusables/getting-started/fork-a-repository.md index c1881fbe31..d793b5bf9b 100644 --- a/translations/ja-JP/data/reusables/getting-started/fork-a-repository.md +++ b/translations/ja-JP/data/reusables/getting-started/fork-a-repository.md @@ -1 +1 @@ -Forking a repository will allow you to make changes to another repository without affecting the original. For more information, see "[Fork a repository](/get-started/quickstart/fork-a-repo)." +リポジトリをフォークすると、他のリポジトリへの変更をオリジナルに影響を与えずに行えます。 詳しい情報については「[リポジトリのフォーク](/get-started/quickstart/fork-a-repo)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/github-pages-enterprise.md b/translations/ja-JP/data/reusables/getting-started/github-pages-enterprise.md index eb381f7aaf..4d8176d090 100644 --- a/translations/ja-JP/data/reusables/getting-started/github-pages-enterprise.md +++ b/translations/ja-JP/data/reusables/getting-started/github-pages-enterprise.md @@ -1 +1 @@ -{% data variables.product.prodname_pages %} is a static site hosting service that takes HTML, CSS, and JavaScript files straight from a repository and publishes a website. You can enable or disable {% data variables.product.prodname_pages %} for your enterprise members at the organization level. For more information, see "[Configuring {% data variables.product.prodname_pages %} for your enterprise](/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise)" and "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages)." +{% data variables.product.prodname_pages %}は、HTML、CSS、JavaScriptファイルをリポジトリから直接取得してWebサイトを公開する、静的サイトホスティングサービスです。 Enterpriseメンバーに対してOrganizationのレベルで{% data variables.product.prodname_pages %}を有効化あるいは無効化できます。 詳しい情報については「[Enterpriseでの{% data variables.product.prodname_pages %}の設定](/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise)」及び「[{% data variables.product.prodname_pages %}について](/pages/getting-started-with-github-pages/about-github-pages)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/giving-access-to-repositories-projects-apps.md b/translations/ja-JP/data/reusables/getting-started/giving-access-to-repositories-projects-apps.md index a497eb258a..92dcc05324 100644 --- a/translations/ja-JP/data/reusables/getting-started/giving-access-to-repositories-projects-apps.md +++ b/translations/ja-JP/data/reusables/getting-started/giving-access-to-repositories-projects-apps.md @@ -1,3 +1,3 @@ -You can give organization members, teams, and outside collaborators different levels of access to repositories owned by your organization with repository roles. 詳しい情報については「[Organizationのリポジトリロール](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)」を参照してください。 +リポジトリロールを使い、Organizationのメンバー、Team、外部のコラボレータに対して、Organizationが所有するリポジトリへの様々なレベルのアクセスを付与できます。 詳しい情報については「[Organizationのリポジトリロール](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)」を参照してください。 -You can also customize access to your organization's project boards and allow individual organization members to manage your organization's {% data variables.product.prodname_github_apps %}. For more information, see "[Managing access to your organization's project boards](/organizations/managing-access-to-your-organizations-project-boards)" and "[Managing access to your organization's apps](/organizations/managing-access-to-your-organizations-apps)." +また、Orgtanizationのプロジェクトボードに対するアクセスをカスタマイズしたり、個々のOrganizationのメンバーにOrganizationの{% data variables.product.prodname_github_apps %}の管理を許可したりできます。 詳しい情報については「[Organizationのプロジェクトボードへのアクセスの管理](/organizations/managing-access-to-your-organizations-project-boards)」及び「[Organizationのアプリケーションへのアクセスの管理](/organizations/managing-access-to-your-organizations-apps)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/learning-enterprise.md b/translations/ja-JP/data/reusables/getting-started/learning-enterprise.md index dde4115e6e..97622036c9 100644 --- a/translations/ja-JP/data/reusables/getting-started/learning-enterprise.md +++ b/translations/ja-JP/data/reusables/getting-started/learning-enterprise.md @@ -1,3 +1,3 @@ -Your enterprise members can learn new skills by completing fun, realistic projects in their very own GitHub repository with [{% data variables.product.prodname_learning %}](https://skills.github.com/). Each course is a hands-on lesson created by the GitHub community and taught by a friendly bot. +Enterpriseのメンバーは、[{% data variables.product.prodname_learning %}](https://skills.github.com/)で自分自身のGitHubリポジトリで楽しくリアルなプロジェクトを完了することで、新しいスキルを学べます。 各コースは、GitHubのコミュニティが作成したハンズオンのレッスンで、親切なbotによって教えてもらえます。 -For more information, see "[Git and {% data variables.product.prodname_dotcom %} learning resources](/github/getting-started-with-github/quickstart/git-and-github-learning-resources)." +詳しい情報については「[Gitと{% data variables.product.prodname_dotcom %}の学習リソース](/github/getting-started-with-github/quickstart/git-and-github-learning-resources)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/learning.md b/translations/ja-JP/data/reusables/getting-started/learning.md index ac8bd20546..a8995d4f07 100644 --- a/translations/ja-JP/data/reusables/getting-started/learning.md +++ b/translations/ja-JP/data/reusables/getting-started/learning.md @@ -1,3 +1,3 @@ -You can learn new skills by completing fun, realistic projects in your very own GitHub repository with [{% data variables.product.prodname_learning %}](https://skills.github.com/). Each course is a hands-on lesson created by the GitHub community and taught by a friendly bot. +[{% data variables.product.prodname_learning %}](https://skills.github.com/)で自分自身のGitHubリポジトリで楽しくリアルなプロジェクトを完了することで、新しいスキルを学べます。 各コースは、GitHubのコミュニティが作成したハンズオンのレッスンで、親切なbotによって教えてもらえます。 -For more information, see "[Git and {% data variables.product.prodname_dotcom %} learning resources](/github/getting-started-with-github/quickstart/git-and-github-learning-resources)." +詳しい情報については「[Gitと{% data variables.product.prodname_dotcom %}の学習リソース](/github/getting-started-with-github/quickstart/git-and-github-learning-resources)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/managing-enterprise-members.md b/translations/ja-JP/data/reusables/getting-started/managing-enterprise-members.md index e178feaeb3..58f148ee00 100644 --- a/translations/ja-JP/data/reusables/getting-started/managing-enterprise-members.md +++ b/translations/ja-JP/data/reusables/getting-started/managing-enterprise-members.md @@ -1 +1 @@ -You can manage settings and audit activity for the members of {% data variables.product.product_location %}. You can {% ifversion ghes %}promote an enterprise member to be a site administrator, {% endif %}manage dormant users, view the audit log for user activity, and customize messages that enterprise members will see. For more information, see "[Managing users in your enterprise](/admin/user-management/managing-users-in-your-enterprise)." +{% data variables.product.product_location %}のメンバーの設定を管理し、アクティビティを監査できます。 {% ifversion ghes %}Enterpriseのメンバーをサイト管理者に昇格させ、{% endif %}休眠ユーザを管理し、ユーザのアクティビティのAudit logを表示させ、Enteprriseのメンバーに表示されるメッセージをカスタマイズできます。 詳しい情報については「[Enterpriseのユーザの管理](/admin/user-management/managing-users-in-your-enterprise)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/managing-org-members.md b/translations/ja-JP/data/reusables/getting-started/managing-org-members.md index e57ffb217b..c02f3c9142 100644 --- a/translations/ja-JP/data/reusables/getting-started/managing-org-members.md +++ b/translations/ja-JP/data/reusables/getting-started/managing-org-members.md @@ -1 +1 @@ -You can invite anyone to be a member of your organization, as long as they have a personal account on {% data variables.product.prodname_dotcom %}. You can also remove members and reinstate former members. For more information, see "[Managing membership in your organization](/organizations/managing-membership-in-your-organization)." +{% data variables.product.prodname_dotcom %}に個人アカウントを持っている人なら、誰でもOrganizationのメンバーになってもらうよう招待できます。 メンバーを削除したり、以前のメンバーの復帰もできます。 詳しい情報については「[Organizationのメンバーシップの管理](/organizations/managing-membership-in-your-organization)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/managing-org-policies.md b/translations/ja-JP/data/reusables/getting-started/managing-org-policies.md index 9951b2f572..1335712b3d 100644 --- a/translations/ja-JP/data/reusables/getting-started/managing-org-policies.md +++ b/translations/ja-JP/data/reusables/getting-started/managing-org-policies.md @@ -1,5 +1,5 @@ -You can manage permissions and policies for a number of different actions and features in your organization. +Organizationの様々なアクションや機能について、権限とポリシーを管理できます。 -For example, to protect your organization's data, you can restrict repository creation in your organization. You can also choose to allow or prevent the forking of private repositories owned by your organization. For more information, see "[Restricting repository creation in your organization](/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization)" and "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)." +たとえば、Organizationのデータを保護するために、Organizationでのリポジトリの作成を制限できます。 また、Organizationが所有するプライベートリポジトリのフォークを許可したり禁止したりすることもできます。 詳しい情報については「[Organizationでのリポジトリ作成の制限](/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization)」及び「[Organizationのフォークのポリシーの管理](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)」を参照してください。 -For the full list of settings you can configure for your organization, see "[Managing organization settings](/organizations/managing-organization-settings)." +Organizationで可能な設定の完全なリストについては「[Organizationの設定の管理](/organizations/managing-organization-settings)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/managing-repo-changes.md b/translations/ja-JP/data/reusables/getting-started/managing-repo-changes.md index a87f372c50..d0d583e676 100644 --- a/translations/ja-JP/data/reusables/getting-started/managing-repo-changes.md +++ b/translations/ja-JP/data/reusables/getting-started/managing-repo-changes.md @@ -1,3 +1,3 @@ -You can configure permissions for creating, transferring and deleting repositories in your organization, including which types members can create. For more information, see "[Restricting repository creation in your organization](/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization)" and "[Setting permissions for deleting or transferring repositories](/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories)." +Organizationにおけるリポジトリの作成、移譲、削除の権限を、メンバーが作成できる種類も含めて設定できます。 詳しい情報については「[Organizationでのリポジトリ作成の制限](/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization)」及び「[リポジトリの削除あるいは移譲の権限の設定](/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories)」を参照してください。 -You can also restrict or grant the ability to change repository visibility. 詳しい情報については「[Organization 内でリポジトリの可視性の変更を制限する](/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization)」を参照してください。 +リポジトリの可視性の変更する機能の制限もしくは許可もできます。 詳しい情報については「[Organization 内でリポジトリの可視性の変更を制限する](/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/managing-team-settings.md b/translations/ja-JP/data/reusables/getting-started/managing-team-settings.md index 27a943fa4f..afd56e552e 100644 --- a/translations/ja-JP/data/reusables/getting-started/managing-team-settings.md +++ b/translations/ja-JP/data/reusables/getting-started/managing-team-settings.md @@ -1,3 +1,3 @@ -You can designate a "team maintainer" to manage team settings and discussions, among other privileges. 詳しい情報については「[Teamメンバーへのチームメンテナロールの割り当て](/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member)」を参照してください。 +Teamの設定、中でもディスカッションの権限管理を行う「チームメンテナ」を指定できます。 詳しい情報については「[Teamメンバーへのチームメンテナロールの割り当て](/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member)」を参照してください。 -You can manage code review assignments for your team, change team visibility, manage scheduled reminders for your team, and more in your team's settings. For more information, see "[Organizing members into teams](/organizations/organizing-members-into-teams)." +Teamに対するコードレビューの割り当て、Teamの可視性の変更、Teamのスケジュールされたリマインダーの管理、その他のTeamの設定も管理できます。 詳しい情報については「[Teamへのメンバーの編成](/organizations/organizing-members-into-teams)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/math-and-diagrams.md b/translations/ja-JP/data/reusables/getting-started/math-and-diagrams.md index 0b8fd102b4..3de15f75dd 100644 --- a/translations/ja-JP/data/reusables/getting-started/math-and-diagrams.md +++ b/translations/ja-JP/data/reusables/getting-started/math-and-diagrams.md @@ -1 +1 @@ -{% ifversion mermaid %}You can use Markdown to add rendered math expressions, diagrams, maps, and 3D models to your wiki. For more information on creating rendered math expressions, see "[Writing mathematical expressions](/get-started/writing-on-github/working-with-advanced-formatting/writing-mathematical-expressions)." For more information on creating diagrams, maps and 3D models, see "[Creating diagrams](/get-started/writing-on-github/working-with-advanced-formatting/creating-diagrams)."{% endif %} \ No newline at end of file +{% ifversion mermaid %}Markdownを使って描画された数式、図、マップ、3Dモデルをwikiに追加できます。 描画された数式の作成に関する詳しい情報については「[数式の作成](/get-started/writing-on-github/working-with-advanced-formatting/writing-mathematical-expressions)」を参照してください。 図、マップ、3Dモデルの作成に関する詳しい情報については「[図の作成](/get-started/writing-on-github/working-with-advanced-formatting/creating-diagrams)」を参照してください。{% endif %} \ No newline at end of file diff --git a/translations/ja-JP/data/reusables/getting-started/open-source-projects.md b/translations/ja-JP/data/reusables/getting-started/open-source-projects.md index ff2bb76ec2..1276eb7b8d 100644 --- a/translations/ja-JP/data/reusables/getting-started/open-source-projects.md +++ b/translations/ja-JP/data/reusables/getting-started/open-source-projects.md @@ -1,4 +1,4 @@ -Contributing to open source projects on {% data variables.product.prodname_dotcom %} can be a rewarding way to learn, teach, and build experience in just about any skill you can imagine. For more information, see "[How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)" in the Open Source Guides. +{% data variables.product.prodname_dotcom %}上のオープンソースプロジェクトへの貢献は、想像できるいかなるスキルについても学び、教え、経験を積むことができる、やりがいのある方法です。 詳しい情報についてはオープンソースガイドの「[オープンソースに貢献する方法](https://opensource.guide/how-to-contribute/)」を参照してください。 -You can find personalized recommendations for projects and good first issues based on your past contributions, stars, and other activities in [Explore](https://github.com/explore).{% ifversion fpt or ghec %} For more information, see "[Finding ways to contribute to open source on GitHub](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)." +過去のコントリビューション、Star、その他のアクティビティに基づく、プロジェクトと優れた最初の課題についてのパーソナライズされた推奨事項を、[Explore](https://github.com/explore)で見つけることができます。{% ifversion fpt or ghec %}詳しい情報については「[GitHubでオープンソースに貢献する方法を見つける](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)」を参照してください。 {% endif %} diff --git a/translations/ja-JP/data/reusables/getting-started/org-permissions-and-roles.md b/translations/ja-JP/data/reusables/getting-started/org-permissions-and-roles.md index 95ca198f8c..fd3ff498ef 100644 --- a/translations/ja-JP/data/reusables/getting-started/org-permissions-and-roles.md +++ b/translations/ja-JP/data/reusables/getting-started/org-permissions-and-roles.md @@ -1 +1 @@ -Each person in your organization has a role that defines their level of access to the organization. The member role is the default, and you can assign owner and billing manager roles as well as "team maintainer" permissions. 詳しい情報については「[Organization内のロール](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)」を参照してください。 +Organizationの各ユーザは、Organizationへのアクセスレベルを定義するロールを持ちます。 メンバーロールがデフォルトで、「チームメンテナ」権限とともにオーナー及び支払いマネージャーのロールを割り当てることができます。 詳しい情報については「[Organization内のロール](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/participating-in-community.md b/translations/ja-JP/data/reusables/getting-started/participating-in-community.md index d5575e40e6..c0851b7a67 100644 --- a/translations/ja-JP/data/reusables/getting-started/participating-in-community.md +++ b/translations/ja-JP/data/reusables/getting-started/participating-in-community.md @@ -1 +1 @@ -There are many ways to participate in the {% data variables.product.prodname_dotcom %} community. You can contribute to open source projects, interact with people in the {% data variables.product.prodname_gcf %}, or learn with {% data variables.product.prodname_learning %}. +{% data variables.product.prodname_dotcom %}コミュニティには、多くの参加方法があります。 オープンソースのプロジェクトに貢献したり、{% data variables.product.prodname_gcf %}で人々とやりとりしたり、{% data variables.product.prodname_learning %}で学ぶことができます。 diff --git a/translations/ja-JP/data/reusables/getting-started/requiring-2fa.md b/translations/ja-JP/data/reusables/getting-started/requiring-2fa.md index 5e966e6049..c33634256b 100644 --- a/translations/ja-JP/data/reusables/getting-started/requiring-2fa.md +++ b/translations/ja-JP/data/reusables/getting-started/requiring-2fa.md @@ -1 +1 @@ -You can view whether your organization members have two-factor authentication enabled and choose to require two-factor authentication in your organization. 詳しい情報については [Organization で 2 要素認証を要求する](/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization)を参照してください。 +Organizationのメンバーが2要素認証を有効化しているかを表示させ、Organizationで2要素認証を必須にすることができます。 詳しい情報については [Organization で 2 要素認証を要求する](/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization)を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/reviewing-org-audit-log-and-integrations.md b/translations/ja-JP/data/reusables/getting-started/reviewing-org-audit-log-and-integrations.md index 3b5757f3d1..ba391864e1 100644 --- a/translations/ja-JP/data/reusables/getting-started/reviewing-org-audit-log-and-integrations.md +++ b/translations/ja-JP/data/reusables/getting-started/reviewing-org-audit-log-and-integrations.md @@ -1,3 +1,3 @@ -The audit log for your organization allows you, as an organization owner, to review the actions performed by members of the organization within the current month and previous six months. For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization)." +OrganizationのAudit logを使うと、OrganizationのオーナーはOrganizationのメンバーが当月及び過去6ヶ月に行ったアクションをレビューできます。 詳しい情報については「[OrganizationのAudit logのレビュー](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization)」を参照してください。 -You can also review and configure the permission levels for your organization's installed integrations. For more information, see "[Reviewing your organization's installed integrations](/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations)." +Organizationにインストールされたインテグレーションの権限レベルをレビューして設定することもできます。 詳しい情報については「[Organizationにインストールされたインテグレーションのレビュー](/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/set-up-git.md b/translations/ja-JP/data/reusables/getting-started/set-up-git.md index 4900b28f29..128c9a8558 100644 --- a/translations/ja-JP/data/reusables/getting-started/set-up-git.md +++ b/translations/ja-JP/data/reusables/getting-started/set-up-git.md @@ -1 +1 @@ -Synchronizing {% data variables.product.prodname_dotcom %} repositories with your computer allows you to work locally and push your changes to {% data variables.product.prodname_dotcom %}. For more information, see “[Set up Git](/get-started/quickstart/set-up-git).” +{% data variables.product.prodname_dotcom %}リポジトリを手元のコンピュータと同期すれば、ローカルで作業を行い変更を{% data variables.product.prodname_dotcom %}にプッシュできるようになります。 詳しい情報については「[Gitのセットアップ](/get-started/quickstart/set-up-git)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/setting-org-and-repo-permissions.md b/translations/ja-JP/data/reusables/getting-started/setting-org-and-repo-permissions.md index 7974f0a1c5..6dd581f67d 100644 --- a/translations/ja-JP/data/reusables/getting-started/setting-org-and-repo-permissions.md +++ b/translations/ja-JP/data/reusables/getting-started/setting-org-and-repo-permissions.md @@ -1,3 +1,3 @@ -We recommend giving a limited number of members in each organization an organization owner role, which provides complete administrative access for that organization. 詳しい情報については「[Organization内のロール](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)」を参照してください。 +Organizationへの完全な管理アクセスを提供するOrganizationオーナーのロールは、各Organizationの限られた数のメンバーに付与することをおすすめします。 詳しい情報については「[Organization内のロール](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)」を参照してください。 -For organizations where you have admin permissions, you can also customize access to each repository with granular permission levels. For more information, see "[Repository permissions levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." +管理権限を持っているOrganizationでは、詳細な権限レベルで各リポジトリへのアクセスをカスタマイズできます。 詳しい情報については「[Organizationのリポジトリ権限レベル](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/sponsors.md b/translations/ja-JP/data/reusables/getting-started/sponsors.md index 387a34c73a..49a21f5035 100644 --- a/translations/ja-JP/data/reusables/getting-started/sponsors.md +++ b/translations/ja-JP/data/reusables/getting-started/sponsors.md @@ -1 +1 @@ -{% data variables.product.prodname_sponsors %} allows you to make a monthly recurring payment to a developer or organization who designs, creates, or maintains open source projects you depend on. 詳しい情報については「[{% data variables.product.prodname_sponsors %}について](/sponsors/getting-started-with-github-sponsors/about-github-sponsors)」を参照してください。 +{% data variables.product.prodname_sponsors %}を使うと、頼りにしているオープンソースのプロジェクトを設計、作成、メンテナンスしている開発者やOrganizationに、月次の定期的な支払いを行えます。 詳しい情報については「[{% data variables.product.prodname_sponsors %}について](/sponsors/getting-started-with-github-sponsors/about-github-sponsors)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/getting-started/using-org-community-files-and-moderation-tools.md b/translations/ja-JP/data/reusables/getting-started/using-org-community-files-and-moderation-tools.md index d12dc4866c..11bc6f1601 100644 --- a/translations/ja-JP/data/reusables/getting-started/using-org-community-files-and-moderation-tools.md +++ b/translations/ja-JP/data/reusables/getting-started/using-org-community-files-and-moderation-tools.md @@ -1,3 +1,3 @@ -You can create default community health files, such as a CONTRIBUTING.md file, a CODE_OF_CONDUCT.md file, or even issue and pull request templates, for your organization. These default files will be used for any repository owned by your organization that does not contain its own file of that type. 詳しい情報については「[デフォルトのコミュニティ健全性ファイルを作成する](/communities/setting-up-your-project-for-healthy-contributions/creating-a-default-community-health-file)」を参照してください。 +CONTRIBUTING.mdファイル、CODE_OF_CONDUCT.mdファイル、さらにはIssueやPull Requestのテンプレートファイルといったデフォルトのコミュニティ健全性ファイルを、Organizationに作成できます。 これらのデフォルトファイルは、それらのタイプの独自ファイルを含まないOrganizationが所有するリポジトリで使われます。 詳しい情報については「[デフォルトのコミュニティ健全性ファイルを作成する](/communities/setting-up-your-project-for-healthy-contributions/creating-a-default-community-health-file)」を参照してください。 -{% data variables.product.prodname_dotcom %} offers multiple tools for moderating and managing your community. For more information, see "[Tools for moderating your community](/communities/setting-up-your-project-for-healthy-contributions/about-community-management-and-moderation#tools-for-moderating-your-community)." +{% data variables.product.prodname_dotcom %}は、コミュニティのモデレートと管理のための複数のツールを提供します。 詳しい情報については「[コミュニティのモデレートのためのツール](/communities/setting-up-your-project-for-healthy-contributions/about-community-management-and-moderation#tools-for-moderating-your-community)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/github-ae/saml-idp-table.md b/translations/ja-JP/data/reusables/github-ae/saml-idp-table.md index a940fba807..baa2eda579 100644 --- a/translations/ja-JP/data/reusables/github-ae/saml-idp-table.md +++ b/translations/ja-JP/data/reusables/github-ae/saml-idp-table.md @@ -1,4 +1,4 @@ -| IdP | SAML | ユーザプロビジョニング | Team mapping | +| IdP | SAML | ユーザプロビジョニング | Teamマッピング | | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | [Azure Active Directory (Azure AD)](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad) | {% octicon "check-circle-fill" aria-label="The check icon" %} | {% octicon "check-circle-fill" aria-label="The check icon" %} | {% octicon "check-circle-fill" aria-label="The check icon" %} | [Okta](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/configuring-authentication-and-provisioning-for-your-enterprise-using-okta) | {% octicon "check-circle-fill" aria-label="The check icon" %}[Beta](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/configuring-authentication-and-provisioning-for-your-enterprise-using-okta) | {% octicon "check-circle-fill" aria-label="The check icon" %}[Beta](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/configuring-authentication-and-provisioning-for-your-enterprise-using-okta) | {% octicon "check-circle-fill" aria-label= "The check icon" %}[Beta](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/mapping-okta-groups-to-teams) | diff --git a/translations/ja-JP/data/reusables/github-connect/access-dotcom-and-enterprise.md b/translations/ja-JP/data/reusables/github-connect/access-dotcom-and-enterprise.md index 2f22dbfd74..1226b5cdb2 100644 --- a/translations/ja-JP/data/reusables/github-connect/access-dotcom-and-enterprise.md +++ b/translations/ja-JP/data/reusables/github-connect/access-dotcom-and-enterprise.md @@ -1 +1 @@ -1. Sign in to {% ifversion ghes %}{% data variables.product.prodname_ghe_server %}{% else %}{% data variables.product.prodname_ghe_managed %}{% endif %} and {% data variables.product.prodname_dotcom_the_website %}. +1. {% ifversion ghes %}{% data variables.product.prodname_ghe_server %}{% else %}{% data variables.product.prodname_ghe_managed %}{% endif %}及び{% data variables.product.prodname_dotcom_the_website %}にサインインしてください。 diff --git a/translations/ja-JP/data/reusables/github-connect/access-profile-settings.md b/translations/ja-JP/data/reusables/github-connect/access-profile-settings.md index 594d515ed4..12520110ca 100644 --- a/translations/ja-JP/data/reusables/github-connect/access-profile-settings.md +++ b/translations/ja-JP/data/reusables/github-connect/access-profile-settings.md @@ -1 +1 @@ -1. On {% ifversion ghes %}{% data variables.product.prodname_ghe_server %}{% else %}{% data variables.product.prodname_ghe_managed %}{% endif %}, in the upper-right corner of any page, click your profile photo, then click **Settings**. ![ユーザバーの [Settings（設定）] アイコン](/assets/images/help/settings/userbar-account-settings.png) +1. {% ifversion ghes %}{% data variables.product.prodname_ghe_server %}{% else %}{% data variables.product.prodname_ghe_managed %}{% endif %}上で、任意のページの右上のプロフィール写真をクリックし、続いて**Settings（設定）**をクリックしてください。 ![ユーザバーの [Settings（設定）] アイコン](/assets/images/help/settings/userbar-account-settings.png) diff --git a/translations/ja-JP/data/reusables/github-connect/authorize-connection.md b/translations/ja-JP/data/reusables/github-connect/authorize-connection.md index 7f60fcb86b..f050e3c69d 100644 --- a/translations/ja-JP/data/reusables/github-connect/authorize-connection.md +++ b/translations/ja-JP/data/reusables/github-connect/authorize-connection.md @@ -1,7 +1,6 @@ -1. Review the resources that -{% data variables.product.product_name %} will access from your {% data variables.product.prodname_dotcom_the_website %} account, then click **Authorize**. +1. Review the resources that {% data variables.product.product_name %} will access from your {% data variables.product.prodname_dotcom_the_website %} account, then click **Authorize**. {% ifversion ghes %} - ![{% data variables.product.prodname_ghe_server %} と {% data variables.product.prodname_dotcom_the_website %} の間の接続を許可します。](/assets/images/help/settings/authorize-ghe-to-connect-to-dotcom.png) + ![Authorize connection between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_dotcom_the_website %}](/assets/images/help/settings/authorize-ghe-to-connect-to-dotcom.png) {% elsif ghae %} - ![{% data variables.product.prodname_ghe_managed %} と {% data variables.product.prodname_dotcom_the_website %} の間の接続を許可します。](/assets/images/enterprise/github-ae/settings/authorize-ghae-to-connect-to-dotcom.png) + ![Authorize connection between {% data variables.product.prodname_ghe_managed %} and {% data variables.product.prodname_dotcom_the_website %}](/assets/images/enterprise/github-ae/settings/authorize-ghae-to-connect-to-dotcom.png) {% endif %} diff --git a/translations/ja-JP/data/reusables/github-connect/beta.md b/translations/ja-JP/data/reusables/github-connect/beta.md index e490e69055..333b47d128 100644 --- a/translations/ja-JP/data/reusables/github-connect/beta.md +++ b/translations/ja-JP/data/reusables/github-connect/beta.md @@ -1,7 +1,7 @@ {% ifversion ghae %} {% note %} -**Note:** {% data variables.product.prodname_github_connect %} for {% data variables.product.product_name %} is currently in beta and subject to change. +**ノート:** {% data variables.product.prodname_github_connect %} for {% data variables.product.product_name %}は現在ベータであり、変更されることがあります。 {% endnote %} {% endif %} diff --git a/translations/ja-JP/data/reusables/github-connect/connect-dotcom-and-enterprise.md b/translations/ja-JP/data/reusables/github-connect/connect-dotcom-and-enterprise.md index 0485841ae1..3ceff83a69 100644 --- a/translations/ja-JP/data/reusables/github-connect/connect-dotcom-and-enterprise.md +++ b/translations/ja-JP/data/reusables/github-connect/connect-dotcom-and-enterprise.md @@ -1,6 +1,6 @@ -1. Click **Connect to {% data variables.product.prodname_dotcom_the_website %}**. +1. **Connect to {% data variables.product.prodname_dotcom_the_website %}**をクリックしてください。 {% ifversion ghes %} ![GitHub Enterprise Server設定からGitHub.comへの接続](/assets/images/help/settings/github.com_end_user_connection.png) {% else %} - ![Connect to GitHub.com from GitHub AE settings](/assets/images/enterprise/github-ae/settings/github.com-end-user-connection.png) + ![GitHub AEの設定からGitHub.comへの接続](/assets/images/enterprise/github-ae/settings/github.com-end-user-connection.png) {% endif %} diff --git a/translations/ja-JP/data/reusables/github-connect/sync-frequency.md b/translations/ja-JP/data/reusables/github-connect/sync-frequency.md index 0905f58853..a4d95bf8d4 100644 --- a/translations/ja-JP/data/reusables/github-connect/sync-frequency.md +++ b/translations/ja-JP/data/reusables/github-connect/sync-frequency.md @@ -1 +1 @@ -{% ifversion fpt or ghec %}{% data variables.product.prodname_enterprise %}{% elsif ghes or ghae %}{% data variables.product.product_name %}{% endif %} sends updates hourly. +{% ifversion fpt or ghec %}{% data variables.product.prodname_enterprise %}{% elsif ghes or ghae %}{% data variables.product.product_name %}{% endif %}は更新を1時間ごとに送信します。 diff --git a/translations/ja-JP/data/reusables/gpg/desktop-support-for-commit-signing.md b/translations/ja-JP/data/reusables/gpg/desktop-support-for-commit-signing.md index 5093127a3e..f9d0e67eda 100644 --- a/translations/ja-JP/data/reusables/gpg/desktop-support-for-commit-signing.md +++ b/translations/ja-JP/data/reusables/gpg/desktop-support-for-commit-signing.md @@ -1,5 +1,5 @@ {% note %} -**Note:** [GitHub Desktop](https://desktop.github.com/) only supports commit signing if your Git client is configured to sign commits by default. +**ノート:** [GitHub Desktop](https://desktop.github.com/)はGitクライアントがデフォルトでコミットに署名するように設定されている場合にのみ、コミット署名をサポートしています。 {% endnote %} diff --git a/translations/ja-JP/data/reusables/gpg/paste-gpg-key-id.md b/translations/ja-JP/data/reusables/gpg/paste-gpg-key-id.md index 1dc868f06a..7ba68c51da 100644 --- a/translations/ja-JP/data/reusables/gpg/paste-gpg-key-id.md +++ b/translations/ja-JP/data/reusables/gpg/paste-gpg-key-id.md @@ -1,9 +1,9 @@ -1. To set your primary GPG signing key in Git, paste the text below, substituting in the GPG primary key ID you'd like to use. この例では、GPG キー ID は `3AA5C34371567BD2` です。 +1. プライマリGPG署名キーをGitで設定するには、使用したいGPGプライマリキーIDを置き換えて以下のテキストを貼り付けてください。 この例では、GPG キー ID は `3AA5C34371567BD2` です。 ```shell $ git config --global user.signingkey 3AA5C34371567BD2 ``` - Alternatively, when setting a subkey include the `!` suffix. In this example, the GPG subkey ID is `4BB6D45482678BE3`: + あるいは、`!`を含めてサブキーを設定する場合は以下のようにしてください。 この例では、GPGサブキーIDは`4BB6D45482678BE3`です: ```shell $ git config --global user.signingkey 4BB6D45482678BE3! ``` diff --git a/translations/ja-JP/data/reusables/notifications/auto-watch.md b/translations/ja-JP/data/reusables/notifications/auto-watch.md index cf295dfeac..6d220bd1bb 100644 --- a/translations/ja-JP/data/reusables/notifications/auto-watch.md +++ b/translations/ja-JP/data/reusables/notifications/auto-watch.md @@ -1 +1 @@ -You automatically watch all repositories that you create and are owned by your personal account. フォークを除き、あなたがプッシュアクセスを持つすべてのリポジトリを自動的にWatchすることもできます。 その他の任意のリポジトリは手動でWatchできます。 +自分が作成したリポジトリ及び自分の個人アカウントが所有するリポジトリは、すべて自動的にWatchします。 フォークを除き、あなたがプッシュアクセスを持つすべてのリポジトリを自動的にWatchすることもできます。 その他の任意のリポジトリは手動でWatchできます。 diff --git a/translations/ja-JP/data/reusables/notifications/email-restrictions-verification.md b/translations/ja-JP/data/reusables/notifications/email-restrictions-verification.md index 04756b1f5f..cf1d4d571d 100644 --- a/translations/ja-JP/data/reusables/notifications/email-restrictions-verification.md +++ b/translations/ja-JP/data/reusables/notifications/email-restrictions-verification.md @@ -1 +1 @@ -{% ifversion fpt or ghec %}To continue receiving email notifications after you enable restrictions, members must verify any email addresses within domains that you verify or approve. 詳しい情報については、「[メールアドレスの検証](/github/getting-started-with-github/verifying-your-email-address)」を参照してください。{% endif %} +{% ifversion fpt or ghec %}制限を有効にした後にメール通知を受け続けるには、メンバーは検証あるいは承認されたドメイン内のメールアドレスを検証しなければなりません。 詳しい情報については、「[メールアドレスの検証](/github/getting-started-with-github/verifying-your-email-address)」を参照してください。{% endif %} diff --git a/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md index 0da5c96fb6..0aa25024aa 100644 --- a/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md +++ b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md @@ -1 +1 @@ -You can choose the delivery method and frequency of notifications about {% data variables.product.prodname_dependabot_alerts %} on repositories that you are watching or where you have subscribed to notifications for security alerts. +Watchしているリポジトリあるいはセキュリティアラートの通知をサブスクライブしたところの{% data variables.product.prodname_dependabot_alerts %}に関する通知の配信方法と頻度を選択できます。 diff --git a/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization2.md b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization2.md index 52b660f719..b55d515a7a 100644 --- a/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization2.md +++ b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization2.md @@ -1 +1 @@ -You can choose the delivery method for notifications, as well as the frequency at which the notifications are sent to you. +通知が送信される頻度とともに、通知の配信方法を選択できます。 diff --git a/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-enable.md b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-enable.md index 17ae0c368a..0e0b406939 100644 --- a/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-enable.md +++ b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-enable.md @@ -1,3 +1,3 @@ {% ifversion fpt or ghes or ghec %} -To receive notifications about {% data variables.product.prodname_dependabot_alerts %} on repositories, you need to watch these repositories, and subscribe to receive "All Activity" notifications or configure custom settings to include "Security alerts." For more information, see "[Configuring your watch settings for an individual repository](/github/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#configuring-your-watch-settings-for-an-individual-repository)." +リポジトリの{% data variables.product.prodname_dependabot_alerts %}に関する通知を受け取るには、それらのリポジトリをWatchし、"All Activity"通知を受信するようサブスクライブするか、"Security alerts"を含めるようにカスタム設定をしてください。 詳しい情報については「[個々のリポジトリのWatchの設定](/github/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#configuring-your-watch-settings-for-an-individual-repository)」を参照してください。 {% endif %} diff --git a/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-options.md b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-options.md index a02fa5ca11..9fbda13501 100644 --- a/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-options.md +++ b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-options.md @@ -1,14 +1,14 @@ -{% ifversion fpt or ghec %}By default, you will receive notifications:{% endif %}{% ifversion ghes or ghae %}By default, if your enterprise owner has configured email for notifications on your instance, you will receive {% data variables.product.prodname_dependabot_alerts %}:{% endif %} +{% ifversion fpt or ghec %}デフォルトでは通知を受け取ります:{% endif %}{% ifversion ghes or ghae %}デフォルトでは、Enterpriseオーナーがインスタンスでメール通知を設定していれば{% data variables.product.prodname_dependabot_alerts %}を受け取ります:{% endif %} - メールについては、{% data variables.product.prodname_dependabot %}がリポジトリで有効化された場合、新しいマニフェストファイルがリポジトリにコミットされた場合、重要度が重大もしくは高の新しい脆弱性が見つかった場合に送信されます（**Email each time a vulnerability is found（脆弱性が見つかるたびにメールする）**オプション）。 -- in the user interface, a warning is shown in your repository's file and code views if there are any insecure dependencies (**UI alerts** option). -- on the command line, warnings are displayed as callbacks when you push to repositories with any insecure dependencies (**Command Line** option). -- インボックスについては、Web通知として表示されます。 A web notification is sent when {% data variables.product.prodname_dependabot %} is enabled for a repository, when a new manifest file is committed to the repository, and when a new vulnerability with a critical or high severity is found (**Web** option).{% ifversion not ghae %} -- {% data variables.product.prodname_mobile %}では、Web通知として表示されます。 For more information, see "[Enabling push notifications with GitHub Mobile](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#enabling-push-notifications-with-github-mobile)."{% endif %} +- ユーザインターフェースについては、安全ではない依存関係があった場合に、リポジトリのファイルとコードビューに警告が表示されます（**UI alerts（UIアラート）**オプション）。 +- コマンドラインについては、安全ではない依存関係を伴うプッシュをリポジトリに対して行った場合、コールバックとして警告が表示されます（**Command Line（コマンドライン）**オプション）。 +- インボックスについては、Web通知として表示されます。 Web通知は、{% data variables.product.prodname_dependabot %}がリポジトリで有効化された場合、新しいマニフェストファイルがリポジトリにコミットされた場合、重要度が重大もしくは高の新しい脆弱性が見つかった場合に送信されます（**Web**オプション）。{% ifversion not ghae %} +- {% data variables.product.prodname_mobile %}では、Web通知として表示されます。 詳しい情報については「[GitHub Mobileでのプッシュ通知の有効化](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#enabling-push-notifications-with-github-mobile)」を参照してください。{% endif %} {% note %} -**Note:** The email and web{% ifversion not ghae %}/{% data variables.product.prodname_mobile %}{% endif %} notifications are: +**ノート:** メール及びWeb{% ifversion not ghae %} / {% data variables.product.prodname_mobile %}{% endif %}通知は以下のようになります。 - _リポジトリごと_ {% data variables.product.prodname_dependabot %}がリポジトリで有効化された場合、あるいは新しいマニフェストファイルがリポジトリにコミットされた場合。 @@ -16,4 +16,4 @@ {% endnote %} -You can customize the way you are notified about {% data variables.product.prodname_dependabot_alerts %}. たとえば、**Email a digest summary of vulnerabilities（脆弱性のダイジェストサマリーメール）**及び**Weekly security email digest（週間のセキュリティメールダイジェスト）**オプションを使って、最大10件のリポジトリに関するアラートをまとめた週間のダイジェストメールを受信できます。 +{% data variables.product.prodname_dependabot_alerts %}に関する通知を受け取る方法をカスタマイズできます。 たとえば、**Email a digest summary of vulnerabilities（脆弱性のダイジェストサマリーメール）**及び**Weekly security email digest（週間のセキュリティメールダイジェスト）**オプションを使って、最大10件のリポジトリに関するアラートをまとめた週間のダイジェストメールを受信できます。 diff --git a/translations/log/cn-resets.csv b/translations/log/cn-resets.csv index c373d5c38f..925ab3ba39 100644 --- a/translations/log/cn-resets.csv +++ b/translations/log/cn-resets.csv @@ -376,13 +376,13 @@ translations/zh-CN/data/reusables/dependency-submission/about-dependency-submiss translations/zh-CN/data/reusables/dotcom_billing/downgrade-org-to-free.md,broken liquid tags translations/zh-CN/data/reusables/education/access-github-community-exchange.md,broken liquid tags translations/zh-CN/data/reusables/enterprise-accounts/emu-password-reset-session.md,broken liquid tags -translations/zh-CN/data/reusables/enterprise-accounts/emu-short-summary.md,rendering error +translations/zh-CN/data/reusables/enterprise-accounts/emu-short-summary.md,broken liquid tags translations/zh-CN/data/reusables/enterprise-licensing/verified-domains-license-sync.md,broken liquid tags translations/zh-CN/data/reusables/enterprise_installation/hardware-considerations-all-platforms.md,broken liquid tags translations/zh-CN/data/reusables/enterprise_management_console/badge_indicator.md,broken liquid tags -translations/zh-CN/data/reusables/enterprise_user_management/consider-usernames-for-external-authentication.md,rendering error +translations/zh-CN/data/reusables/enterprise_user_management/consider-usernames-for-external-authentication.md,broken liquid tags translations/zh-CN/data/reusables/gated-features/codespaces-classroom-articles.md,broken liquid tags -translations/zh-CN/data/reusables/gated-features/enterprise-accounts.md,rendering error +translations/zh-CN/data/reusables/gated-features/enterprise-accounts.md,broken liquid tags translations/zh-CN/data/reusables/gated-features/packages.md,broken liquid tags translations/zh-CN/data/reusables/gated-features/secret-scanning-partner.md,broken liquid tags translations/zh-CN/data/reusables/gated-features/secret-scanning.md,broken liquid tags @@ -403,9 +403,9 @@ translations/zh-CN/data/reusables/package_registry/packages-cluster-support.md,b translations/zh-CN/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md,broken liquid tags translations/zh-CN/data/reusables/repositories/enable-security-alerts.md,broken liquid tags translations/zh-CN/data/reusables/repositories/select-marketplace-apps.md,broken liquid tags -translations/zh-CN/data/reusables/saml/saml-session-oauth.md,rendering error +translations/zh-CN/data/reusables/saml/saml-session-oauth.md,broken liquid tags translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,Listed in localization-support#489 -translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,rendering error +translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,broken liquid tags translations/zh-CN/data/reusables/scim/after-you-configure-saml.md,broken liquid tags translations/zh-CN/data/reusables/secret-scanning/enterprise-enable-secret-scanning.md,broken liquid tags translations/zh-CN/data/reusables/secret-scanning/partner-program-link.md,broken liquid tags diff --git a/translations/log/ja-resets.csv b/translations/log/ja-resets.csv index 971831095e..c960f8ee78 100644 --- a/translations/log/ja-resets.csv +++ b/translations/log/ja-resets.csv @@ -303,9 +303,9 @@ translations/ja-JP/data/reusables/enterprise-accounts/actions-tab.md,broken liqu translations/ja-JP/data/reusables/enterprise-accounts/emu-password-reset-session.md,broken liquid tags translations/ja-JP/data/reusables/enterprise-accounts/emu-short-summary.md,broken liquid tags translations/ja-JP/data/reusables/enterprise-accounts/hooks-tab.md,Listed in localization-support#489 -translations/ja-JP/data/reusables/enterprise-accounts/hooks-tab.md,broken liquid tags +translations/ja-JP/data/reusables/enterprise-accounts/hooks-tab.md,rendering error translations/ja-JP/data/reusables/enterprise-accounts/messages-tab.md,Listed in localization-support#489 -translations/ja-JP/data/reusables/enterprise-accounts/messages-tab.md,broken liquid tags +translations/ja-JP/data/reusables/enterprise-accounts/messages-tab.md,rendering error translations/ja-JP/data/reusables/enterprise-accounts/pages-tab.md,broken liquid tags translations/ja-JP/data/reusables/enterprise-licensing/verified-domains-license-sync.md,broken liquid tags translations/ja-JP/data/reusables/enterprise_installation/hardware-considerations-all-platforms.md,broken liquid tags @@ -313,7 +313,18 @@ translations/ja-JP/data/reusables/enterprise_management_console/advanced-securit translations/ja-JP/data/reusables/enterprise_management_console/badge_indicator.md,broken liquid tags translations/ja-JP/data/reusables/enterprise_user_management/disclaimer-for-git-read-access.md,broken liquid tags translations/ja-JP/data/reusables/gated-features/code-scanning.md,Listed in localization-support#489 +translations/ja-JP/data/reusables/gated-features/codespaces-classroom-articles.md,broken liquid tags +translations/ja-JP/data/reusables/gated-features/codespaces.md,broken liquid tags +translations/ja-JP/data/reusables/gated-features/copilot.md,broken liquid tags +translations/ja-JP/data/reusables/gated-features/emus.md,broken liquid tags +translations/ja-JP/data/reusables/gated-features/enterprise-accounts.md,broken liquid tags +translations/ja-JP/data/reusables/gated-features/secret-scanning-partner.md,broken liquid tags +translations/ja-JP/data/reusables/gated-features/secret-scanning.md,broken liquid tags +translations/ja-JP/data/reusables/gated-features/security-overview.md,broken liquid tags +translations/ja-JP/data/reusables/getting-started/actions.md,broken liquid tags +translations/ja-JP/data/reusables/getting-started/api.md,broken liquid tags translations/ja-JP/data/reusables/getting-started/marketplace.md,broken liquid tags +translations/ja-JP/data/reusables/github-connect/authorize-connection.md,broken liquid tags translations/ja-JP/data/reusables/large_files/can-include-lfs-objects-archives.md,broken liquid tags translations/ja-JP/data/reusables/large_files/rejected_pushes.md,broken liquid tags translations/ja-JP/data/reusables/large_files/storage_assets_location.md,broken liquid tags diff --git a/translations/zh-CN/content/actions/learn-github-actions/contexts.md b/translations/zh-CN/content/actions/learn-github-actions/contexts.md index 5a9f912ee0..4ced2fa7d1 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/contexts.md +++ b/translations/zh-CN/content/actions/learn-github-actions/contexts.md @@ -200,7 +200,7 @@ jobs: {%- ifversion fpt or ghec or ghes > 3.5 or ghae-issue-4722 %} | `github.run_attempt` | `string` | 在存储库中运行的特定工作流程的每次尝试的唯一编号。 对于工作流程运行的第一次尝试，此数字从 1 开始，并随着每次重新运行而递增。 | {%- endif %} -| `github.server_url` | `string` | GitHub 服务器的 URL。 例如：`https://github.com`。 | | `github.sha` | `string` | 触发工作流运行的提交 SHA。 | | `github.token` | `string` | 用于代表存储库上安装的 GitHub 应用进行身份验证的令牌。 这在功能上等同于 `GITHUB_TOKEN` 密码。 更多信息请参阅“[自动令牌身份验证](/actions/security-guides/automatic-token-authentication)”。
注意：此上下文属性由 Actions 运行器设置，并且仅在作业的执行 `steps` 中可用。 否则，此属性的值将为 `null`。 |{% ifversion actions-stable-actor-ids %} | `github.triggering_actor` | `string` | The username of the user that initiated the workflow run. If the workflow run is a re-run, this value may differ from `github.actor`. Any workflow re-runs will use the privileges of `github.actor`, even if the actor initiating the re-run (`github.triggering_actor`) has different privileges. |{% endif %} | `github.workflow` | `string` | The name of the workflow. 如果工作流程文件未指定 `name`，此属性的值将是仓库中工作流程文件的完整路径。 | | `github.workspace` | `string` | 运行器上步骤的默认工作目录，以及使用[`检出`](https://github.com/actions/checkout)操作时存储库的默认位置。 | +| `github.server_url` | `string` | GitHub 服务器的 URL。 例如：`https://github.com`。 | | `github.sha` | `string` | {% data reusables.actions.github_sha_description %} | | `github.token` | `string` | A token to authenticate on behalf of the GitHub App installed on your repository. 这在功能上等同于 `GITHUB_TOKEN` 密码。 更多信息请参阅“[自动令牌身份验证](/actions/security-guides/automatic-token-authentication)”。
注意：此上下文属性由 Actions 运行器设置，并且仅在作业的执行 `steps` 中可用。 否则，此属性的值将为 `null`。 |{% ifversion actions-stable-actor-ids %} | `github.triggering_actor` | `string` | The username of the user that initiated the workflow run. If the workflow run is a re-run, this value may differ from `github.actor`. Any workflow re-runs will use the privileges of `github.actor`, even if the actor initiating the re-run (`github.triggering_actor`) has different privileges. |{% endif %} | `github.workflow` | `string` | The name of the workflow. 如果工作流程文件未指定 `name`，此属性的值将是仓库中工作流程文件的完整路径。 | | `github.workspace` | `string` | 运行器上步骤的默认工作目录，以及使用[`检出`](https://github.com/actions/checkout)操作时存储库的默认位置。 | ### `github` 上下文的示例内容 diff --git a/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md b/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md index a290bcda48..d8f2e403a4 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md +++ b/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md @@ -147,7 +147,7 @@ jobs: {%- ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5338 %} | `GITHUB_REF_NAME` | {% data reusables.actions.ref_name-description %} For example, `feature-branch-1`.| | `GITHUB_REF_PROTECTED` | {% data reusables.actions.ref_protected-description %} | | `GITHUB_REF_TYPE` | {% data reusables.actions.ref_type-description %} {%- endif %} -| `GITHUB_REPOSITORY` |所有者和存储库名称。 例如 `octocat/Hello-World`。 | | `GITHUB_REPOSITORY_OWNER` |存储库所有者的姓名。 例如 `octocat`。 | | `GITHUB_RETENTION_DAYS` |工作流程运行日志和构件的保留天数。 例如 `90`。 | | `GITHUB_RUN_ATTEMPT` | 在存储库中运行的特定工作流程的每次尝试的唯一编号。 对于工作流程运行的第一次尝试，此数字从 1 开始，并随着每次重新运行而递增。 例如 `3`。 | | `GITHUB_RUN_ID` | {% data reusables.actions.run_id_description %} 例如 `1658821493`。 | | `GITHUB_RUN_NUMBER` | {% data reusables.actions.run_number_description %} 例如 `3`。 | | `GITHUB_SERVER_URL`| {% data variables.product.product_name %} 服务器的 URL。 例如：`https://{% data variables.product.product_url %}`。 | `GITHUB_SHA` | 触发工作流程的提交 SHA。 此提交 SHA 的值取决于触发工作流程的事件。 更多信息请参阅“[触发工作流程的事件](/actions/using-workflows/events-that-trigger-workflows)”。 例如 `ffac537e6cbbf934b08745a378932722df287a53`。 | +| `GITHUB_REPOSITORY` |所有者和存储库名称。 例如 `octocat/Hello-World`。 | | `GITHUB_REPOSITORY_OWNER` |存储库所有者的姓名。 例如 `octocat`。 | | `GITHUB_RETENTION_DAYS` |工作流程运行日志和构件的保留天数。 例如 `90`。 | | `GITHUB_RUN_ATTEMPT` | 在存储库中运行的特定工作流程的每次尝试的唯一编号。 对于工作流程运行的第一次尝试，此数字从 1 开始，并随着每次重新运行而递增。 例如 `3`。 | | `GITHUB_RUN_ID` | {% data reusables.actions.run_id_description %} 例如 `1658821493`。 | | `GITHUB_RUN_NUMBER` | {% data reusables.actions.run_number_description %} 例如 `3`。 | | `GITHUB_SERVER_URL`| {% data variables.product.product_name %} 服务器的 URL。 例如：`https://{% data variables.product.product_url %}`。 | `GITHUB_SHA` | {% data reusables.actions.github_sha_description %} {%- ifversion actions-job-summaries %} | `GITHUB_STEP_SUMMARY` | 包含工作流程命令中作业摘要的文件在运行器上的路径。 此文件对于当前步骤是唯一的，并且会针对作业中的每个步骤进行更改。 例如，`/home/rob/runner/_layout/_work/_temp/_runner_file_commands/step_summary_1cb22d7f-5663-41a8-9ffc-13472605c76c`。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程命令](/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary)”。 | {%- endif %} diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/creating-a-codespace.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/creating-a-codespace.md index 38467f41a7..0679d8294a 100644 --- a/translations/zh-CN/content/codespaces/developing-in-codespaces/creating-a-codespace.md +++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/creating-a-codespace.md @@ -2,7 +2,6 @@ title: 创建代码空间 intro: 您可以为仓库中的分支创建代码空间以便在线开发。 product: '{% data reusables.gated-features.codespaces %}' -permissions: '{% data reusables.codespaces.availability %}' redirect_from: - /github/developing-online-with-github-codespaces/creating-a-codespace - /github/developing-online-with-codespaces/creating-a-codespace @@ -21,7 +20,7 @@ shortTitle: 创建代码空间 可以在 {% data variables.product.prodname_dotcom_the_website %} 上、{% data variables.product.prodname_vscode %} 中或使用 {% data variables.product.prodname_cli %} 创建代码空间。 {% data reusables.codespaces.codespaces-are-personal %} -代码空间与仓库的特定分支相关联，且仓库不能为空。 {% data reusables.codespaces.concurrent-codespace-limit %} 更多信息请参阅“[删除代码空间](/github/developing-online-with-codespaces/deleting-a-codespace)”。 +代码空间与仓库的特定分支相关联，且仓库不能为空。 {% data reusables.codespaces.concurrent-codespace-limit %} 创建代码空间时，需要执行一些步骤并将您连接到开发环境。 @@ -45,8 +44,6 @@ shortTitle: 创建代码空间 ## 访问 {% data variables.product.prodname_github_codespaces %} -{% data reusables.codespaces.availability %} - 当您访问 {% data variables.product.prodname_github_codespaces %} 时，在查看仓库时会看到 **{% octicon "code" aria-label="The code icon" %} Code（代码）**下拉菜单中的“Codespaces（代码空间）”选项卡。 在以下条件下，您可以访问代码空间： diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/default-environment-variables-for-your-codespace.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/default-environment-variables-for-your-codespace.md index 50c475d75f..32ddbd2164 100644 --- a/translations/zh-CN/content/codespaces/developing-in-codespaces/default-environment-variables-for-your-codespace.md +++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/default-environment-variables-for-your-codespace.md @@ -2,7 +2,6 @@ title: 代码空间的默认环境变量 shortTitle: 默认环境变量 product: '{% data reusables.gated-features.codespaces %}' -permissions: '{% data reusables.codespaces.availability %}' intro: '{% data variables.product.prodname_dotcom %} 为每个代码空间设置默认环境变量。' versions: fpt: '*' diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/developing-in-a-codespace.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/developing-in-a-codespace.md index e341666a31..4adad5ddd2 100644 --- a/translations/zh-CN/content/codespaces/developing-in-codespaces/developing-in-a-codespace.md +++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/developing-in-a-codespace.md @@ -2,7 +2,6 @@ title: Developing in a codespace intro: 'You can open a codespace on {% data variables.product.product_name %}, then develop using {% data variables.product.prodname_vscode %}''s features.' product: '{% data reusables.gated-features.codespaces %}' -permissions: 'You can develop in codespaces you''ve created for repositories owned by organizations using {% data variables.product.prodname_team %} and {% data variables.product.prodname_ghe_cloud %}.' redirect_from: - /github/developing-online-with-github-codespaces/developing-in-a-codespace - /github/developing-online-with-codespaces/developing-in-a-codespace diff --git a/translations/zh-CN/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/translations/zh-CN/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 165e374169..c3f1afcd31 100644 --- a/translations/zh-CN/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/translations/zh-CN/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -39,46 +39,49 @@ X-Accepted-OAuth-Scopes: user ## 可用作用域 -| 名称 | 描述 | -| ------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% ifversion not ghae %} -| **`（无作用域）`** | 授予对公共信息的只读访问权限（包括用户个人资料信息、公共仓库信息和 gist）{% endif %}{% ifversion ghes or ghae %} -| **`site_admin`** | 授予站点管理员对 [{% data variables.product.prodname_ghe_server %} 管理 API 端点](/rest/reference/enterprise-admin)的访问权限。{% endif %} -| **`repo`** | Grants full access to public{% ifversion ghec or ghes or ghae %}, internal,{% endif %} and private repositories including read and write access to code, commit statuses, repository invitations, collaborators, deployment statuses, and repository webhooks. **Note**: In addition to repository related resources, the `repo` scope also grants access to manage organization-owned resources including projects, invitations, team memberships and webhooks. This scope also grants the ability to manage projects owned by users. | -|  `repo:status` | 授予对{% ifversion fpt %}公共和私有{% elsif ghec or ghes %}公共、私有和内部{% elsif ghae %}私有和内部{% endif %}仓库中的提交状态的读/写访问权限。 仅在授予其他用户或服务对私有仓库提交状态的访问权限而*不*授予对代码的访问权限时，才需要此作用域。 | -|  `repo_deployment` | 授予对{% ifversion not ghae %}公共{% else %}内部{% endif %}和私有仓库的[部署状态](/rest/reference/repos#deployments)的访问权限。 仅在授予其他用户或服务对部署状态的访问权限而*不*授予对代码的访问权限时，才需要此作用域。{% ifversion not ghae %} -|  `public_repo` | 将访问权限限制为公共仓库。 这包括对公共仓库和组织的代码、提交状态、仓库项目、协作者以及部署状态的读取/写入权限。 标星公共仓库也需要此权限。{% endif %} -|  `repo:invite` | 授予接受/拒绝仓库协作邀请的权限。 仅在授予其他用户或服务对邀请的访问权限而*不*授予对代码的访问权限时，才需要此作用域。{% ifversion fpt or ghes or ghec %} -|  `security_events` | 授予：
对 [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning) 中安全事件的读取和写入权限
对 {%- ifversion ghec %}[{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning) 中安全事件的读取和写入权限
{%- endif %}仅在授予其他用户或服务对安全事件的访问权限而*不*授予对代码的访问权限时，才需要此作用域。{% endif %} -| **`admin:repo_hook`** | 授予对{% ifversion fpt %}公共或私有{% elsif ghec or ghes %}公共、私有或内部{% elsif ghae %}私有或内部{% endif %}仓库中仓库挂钩的读取、写入、ping 和删除访问权限。 `repo` {% ifversion fpt or ghec or ghes %}和 `public_repo` 范围授予{% else %}范围授予{% endif %}对仓库（包括仓库挂钩）的完全访问权限。 使用 `admin:repo_hook` 作用域将访问权限限制为仅仓库挂钩。 | -|  `write:repo_hook` | 授予对{% ifversion fpt %}公共或私有{% elsif ghec or ghes %}公共、私有或内部{% elsif ghae %}私有或内部{% endif %}仓库中挂钩的读取、写入和 ping 访问权限。 | -|  `read:repo_hook` | 授予对{% ifversion fpt %}公共或私有{% elsif ghec or ghes %}公共、私有或内部{% elsif ghae %}私有或内部{% endif %}仓库中挂钩的读取和 ping 访问权限。 | -| **`admin:org`** | 全面管理组织及其团队、项目和成员。 | -|  `write:org` | 对组织成员身份、组织项目和团队成员身份的读取和写入权限。 | -|  `read:org` | 对组织成员身份、组织项目和团队成员身份的只读权限。 | -| **`admin:public_key`** | 全面管理公钥。 | -|  `write:public_key` | 创建、列出和查看公钥的详细信息。 | -|  `read:public_key` | 列出和查看公钥的详细信息。 | -| **`admin:org_hook`** | 授予对组织挂钩的读取、写入、ping 和删除权限。 **注：**OAuth 令牌只能对由 OAuth 应用程序创建的组织挂钩执行这些操作。 个人访问令牌只能对用户创建的组织挂钩执行这些操作。 | -| **`gist`** | 授予对 gist 的写入权限。 | -| **`通知`** | 授予：
* 对用户通知的读取权限
* 对线程的标记读取权限
* 对仓库的关注和取消关注权限，以及
* 对线程订阅的读取、写入和删除权限。 | -| **`用户`** | 仅授予对个人资料的读取/写入权限。 请注意，此作用域包括 `user:email` 和 `user:follow`。 | -|  `read:user` | 授予读取用户个人资料数据的权限。 | -|  `user:email` | 授予对用户电子邮件地址的读取权限。 | -|  `user:follow` | 授予关注或取消关注其他用户的权限。{% ifversion projects-oauth-scope %} -| **`project`** | Grants read/write access to user and organization {% data variables.projects.projects_v2 %}. | -|  `read:project` | Grants read only access to user and organization {% data variables.projects.projects_v2 %}.{% endif %} -| **`delete_repo`** | 授予删除可管理仓库的权限。 | -| **`write:discussion`** | 授予对团队讨论的读取和写入权限。 | -|  `read:discussion` | 允许对团队讨论进行读取访问。 | -| **`write:packages`** | 授予在 {% data variables.product.prodname_registry %} 中上传或发布包的权限。 更多信息请参阅“[发布包](/github/managing-packages-with-github-packages/publishing-a-package)”。 | -| **`read:packages`** | 授予从 {% data variables.product.prodname_registry %} 下载或安装包的权限。 更多信息请参阅“[安装包](/github/managing-packages-with-github-packages/installing-a-package)”。 | -| **`delete:packages`** | 授予从 {% data variables.product.prodname_registry %} 删除包的权限。 更多信息请参阅“[删除和恢复软件包](/packages/learn-github-packages/deleting-and-restoring-a-package)”。 | -| **`admin:gpg_key`** | 全面管理 GPG 密钥。 | -|  `write:gpg_key` | 创建、列出和查看 GPG 密钥的详细信息。 | -|  `read:gpg_key` | 列出和查看 GPG 密钥的详细信息。{% ifversion fpt or ghec %} -| **`代码空间`** | 授予创建和管理代码空间的能力。 Codespaces 可以暴露可能有不同范围集的 GITHUB_TOKEN。 更多信息请参阅“[{% data variables.product.prodname_github_codespaces %} 中的安全性](/codespaces/codespaces-reference/security-in-github-codespaces#authentication)”。{% endif %} -| **`工作流程`** | 授予添加和更新 {% data variables.product.prodname_actions %} 工作流程文件的权限。 如果在同一仓库中的另一个分支上存在相同的文件(具有相同的路径和内容)，则工作流程文件可以在没有此作用域的情况下提交。 工作流程文件可以暴露可能有不同范围集的 `GITHUB_TOKEN`。 更多信息请参阅“[工作流程中的身份验证](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token)。 | - +| 名称 | 描述 | +| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% ifversion not ghae %} +| **`（无作用域）`** | 授予对公共信息的只读访问权限（包括用户个人资料信息、公共仓库信息和 gist）{% endif %}{% ifversion ghes or ghae %} +| **`site_admin`** | 授予站点管理员对 [{% data variables.product.prodname_ghe_server %} 管理 API 端点](/rest/reference/enterprise-admin)的访问权限。{% endif %} +| **`repo`** | Grants full access to public{% ifversion ghec or ghes or ghae %}, internal,{% endif %} and private repositories including read and write access to code, commit statuses, repository invitations, collaborators, deployment statuses, and repository webhooks. **Note**: In addition to repository related resources, the `repo` scope also grants access to manage organization-owned resources including projects, invitations, team memberships and webhooks. This scope also grants the ability to manage projects owned by users. | +|  `repo:status` | 授予对{% ifversion fpt %}公共和私有{% elsif ghec or ghes %}公共、私有和内部{% elsif ghae %}私有和内部{% endif %}仓库中的提交状态的读/写访问权限。 仅在授予其他用户或服务对私有仓库提交状态的访问权限而*不*授予对代码的访问权限时，才需要此作用域。 | +|  `repo_deployment` | 授予对{% ifversion not ghae %}公共{% else %}内部{% endif %}和私有仓库的[部署状态](/rest/reference/repos#deployments)的访问权限。 仅在授予其他用户或服务对部署状态的访问权限而*不*授予对代码的访问权限时，才需要此作用域。{% ifversion not ghae %} +|  `public_repo` | 将访问权限限制为公共仓库。 这包括对公共仓库和组织的代码、提交状态、仓库项目、协作者以及部署状态的读取/写入权限。 标星公共仓库也需要此权限。{% endif %} +|  `repo:invite` | 授予接受/拒绝仓库协作邀请的权限。 仅在授予其他用户或服务对邀请的访问权限而*不*授予对代码的访问权限时，才需要此作用域。{% ifversion fpt or ghes or ghec %} +|  `security_events` | 授予：
对 [{% data variables.product.prodname_code_scanning %} API](/rest/reference/code-scanning) 中安全事件的读取和写入权限
对 {%- ifversion ghec %}[{% data variables.product.prodname_secret_scanning %} API](/rest/reference/secret-scanning) 中安全事件的读取和写入权限
{%- endif %}仅在授予其他用户或服务对安全事件的访问权限而*不*授予对代码的访问权限时，才需要此作用域。{% endif %} +| **`admin:repo_hook`** | 授予对{% ifversion fpt %}公共或私有{% elsif ghec or ghes %}公共、私有或内部{% elsif ghae %}私有或内部{% endif %}仓库中仓库挂钩的读取、写入、ping 和删除访问权限。 `repo` {% ifversion fpt or ghec or ghes %}和 `public_repo` 范围授予{% else %}范围授予{% endif %}对仓库（包括仓库挂钩）的完全访问权限。 使用 `admin:repo_hook` 作用域将访问权限限制为仅仓库挂钩。 | +|  `write:repo_hook` | 授予对{% ifversion fpt %}公共或私有{% elsif ghec or ghes %}公共、私有或内部{% elsif ghae %}私有或内部{% endif %}仓库中挂钩的读取、写入和 ping 访问权限。 | +|  `read:repo_hook` | 授予对{% ifversion fpt %}公共或私有{% elsif ghec or ghes %}公共、私有或内部{% elsif ghae %}私有或内部{% endif %}仓库中挂钩的读取和 ping 访问权限。 | +| **`admin:org`** | 全面管理组织及其团队、项目和成员。 | +|  `write:org` | 对组织成员身份、组织项目和团队成员身份的读取和写入权限。 | +|  `read:org` | 对组织成员身份、组织项目和团队成员身份的只读权限。 | +| **`admin:public_key`** | 全面管理公钥。 | +|  `write:public_key` | 创建、列出和查看公钥的详细信息。 | +|  `read:public_key` | 列出和查看公钥的详细信息。 | +| **`admin:org_hook`** | 授予对组织挂钩的读取、写入、ping 和删除权限。 **注：**OAuth 令牌只能对由 OAuth 应用程序创建的组织挂钩执行这些操作。 个人访问令牌只能对用户创建的组织挂钩执行这些操作。 | +| **`gist`** | 授予对 gist 的写入权限。 | +| **`通知`** | 授予：
* 对用户通知的读取权限
* 对线程的标记读取权限
* 对仓库的关注和取消关注权限，以及
* 对线程订阅的读取、写入和删除权限。 | +| **`用户`** | 仅授予对个人资料的读取/写入权限。 请注意，此作用域包括 `user:email` 和 `user:follow`。 | +|  `read:user` | 授予读取用户个人资料数据的权限。 | +|  `user:email` | 授予对用户电子邮件地址的读取权限。 | +|  `user:follow` | 授予关注或取消关注其他用户的权限。{% ifversion projects-oauth-scope %} +| **`project`** | Grants read/write access to user and organization {% data variables.projects.projects_v2 %}. | +|  `read:project` | Grants read only access to user and organization {% data variables.projects.projects_v2 %}.{% endif %} +| **`delete_repo`** | 授予删除可管理仓库的权限。 | +| **`write:discussion`** | 授予对团队讨论的读取和写入权限。 | +|  `read:discussion` | 允许对团队讨论进行读取访问。 | +| **`write:packages`** | 授予在 {% data variables.product.prodname_registry %} 中上传或发布包的权限。 更多信息请参阅“[发布包](/github/managing-packages-with-github-packages/publishing-a-package)”。 | +| **`read:packages`** | 授予从 {% data variables.product.prodname_registry %} 下载或安装包的权限。 更多信息请参阅“[安装包](/github/managing-packages-with-github-packages/installing-a-package)”。 | +| **`delete:packages`** | 授予从 {% data variables.product.prodname_registry %} 删除包的权限。 更多信息请参阅“[删除和恢复软件包](/packages/learn-github-packages/deleting-and-restoring-a-package)”。 | +| **`admin:gpg_key`** | 全面管理 GPG 密钥。 | +|  `write:gpg_key` | 创建、列出和查看 GPG 密钥的详细信息。 | +|  `read:gpg_key` | 列出和查看 GPG 密钥的详细信息。{% ifversion fpt or ghec %} +| **`代码空间`** | 授予创建和管理代码空间的能力。 Codespaces 可以暴露可能有不同范围集的 GITHUB_TOKEN。 更多信息请参阅“[{% data variables.product.prodname_github_codespaces %} 中的安全性](/codespaces/codespaces-reference/security-in-github-codespaces#authentication)”。{% endif %} +| **`工作流程`** | 授予添加和更新 {% data variables.product.prodname_actions %} 工作流程文件的权限。 如果在同一仓库中的另一个分支上存在相同的文件(具有相同的路径和内容)，则工作流程文件可以在没有此作用域的情况下提交。 工作流程文件可以暴露可能有不同范围集的 `GITHUB_TOKEN`。 For more information, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token)."{% ifversion not fpt %} +| **`admin:enterprise`** | Gives full control of enterprise functionality. For more information, see "[Managing enterprise accounts](/graphql/guides/managing-enterprise-accounts)" in the GraphQL API documentation.

Includes `manage_runners:enterprise`{% ifversion ghec or ghes > 3.3 %}, `manage_billing:enterprise`,{% endif %} and `read:enterprise`. | +|  `manage_runners:enterprise` | Gives full control over self-hosted runners within the enterprise. 更多信息请参阅“[关于自托管运行器](/actions/hosting-your-own-runners/about-self-hosted-runners)”。 {% ifversion ghec or ghes > 3.3 %} +|  `manage_billing:enterprise` | Read and write enterprise billing data. For more information, see "[Billing](/rest/billing)" in the REST API documentation. {% endif %} +|  `read:enterprise` | Read all data on an enterprise profile. Does not include profile data of enterprise members or organizations.{% endif %} {% note %} **注：**您的 OAuth 应用程序可以在初始重定向中请求作用域。 您可以使用 `%20` 以空格分隔多个作用域来指定它们： diff --git a/translations/zh-CN/content/get-started/quickstart/set-up-git.md b/translations/zh-CN/content/get-started/quickstart/set-up-git.md index 7458dc102e..cf58ba5012 100644 --- a/translations/zh-CN/content/get-started/quickstart/set-up-git.md +++ b/translations/zh-CN/content/get-started/quickstart/set-up-git.md @@ -41,17 +41,17 @@ If you do not need to work with files locally, {% data variables.product.product 1. [Download and install the latest version of Git](https://git-scm.com/downloads). -{% note %} + {% note %} + + **Note**: If you are using a Chrome OS device, additional set up is required: + + 1. Install a terminal emulator such as Termux from the Google Play Store on your Chrome OS device. + 1. From the terminal emulator that you installed, install Git. For example, in Termux, enter `apt install git` and then type `y` when prompted. + + {% endnote %} -**Note**: If you are using a Chrome OS device, additional set up is required: - -2. Install a terminal emulator such as Termux from the Google Play Store on your Chrome OS device. -3. From the terminal emulator that you installed, install Git. For example, in Termux, enter `apt install git` and then type `y` when prompted. - -{% endnote %} - -2. [Set your username in Git](/github/getting-started-with-github/setting-your-username-in-git). -3. [Set your commit email address in Git](/articles/setting-your-commit-email-address). +1. [Set your username in Git](/github/getting-started-with-github/setting-your-username-in-git). +1. [Set your commit email address in Git](/articles/setting-your-commit-email-address). ## Authenticating with {% data variables.product.prodname_dotcom %} from Git diff --git a/translations/zh-CN/content/index.md b/translations/zh-CN/content/index.md index fbfc13a557..5e385e9de5 100644 --- a/translations/zh-CN/content/index.md +++ b/translations/zh-CN/content/index.md @@ -19,6 +19,7 @@ redirect_from: - /troubleshooting-common-issues versions: '*' children: + - search - get-started - account-and-profile - authentication diff --git a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md index c5da05e4d3..d1b4d72d71 100644 --- a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md +++ b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md @@ -92,9 +92,10 @@ redirect_from: - **设置交互限制**：暂时限制某些用户在公共存储库中发表评论、打开议题或创建拉取请求，以强制执行一段有限的活动。 更多信息请参阅“[限制存储库中的交互](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)”。 {%- endif %} - **设置社交预览**：将识别图像添加到存储库，该图像在链接存储库时显示在社交媒体平台上。 更多信息请参阅“[自定义仓库的社交媒体审查](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview)”。 -- **推送提交到受保护分支**：推送到标记为受保护分支的分支。 +- **推送提交到受保护分支**：推送到标记为受保护分支的分支。 Branch protection rules will still apply and could result in a push being rejected. - **创建受保护的标记**：创建与标记保护规则匹配的标记。 更多信息请参阅“[配置标记保护规则](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)”。 -- **删除受保护的标记**：删除与标记保护规则匹配的标记。 更多信息请参阅“[配置标记保护规则](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)”。 +- **删除受保护的标记**：删除与标记保护规则匹配的标记。 For more information, see "[Configuring tag protection rules](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)."{% ifversion bypass-branch-protections %} +- **Bypass branch protections**: Push to a protected branch without needing to comply with branch protection rules.{% endif %} ### 安全 diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md index 8698f67c7b..7f57608d45 100644 --- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md +++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md @@ -27,7 +27,7 @@ redirect_from: 1. 在“Pull Requests（拉取请求）”列表中，单击要添加到合并队列的拉取请求。 1. 单击 **Merge when ready（准备就绪时合并）**将拉取请求添加到合并队列中。 或者，如果您是管理员，则可以： - - 如果分支保护设置允许，可直接合并请求，方法是选中 **Merge without waiting for requirements to be met (administrators only)（合并，而无需等待满足要求 [仅限管理员]）**，并遵循标准流程。 ![合并队列选项](/assets/images/help/pull_requests/merge-queue-options.png) + - Directly merge the pull request by checking **Merge without waiting for requirements to be met ({% ifversion bypass-branch-protections %}bypass branch protections{% else %}administrators only{% endif %})**, if allowed by branch protection settings, and follow the standard flow. ![合并队列选项](/assets/images/help/pull_requests/merge-queue-options.png) {% tip %} diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md index 2301006a77..c6cc4aba8d 100644 --- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md +++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md @@ -32,7 +32,10 @@ topics: 默认情况下，每个分支保护规则都禁止强制推送到匹配的分支并阻止删除匹配的分支。 您可以选择禁用这些限制并启用其他分支保护设置。 -默认情况下，分支保护规则的限制不适用于对仓库具有管理员权限的人。 您也可以选择包括管理员。 +{% ifversion bypass-branch-protections %} +By default, the restrictions of a branch protection rule don't apply to people with admin permissions to the repository or custom roles with the "bypass branch protections" permission. You can optionally apply the restrictions to administrators and roles with the "bypass branch protections" permission, too. For more information, see "[Managing custom repository roles for an organization](/en/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)". +{% else %} +默认情况下，分支保护规则的限制不适用于对仓库具有管理员权限的人。 You can optionally choose to include administrators, too.{% endif %} {% data reusables.repositories.branch-rules-example %} 关于分支名称模式的更多信息，请参阅“[管理分支保护规则](/github/administering-a-repository/managing-a-branch-protection-rule)”。 @@ -52,7 +55,7 @@ topics: {%- ifversion required-deployments %} - [要求部署在合并之前成功](#require-deployments-to-succeed-before-merging) {%- endif %} -- [包括管理员](#include-administrators) +{% ifversion bypass-branch-protections %}- [Do not allow bypassing the above settings](#do-not-allow-bypassing-the-above-settings){% else %}- [Include administrators](#include-administrators){% endif %} - [限制谁可以推送到匹配的分支](#restrict-who-can-push-to-matching-branches) - [允许强制推送](#allow-force-pushes) - [允许删除](#allow-deletions) @@ -124,7 +127,7 @@ remote: error: Changes have been requested. {% endnote %} -如果提交已进行签名和验证，则始终可以将本地提交推送到分支。 {% ifversion fpt or ghec %}您也可以使用 {% data variables.product.product_name %} 上的拉请求将已经签名和验证的提交合并到分支。 但除非您是拉取请求的作者，否则不能将拉取请求压缩并合并到 {% data variables.product.product_name %} 。{% else %}但不能将拉取请求合并到 {% data variables.product.product_name %} 上的分支。{% endif %} 您可以在本地{% ifversion fpt or ghec %}压缩和{% endif %}合并拉取请求。 更多信息请参阅“[在本地检出拉取请求](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally)”。 +如果提交已进行签名和验证，则始终可以将本地提交推送到分支。 {% ifversion fpt or ghec %}您也可以使用 {% data variables.product.product_name %} 上的拉请求将已经签名和验证的提交合并到分支。 但除非您是拉取请求的作者，否则不能将拉取请求压缩并合并到 {% data variables.product.product_name %} 。{% else %}但不能将拉取请求合并到 {% data variables.product.product_name %} 上的分支。{% endif %} 您可以在本地 {% ifversion fpt or ghec %}压缩和{% endif %}合并拉取请求。 更多信息请参阅“[在本地检出拉取请求](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally)”。 {% ifversion fpt or ghec %} 有关合并方法的更多信息，请参阅“[关于 {% data variables.product.prodname_dotcom %} 上的合并方法](/github/administering-a-repository/about-merge-methods-on-github)”。{% endif %} @@ -149,9 +152,15 @@ remote: error: Changes have been requested. 您可以要求先将更改成功部署到特定环境，然后才能合并分支。 例如，可以使用此规则确保在更改合并到默认分支之前，将更改成功部署到过渡环境。 -### 包括管理员 +{% ifversion bypass-branch-protections %}### Do not allow bypassing the above settings{% else %} +### Include administrators{% endif %} -默认情况下，受保护分支规则不适用于对仓库具有管理员权限的人。 您可以启用此设置将管理员纳入受保护分支规则。 +{% ifversion bypass-branch-protections %} +By default, the restrictions of a branch protection rule do not apply to people with admin permissions to the repository or custom roles with the "bypass branch protections" permission in a repository. + +You can enable this setting to apply the restrictions to admins and roles with the "bypass branch protections" permission, too. For more information, see "[Managing custom repository roles for an organization](/en/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)". +{% else %} +默认情况下，受保护分支规则不适用于对仓库具有管理员权限的人。 You can enable this setting to include administrators in your protected branch rules.{% endif %} ### 限制谁可以推送到匹配的分支 diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md index b372bcf39a..796bcbeb76 100644 --- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md +++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md @@ -84,7 +84,7 @@ shortTitle: 分支保护规则 {%- ifversion required-deployments %} 1. （可选）要选择在合并之前必须将更改成功部署到哪些环境，请选择 **Require deployments to succeed before merging（在合并之前需要部署成功）**，然后选择环境。 ![需要成功部署选项](/assets/images/help/repository/require-successful-deployment.png) {%- endif %} -1. （可选）选择 **Apply the rules above to administrators（将上述规则应用于管理员）**。 ![将上述规则应用于管理员复选框](/assets/images/help/repository/include-admins-protected-branches.png) +1. Optionally, select {% ifversion bypass-branch-protections %}**Do not allow bypassing the above settings**. ![Do not allow bypassing the above settings checkbox](/assets/images/help/repository/do-not-allow-bypassing-the-above-settings.png){% else %}**Apply the rules above to administrators**. ![Apply the rules above to administrators checkbox](/assets/images/help/repository/include-admins-protected-branches.png){% endif %} 1. （可选）{% ifversion fpt or ghec %}如果仓库由组织拥有，可使用 {% data variables.product.prodname_team %} 或 {% data variables.product.prodname_ghe_cloud %}{% endif %} 启用分支限制。 - 选择 **Restrict who can push to matching branches（限制谁可以推送到匹配分支）**。 ![Branch restriction checkbox](/assets/images/help/repository/restrict-branch.png){% ifversion restrict-pushes-create-branch %} - （可选）要同时限制创建匹配分支，请选择 **Restrict pushes that create matching branches（限制创建匹配分支的推送）**。 ![Branch creation restriction checkbox](/assets/images/help/repository/restrict-branch-create.png){% endif %} diff --git a/translations/zh-CN/data/features/bypass-branch-protections.yml b/translations/zh-CN/data/features/bypass-branch-protections.yml new file mode 100644 index 0000000000..d955962e56 --- /dev/null +++ b/translations/zh-CN/data/features/bypass-branch-protections.yml @@ -0,0 +1,7 @@ +#Issue: 6667 +#Description: Allow merging pull requests without complying with branch protection rules. +versions: + fpt: '*' + ghec: '*' + ghes: '>=3.7' + ghae: 'issue-6667' diff --git a/translations/zh-CN/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml b/translations/zh-CN/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml index 862699bc95..e85864a7b9 100644 --- a/translations/zh-CN/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml +++ b/translations/zh-CN/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml @@ -154,13 +154,6 @@ upcoming_changes: date: '2022-10-01T00:00:00+00:00' criticality: 重大 owner: lukewar - - - location: ProjectNextFieldType.TASKS - description: '`TASKS` will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement.' - reason: '''ProjectNext'' API 已被弃用，取而代之的是功能更强大的 ''ProjectV2'' API。' - date: '2022-10-01T00:00:00+00:00' - criticality: 重大 - owner: lukewar - location: ProjectNextFieldType.TEXT description: '`TEXT` will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement.' @@ -175,6 +168,13 @@ upcoming_changes: date: '2022-10-01T00:00:00+00:00' criticality: 重大 owner: lukewar + - + location: ProjectNextFieldType.TRACKS + description: '“TRACKS”将被删除。请按照 https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/ 的 ProjectV2 指南，找到合适的替代项。' + reason: '''ProjectNext'' API 已被弃用，取而代之的是功能更强大的 ''ProjectV2'' API。' + date: '2022-10-01T00:00:00+00:00' + criticality: 重大 + owner: lukewar - location: RemovePullRequestFromMergeQueueInput.branch description: '`branch` 将被删除。' diff --git a/translations/zh-CN/data/graphql/ghec/graphql_upcoming_changes.public.yml b/translations/zh-CN/data/graphql/ghec/graphql_upcoming_changes.public.yml index 74549f78c1..caada567a9 100644 --- a/translations/zh-CN/data/graphql/ghec/graphql_upcoming_changes.public.yml +++ b/translations/zh-CN/data/graphql/ghec/graphql_upcoming_changes.public.yml @@ -574,13 +574,6 @@ upcoming_changes: date: '2022-10-01T00:00:00+00:00' criticality: 重大 owner: lukewar - - - location: ProjectNextFieldType.TASKS - description: '`TASKS` will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement.' - reason: '''ProjectNext'' API 已被弃用，取而代之的是功能更强大的 ''ProjectV2'' API。' - date: '2022-10-01T00:00:00+00:00' - criticality: 重大 - owner: lukewar - location: ProjectNextFieldType.TEXT description: '`TEXT` will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement.' @@ -595,6 +588,13 @@ upcoming_changes: date: '2022-10-01T00:00:00+00:00' criticality: 重大 owner: lukewar + - + location: ProjectNextFieldType.TRACKS + description: '“TRACKS”将被删除。请按照 https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/ 的 ProjectV2 指南，找到合适的替代项。' + reason: '''ProjectNext'' API 已被弃用，取而代之的是功能更强大的 ''ProjectV2'' API。' + date: '2022-10-01T00:00:00+00:00' + criticality: 重大 + owner: lukewar - location: ProjectNextItem.content description: '“content”将被删除。请按照 https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/ 的 ProjectV2 指南，找到合适的替代项。' diff --git a/translations/zh-CN/data/graphql/graphql_upcoming_changes.public.yml b/translations/zh-CN/data/graphql/graphql_upcoming_changes.public.yml index 74549f78c1..caada567a9 100644 --- a/translations/zh-CN/data/graphql/graphql_upcoming_changes.public.yml +++ b/translations/zh-CN/data/graphql/graphql_upcoming_changes.public.yml @@ -574,13 +574,6 @@ upcoming_changes: date: '2022-10-01T00:00:00+00:00' criticality: 重大 owner: lukewar - - - location: ProjectNextFieldType.TASKS - description: '`TASKS` will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement.' - reason: '''ProjectNext'' API 已被弃用，取而代之的是功能更强大的 ''ProjectV2'' API。' - date: '2022-10-01T00:00:00+00:00' - criticality: 重大 - owner: lukewar - location: ProjectNextFieldType.TEXT description: '`TEXT` will be removed. Follow the ProjectV2 guide at https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/, to find a suitable replacement.' @@ -595,6 +588,13 @@ upcoming_changes: date: '2022-10-01T00:00:00+00:00' criticality: 重大 owner: lukewar + - + location: ProjectNextFieldType.TRACKS + description: '“TRACKS”将被删除。请按照 https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/ 的 ProjectV2 指南，找到合适的替代项。' + reason: '''ProjectNext'' API 已被弃用，取而代之的是功能更强大的 ''ProjectV2'' API。' + date: '2022-10-01T00:00:00+00:00' + criticality: 重大 + owner: lukewar - location: ProjectNextItem.content description: '“content”将被删除。请按照 https://github.blog/changelog/2022-06-23-the-new-github-issues-june-23rd-update/ 的 ProjectV2 指南，找到合适的替代项。' diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/17.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/17.yml index 4d76e62101..bb150ca808 100644 --- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/17.yml +++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/17.yml @@ -7,3 +7,12 @@ sections: **HIGH**: Previously installed apps on user accounts were automatically granted permission to access an organization on scoped access tokens after the user account was transformed into an organization account. This vulnerability was reported via the [GitHub Bug Bounty program](https://bounty.github.com). bugs: - When a custom dormancy threshold was set for the instance, suspending all dormant users did not reliably respect the threshold. For more information about dormancy, see "[Managing dormant users](/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users)." + known_issues: + - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 实例上，攻击者可以创建第一个管理员用户。 + - 自定义防火墙规则在升级过程中被删除。 + - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。 + - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。 + - 当“用户可以搜索 GitHub.com”与 {% data variables.product.prodname_github_connect %} 一起启用时，私有和内部存储库中的议题不会包含在 {% data variables.product.prodname_dotcom_the_website %} 搜索结果中。 + - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。' + - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。 + - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}' diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/12.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/12.yml index bdd7c88536..c5393b6c21 100644 --- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/12.yml +++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/12.yml @@ -9,3 +9,14 @@ sections: - When a custom dormancy threshold was set for the instance, suspending all dormant users did not reliably respect the threshold. For more information about dormancy, see "[Managing dormant users](/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users)." changes: - 'The enterprise audit log now includes more user-generated events, such as `project.create`. The REST API also returns additional user-generated events, such as `repo.create`. For more information, see "[Accessing the audit log for your enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/accessing-the-audit-log-for-your-enterprise)" and "[Using the audit log API for your enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/using-the-audit-log-api-for-your-enterprise#querying-the-audit-log-rest-api)."' + known_issues: + - 升级到 {% data variables.product.prodname_ghe_server %} 3.3 后，{% data variables.product.prodname_actions %} 可能无法自动启动。要解决此问题，请通过 SSH 连接到设备并运行“ghe-actions-start”命令。 + - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 实例上，攻击者可以创建第一个管理员用户。 + - 自定义防火墙规则在升级过程中被删除。 + - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。 + - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。 + - 当“用户可以搜索 GitHub.com”与 {% data variables.product.prodname_github_connect %} 一起启用时，私有和内部存储库中的议题不会包含在 {% data variables.product.prodname_dotcom_the_website %} 搜索结果中。 + - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。' + - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。 + - '{% data variables.product.prodname_actions %} 存储设置在选择“Force Path Style（强制路径样式）”时无法验证和保存在 {% data variables.enterprise.management_console %} 中，而必须使用“ghe-actions-precheck”命令行实用程序进行配置。' + - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}' diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/7.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/7.yml index 4ac13d11b8..479702d0d7 100644 --- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/7.yml +++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/7.yml @@ -12,3 +12,15 @@ sections: changes: - '`pre_receive_hook.rejected_push` events were not displayed in the enterprise audit log.' - Both migration archives for repositories and archive exports for user accounts include release reactions. + known_issues: + - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 实例上，攻击者可以创建第一个管理员用户。 + - 自定义防火墙规则在升级过程中被删除。 + - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。 + - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。 + - 当“用户可以搜索 GitHub.com”与 {% data variables.product.prodname_github_connect %} 一起启用时，私有和内部存储库中的议题不会包含在 {% data variables.product.prodname_dotcom_the_website %} 搜索结果中。 + - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。' + - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。 + - | + 在多个级别（例如，企业和组织）上使用“--ephemeral”参数注册自托管运行器后，运行器可能会陷入空闲状态并需要重新注册。[更新时间：2022 年 6 月 17 日] + - After upgrading to {% data variables.product.prodname_ghe_server %} 3.4, releases may appear to be missing from repositories. This can occur when the required Elasticsearch index migrations have not successfully completed. + - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}' diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-5/4.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-5/4.yml index 2d66fe18bf..ed005d20b8 100644 --- a/translations/zh-CN/data/release-notes/enterprise-server/3-5/4.yml +++ b/translations/zh-CN/data/release-notes/enterprise-server/3-5/4.yml @@ -18,3 +18,13 @@ sections: - The light high contrast theme was unavailable in GitHub Enterprise Server 3.5.0, 3.5.1, 3.5.2, and 3.5.3, but is now available in 3.5.4. For more information, see "[Managing your theme settings](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-your-theme-settings)." changes: - '`pre_receive_hook.rejected_push` events were not displayed in the enterprise audit log.' + known_issues: + - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 实例上，攻击者可以创建第一个管理员用户。 + - 自定义防火墙规则在升级过程中被删除。 + - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。 + - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接，则议题无法关闭。 + - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后，私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。 + - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分，我们继续拥有返回时间值所需的所有数据，并将在我们解决现有性能问题后恢复返回这个值。' + - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。 + - Actions services need to be restarted after restoring an appliance from a backup taken on a different host. + - '{% data reusables.release-notes.ghas-3.4-secret-scanning-known-issue %}' diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-6/0-rc1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-6/0-rc1.yml index a729a01d0e..e7834b56ee 100644 --- a/translations/zh-CN/data/release-notes/enterprise-server/3-6/0-rc1.yml +++ b/translations/zh-CN/data/release-notes/enterprise-server/3-6/0-rc1.yml @@ -80,8 +80,6 @@ sections: notes: - | Enterprise owners on instances with a GitHub Advanced Security license can see an overview of Dependabot alerts for the entire instance, including a repository-centric view of application security risks, and an alert-centric view of all secret scanning and Dependabot alerts. The views are in beta and subject to change, and alert-centric views for code scanning are planned for a future release of GitHub Enterprise Server. For more information, see "[Viewing the security overview](/code-security/security-overview/viewing-the-security-overview#viewing-the-security-overview-for-an-enterprise)." - - | - Dependabot alerts show users if repository code calls vulnerable functions. Individual alerts display a "vulnerable call" label and code snippet, and users can filter search by `has:vulnerable-calls`. Vulnerable functions are curated during publication to the [GitHub Advisory Database](https://github.com/advisories). New incoming Python advisories will be supported, and GitHub is backfilling known vulnerable functions for historical Python advisories. After beta testing with Python, GitHub will add support for other ecosystems. For more information, see "[Viewing and updating Dependabot alerts](/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts)." - | Users can select multiple Dependabot alerts, then dismiss or reopen or dismiss the alerts. For example, from the **Closed alerts** tab, you can select multiple alerts that have been previously dismissed, and then reopen them all at once. For more information, see "[About Dependabot alerts](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies)." - | diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-6/0.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-6/0.yml index 5a6efee21d..8f86df75a1 100644 --- a/translations/zh-CN/data/release-notes/enterprise-server/3-6/0.yml +++ b/translations/zh-CN/data/release-notes/enterprise-server/3-6/0.yml @@ -79,8 +79,6 @@ sections: notes: - | Enterprise owners on instances with a GitHub Advanced Security license can see an overview of Dependabot alerts for the entire instance, including a repository-centric view of application security risks, and an alert-centric view of all secret scanning and Dependabot alerts. The views are in beta and subject to change, and alert-centric views for code scanning are planned for a future release of GitHub Enterprise Server. For more information, see "[Viewing the security overview](/code-security/security-overview/viewing-the-security-overview#viewing-the-security-overview-for-an-enterprise)." - - | - Dependabot alerts show users if repository code calls vulnerable functions. Individual alerts display a "vulnerable call" label and code snippet, and users can filter search by `has:vulnerable-calls`. Vulnerable functions are curated during publication to the [GitHub Advisory Database](https://github.com/advisories). New incoming Python advisories will be supported, and GitHub is backfilling known vulnerable functions for historical Python advisories. After beta testing with Python, GitHub will add support for other ecosystems. For more information, see "[Viewing and updating Dependabot alerts](/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts)." - | Users can select multiple Dependabot alerts, then dismiss or reopen or dismiss the alerts. For example, from the **Closed alerts** tab, you can select multiple alerts that have been previously dismissed, and then reopen them all at once. For more information, see "[About Dependabot alerts](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies)." - | diff --git a/translations/zh-CN/data/reusables/actions/github_sha_description.md b/translations/zh-CN/data/reusables/actions/github_sha_description.md new file mode 100644 index 0000000000..8f9ce93590 --- /dev/null +++ b/translations/zh-CN/data/reusables/actions/github_sha_description.md @@ -0,0 +1 @@ +触发工作流程的提交 SHA。 此提交 SHA 的值取决于触发工作流程的事件。 更多信息请参阅“[触发工作流程的事件](/actions/using-workflows/events-that-trigger-workflows)”。 例如 `ffac537e6cbbf934b08745a378932722df287a53`。 \ No newline at end of file diff --git a/translations/zh-CN/data/reusables/codespaces/availability.md b/translations/zh-CN/data/reusables/codespaces/availability.md deleted file mode 100644 index 586d18c9f5..0000000000 --- a/translations/zh-CN/data/reusables/codespaces/availability.md +++ /dev/null @@ -1 +0,0 @@ -代码空间可用于使用 {% data variables.product.prodname_team %} 和 {% data variables.product.prodname_ghe_cloud %} 的组织拥有的存储库。 diff --git a/translations/zh-CN/data/reusables/codespaces/concurrent-codespace-limit.md b/translations/zh-CN/data/reusables/codespaces/concurrent-codespace-limit.md index b1b4c3dcdd..a73657b7b9 100644 --- a/translations/zh-CN/data/reusables/codespaces/concurrent-codespace-limit.md +++ b/translations/zh-CN/data/reusables/codespaces/concurrent-codespace-limit.md @@ -1 +1 @@ -每个仓库甚至每个分支可创建多个代码空间。 但是，每个个人帐户都有 10 个代码空间的限制。 如果您已达到上限，想要创建一个新的代码空间，必须先删除一个旧代码空间。 +每个仓库甚至每个分支可创建多个代码空间。 diff --git a/translations/zh-CN/data/ui.yml b/translations/zh-CN/data/ui.yml index 94597dcfdf..e8fea47fbb 100644 --- a/translations/zh-CN/data/ui.yml +++ b/translations/zh-CN/data/ui.yml @@ -32,6 +32,9 @@ search: search_error: 尝试执行搜索时出错。 description: 输入搜索词以在 GitHub 文档中查找。 label: 搜索 GitHub 文档 + results_found: Found {n} results in {s}ms + results_page: This is page {page} of {pages}. + nothing_found: Nothing found 😿 homepage: explore_by_product: 按产品浏览 version_picker: 版本