From 3345e0dde860e4cef64740992d9234b8b31afef7 Mon Sep 17 00:00:00 2001 From: tvachkov <53747873+tvachkov@users.noreply.github.com> Date: Sun, 11 Oct 2020 08:37:42 +0200 Subject: [PATCH 01/40] Replaced "main" by "master" The default branch is normally called master, not main. --- ...-an-existing-project-to-github-using-the-command-line.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md b/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md index a2caca6558..04c3a57290 100644 --- a/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md +++ b/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md @@ -49,7 +49,7 @@ versions: ``` 9. [Push the changes](/articles/pushing-commits-to-a-remote-repository/) in your local repository to {% data variables.product.product_location %}. ```shell - $ git push -u origin main + $ git push -u origin master # Pushes the changes in your local repository up to the remote repository you specified as the origin ``` @@ -86,7 +86,7 @@ versions: ``` 9. [Push the changes](/articles/pushing-commits-to-a-remote-repository/) in your local repository to {% data variables.product.product_location %}. ```shell - $ git push origin main + $ git push origin master # Pushes the changes in your local repository up to the remote repository you specified as the origin ``` @@ -123,7 +123,7 @@ versions: ``` 9. [Push the changes](/articles/pushing-commits-to-a-remote-repository/) in your local repository to {% data variables.product.product_location %}. ```shell - $ git push origin main + $ git push origin master # Pushes the changes in your local repository up to the remote repository you specified as the origin ``` From 08c9c4923d5b73be226d9d2aa59f4d8baf6246ef Mon Sep 17 00:00:00 2001 From: Kendell R Date: Wed, 21 Oct 2020 17:57:08 -0700 Subject: [PATCH 02/40] Note that Firefox works too. --- .../file-attachments-on-issues-and-pull-requests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md b/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md index 53a67879b0..1fa50b41a0 100644 --- a/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md +++ b/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md @@ -20,7 +20,7 @@ To attach a file to an issue or pull request conversation, drag and drop it into {% tip %} -**Tip:** If you're using Chrome, you can also copy-and-paste images directly into the box. +**Tip:** If you're using Chrome or Firefox, you can also copy-and-paste images directly into the box. {% endtip %} From 099d6c9748b67fe80ca337404517030688b35b47 Mon Sep 17 00:00:00 2001 From: Kendell R Date: Thu, 22 Oct 2020 10:42:04 -0700 Subject: [PATCH 03/40] Update content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md --- .../file-attachments-on-issues-and-pull-requests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md b/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md index 1fa50b41a0..864c2f72db 100644 --- a/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md +++ b/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md @@ -20,7 +20,7 @@ To attach a file to an issue or pull request conversation, drag and drop it into {% tip %} -**Tip:** If you're using Chrome or Firefox, you can also copy-and-paste images directly into the box. +**Tip:** If you're using Chrome, Firefox, or any Chromium-based browser (like the new Edge), you can also copy-and-paste images directly into the box. {% endtip %} From 7fbda3afb2f9f580bc1f03f61da32e2ec65e11bf Mon Sep 17 00:00:00 2001 From: Kendell R Date: Fri, 23 Oct 2020 15:56:36 -0700 Subject: [PATCH 04/40] Update content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md Co-authored-by: Janice --- .../file-attachments-on-issues-and-pull-requests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md b/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md index 864c2f72db..be06edca14 100644 --- a/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md +++ b/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md @@ -20,7 +20,7 @@ To attach a file to an issue or pull request conversation, drag and drop it into {% tip %} -**Tip:** If you're using Chrome, Firefox, or any Chromium-based browser (like the new Edge), you can also copy-and-paste images directly into the box. +**Tip:** In many browsers, you can copy-and-paste images directly into the box. {% endtip %} From 865d29b13f2f590553417512c5dde4c102511ca7 Mon Sep 17 00:00:00 2001 From: tvachkov <53747873+tvachkov@users.noreply.github.com> Date: Sat, 24 Oct 2020 08:33:17 +0200 Subject: [PATCH 05/40] New changes: git init -b main Aligning the init command to the push command: both are considering "main" instead of "master" --- ...sting-project-to-github-using-the-command-line.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md b/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md index 04c3a57290..2fb8281f18 100644 --- a/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md +++ b/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md @@ -26,7 +26,7 @@ versions: 3. Change the current working directory to your local project. 4. Initialize the local directory as a Git repository. ```shell - $ git init + $ git init -b main ``` 5. Add the files in your new local repository. This stages them for the first commit. ```shell @@ -49,7 +49,7 @@ versions: ``` 9. [Push the changes](/articles/pushing-commits-to-a-remote-repository/) in your local repository to {% data variables.product.product_location %}. ```shell - $ git push -u origin master + $ git push -u origin main # Pushes the changes in your local repository up to the remote repository you specified as the origin ``` @@ -63,7 +63,7 @@ versions: 3. Change the current working directory to your local project. 4. Initialize the local directory as a Git repository. ```shell - $ git init + $ git init -b main ``` 5. Add the files in your new local repository. This stages them for the first commit. ```shell @@ -86,7 +86,7 @@ versions: ``` 9. [Push the changes](/articles/pushing-commits-to-a-remote-repository/) in your local repository to {% data variables.product.product_location %}. ```shell - $ git push origin master + $ git push origin main # Pushes the changes in your local repository up to the remote repository you specified as the origin ``` @@ -100,7 +100,7 @@ versions: 3. Change the current working directory to your local project. 4. Initialize the local directory as a Git repository. ```shell - $ git init + $ git init -b main ``` 5. Add the files in your new local repository. This stages them for the first commit. ```shell @@ -123,7 +123,7 @@ versions: ``` 9. [Push the changes](/articles/pushing-commits-to-a-remote-repository/) in your local repository to {% data variables.product.product_location %}. ```shell - $ git push origin master + $ git push origin main # Pushes the changes in your local repository up to the remote repository you specified as the origin ``` From 1acaa20bc8ece57cced3040e09b33fba8efb3a29 Mon Sep 17 00:00:00 2001 From: Ghassen Rjab Date: Sun, 25 Oct 2020 05:59:32 +0100 Subject: [PATCH 06/40] Fix tags of "Publishing Node.js packages" --- content/actions/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/index.md b/content/actions/index.md index 8df3114639..7d2f2b7304 100644 --- a/content/actions/index.md +++ b/content/actions/index.md @@ -162,7 +162,7 @@ versions:

Publishing Node.js packages

Use GitHub Actions to push your Node.js package to GitHub Packages or npm.

- Java + JavaScript/TypeScript CI
From 533c532fc186a5fa0277012910b69622c3260c26 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Sun, 25 Oct 2020 18:07:33 +0100 Subject: [PATCH 07/40] Fix list Markdown formatting --- content/graphql/guides/forming-calls-with-graphql.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/graphql/guides/forming-calls-with-graphql.md b/content/graphql/guides/forming-calls-with-graphql.md index ff6b2e195a..4f04295aa1 100644 --- a/content/graphql/guides/forming-calls-with-graphql.md +++ b/content/graphql/guides/forming-calls-with-graphql.md @@ -334,9 +334,9 @@ With the ID known, we can proceed with the mutation: Let's examine this line: - - `addReaction` is the name of the mutation. - - `input` is the required argument key. This will always be `input` for a mutation. - - `{subjectId:"MDU6SXNzdWUyMzEzOTE1NTE=",content:HOORAY}` is the required argument value. This will always be an [input object](/v4/input_object/) (hence the curly braces) composed of input fields (`subjectId` and `content` in this case) for a mutation. + - `addReaction` is the name of the mutation. + - `input` is the required argument key. This will always be `input` for a mutation. + - `{subjectId:"MDU6SXNzdWUyMzEzOTE1NTE=",content:HOORAY}` is the required argument value. This will always be an [input object](/v4/input_object/) (hence the curly braces) composed of input fields (`subjectId` and `content` in this case) for a mutation. How do we know which value to use for the content? The [`addReaction` docs](/v4/mutation/addreaction/) tell us the `content` field has the type [`ReactionContent`](/v4/enum/reactioncontent/), which is an [enum](/v4/enum) because only certain emoji reactions are supported on GitHub issues. These are the allowed values for reactions (note some values differ from their corresponding emoji names): From 4bc5e1ca574ec7b0b13066440fe23cfaa87d7533 Mon Sep 17 00:00:00 2001 From: Ashish Date: Mon, 26 Oct 2020 16:37:19 +0530 Subject: [PATCH 08/40] Update about-billing-for-github-actions.md missing single word. --- .../about-billing-for-github-actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md index 3c0da17daa..b3562de799 100644 --- a/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md @@ -51,7 +51,7 @@ The number of jobs you can run concurrently across all repositories in your user At the end of the month, {% data variables.product.prodname_dotcom %} calculates the cost of minutes and storage used over the amount included in your account. For example, if your organization uses {% data variables.product.prodname_team %} and allows unlimited spending, using 15,000 minutes could have a total storage and minute overage cost of $56, depending on the operating systems used to run jobs. - 5,000 (3,000 Linux and 2,000 Windows) minutes = $56 ($24 + $32). - - 3,000 Linux minutes at $0.008 per = $24. + - 3,000 Linux minutes at $0.008 per minute = $24. - 2,000 Windows minutes at $0.016 per minute = $32. At the end of the month, {% data variables.product.prodname_dotcom %} rounds your data transfer to the nearest GB. From 1652960986d87ddb724cfee9c840950ac5ea125a Mon Sep 17 00:00:00 2001 From: hubwriter <54933897+hubwriter@users.noreply.github.com> Date: Mon, 26 Oct 2020 15:12:12 +0000 Subject: [PATCH 09/40] [DSP, already shipped] Use conditioning to revert the dismiss/delete alert changes on GHES (#16211) * Use conditioning to revert dismiss/delete alert changes on GHES * Add new dotcom version text that is also good for GHES * Reinstate original subheading for GHES 2.22 --- ...ode-scanning-alerts-for-your-repository.md | 26 ++++++++++++++++--- ...g-code-scanning-alerts-in-pull-requests.md | 14 ++++++++-- .../code-scanning/click-alert-in-list.md | 2 ++ .../false-positive-fix-codeql.md | 2 +- 4 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 data/reusables/code-scanning/click-alert-in-list.md diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md index 523b1ecc5e..d8dc845a31 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md @@ -1,7 +1,7 @@ --- title: Managing code scanning alerts for your repository shortTitle: Managing alerts -intro: 'You can view, fix, dismiss, or delete alerts for potential vulnerabilities or errors in your project''s code.' +intro: 'You can view, fix, {% if currentVersion == "enterprise-server@2.22" %}or close{% else %}dismiss, or delete{% endif %} alerts for potential vulnerabilities or errors in your project''s code.' product: '{% data reusables.gated-features.code-scanning %}' permissions: 'People with write permission to a repository can manage {% data variables.product.prodname_code_scanning %} alerts for the repository.' versions: @@ -28,7 +28,7 @@ Each alert highlights a problem with the code and the name of the tool that iden If you enable {% data variables.product.prodname_code_scanning %} using {% data variables.product.prodname_codeql %}, this can also detect data-flow problems in your code. Data-flow analysis finds potential security issues in code, such as: using data insecurely, passing dangerous arguments to functions, and leaking sensitive information. -When {% data variables.product.prodname_code_scanning_capc %} reports data-flow alerts, {% data variables.product.prodname_dotcom %} shows you how data moves through the code. {% data variables.product.prodname_code_scanning_capc %} allows you to identify the areas of your code that leak sensitive information, and that could be the entry point for attacks by malicious users. +When {% data variables.product.prodname_code_scanning %} reports data-flow alerts, {% data variables.product.prodname_dotcom %} shows you how data moves through the code. {% data variables.product.prodname_code_scanning_capc %} allows you to identify the areas of your code that leak sensitive information, and that could be the entry point for attacks by malicious users. ### Viewing an alert @@ -48,12 +48,20 @@ Anyone with read permission for a repository can see {% data variables.product.p Anyone with write permission for a repository can fix an alert by committing a correction to the code. If the repository has {% data variables.product.prodname_code_scanning %} scheduled to run on pull requests, it's best to raise a pull request with your correction. This will trigger {% data variables.product.prodname_code_scanning %} analysis of the changes and test that your fix doesn't introduce any new problems. For more information, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)" and "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)." -If you have write permission for a repository, you can view fixed alerts by viewing the summary of alerts and clicking **Closed**. For more information, see "[Viewing an alert](#viewing-an-alert)." The "Closed" list shows fixed alerts and alerts that users have dismissed. +If you have write permission for a repository, you can view fixed alerts by viewing the summary of alerts and clicking **Closed**. For more information, see "[Viewing an alert](#viewing-an-alert)." The "Closed" list shows fixed alerts and alerts that users have {% if currentVersion == "enterprise-server@2.22" %}closed{% else %}dismissed{% endif %}. Alerts may be fixed in one branch but not in another. You can use the "Branch" drop-down menu, on the summary of alerts, to check whether an alert is fixed in a particular branch. ![Filtering alerts by branch](/assets/images/help/repository/code-scanning-branch-filter.png) +{% if currentVersion == "enterprise-server@2.22" %} + +### Closing an alert + +Closing an alert is a way to resolve an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} + +{% else %} + ### Dismissing or deleting alerts There are two ways of closing an alert. You can fix the problem in the code, or you can dismiss the alert. Alternatively, if you have admin permissions for the repository, you can delete alerts. Deleting alerts is useful in situations where you have enabled a {% data variables.product.prodname_code_scanning %} tool and then decided to remove it, or where you have enabled {% data variables.product.prodname_codeql %} analysis with a larger set of queries than you want to continue using, and you've then removed some queries from the tool. In both cases, deleting alerts allows you to clean up your {% data variables.product.prodname_code_scanning %} results. You can delete alerts from the summary list within the **Security** tab. @@ -77,9 +85,19 @@ When you delete an alert: To dismiss or delete alerts: +{% endif %} + {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} +{% if currentVersion == "enterprise-server@2.22" %} +{% data reusables.code-scanning.click-alert-in-list %} +1. Select the **Close** drop-down menu and click a reason for closing the alert. + ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + +{% data reusables.code-scanning.false-positive-fix-codeql %} + +{% else %} 1. If you have admin permissions for the repository, and you want to delete alerts for this {% data variables.product.prodname_code_scanning %} tool, select some or all of the check boxes and click **Delete**. @@ -104,6 +122,8 @@ To dismiss or delete alerts: If a project has multiple alerts that you want to dismiss for the same reason, you can bulk dismiss them from the summary of alerts. Typically, you'll want to filter the list and then dismiss all of the matching alerts. For example, you might want to dismiss all of the current alerts in the project that have been tagged for a particular Common Weakness Enumeration (CWE) vulnerability. +{% endif %} + ### Further reading - "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)" diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md index 49c84a333e..380e5917f1 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md @@ -15,7 +15,7 @@ versions: In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch or protected branches, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." -If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch, and the repository owner has configured required status checks, then you must either fix or dismiss all error alerts before the pull request can be merged. For more information, see "[About required status checks](/github/administering-a-repository/about-required-status-checks)." +If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch, and the repository owner has configured required status checks, then you must either fix or {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} all error alerts before the pull request can be merged. For more information, see "[About required status checks](/github/administering-a-repository/about-required-status-checks)." ![Failed {% data variables.product.prodname_code_scanning %} check on a pull request](/assets/images/help/repository/code-scanning-check-failure.png) @@ -39,10 +39,18 @@ In the detailed view for an alert, some {% data variables.product.prodname_code_ ![Alert description and link to show more information](/assets/images/help/repository/code-scanning-pr-alert.png) -### Fixing an alert on your pull request +### {% if currentVersion == "enterprise-server@2.22" %}Resolving{% else %}Fixing{% endif %} an alert on your pull request Anyone with write permission for a repository can fix a {% data variables.product.prodname_code_scanning %} alert that's identified on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is closed and the annotation removed. +{% if currentVersion == "enterprise-server@2.22" %} + +If you don't think that an alert needs to be fixed, you can close the alert manually. {% data reusables.code-scanning.close-alert-examples %} The **Close** button is available in annotations and in the alerts view if you have write permission for the repository. + +{% data reusables.code-scanning.false-positive-fix-codeql %} + +{% else %} + ### Dismissing an alert on your pull request An alternative way of closing an alert is to dismiss it. You can dismiss an alert if you don't think it needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} If you have write permission for the repository, the **Dismiss** button is available in code annotations and in the alerts summary. When you click **Dismiss** you will be prompted to choose a reason for closing the alert. @@ -54,3 +62,5 @@ An alternative way of closing an alert is to dismiss it. You can dismiss an aler {% data reusables.code-scanning.false-positive-fix-codeql %} For more information about dismissing alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#dismissing-or-deleting-alerts)." + +{% endif %} \ No newline at end of file diff --git a/data/reusables/code-scanning/click-alert-in-list.md b/data/reusables/code-scanning/click-alert-in-list.md new file mode 100644 index 0000000000..314164be42 --- /dev/null +++ b/data/reusables/code-scanning/click-alert-in-list.md @@ -0,0 +1,2 @@ +1. Under "Code scanning," click the alert you'd like to explore. + ![List of alerts from {% data variables.product.prodname_code_scanning %}](/assets/images/help/repository/code-scanning-click-alert.png) diff --git a/data/reusables/code-scanning/false-positive-fix-codeql.md b/data/reusables/code-scanning/false-positive-fix-codeql.md index 116630a498..011f129f12 100644 --- a/data/reusables/code-scanning/false-positive-fix-codeql.md +++ b/data/reusables/code-scanning/false-positive-fix-codeql.md @@ -1 +1 @@ -If you dismiss a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." +If you {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." From 803605cbce17ea0d43e785767af09e9959c76fe3 Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Mon, 26 Oct 2020 15:27:29 +0000 Subject: [PATCH 10/40] Add Dependabot troubleshooting topic (#16139) --- .../dependabot/dependabot-alert-pr-link.png | Bin 0 -> 123339 bytes .../dependabot-security-update-error.png | Bin 0 -> 66018 bytes .../dependabot-tab-view-error-beta.png | Bin 0 -> 46990 bytes .../dependabot-version-update-error-beta.png | Bin 0 -> 90639 bytes ...about-github-dependabot-version-updates.md | 2 +- .../about-securing-your-repository.md | 10 ++- ...ng-pull-requests-for-dependency-updates.md | 4 +- ...bout-alerts-for-vulnerable-dependencies.md | 4 +- ...bout-github-dependabot-security-updates.md | 33 +++++++ ...ilities-in-the-github-advisory-database.md | 1 + ...ring-github-dependabot-security-updates.md | 26 +----- .../index.md | 2 + ...roubleshooting-github-dependabot-errors.md | 82 ++++++++++++++++++ ...he-detection-of-vulnerable-dependencies.md | 6 +- ...nerable-dependencies-in-your-repository.md | 6 +- .../permission-levels-for-an-organization.md | 2 +- ...ure-version.md => automated-tests-note.md} | 2 - .../dependabot/pull-request-introduction.md | 1 + 18 files changed, 144 insertions(+), 37 deletions(-) create mode 100644 assets/images/help/dependabot/dependabot-alert-pr-link.png create mode 100644 assets/images/help/dependabot/dependabot-security-update-error.png create mode 100644 assets/images/help/dependabot/dependabot-tab-view-error-beta.png create mode 100644 assets/images/help/dependabot/dependabot-version-update-error-beta.png create mode 100644 content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md create mode 100644 content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md rename data/reusables/dependabot/{upgrade-dependency-to-minimum-secure-version.md => automated-tests-note.md} (80%) create mode 100644 data/reusables/dependabot/pull-request-introduction.md diff --git a/assets/images/help/dependabot/dependabot-alert-pr-link.png b/assets/images/help/dependabot/dependabot-alert-pr-link.png new file mode 100644 index 0000000000000000000000000000000000000000..03c9de0402a846b5ab04fa5488578173a384744c GIT binary patch literal 123339 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 NsBL_oc<({T{{pYsfcgLc literal 0 HcmV?d00001 diff --git a/assets/images/help/dependabot/dependabot-tab-view-error-beta.png b/assets/images/help/dependabot/dependabot-tab-view-error-beta.png new file mode 100644 index 0000000000000000000000000000000000000000..2b7d81a0f0e248c81fdb967ec5f92425394a660c GIT binary patch literal 46990 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

w2l7qVEN@4;J{mgo2&{RsDFO!#Bqm4l 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 CDd|uE literal 0 HcmV?d00001 diff --git a/assets/images/help/dependabot/dependabot-version-update-error-beta.png b/assets/images/help/dependabot/dependabot-version-update-error-beta.png new file mode 100644 index 0000000000000000000000000000000000000000..656afdc47074d5c4e71a26141008ec5d3c6d11f6 GIT binary patch literal 90639 zcmd@6cTkj1^gf7!2?d3Z3X()ra*`lHKtKV>83rWhFbp|oFo6;!!;sSeLy|D$C<2mU z$U~AGh5<;7?fw{G3qs_jyz>%5)&^y$;j)9p7k71?{lG{gi11o!0S zq%{Z#ZUhk!Tvxb#3y|#j30(f%agx(@B_MdjborN1UW4&3AS7~=SAIvdOiWJp^p)9v ze+{lg@7}w;b$7FIbRj4#?UMsUcijMyw56-L3)smG?C3!7@Xj*^Ku&xqmvVISb^%-4 zxDgbS^@#vd(krQprRinTr*2?-O9Fu-vOB<+JC|QH9j)9vO zCA0vtTbIeSz;1Sy1O?kj76O8&1oF~vwY*ZdW&_`YESoPb63s9_GaqM_e}FpYxPE^u z&qc$@d{>rE`LW2S1^M!aW-NJDzv?5`>xdgv77do7l2t9NwN4`~WMfLP_hZ#%VzP5z zvAJ}9*Q^ku2#+**#8{{KeqLfSC4+YIX{{;V&meIE5m@YAcBF?k`t9Rdb|m(T=dKjc zG9dhYFEvZ|FG_%;yz}&5luY*8?WnI<|5e^S^dZ!mQ^Ai1baR%|iiV>2sf6)O zUl$UC{DQid^*`BJ}tT@k`l5Lc`rt3F9TYD;8-LFV>fpC zuU{oJ*vBywE@SfltIUYyZq{6JF0!5Wv(h}wa$|aef`5NUTZKu!ed2p4Pkxo0z$x4D z!JF9FDohmb-p&>tCj!zVaW}C}5L}BxJ(LuT$H*Z^TbRK|3DRG@j^r8tWwKe@B>#ZL zs{c9GRd}CR$l&NWw#UX56)+VEgUnSv0tp(#U#cb$N`-X-AN^1_)x&j3aO^v~?#ot7 zfl*#Rw&5ZFM$(DPX^{V~kvOq&dMQGaZsfyMm8X9~57o^ZSNVt5W?~6q7|RGcO6A6- zyYTRmp7WvAYNxA@1g}9Ys@Lb4_U*V*qhT@EV=OeW3oc?3OjT%i8e6TH*gTyhip@{v zEAY}pM*5o(WSYyT@AP;$v_8N}Q&@HB;oj3JMzYOGWhJ~=>b`+Q$j$&=kGNXFbI1q- z7^dC^B^T6>;{LXAQg!IAO|j)`IOX^VeZ9-hW-frZjzeiUikTg2ZFS-ya2-V*_JCdq z^nsDhsG(PzpQ-P%`bw#3kERLa_U+1_3}!wQ)`#k09@_(;x6Xw<1N=-2e*LCCCNklV zxRdg}-xr(4Y)_Mpt1>KAd7X1A-(AO9xOt@&=RYvs#qaf!XIpV+bm-HQ#6=i{+Ey^zYpg zs0g=Vd<;K>vaDc#jN{;@hUGaTf*^Z&WZc*nWydFjqxpmUhGAnNFXOAdL-r!ae>2nfPaPPeUgazm2Uf#1 zRv!NbwVj)@my47t<4;J#hChC$`f{}AcXWc-7*fj*_2lw7LHKh?s5YLF^I1a8mKG^| z9fOqmG%nXz>-Ab8LPq+t1MB<953m#!{oOktR;{;boQ7u$+9h%-I>RT}`O(5fuV!}b zHIAhY6DB(!T@Hp+WyN{w6!r=Y{+%zU9-8Bd)h}1rd)Rc;2X37V$PI5(E|HI7!Yu_s z?~!q*+3ze5G0pHY^{EAec)EeH`uplW=c-^mp6Zlv5IRAkUt`Z4+ye=`JD?AWt9<)T zcmsNzqSRE+_yaFz-v_0sC44mnjp4Tc6hWj;T?ry1kx}xI~bp zYHKq2d6=w)50|E(e7xf$xSjkD$@++SShkpcN{mDdOf{^wVp%o6>n*m~1f;G4tLD0_ z=D`PhIoJ`s#>JU7gUxzxFM)WxO+@)I+Rrc1UHQY%lFQ0Y7U;Rt={;)Eb&6?1G`;4uXuoh@nr5(7SE9Q z1jc>?!%05|TN(=Z#><~>4K=wqc8Zl{_;O<|&c*U|G%KbL*&|;%V};TJ%a6@a5?fYA zJx}Hxn{jgun1f#@+5?%YR*ycB8=2WrLS0&*=1v<-?YSiu2M;?3!5a1p!qK$`~sD@lq%0DV~;{VHTB{DsUr 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
9H<-aap6+`ZRFx>yI}k}Gi{WKM{5L%AloI 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 M07*qoM6N<$f|Mv)=>Px# literal 0 HcmV?d00001 diff --git a/content/github/administering-a-repository/about-github-dependabot-version-updates.md b/content/github/administering-a-repository/about-github-dependabot-version-updates.md index 167fff0c42..d765f55cfb 100644 --- a/content/github/administering-a-repository/about-github-dependabot-version-updates.md +++ b/content/github/administering-a-repository/about-github-dependabot-version-updates.md @@ -17,7 +17,7 @@ You enable {% data variables.product.prodname_dependabot_version_updates %} by c When {% data variables.product.prodname_dependabot_short %} identifies an outdated dependency, it raises a pull request to update the manifest to the latest version of the dependency. For vendored dependencies, {% data variables.product.prodname_dependabot_short %} raises a pull request to directly replace the outdated dependency with the new version. You check that your tests pass, review the changelog and release notes included in the pull request summary, and then merge it. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." -If you enable security updates, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +If you enable security updates, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." {% data reusables.dependabot.dependabot-tos %} diff --git a/content/github/administering-a-repository/about-securing-your-repository.md b/content/github/administering-a-repository/about-securing-your-repository.md index dcce1ad09e..63214df232 100644 --- a/content/github/administering-a-repository/about-securing-your-repository.md +++ b/content/github/administering-a-repository/about-securing-your-repository.md @@ -21,10 +21,14 @@ The first step to securing a repository is to set up who can see and modify your Privately discuss and fix security vulnerabilities in your repository's code. You can then publish a security advisory to alert your community to the vulnerability and encourage them to upgrade. For more information, see "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." -- **{% data variables.product.prodname_dependabot_short %} alerts** +- **{% data variables.product.prodname_dependabot_short %} alerts and security updates** - View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" + and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." + +- **{% data variables.product.prodname_dependabot_short %} version updates** + + Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot-version-updates)." - **{% data variables.product.prodname_code_scanning_capc %} alerts** diff --git a/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md index d59bf97cc3..6f93905e1f 100644 --- a/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md +++ b/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md @@ -9,9 +9,9 @@ versions: ### About {% data variables.product.prodname_dependabot %} pull requests -{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot_short %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." +{% data reusables.dependabot.pull-request-introduction %} -When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package management system. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package manager. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." If you have many dependencies to manage, you may want to customize the configuration for each package manager so that pull requests have specific reviewers, assignees, and labels. For more information, see "[Customizing dependency updates](/github/administering-a-repository/customizing-dependency-updates)." diff --git a/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index 734552725a..b6e48cbaec 100644 --- a/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -49,7 +49,7 @@ You can also enable or disable {% data variables.product.prodname_dependabot %} {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert also contains a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."{% endif %} +When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert will also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."{% endif %} {% endif %} {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} @@ -79,6 +79,6 @@ We send security alerts to people with admin permissions in the affected reposit {% if currentVersion == "free-pro-team@latest" %} ### Further reading -- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" +- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" - "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Understanding how {% data variables.product.product_name %} uses and protects your data](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %} diff --git a/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md b/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md new file mode 100644 index 0000000000..4b7addb049 --- /dev/null +++ b/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md @@ -0,0 +1,33 @@ +--- +title: About GitHub Dependabot security updates +intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.' +shortTitle: About Dependabot security updates +versions: + free-pro-team: '*' +--- + +### About {% data variables.product.prodname_dependabot_security_updates %} + +{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot_short %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot_short %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + +{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot_short %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." + +{% note %} + +**Note** + +The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. You will see a {% data variables.product.prodname_dependabot_short %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot_short %} is unable to update an indirect or transitive dependency that is not explicitly defined. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)." + +{% endnote %} + +### About pull requests for security updates + +Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. This includes information about the vulnerability like release notes, changelog entries, and commit details. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_short %} alerts for the repository. + +When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot_short %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot_short %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)." + +{% data reusables.dependabot.automated-tests-note %} + +### About compatibility scores + +{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency. diff --git a/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md b/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md index 19e110d291..4b58d7b897 100644 --- a/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md +++ b/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md @@ -1,6 +1,7 @@ --- title: Browsing security vulnerabilities in the GitHub Advisory Database intro: 'The {% data variables.product.prodname_advisory_database %} allows you to browse or search for vulnerabilities that affect open source projects on {% data variables.product.company_short %}.' +shortTitle: Browsing the Advisory Database versions: free-pro-team: '*' --- diff --git a/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md b/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md index 990601c5bf..2acde31d0a 100644 --- a/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md +++ b/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md @@ -5,30 +5,16 @@ redirect_from: - /articles/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-updates +shortTitle: Configuring Dependabot security updates versions: free-pro-team: '*' --- -### About {% data variables.product.prodname_dependabot_security_updates %} +### About configuring {% data variables.product.prodname_dependabot_security_updates %} -{% data variables.product.prodname_dependabot_short %} monitors security advisories such as the {% data variables.product.prodname_advisory_database %} and [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database) and automatically triggers a pull request when it detects a new vulnerable dependency in the dependency graph of repositories. For more information about the {% data variables.product.prodname_advisory_database %}, see "[About the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database#about-the-github-advisory-database)." +You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_short %} alerts and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." -{% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} - -{% data variables.product.prodname_dependabot_short %} includes a link to the pull request in the alert for the vulnerable dependency. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." - -Each security update contains everything you need to quickly and safely review and merge a proposed fix into your project. This includes information about the vulnerability like release notes, changelog entries, and commit details. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_short %} alerts for the repository. - -When you merge a pull request that contains a security update, the corresponding alert is marked as resolved for your repository. - -{% note %} - -**Note** -{% data variables.product.prodname_dependabot_security_updates %} only resolve security vulnerabilities in the dependencies tracked by your dependency graph. Security updates are not created to resolve vulnerabilities in private registries or packages hosted in private repositories. However, indirect or transitive dependencies are included if they are explicitly defined in a lock file, or similar. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." Additionally, it's important to highlight that {% data variables.product.prodname_dependabot_security_updates %} automatically create pulls requests with proposed fixes to the lock files, for the dependencies detected as vulnerable. - -{% endnote %} - -You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_short %} alerts and the dependency graph. You can disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository or for all repositories owned by your user account or organization. For more information, see "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-github-dependabot-security-updates-for-your-repositories)" below. +You can disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository or for all repositories owned by your user account or organization. For more information, see "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-github-dependabot-security-updates-for-your-repositories)" below. {% data reusables.dependabot.dependabot-tos %} @@ -53,10 +39,6 @@ You can enable {% data variables.product.prodname_dependabot_security_updates %} If security updates are not enabled for your repository and you don't know why, first try enabling them using the instructions given in the procedural sections below. If security updates are still not working, you can [contact support](https://support.github.com/contact). -### About compatibility scores - -{% data variables.product.prodname_dependabot_security_updates %} also include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. We look at previously-passing CI tests from public repositories where we've generated a given security update to learn whether the update causes tests to fail. An update's compatibility score is the percentage of CI runs that passed when updating between relevant versions of the dependency. - ### Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories You can enable or disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository. diff --git a/content/github/managing-security-vulnerabilities/index.md b/content/github/managing-security-vulnerabilities/index.md index 33684e122b..61c09009e1 100644 --- a/content/github/managing-security-vulnerabilities/index.md +++ b/content/github/managing-security-vulnerabilities/index.md @@ -30,7 +30,9 @@ versions: {% link_in_list /about-alerts-for-vulnerable-dependencies %} {% link_in_list /configuring-notifications-for-vulnerable-dependencies %} + {% link_in_list /about-github-dependabot-security-updates %} {% link_in_list /configuring-github-dependabot-security-updates %} {% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %} {% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %} + {% link_in_list /troubleshooting-github-dependabot-errors %} diff --git a/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md b/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md new file mode 100644 index 0000000000..a376ff1995 --- /dev/null +++ b/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md @@ -0,0 +1,82 @@ +--- +title: Troubleshooting GitHub Dependabot errors +intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot_short %}.' +shortTitle: Troubleshooting errors +versions: + free-pro-team: '*' +--- + +{% data reusables.dependabot.beta-note %} + +### About {% data variables.product.prodname_dependabot %} errors + +{% data reusables.dependabot.pull-request-introduction %} + +If anything prevents {% data variables.product.prodname_dependabot_short %} from raising a pull request, this is reported as an error. + +### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot_short %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_short %} alerts view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_short %} alerts** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request. + +![{% data variables.product.prodname_dependabot_short %} alerts view showing a pull request link](/assets/images/help/dependabot/dependabot-alert-pr-link.png) + +There are three reasons why an alert may have no pull request link: + +1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository. +1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file. +1. An error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request. + +If an error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request, you can display details of the error by clicking the alert. + +![{% data variables.product.prodname_dependabot_short %} alert showing the error that blocked the creation of a pull request](/assets/images/help/dependabot/dependabot-security-update-error.png) + +### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot_short %} are listed on the {% data variables.product.prodname_dependabot_short %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot_short %}** tab. + +![{% data variables.product.prodname_dependabot_short %} view showing an error](/assets/images/help/dependabot/dependabot-tab-view-error-beta.png) + +To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed. + +![{% data variables.product.prodname_dependabot_short %} version update error and log ](/assets/images/help/dependabot/dependabot-version-update-error-beta.png) + +### Understanding {% data variables.product.prodname_dependabot_short %} errors + +Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot_short %} configuration files. Consequently, some errors are specific to one type of update. + +#### {% data variables.product.prodname_dependabot_short %} cannot update DEPENDENCY to a non-vulnerable version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository. + +Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem. + +The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." + +#### {% data variables.product.prodname_dependabot_short %} cannot update to the required version as there is already an open pull request for the latest version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version. + +There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +#### {% data variables.product.prodname_dependabot_short %} timed out during its update + +{% data variables.product.prodname_dependabot_short %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out. + +This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot_short %} to review the version update and generate the pull request in the time available. + +If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." + +#### {% data variables.product.prodname_dependabot_short %} cannot open any more pull requests + +There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot_short %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests. + +There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit)." + +The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +### Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually + +If you unblock {% data variables.product.prodname_dependabot_short %}, you can manually trigger a fresh attempt to create a pull request. + +- **Security updates**—display the {% data variables.product.prodname_dependabot_short %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot_short %} security update**. +- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**. diff --git a/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md index 09109cb63f..9926d8bcf2 100644 --- a/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md +++ b/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md @@ -1,6 +1,7 @@ --- title: Troubleshooting the detection of vulnerable dependencies intro: 'If the dependency information reported by {% data variables.product.product_name %} is not what you expected, there are a number of points to consider, and various things you can check.' +shortTitle: Troubleshooting detection versions: free-pro-team: '*' --- @@ -14,9 +15,9 @@ The results of dependency detection reported by {% data variables.product.produc * {% data variables.product.prodname_advisory_database %} is one of the data sources that {% data variables.product.prodname_dotcom %} uses to identify vulnerable dependencies. It's a free, curated database of vulnerability information for common package ecosystems on {% data variables.product.prodname_dotcom %}. It includes both data reported directly to {% data variables.product.prodname_dotcom %} from {% data variables.product.prodname_security_advisories %}, as well as official feeds and community sources. This data is reviewed and curated by {% data variables.product.prodname_dotcom %} to ensure that false or unactionable information is not shared with the development community. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)" and "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." * The dependency graph parses all known package manifest files in a user’s repository. For example, for npm it will parse the _package-lock.json_ file. It constructs a graph of all of the repository’s dependencies and public dependents. This happens when you enable the dependency graph and when anyone pushes to the default branch, and it includes commits that makes changes to a supported manifest format. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." * {% data variables.product.prodname_dependabot_short %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_short %} alerts are aggregated at the repository level, rather than creating one alert per vulnerability. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." -* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive a security alert about a vulnerable dependency in your repository. {% data variables.product.prodname_dotcom %} automatically creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." - {% data variables.product.prodname_dependabot_short %} doesn't scan repositories on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database. + {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database. ### Why don't I get vulnerability alerts for some ecosystems? @@ -97,3 +98,4 @@ When you click to display the alert details, you can see how many vulnerabilitie - "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index bbb866e0cb..d60cba9bf6 100644 --- a/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -4,16 +4,17 @@ intro: 'If {% data variables.product.product_name %} discovers vulnerable depend redirect_from: - /articles/viewing-and-updating-vulnerable-dependencies-in-your-repository permissions: Repository administrators and organization owners can view and update dependencies. +shortTitle: Viewing and updating vulnerable dependencies versions: free-pro-team: '*' --- Your repository's {% data variables.product.prodname_dependabot %} alerts tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}. You can sort the list of alerts using the drop-down menu, and you can click into specific alerts for more details. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." -You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." ### About updates for vulnerable dependencies in your repository -{% data variables.product.product_name %} sends {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} creates a pull request to fix it. {% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} +{% data variables.product.product_name %} sends {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} 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. ### Viewing and updating vulnerable dependencies @@ -35,3 +36,4 @@ You can enable automatic security updates for any repository that uses {% data v - "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" - "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" - "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md index be3bf1afa9..92257d1682 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md +++ b/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md @@ -63,7 +63,7 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | Purchase, install, manage billing for, and cancel {% data variables.product.prodname_marketplace %} apps | **X** | | | | List apps in {% data variables.product.prodname_marketplace %} | **X** | | | | Receive [{% data variables.product.prodname_dependabot_alerts %} about vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) for all of an organization's repositories | **X** | | | -| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)") | **X** | | | +| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | | | [Manage the forking policy](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | | | [Limit activity in public repositories in an organization](/articles/limiting-interactions-in-your-organization) | **X** | | | | Pull (read), push (write), and clone (copy) *all repositories* in the organization | **X** | | | diff --git a/data/reusables/dependabot/upgrade-dependency-to-minimum-secure-version.md b/data/reusables/dependabot/automated-tests-note.md similarity index 80% rename from data/reusables/dependabot/upgrade-dependency-to-minimum-secure-version.md rename to data/reusables/dependabot/automated-tests-note.md index 52127e64ed..1f15a27f8e 100644 --- a/data/reusables/dependabot/upgrade-dependency-to-minimum-secure-version.md +++ b/data/reusables/dependabot/automated-tests-note.md @@ -1,5 +1,3 @@ -The pull request will upgrade the dependency to the minimum possible secure version needed to avoid the vulnerability. - {% note %} **Note:** It's good practice to have automated tests and acceptance processes in place so that checks are carried out before the pull request is merged. This is particularly important if the suggested version to upgrade to contains additional functionality, or a change that breaks your project's code. For more information about continuous integration, see "[About continuous integration](/actions/building-and-testing-code-with-continuous-integration/about-continuous-integration)." diff --git a/data/reusables/dependabot/pull-request-introduction.md b/data/reusables/dependabot/pull-request-introduction.md new file mode 100644 index 0000000000..7494d21059 --- /dev/null +++ b/data/reusables/dependabot/pull-request-introduction.md @@ -0,0 +1 @@ +{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot_short %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." \ No newline at end of file From 03a59f0a9f4017fd99c4045e6b24ad8a2cdf7f19 Mon Sep 17 00:00:00 2001 From: hubwriter <54933897+hubwriter@users.noreply.github.com> Date: Mon, 26 Oct 2020 15:30:29 +0000 Subject: [PATCH 11/40] Update docs to reflect default (#16170) --- .../enabling-code-scanning-for-a-repository.md | 4 ++-- .../triaging-code-scanning-alerts-in-pull-requests.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md index f4cabb2462..897fc3a74f 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md @@ -42,7 +42,7 @@ You decide how you generate {% data variables.product.prodname_code_scanning %} ![Choose where to commit](/assets/images/help/repository/start-commit-choose-where-to-commit.png) 8. Click **Commit new file** or **Propose new file**. -In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch or any protected branches. As a result, {% data variables.product.prodname_code_scanning %} will now commence. +In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch. As a result, {% data variables.product.prodname_code_scanning %} will now commence. ### Viewing the logging output from {% data variables.product.prodname_code_scanning %} @@ -90,7 +90,7 @@ After {% data variables.product.prodname_code_scanning %} has analyzed the code There are other situations where there may be no analysis for the latest commit to the base branch for a pull request. These include: -* The pull request has been raised against a branch other than the default branch or a protected branch, and this branch hasn't been analyzed. +* The pull request has been raised against a branch other than the default branch, and this branch hasn't been analyzed. To check whether a branch has been scanned, go to the {% data variables.product.prodname_code_scanning_capc %} page, click the **Branch** drop-down and select the relevant branch. diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md index 380e5917f1..ab7bf0dbc9 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md @@ -13,9 +13,9 @@ versions: ### About {% data variables.product.prodname_code_scanning %} results on pull requests -In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch or protected branches, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." -If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch, and the repository owner has configured required status checks, then you must either fix or {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} all error alerts before the pull request can be merged. For more information, see "[About required status checks](/github/administering-a-repository/about-required-status-checks)." +If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch that has been enabled for {% data variables.product.prodname_code_scanning %}, and the repository owner has configured required status checks, then you must either fix or {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} all error alerts before the pull request can be merged. For more information, see "[About required status checks](/github/administering-a-repository/about-required-status-checks)." ![Failed {% data variables.product.prodname_code_scanning %} check on a pull request](/assets/images/help/repository/code-scanning-check-failure.png) From 222d419e0f0a7b3a0788f794357b1fe13ff99f5c Mon Sep 17 00:00:00 2001 From: Dirkjan Bussink Date: Mon, 26 Oct 2020 17:19:38 +0100 Subject: [PATCH 12/40] Remove MD5 hostkey references in documentation (#16148) --- .../githubs-ssh-key-fingerprints.md | 7 +------ .../testing-your-ssh-connection.md | 8 -------- .../githubs-ssh-key-fingerprints.md | 7 +------ .../testing-your-ssh-connection.md | 8 -------- .../githubs-ssh-key-fingerprints.md | 7 +------ .../testing-your-ssh-connection.md | 8 -------- .../githubs-ssh-key-fingerprints.md | 7 +------ .../testing-your-ssh-connection.md | 8 -------- .../githubs-ssh-key-fingerprints.md | 7 +------ .../testing-your-ssh-connection.md | 8 -------- .../githubs-ssh-key-fingerprints.md | 7 +------ .../testing-your-ssh-connection.md | 8 -------- .../githubs-ssh-key-fingerprints.md | 7 +------ .../testing-your-ssh-connection.md | 8 -------- .../githubs-ssh-key-fingerprints.md | 7 +------ .../testing-your-ssh-connection.md | 8 -------- 16 files changed, 8 insertions(+), 112 deletions(-) diff --git a/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index 007a22af6d..309b4e69c1 100644 --- a/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,12 +9,7 @@ versions: free-pro-team: '*' --- -These are {% data variables.product.prodname_dotcom %}'s public key fingerprints (in hexadecimal format): - -- `16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48` (RSA) -- `ad:1c:08:a4:40:e3:6f:9c:f5:66:26:5d:4b:33:5d:8c` (DSA) - -These are the SHA256 hashes shown in OpenSSH 6.8 and newer (in base64 format): +These are {% data variables.product.prodname_dotcom %}'s public key fingerprints: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/content/github/authenticating-to-github/testing-your-ssh-connection.md b/content/github/authenticating-to-github/testing-your-ssh-connection.md index b70b2278b2..a1b6502337 100644 --- a/content/github/authenticating-to-github/testing-your-ssh-connection.md +++ b/content/github/authenticating-to-github/testing-your-ssh-connection.md @@ -24,14 +24,6 @@ When you test your connection, you'll need to authenticate this action using you You may see a warning like this: - ```shell - > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. - > RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. - > Are you sure you want to continue connecting (yes/no)? - ``` - - or like this: - ```shell > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. > RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8. diff --git a/translations/de-DE/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/de-DE/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index e17a75f598..798c333ccd 100644 --- a/translations/de-DE/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/de-DE/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,12 +9,7 @@ versions: free-pro-team: '*' --- -Dies sind die öffentlichen Schlüssel-Fingerprints von {% data variables.product.prodname_dotcom %} (im Hexadezimalformat): - -- `16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48` (RSA) -- `ad:1c:08:a4:40:e3:6f:9c:f5:66:26:5d:4b:33:5d:8c` (DSA) - -Dies sind die SHA256-Hashes, die in OpenSSH 6.8 und höher angezeigt werden (im base64-Format): +Dies sind die öffentlichen Schlüssel-Fingerprints von {% data variables.product.prodname_dotcom %}: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/de-DE/content/github/authenticating-to-github/testing-your-ssh-connection.md b/translations/de-DE/content/github/authenticating-to-github/testing-your-ssh-connection.md index 5aefc509ff..e355a014a5 100644 --- a/translations/de-DE/content/github/authenticating-to-github/testing-your-ssh-connection.md +++ b/translations/de-DE/content/github/authenticating-to-github/testing-your-ssh-connection.md @@ -24,14 +24,6 @@ Für den Test Deiner Verbindung musst Du diese Aktion mit Deinem Passwort authen Eventuell erhälst Du eine Warnung wie die folgende: - ```shell - > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. - > RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. - > Are you sure you want to continue connecting (yes/no)? - ``` - - oder wie diese: - ```shell > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. > RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8. diff --git a/translations/es-XL/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/es-XL/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index eba603ea79..759f2f7512 100644 --- a/translations/es-XL/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/es-XL/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,12 +9,7 @@ versions: free-pro-team: '*' --- -Estas son las huellas digitales de clave pública de {% data variables.product.prodname_dotcom %} (en formato hexadecimal): - -- `16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48` (RSA) -- `ad:1c:08:a4:40:e3:6f:9c:f5:66:26:5d:4b:33:5d:8c` (DSA) - -Estos son los hashes SHA256 que se muestran en OpenSSH 6.8 y versiones posteriores (en formato base64): +Estas son las huellas digitales de clave pública de {% data variables.product.prodname_dotcom %}: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/es-XL/content/github/authenticating-to-github/testing-your-ssh-connection.md b/translations/es-XL/content/github/authenticating-to-github/testing-your-ssh-connection.md index 7d5a7fcd0e..4bbfd236c7 100644 --- a/translations/es-XL/content/github/authenticating-to-github/testing-your-ssh-connection.md +++ b/translations/es-XL/content/github/authenticating-to-github/testing-your-ssh-connection.md @@ -24,14 +24,6 @@ Cuando pruebes tu conexión, tendrás que autenticar esta acción utilizando tu Puedes ver una advertencia como la siguiente: - ```shell - > La autenticidad del host '{% data variables.command_line.codeblock %} (DIRECCIÓN IP)' no se puede establecer. - > La clave de huella digital RSA es 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. - > ¿Estás seguro de que quieres continuar conectado (sí/no)? - ``` - - o como la siguiente: - ```shell > La autenticidad del host '{% data variables.command_line.codeblock %} (DIRECCIÓN IP)' no se puede establecer. > La clave de huella digital RSA es SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8. diff --git a/translations/ja-JP/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/ja-JP/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index 4b85a5dfea..ae4767e0ba 100644 --- a/translations/ja-JP/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/ja-JP/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,12 +9,7 @@ versions: free-pro-team: '*' --- -{% data variables.product.prodname_dotcom %} のパブリックキーフィンガープリントを以下に示します (16 進形式): - -- `16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48` (RSA) -- `ad:1c:08:a4:40:e3:6f:9c:f5:66:26:5d:4b:33:5d:8c` (DSA) - -OpenSSH 6.8 以降で表示される SHA256 ハッシュを次に示します (base64 形式): +{% data variables.product.prodname_dotcom %} のパブリックキーフィンガープリントを以下に示します: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/ja-JP/content/github/authenticating-to-github/testing-your-ssh-connection.md b/translations/ja-JP/content/github/authenticating-to-github/testing-your-ssh-connection.md index 5fb9890937..916809879e 100644 --- a/translations/ja-JP/content/github/authenticating-to-github/testing-your-ssh-connection.md +++ b/translations/ja-JP/content/github/authenticating-to-github/testing-your-ssh-connection.md @@ -24,14 +24,6 @@ SSH 接続をテストする前に、次のことを済ませておく必要が 以下のような警告が表示される場合があります: - ```shell - > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. - > RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. - > Are you sure you want to continue connecting (yes/no)? - ``` - - また、以下のように表示される場合もあります: - ```shell > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. > RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8. diff --git a/translations/ko-KR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/ko-KR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index 007a22af6d..309b4e69c1 100644 --- a/translations/ko-KR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/ko-KR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,12 +9,7 @@ versions: free-pro-team: '*' --- -These are {% data variables.product.prodname_dotcom %}'s public key fingerprints (in hexadecimal format): - -- `16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48` (RSA) -- `ad:1c:08:a4:40:e3:6f:9c:f5:66:26:5d:4b:33:5d:8c` (DSA) - -These are the SHA256 hashes shown in OpenSSH 6.8 and newer (in base64 format): +These are {% data variables.product.prodname_dotcom %}'s public key fingerprints: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/ko-KR/content/github/authenticating-to-github/testing-your-ssh-connection.md b/translations/ko-KR/content/github/authenticating-to-github/testing-your-ssh-connection.md index b70b2278b2..a1b6502337 100644 --- a/translations/ko-KR/content/github/authenticating-to-github/testing-your-ssh-connection.md +++ b/translations/ko-KR/content/github/authenticating-to-github/testing-your-ssh-connection.md @@ -24,14 +24,6 @@ When you test your connection, you'll need to authenticate this action using you You may see a warning like this: - ```shell - > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. - > RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. - > Are you sure you want to continue connecting (yes/no)? - ``` - - or like this: - ```shell > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. > RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8. diff --git a/translations/pt-BR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/pt-BR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index 111eaf040c..c43ad06c94 100644 --- a/translations/pt-BR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/pt-BR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,12 +9,7 @@ versions: free-pro-team: '*' --- -Estas são as impressões digitais da chave pública do {% data variables.product.prodname_dotcom %} (em formato hexadecimal): - -- `16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48` (RSA) -- `ad:1c:08:a4:40:e3:6f:9c:f5:66:26:5d:4b:33:5d:8c` (DSA) - -Estas são as hashes apresentadas no OpenSSH 6.8 e posterior (no formato base64): +Estas são as impressões digitais da chave pública do {% data variables.product.prodname_dotcom %}: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/pt-BR/content/github/authenticating-to-github/testing-your-ssh-connection.md b/translations/pt-BR/content/github/authenticating-to-github/testing-your-ssh-connection.md index 31dd5c0229..5586b1f6c1 100644 --- a/translations/pt-BR/content/github/authenticating-to-github/testing-your-ssh-connection.md +++ b/translations/pt-BR/content/github/authenticating-to-github/testing-your-ssh-connection.md @@ -24,14 +24,6 @@ Quando você testar a conexão, precisará autenticar essa ação usando sua sen Você poderá receber um aviso como este: - ```shell - > Não é possível estabelecer a autenticidade do host '{% data variables.command_line.codeblock %} (IP ADDRESS)'. - > A impressão digital da chave RSA é 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. - > Tem certeza de que deseja continuar com a conexão (sim/não)? - ``` - - ou como este: - ```shell > Não é possível estabelecer a autenticidade do host '{% data variables.command_line.codeblock %} (IP ADDRESS)'. > A impressão digital da chave RSA é SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8. diff --git a/translations/ru-RU/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/ru-RU/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index 007a22af6d..309b4e69c1 100644 --- a/translations/ru-RU/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/ru-RU/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,12 +9,7 @@ versions: free-pro-team: '*' --- -These are {% data variables.product.prodname_dotcom %}'s public key fingerprints (in hexadecimal format): - -- `16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48` (RSA) -- `ad:1c:08:a4:40:e3:6f:9c:f5:66:26:5d:4b:33:5d:8c` (DSA) - -These are the SHA256 hashes shown in OpenSSH 6.8 and newer (in base64 format): +These are {% data variables.product.prodname_dotcom %}'s public key fingerprints: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/ru-RU/content/github/authenticating-to-github/testing-your-ssh-connection.md b/translations/ru-RU/content/github/authenticating-to-github/testing-your-ssh-connection.md index b70b2278b2..a1b6502337 100644 --- a/translations/ru-RU/content/github/authenticating-to-github/testing-your-ssh-connection.md +++ b/translations/ru-RU/content/github/authenticating-to-github/testing-your-ssh-connection.md @@ -24,14 +24,6 @@ When you test your connection, you'll need to authenticate this action using you You may see a warning like this: - ```shell - > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. - > RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. - > Are you sure you want to continue connecting (yes/no)? - ``` - - or like this: - ```shell > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. > RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8. diff --git a/translations/zh-CN/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/zh-CN/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index 821dc9d957..1db4958f93 100644 --- a/translations/zh-CN/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/zh-CN/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,12 +9,7 @@ versions: free-pro-team: '*' --- -以下是 {% data variables.product.prodname_dotcom %} 的公钥指纹（十六进制格式）： - -- `16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48` (RSA) -- `ad:1c:08:a4:40:e3:6f:9c:f5:66:26:5d:4b:33:5d:8c` (DSA) - -以下是 OpenSSH 6.8 和更新版本中显示的 SHA256 哈希（base64 格式）： +以下是 {% data variables.product.prodname_dotcom %} 的公钥指纹 ： - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/zh-CN/content/github/authenticating-to-github/testing-your-ssh-connection.md b/translations/zh-CN/content/github/authenticating-to-github/testing-your-ssh-connection.md index fa9f2c333b..84794c469c 100644 --- a/translations/zh-CN/content/github/authenticating-to-github/testing-your-ssh-connection.md +++ b/translations/zh-CN/content/github/authenticating-to-github/testing-your-ssh-connection.md @@ -24,14 +24,6 @@ versions: 您可能会看到类似如下的警告： - ```shell - > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. - > RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. - > Are you sure you want to continue connecting (yes/no)? - ``` - - 或类似如下： - ```shell > The authenticity of host '{% data variables.command_line.codeblock %} (IP ADDRESS)' can't be established. > RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8. From 93849795e05dfafa1d19f5ebb84565d899d9120c Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Mon, 26 Oct 2020 10:18:42 -0700 Subject: [PATCH 13/40] Record redirect events (#16181) * Record redirect events * Update index.js * Update record-redirect.js * Only run when it can send to Hydro * Update record-redirect.js --- lib/hydro.js | 7 +++++++ middleware/index.js | 5 +++-- middleware/record-redirect.js | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 middleware/record-redirect.js diff --git a/lib/hydro.js b/lib/hydro.js index 6ef062e7e7..2f246a09d9 100644 --- a/lib/hydro.js +++ b/lib/hydro.js @@ -21,6 +21,13 @@ module.exports = class Hydro { this.schemas = SCHEMAS } + /** + * Can check if it can actually send to Hydro + */ + maySend () { + return Boolean(this.secret && this.endpoint) + } + /** * Generate a SHA256 hash of the payload using the secret * to authenticate with Hydro diff --git a/middleware/index.js b/middleware/index.js index 225abb7c89..98106e419c 100644 --- a/middleware/index.js +++ b/middleware/index.js @@ -16,6 +16,9 @@ module.exports = function (app) { app.use(require('morgan')('dev', { skip: (req, res) => !isDevelopment })) app.use(require('./rate-limit')) if (isDevelopment) app.use(require('./webpack')) + app.use(require('./cookie-parser')) + app.use(require('./req-utils')) + app.use(require('./record-redirect')) app.use(require('./redirects/external')) app.use(require('./redirects/help-to-docs')) app.use(require('./set-fastly-cache-headers')) @@ -24,9 +27,7 @@ module.exports = function (app) { app.use(require('./cors')) app.use(require('./csp')) app.use(require('helmet')()) - app.use(require('./req-utils')) app.use(require('./robots')) - app.use(require('./cookie-parser')) app.use(express.json()) // Must come before ./csrf app.use(require('./csrf')) app.use(require('./handle-csrf-errors')) diff --git a/middleware/record-redirect.js b/middleware/record-redirect.js new file mode 100644 index 0000000000..564f0d37d6 --- /dev/null +++ b/middleware/record-redirect.js @@ -0,0 +1,27 @@ +const { v4: uuidv4 } = require('uuid') +const { inRange } = require('lodash') + +module.exports = function (req, res, next) { + if (!req.hydro.maySend()) return next() + + res.on('finish', async function recordRedirect () { + if (!inRange(res.statusCode, 300, 400)) return + const schemaName = req.hydro.schemas.redirect + const redirectEvent = { + context: { + user: req.cookies['_docs-events'] || uuidv4(), + event_id: uuidv4(), + version: '1.0.0', + created: new Date().toISOString(), + path: req.path, + referrer: req.get('referer') + }, + redirect_from: req.originalUrl, + redirect_to: res.get('location') + } + const hydroRes = await req.hydro.publish(schemaName, redirectEvent) + if (!hydroRes.ok) console.log('Failed to record redirect to Hydro') + }) + + return next() +} From 73e445de556a0453b105f6611f7b9c96cd060c85 Mon Sep 17 00:00:00 2001 From: Jason Etcovitch Date: Mon, 26 Oct 2020 15:04:57 -0400 Subject: [PATCH 14/40] Updoot liquid and render-content (#16215) --- package-lock.json | 40 ++++++++++++++++++++-------------------- package.json | 4 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3ac9cb1d9c..63ae8cf871 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1131,9 +1131,9 @@ } }, "@github-docs/render-content": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@github-docs/render-content/-/render-content-5.1.0.tgz", - "integrity": "sha512-d0Is3zPvumal5MYRYcZv0X2jwzEV3e5/OTwWTi2s9ZVWK53TwoHvO0r+I2Z0XQfHDKZgM6V0h2lZhRIJxcYsMg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@github-docs/render-content/-/render-content-5.2.0.tgz", + "integrity": "sha512-/rrDSvspp+xRn7xHD+0Wv7oobn8yw8qx1BN7rpoS2PpNIgmd9QBNW8m8aS8CI2Y41BF7wPSDvxxx8EYoKsXlDQ==", "requires": { "@primer/octicons": "^11.0.0", "cheerio": "^1.0.0-rc.3", @@ -1141,7 +1141,7 @@ "hastscript": "^6.0.0", "html-entities": "^1.2.1", "hubdown": "^2.6.0", - "liquid": "^5.0.0", + "liquid": "^5.1.0", "parse5": "^6.0.1", "remark-code-extra": "^1.0.1", "semver": "^5.7.1", @@ -4206,7 +4206,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "requires": { "buffer-xor": "^1.0.3", @@ -4240,7 +4240,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "requires": { "bn.js": "^4.1.0", @@ -5657,7 +5657,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "requires": { "cipher-base": "^1.0.1", @@ -5669,7 +5669,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "requires": { "cipher-base": "^1.0.3", @@ -6396,7 +6396,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "requires": { "bn.js": "^4.1.0", @@ -9958,9 +9958,9 @@ "integrity": "sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg==" }, "highlight.js": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.2.1.tgz", - "integrity": "sha512-A+sckVPIb9zQTUydC9lpRX1qRFO/N0OKEh0NwIr65ckvWA/oMY8v9P3+kGRK3w2ULSh9E8v5MszXafodQ6039g==" + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.1.tgz", + "integrity": "sha512-jeW8rdPdhshYKObedYg5XGbpVgb1/DT4AHvDFXhkU7UnGSIjy9kkJ7zHG7qplhFHMitTSzh5/iClKQk3Kb2RFQ==" }, "highlightjs-graphql": { "version": "1.0.2", @@ -14953,9 +14953,9 @@ "dev": true }, "liquid": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/liquid/-/liquid-5.0.0.tgz", - "integrity": "sha512-lpoE6D+nLSn4W0SwdV1B2EWX+DXFeroSAFk29+XLyO9Y+/k9yRZ4SyoGQCcAHw9kt/G6D/nJaHlStZbbknpsUg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/liquid/-/liquid-5.1.0.tgz", + "integrity": "sha512-bL1FuJSqKsmk4UVTiWnxpyuwR70YOJnV3eSztEVe3MbsHB+f9FsEPaSRM1upVJLxTQyv9A+FP5tZhoQq3S7EWQ==", "requires": { "strftime": "~0.9.2" }, @@ -15144,12 +15144,12 @@ "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" }, "lowlight": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.15.0.tgz", - "integrity": "sha512-GhG/R+2zt5Wg8kCfOhapH8wDdJSHSIvdDW/DOPXCeResVqgHYLnOHBp6g9DoUIPVIyBpvQYCG4SV7XeelYFpyA==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.16.0.tgz", + "integrity": "sha512-ECLdzIJvBEjK4ef51sWiGZyz21yx4IEPaF/62DRxLehoOHkWqN3OsLB1GUMfc6Mcf87rR5eW7z6lI9cNEXZDsQ==", "requires": { "fault": "^1.0.0", - "highlight.js": "~10.2.0" + "highlight.js": "~10.3.0" } }, "lru-cache": { @@ -19071,7 +19071,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "requires": { "inherits": "^2.0.1", diff --git a/package.json b/package.json index 8368be49c1..a7dd3bbd09 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@babel/runtime": "^7.11.2", "@github-docs/data-directory": "^1.2.0", "@github-docs/frontmatter": "^1.3.1", - "@github-docs/render-content": "^5.1.0", + "@github-docs/render-content": "^5.2.0", "@github/rest-api-operations": "^3.1.4", "@octokit/rest": "^16.38.1", "@primer/css": "^15.1.0", @@ -50,7 +50,7 @@ "js-cookie": "^2.2.1", "js-yaml": "^3.14.0", "lil-env-thing": "^1.0.0", - "liquid": "^5.0.0", + "liquid": "^5.1.0", "lodash": "^4.17.19", "mini-css-extract-plugin": "^0.9.0", "mkdirp": "^1.0.3", From d743ff9512e5c3b2d6eec5aea7b4cc7bffb0f09c Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Mon, 26 Oct 2020 14:17:49 -0700 Subject: [PATCH 15/40] Remove more Google Analytics references (#16194) --- includes/footer.html | 24 +++++++++---------- javascripts/search.js | 8 +++---- middleware/csp.js | 5 +--- tests/rendering/server.js | 2 -- .../top-developer-site-path-redirects.js | 2 +- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/includes/footer.html b/includes/footer.html index 23d9d70d36..062c88a8c2 100644 --- a/includes/footer.html +++ b/includes/footer.html @@ -2,29 +2,29 @@

    - {% for link in gettingStartedLinks %} + {% for link in featuredLinks.gettingStarted %}
  • {% include featured-link %}
    • {% endfor %}
diff --git a/content/index.md b/content/index.md index 1800e3661d..c915b6dd27 100644 --- a/content/index.md +++ b/content/index.md @@ -1,16 +1,17 @@ --- title: '{% data variables.product.product_name %}{% if currentVersion == "free-pro-team@latest" %}.com{% endif %} Help Documentation' -gettingStartedLinks: - - /github/getting-started-with-github/set-up-git - - /github/authenticating-to-github/connecting-to-github-with-ssh - - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github - - /github/writing-on-github/basic-writing-and-formatting-syntax -popularLinks: - - /github/collaborating-with-issues-and-pull-requests/about-pull-requests - - /github/authenticating-to-github - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - - /github/using-git/managing-remote-repositories - - /github/working-with-github-pages +featuredLinks: + gettingStarted: + - /github/getting-started-with-github/set-up-git + - /github/authenticating-to-github/connecting-to-github-with-ssh + - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github + - /github/writing-on-github/basic-writing-and-formatting-syntax + popular: + - /github/collaborating-with-issues-and-pull-requests/about-pull-requests + - /github/authenticating-to-github + - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /github/using-git/managing-remote-repositories + - /github/working-with-github-pages versions: '*' --- diff --git a/content/insights/index.md b/content/insights/index.md index 552ed3fe31..068ac882f7 100644 --- a/content/insights/index.md +++ b/content/insights/index.md @@ -2,14 +2,15 @@ title: GitHub Insights Documentation shortTitle: GitHub Insights intro: 'Understand and improve your software delivery process through data with {% data variables.product.prodname_insights %}. You can view customized reports based on data from {% data variables.product.prodname_enterprise %}.' -gettingStartedLinks: - - /insights/installing-and-configuring-github-insights/about-github-insights - - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights - - /insights/installing-and-configuring-github-insights/installing-github-insights - - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports -popularLinks: - - /insights/installing-and-configuring-github-insights/about-data-in-github-insights - - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights +featuredLinks: + gettingStarted: + - /insights/installing-and-configuring-github-insights/about-github-insights + - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights + - /insights/installing-and-configuring-github-insights/installing-github-insights + - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports + popular: + - /insights/installing-and-configuring-github-insights/about-data-in-github-insights + - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights redirect_from: - /github/installing-and-configuring-github-insights versions: diff --git a/content/packages/index.md b/content/packages/index.md index 8fc138d889..e00d89f22a 100644 --- a/content/packages/index.md +++ b/content/packages/index.md @@ -2,18 +2,19 @@ title: GitHub Packages Documentation shortTitle: GitHub Packages intro: 'Learn to safely publish and consume packages, store your packages alongside your code, and share your packages privately with your team or publicly with the open source community. You can also automate your packages with {% data variables.product.prodname_actions %}.' -gettingStartedLinks: - - /packages/publishing-and-managing-packages/about-github-packages - - /packages/getting-started-with-github-container-registry/about-github-container-registry - - /packages/getting-started-with-github-container-registry - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/publishing-and-managing-packages/publishing-a-package - - /packages/publishing-and-managing-packages/installing-a-package -popularLinks: - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions +featuredLinks: + gettingStarted: + - /packages/publishing-and-managing-packages/about-github-packages + - /packages/getting-started-with-github-container-registry/about-github-container-registry + - /packages/getting-started-with-github-container-registry + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/publishing-and-managing-packages/publishing-a-package + - /packages/publishing-and-managing-packages/installing-a-package + popular: + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions redirect_from: - /github/managing-packages-with-github-packages - /categories/managing-packages-with-github-package-registry diff --git a/includes/article.html b/includes/article.html index 8719e347a9..e448c18d8f 100644 --- a/includes/article.html +++ b/includes/article.html @@ -63,7 +63,7 @@
- {% if gettingStartedLinks and popularLinks %} + {% if featuredLinks.gettingStarted and featuredLinks.popular %} {% include featured-links %} {% endif %} {{ renderedPage }} diff --git a/includes/featured-links.html b/includes/featured-links.html index acd7c395a7..6fdbebc2fb 100644 --- a/includes/featured-links.html +++ b/includes/featured-links.html @@ -7,7 +7,7 @@

{% data ui.toc.getting_started %}

- {% for link in gettingStartedLinks %} + {% for link in featuredLinks.gettingStarted %} {% include featured-link %} {% endfor %} @@ -18,7 +18,7 @@

{% data ui.toc.popular_articles %}

- {% for link in popularLinks %} + {% for link in featuredLinks.popular %} {% include featured-link %} {% endfor %} diff --git a/lib/frontmatter.js b/lib/frontmatter.js index f3e79a5325..888cda357f 100644 --- a/lib/frontmatter.js +++ b/lib/frontmatter.js @@ -52,15 +52,6 @@ const schema = { redirect_from: { type: ['array', 'string'] }, - gettingStartedLinks: { - type: 'array' - }, - popularLinks: { - type: 'array' - }, - guideLinks: { - type: 'array' - }, allowTitleToDifferFromFilename: { type: 'boolean' }, @@ -70,6 +61,16 @@ const schema = { quickstart: { type: 'string' }, learn: { type: 'string' } } + }, + featuredLinks: { + type: 'object', + additionalProperties: false, + patternProperties: { + '^[a-zA-Z-_]+$': { + type: 'array', + items: { type: 'string' } + } + } } } } diff --git a/lib/page.js b/lib/page.js index ef77844b6d..d08729b004 100644 --- a/lib/page.js +++ b/lib/page.js @@ -59,15 +59,6 @@ class Page { this.rawProduct = this.product this.rawPermissions = this.permissions - // Store raw data so we can access/modify it later in middleware - this.rawGettingStartedLinks = this.gettingStartedLinks - this.rawPopularLinks = this.popularLinks - this.rawGuideLinks = this.guideLinks - // Do not need to keep the original props - delete this.gettingStartedLinks - delete this.popularLinks - delete this.guideLinks - // a page should only be available in versions that its parent product is available in const versionsParentProductIsNotAvailableIn = getApplicableVersions(this.versions, this.fullPath) // only the homepage will not have this.parentProduct diff --git a/middleware/featured-links.js b/middleware/featured-links.js index b75f24b018..d8851c2020 100644 --- a/middleware/featured-links.js +++ b/middleware/featured-links.js @@ -8,9 +8,12 @@ module.exports = async (req, res, next) => { if (!(req.context.page.relativePath.endsWith('index.md') || req.context.page.layout === 'product-landing')) return next() - req.context.gettingStartedLinks = await getLinkData(req.context.page.rawGettingStartedLinks, req.context) - req.context.popularLinks = await getLinkData(req.context.page.rawPopularLinks, req.context) - req.context.guideLinks = await getLinkData(req.context.page.rawGuideLinks, req.context) + if (!req.context.page.featuredLinks) return next() + + req.context.featuredLinks = {} + for (const key in req.context.page.featuredLinks) { + req.context.featuredLinks[key] = await getLinkData(req.context.page.featuredLinks[key], req.context) + } return next() } diff --git a/tests/content/featured-links.js b/tests/content/featured-links.js index 4605fd2110..21f010871a 100644 --- a/tests/content/featured-links.js +++ b/tests/content/featured-links.js @@ -3,7 +3,7 @@ const enterpriseServerReleases = require('../../lib/enterprise-server-releases') const japaneseCharacters = require('japanese-characters') const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version') -describe('gettingStartedLinks and popularLinks', () => { +describe('featuredLinks', () => { jest.setTimeout(3 * 60 * 1000) describe('rendering', () => { @@ -55,7 +55,7 @@ describe('gettingStartedLinks and popularLinks', () => { describe('context.page object', () => { test('returns modified array of links', async () => { - const gettingStartedLinks = await getJSON('/en?json=gettingStartedLinks') + const gettingStartedLinks = await getJSON('/en?json=featuredLinks.gettingStarted') const expectedFirstLink = { href: `/en/${nonEnterpriseDefaultVersion}/github/getting-started-with-github/set-up-git`, title: 'Set up Git' @@ -66,7 +66,7 @@ describe('gettingStartedLinks and popularLinks', () => { }) test('returns raw array of links on the page object', async () => { - const rawGettingStartedLinks = await getJSON('/en?json=page.rawGettingStartedLinks') + const rawGettingStartedLinks = await getJSON('/en?json=page.featuredLinks.gettingStarted') expect(rawGettingStartedLinks[0]).toEqual('/github/getting-started-with-github/set-up-git') }) }) diff --git a/translations/de-DE/content/actions/index.md b/translations/de-DE/content/actions/index.md index 7d6700497d..b486e5addf 100644 --- a/translations/de-DE/content/actions/index.md +++ b/translations/de-DE/content/actions/index.md @@ -2,15 +2,16 @@ title: Dokumentation zu GitHub Actions shortTitle: GitHub Actions intro: 'Mit {% data variables.product.prodname_actions %} kannst Du Deine Softwareentwicklungs-Workflows direkt in Ihrem Repository automatisieren, anpassen und ausführen. Du kannst Actions entdecken, erstellen und weitergeben, um beliebige Aufträge (einschließlich CI/CD) auszuführen. Du kannst auch Actions in einem vollständig angepassten Workflow kombinieren.' -gettingStartedLinks: - - /actions/quickstart - - /actions/learn-github-actions -guideLinks: - - /actions/managing-workflow-runs - - /actions/hosting-your-own-runners -popularLinks: - - /actions/reference/workflow-syntax-for-github-actions - - /actions/reference/events-that-trigger-workflows +featuredLinks: + gettingStarted: + - /actions/quickstart + - /actions/learn-github-actions + guide: + - /actions/managing-workflow-runs + - /actions/hosting-your-own-runners + popular: + - /actions/reference/workflow-syntax-for-github-actions + - /actions/reference/events-that-trigger-workflows redirect_from: - /articles/automating-your-workflow-with-github-actions/ - /articles/customizing-your-project-with-github-actions/ @@ -39,7 +40,7 @@ versions:

{% data ui.toc.getting_started %}

    - {% for link in gettingStartedLinks %} + {% for link in featuredLinks.gettingStarted %}
  • {% include featured-link %}
    • {% endfor %}
@@ -50,7 +51,7 @@ versions:

{% data ui.toc.popular_articles %}

    - {% for link in popularLinks %} + {% for link in featuredLinks.popular %}
  • {% include featured-link %}
    • {% endfor %}
@@ -61,7 +62,7 @@ versions:

Manage workflows

    - {% for link in guideLinks %} + {% for link in featuredLinks.guide %}
  • {% include featured-link %}
    • {% endfor %}
diff --git a/translations/de-DE/content/index.md b/translations/de-DE/content/index.md index 1800e3661d..c915b6dd27 100644 --- a/translations/de-DE/content/index.md +++ b/translations/de-DE/content/index.md @@ -1,16 +1,17 @@ --- title: '{% data variables.product.product_name %}{% if currentVersion == "free-pro-team@latest" %}.com{% endif %} Help Documentation' -gettingStartedLinks: - - /github/getting-started-with-github/set-up-git - - /github/authenticating-to-github/connecting-to-github-with-ssh - - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github - - /github/writing-on-github/basic-writing-and-formatting-syntax -popularLinks: - - /github/collaborating-with-issues-and-pull-requests/about-pull-requests - - /github/authenticating-to-github - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - - /github/using-git/managing-remote-repositories - - /github/working-with-github-pages +featuredLinks: + gettingStarted: + - /github/getting-started-with-github/set-up-git + - /github/authenticating-to-github/connecting-to-github-with-ssh + - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github + - /github/writing-on-github/basic-writing-and-formatting-syntax + popular: + - /github/collaborating-with-issues-and-pull-requests/about-pull-requests + - /github/authenticating-to-github + - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /github/using-git/managing-remote-repositories + - /github/working-with-github-pages versions: '*' --- diff --git a/translations/de-DE/content/insights/index.md b/translations/de-DE/content/insights/index.md index 552ed3fe31..068ac882f7 100644 --- a/translations/de-DE/content/insights/index.md +++ b/translations/de-DE/content/insights/index.md @@ -2,14 +2,15 @@ title: GitHub Insights Documentation shortTitle: GitHub Insights intro: 'Understand and improve your software delivery process through data with {% data variables.product.prodname_insights %}. You can view customized reports based on data from {% data variables.product.prodname_enterprise %}.' -gettingStartedLinks: - - /insights/installing-and-configuring-github-insights/about-github-insights - - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights - - /insights/installing-and-configuring-github-insights/installing-github-insights - - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports -popularLinks: - - /insights/installing-and-configuring-github-insights/about-data-in-github-insights - - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights +featuredLinks: + gettingStarted: + - /insights/installing-and-configuring-github-insights/about-github-insights + - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights + - /insights/installing-and-configuring-github-insights/installing-github-insights + - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports + popular: + - /insights/installing-and-configuring-github-insights/about-data-in-github-insights + - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights redirect_from: - /github/installing-and-configuring-github-insights versions: diff --git a/translations/de-DE/content/packages/index.md b/translations/de-DE/content/packages/index.md index 8fc138d889..e00d89f22a 100644 --- a/translations/de-DE/content/packages/index.md +++ b/translations/de-DE/content/packages/index.md @@ -2,18 +2,19 @@ title: GitHub Packages Documentation shortTitle: GitHub Packages intro: 'Learn to safely publish and consume packages, store your packages alongside your code, and share your packages privately with your team or publicly with the open source community. You can also automate your packages with {% data variables.product.prodname_actions %}.' -gettingStartedLinks: - - /packages/publishing-and-managing-packages/about-github-packages - - /packages/getting-started-with-github-container-registry/about-github-container-registry - - /packages/getting-started-with-github-container-registry - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/publishing-and-managing-packages/publishing-a-package - - /packages/publishing-and-managing-packages/installing-a-package -popularLinks: - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions +featuredLinks: + gettingStarted: + - /packages/publishing-and-managing-packages/about-github-packages + - /packages/getting-started-with-github-container-registry/about-github-container-registry + - /packages/getting-started-with-github-container-registry + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/publishing-and-managing-packages/publishing-a-package + - /packages/publishing-and-managing-packages/installing-a-package + popular: + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions redirect_from: - /github/managing-packages-with-github-packages - /categories/managing-packages-with-github-package-registry diff --git a/translations/es-XL/content/actions/index.md b/translations/es-XL/content/actions/index.md index 9d02a4a7d2..c6364b57ee 100644 --- a/translations/es-XL/content/actions/index.md +++ b/translations/es-XL/content/actions/index.md @@ -2,15 +2,16 @@ title: Documentación de GitHub Actions shortTitle: GitHub Actions intro: 'Automatiza, personaliza y ejecuta tus flujos de trabajo de desarrollo de software directamente en tu repositorio con {% data variables.product.prodname_actions %}. Puedes descubrir, crear y compartir acciones para realizar cualquier trabajo que quieras, incluido CI/CD, y combinar acciones en un flujo de trabajo completamente personalizado.' -gettingStartedLinks: - - /actions/quickstart - - /actions/learn-github-actions -guideLinks: - - /actions/managing-workflow-runs - - /actions/hosting-your-own-runners -popularLinks: - - /actions/reference/workflow-syntax-for-github-actions - - /actions/reference/events-that-trigger-workflows +featuredLinks: + gettingStarted: + - /actions/quickstart + - /actions/learn-github-actions + guide: + - /actions/managing-workflow-runs + - /actions/hosting-your-own-runners + popular: + - /actions/reference/workflow-syntax-for-github-actions + - /actions/reference/events-that-trigger-workflows redirect_from: - /articles/automating-your-workflow-with-github-actions/ - /articles/customizing-your-project-with-github-actions/ @@ -39,7 +40,7 @@ versions:

{% data ui.toc.getting_started %}

    - {% for link in gettingStartedLinks %} + {% for link in featuredLinks.gettingStarted %}
  • {% include featured-link %}
    • {% endfor %}
@@ -50,7 +51,7 @@ versions:

{% data ui.toc.popular_articles %}

    - {% for link in popularLinks %} + {% for link in featuredLinks.popular %}
  • {% include featured-link %}
    • {% endfor %}
@@ -61,7 +62,7 @@ versions:

Administrar flujos de trabajo

    - {% for link in guideLinks %} + {% for link in featuredLinks.guide %}
  • {% include featured-link %}
    • {% endfor %}
diff --git a/translations/es-XL/content/index.md b/translations/es-XL/content/index.md index fb12960fd3..84fcd70482 100644 --- a/translations/es-XL/content/index.md +++ b/translations/es-XL/content/index.md @@ -1,16 +1,17 @@ --- title: '{% data variables.product.product_name %}{% if currentVersion == "free-pro-team@latest" %}.com{% endif %} Documentación de Ayuda' -gettingStartedLinks: - - /github/getting-started-with-github/set-up-git - - /github/authenticating-to-github/connecting-to-github-with-ssh - - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github - - /github/writing-on-github/basic-writing-and-formatting-syntax -popularLinks: - - /github/collaborating-with-issues-and-pull-requests/about-pull-requests - - /github/authenticating-to-github - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - - /github/using-git/managing-remote-repositories - - /github/working-with-github-pages +featuredLinks: + gettingStarted: + - /github/getting-started-with-github/set-up-git + - /github/authenticating-to-github/connecting-to-github-with-ssh + - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github + - /github/writing-on-github/basic-writing-and-formatting-syntax + popular: + - /github/collaborating-with-issues-and-pull-requests/about-pull-requests + - /github/authenticating-to-github + - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /github/using-git/managing-remote-repositories + - /github/working-with-github-pages versions: free-pro-team: '*' enterprise-server: '*' diff --git a/translations/es-XL/content/insights/index.md b/translations/es-XL/content/insights/index.md index 1a3403afb1..61fc5bc414 100644 --- a/translations/es-XL/content/insights/index.md +++ b/translations/es-XL/content/insights/index.md @@ -2,14 +2,15 @@ title: Documentación de GitHub Insights shortTitle: GitHub Insights intro: 'Entiende y mejora tu proceso de entrega de software a través de datos con {% data variables.product.prodname_insights %}. Puedes ver informes personalizados basados en datos de {% data variables.product.prodname_enterprise %}.' -gettingStartedLinks: - - /insights/installing-and-configuring-github-insights/about-github-insights - - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights - - /insights/installing-and-configuring-github-insights/installing-github-insights - - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports -popularLinks: - - /insights/installing-and-configuring-github-insights/about-data-in-github-insights - - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights +featuredLinks: + gettingStarted: + - /insights/installing-and-configuring-github-insights/about-github-insights + - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights + - /insights/installing-and-configuring-github-insights/installing-github-insights + - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports + popular: + - /insights/installing-and-configuring-github-insights/about-data-in-github-insights + - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights redirect_from: - /github/installing-and-configuring-github-insights versions: diff --git a/translations/es-XL/content/packages/index.md b/translations/es-XL/content/packages/index.md index 193886e6fb..ef6941783b 100644 --- a/translations/es-XL/content/packages/index.md +++ b/translations/es-XL/content/packages/index.md @@ -2,18 +2,19 @@ title: Documentación de GitHub Packages shortTitle: Paquetes de GitHub intro: 'Aprende a publicar y consumir paquetes de forma segura, almacena tus paquetes junto con tu código y comparte tus paquetes de forma privada con tu equipo o de manera pública con la comunidad de código abierto. También puedes automatizar tus paquetes con {% data variables.product.prodname_actions %}.' -gettingStartedLinks: - - /packages/publishing-and-managing-packages/about-github-packages - - /packages/getting-started-with-github-container-registry/about-github-container-registry - - /packages/getting-started-with-github-container-registry - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/publishing-and-managing-packages/publishing-a-package - - /packages/publishing-and-managing-packages/installing-a-package -popularLinks: - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions +featuredLinks: + gettingStarted: + - /packages/publishing-and-managing-packages/about-github-packages + - /packages/getting-started-with-github-container-registry/about-github-container-registry + - /packages/getting-started-with-github-container-registry + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/publishing-and-managing-packages/publishing-a-package + - /packages/publishing-and-managing-packages/installing-a-package + popular: + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions redirect_from: - /github/managing-packages-with-github-packages - /categories/managing-packages-with-github-package-registry diff --git a/translations/ja-JP/content/actions/index.md b/translations/ja-JP/content/actions/index.md index 07577fec2b..5bf3bb6184 100644 --- a/translations/ja-JP/content/actions/index.md +++ b/translations/ja-JP/content/actions/index.md @@ -2,15 +2,16 @@ title: GitHub Actionsのドキュメント shortTitle: GitHub Actions intro: '{% data variables.product.prodname_actions %}で、ソフトウェア開発ワークフローをリポジトリの中で自動化、カスタマイズ実行しましょう。 CI/CDを含む好きなジョブを実行してくれるアクションを、見つけたり、作成したり、共有したり、完全にカスタマイズされたワークフロー中でアクションを組み合わせたりできます。' -gettingStartedLinks: - - /actions/quickstart - - /actions/learn-github-actions -guideLinks: - - /actions/managing-workflow-runs - - /actions/hosting-your-own-runners -popularLinks: - - /actions/reference/workflow-syntax-for-github-actions - - /actions/reference/events-that-trigger-workflows +featuredLinks: + gettingStarted: + - /actions/quickstart + - /actions/learn-github-actions + guide: + - /actions/managing-workflow-runs + - /actions/hosting-your-own-runners + popular: + - /actions/reference/workflow-syntax-for-github-actions + - /actions/reference/events-that-trigger-workflows redirect_from: - /articles/automating-your-workflow-with-github-actions/ - /articles/customizing-your-project-with-github-actions/ @@ -39,7 +40,7 @@ versions:

{% data ui.toc.getting_started %}

    - {% for link in gettingStartedLinks %} + {% for link in featuredLinks.gettingStarted %}
  • {% include featured-link %}
    • {% endfor %}
@@ -50,7 +51,7 @@ versions:

{% data ui.toc.popular_articles %}

    - {% for link in popularLinks %} + {% for link in featuredLinks.popular %}
  • {% include featured-link %}
    • {% endfor %}
@@ -61,7 +62,7 @@ versions:

Manage workflows

    - {% for link in guideLinks %} + {% for link in featuredLinks.guide %}
  • {% include featured-link %}
    • {% endfor %}
diff --git a/translations/ja-JP/content/index.md b/translations/ja-JP/content/index.md index 1800e3661d..c915b6dd27 100644 --- a/translations/ja-JP/content/index.md +++ b/translations/ja-JP/content/index.md @@ -1,16 +1,17 @@ --- title: '{% data variables.product.product_name %}{% if currentVersion == "free-pro-team@latest" %}.com{% endif %} Help Documentation' -gettingStartedLinks: - - /github/getting-started-with-github/set-up-git - - /github/authenticating-to-github/connecting-to-github-with-ssh - - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github - - /github/writing-on-github/basic-writing-and-formatting-syntax -popularLinks: - - /github/collaborating-with-issues-and-pull-requests/about-pull-requests - - /github/authenticating-to-github - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - - /github/using-git/managing-remote-repositories - - /github/working-with-github-pages +featuredLinks: + gettingStarted: + - /github/getting-started-with-github/set-up-git + - /github/authenticating-to-github/connecting-to-github-with-ssh + - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github + - /github/writing-on-github/basic-writing-and-formatting-syntax + popular: + - /github/collaborating-with-issues-and-pull-requests/about-pull-requests + - /github/authenticating-to-github + - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /github/using-git/managing-remote-repositories + - /github/working-with-github-pages versions: '*' --- diff --git a/translations/ja-JP/content/insights/index.md b/translations/ja-JP/content/insights/index.md index 30254a78e0..9e7c919d84 100644 --- a/translations/ja-JP/content/insights/index.md +++ b/translations/ja-JP/content/insights/index.md @@ -2,14 +2,15 @@ title: GitHub Insightsのドキュメント shortTitle: GitHub Insights intro: '{% data variables.product.prodname_insights %}とデータを通じてソフトウェアのデリバリプロセスを理解し、改善してください。 {% data variables.product.prodname_enterprise %}空のデータに基づくカスタマイズされたレポートを見ることができます。' -gettingStartedLinks: - - /insights/installing-and-configuring-github-insights/about-github-insights - - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights - - /insights/installing-and-configuring-github-insights/installing-github-insights - - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports -popularLinks: - - /insights/installing-and-configuring-github-insights/about-data-in-github-insights - - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights +featuredLinks: + gettingStarted: + - /insights/installing-and-configuring-github-insights/about-github-insights + - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights + - /insights/installing-and-configuring-github-insights/installing-github-insights + - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports + popular: + - /insights/installing-and-configuring-github-insights/about-data-in-github-insights + - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights redirect_from: - /github/installing-and-configuring-github-insights versions: diff --git a/translations/ja-JP/content/packages/index.md b/translations/ja-JP/content/packages/index.md index 4cfdb6b140..035960447b 100644 --- a/translations/ja-JP/content/packages/index.md +++ b/translations/ja-JP/content/packages/index.md @@ -2,18 +2,19 @@ title: GitHub Packagesのドキュメント shortTitle: GitHub Packages intro: '安全にパッケージを公開及び利用し、コードと共にパッケージを保存し、パッケージをTeamとプライベートに、あるいはオープンソースコミュニティとパブリックに共有してください。 また、{% data variables.product.prodname_actions %}とパッケージを自動化することもできます。' -gettingStartedLinks: - - /packages/publishing-and-managing-packages/about-github-packages - - /packages/getting-started-with-github-container-registry/about-github-container-registry - - /packages/getting-started-with-github-container-registry - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/publishing-and-managing-packages/publishing-a-package - - /packages/publishing-and-managing-packages/installing-a-package -popularLinks: - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions +featuredLinks: + gettingStarted: + - /packages/publishing-and-managing-packages/about-github-packages + - /packages/getting-started-with-github-container-registry/about-github-container-registry + - /packages/getting-started-with-github-container-registry + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/publishing-and-managing-packages/publishing-a-package + - /packages/publishing-and-managing-packages/installing-a-package + popular: + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions redirect_from: - /github/managing-packages-with-github-packages - /categories/managing-packages-with-github-package-registry diff --git a/translations/ko-KR/content/actions/index.md b/translations/ko-KR/content/actions/index.md index 0696a46ac8..9cb200f069 100644 --- a/translations/ko-KR/content/actions/index.md +++ b/translations/ko-KR/content/actions/index.md @@ -2,15 +2,16 @@ title: GitHub Actions Documentation shortTitle: GitHub Actions intro: 'Automate, customize, and execute your software development workflows right in your repository with {% data variables.product.prodname_actions %}. You can discover, create, and share actions to perform any job you''d like, including CI/CD, and combine actions in a completely customized workflow.' -gettingStartedLinks: - - /actions/quickstart - - /actions/learn-github-actions -guideLinks: - - /actions/managing-workflow-runs - - /actions/hosting-your-own-runners -popularLinks: - - /actions/reference/workflow-syntax-for-github-actions - - /actions/reference/events-that-trigger-workflows +featuredLinks: + gettingStarted: + - /actions/quickstart + - /actions/learn-github-actions + guide: + - /actions/managing-workflow-runs + - /actions/hosting-your-own-runners + popular: + - /actions/reference/workflow-syntax-for-github-actions + - /actions/reference/events-that-trigger-workflows redirect_from: - /articles/automating-your-workflow-with-github-actions/ - /articles/customizing-your-project-with-github-actions/ @@ -39,7 +40,7 @@ versions:

{% data ui.toc.getting_started %}

    - {% for link in gettingStartedLinks %} + {% for link in featuredLinks.gettingStarted %}
  • {% include featured-link %}
    • {% endfor %}
@@ -50,7 +51,7 @@ versions:

{% data ui.toc.popular_articles %}

    - {% for link in popularLinks %} + {% for link in featuredLinks.popular %}
  • {% include featured-link %}
    • {% endfor %}
@@ -61,7 +62,7 @@ versions:

Manage workflows

    - {% for link in guideLinks %} + {% for link in featuredLinks.guide %}
  • {% include featured-link %}
    • {% endfor %}
diff --git a/translations/ko-KR/content/index.md b/translations/ko-KR/content/index.md index 1800e3661d..c915b6dd27 100644 --- a/translations/ko-KR/content/index.md +++ b/translations/ko-KR/content/index.md @@ -1,16 +1,17 @@ --- title: '{% data variables.product.product_name %}{% if currentVersion == "free-pro-team@latest" %}.com{% endif %} Help Documentation' -gettingStartedLinks: - - /github/getting-started-with-github/set-up-git - - /github/authenticating-to-github/connecting-to-github-with-ssh - - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github - - /github/writing-on-github/basic-writing-and-formatting-syntax -popularLinks: - - /github/collaborating-with-issues-and-pull-requests/about-pull-requests - - /github/authenticating-to-github - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - - /github/using-git/managing-remote-repositories - - /github/working-with-github-pages +featuredLinks: + gettingStarted: + - /github/getting-started-with-github/set-up-git + - /github/authenticating-to-github/connecting-to-github-with-ssh + - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github + - /github/writing-on-github/basic-writing-and-formatting-syntax + popular: + - /github/collaborating-with-issues-and-pull-requests/about-pull-requests + - /github/authenticating-to-github + - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /github/using-git/managing-remote-repositories + - /github/working-with-github-pages versions: '*' --- diff --git a/translations/ko-KR/content/insights/index.md b/translations/ko-KR/content/insights/index.md index 552ed3fe31..068ac882f7 100644 --- a/translations/ko-KR/content/insights/index.md +++ b/translations/ko-KR/content/insights/index.md @@ -2,14 +2,15 @@ title: GitHub Insights Documentation shortTitle: GitHub Insights intro: 'Understand and improve your software delivery process through data with {% data variables.product.prodname_insights %}. You can view customized reports based on data from {% data variables.product.prodname_enterprise %}.' -gettingStartedLinks: - - /insights/installing-and-configuring-github-insights/about-github-insights - - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights - - /insights/installing-and-configuring-github-insights/installing-github-insights - - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports -popularLinks: - - /insights/installing-and-configuring-github-insights/about-data-in-github-insights - - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights +featuredLinks: + gettingStarted: + - /insights/installing-and-configuring-github-insights/about-github-insights + - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights + - /insights/installing-and-configuring-github-insights/installing-github-insights + - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports + popular: + - /insights/installing-and-configuring-github-insights/about-data-in-github-insights + - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights redirect_from: - /github/installing-and-configuring-github-insights versions: diff --git a/translations/ko-KR/content/packages/index.md b/translations/ko-KR/content/packages/index.md index 8fc138d889..e00d89f22a 100644 --- a/translations/ko-KR/content/packages/index.md +++ b/translations/ko-KR/content/packages/index.md @@ -2,18 +2,19 @@ title: GitHub Packages Documentation shortTitle: GitHub Packages intro: 'Learn to safely publish and consume packages, store your packages alongside your code, and share your packages privately with your team or publicly with the open source community. You can also automate your packages with {% data variables.product.prodname_actions %}.' -gettingStartedLinks: - - /packages/publishing-and-managing-packages/about-github-packages - - /packages/getting-started-with-github-container-registry/about-github-container-registry - - /packages/getting-started-with-github-container-registry - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/publishing-and-managing-packages/publishing-a-package - - /packages/publishing-and-managing-packages/installing-a-package -popularLinks: - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions +featuredLinks: + gettingStarted: + - /packages/publishing-and-managing-packages/about-github-packages + - /packages/getting-started-with-github-container-registry/about-github-container-registry + - /packages/getting-started-with-github-container-registry + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/publishing-and-managing-packages/publishing-a-package + - /packages/publishing-and-managing-packages/installing-a-package + popular: + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions redirect_from: - /github/managing-packages-with-github-packages - /categories/managing-packages-with-github-package-registry diff --git a/translations/pt-BR/content/actions/index.md b/translations/pt-BR/content/actions/index.md index 09bd83f878..4826225e37 100644 --- a/translations/pt-BR/content/actions/index.md +++ b/translations/pt-BR/content/actions/index.md @@ -2,15 +2,16 @@ title: Documentação do GitHub Actions shortTitle: GitHub Actions intro: 'Automatize, personalize e execute seus fluxos de trabalho de desenvolvimento do software diretamente no seu repositório com o {% data variables.product.prodname_actions %}. Você pode descobrir, criar e compartilhar ações para realizar qualquer trabalho que desejar, incluindo CI/CD, bem como combinar ações em um fluxo de trabalho completamente personalizado.' -gettingStartedLinks: - - /actions/quickstart - - /actions/learn-github-actions -guideLinks: - - /actions/managing-workflow-runs - - /actions/hosting-your-own-runners -popularLinks: - - /actions/reference/workflow-syntax-for-github-actions - - /actions/reference/events-that-trigger-workflows +featuredLinks: + gettingStarted: + - /actions/quickstart + - /actions/learn-github-actions + guide: + - /actions/managing-workflow-runs + - /actions/hosting-your-own-runners + popular: + - /actions/reference/workflow-syntax-for-github-actions + - /actions/reference/events-that-trigger-workflows redirect_from: - /articles/automating-your-workflow-with-github-actions/ - /articles/customizing-your-project-with-github-actions/ @@ -39,7 +40,7 @@ versions:

{% data ui.toc.getting_started %}

    - {% for link in gettingStartedLinks %} + {% for link in featuredLinks.gettingStarted %}
  • {% include featured-link %}
    • {% endfor %}
@@ -50,7 +51,7 @@ versions:

{% data ui.toc.popular_articles %}

    - {% for link in popularLinks %} + {% for link in featuredLinks.popular %}
  • {% include featured-link %}
    • {% endfor %}
@@ -61,7 +62,7 @@ versions:

Gerenciar fluxos de trabalho

    - {% for link in guideLinks %} + {% for link in featuredLinks.guide %}
  • {% include featured-link %}
    • {% endfor %}
diff --git a/translations/pt-BR/content/index.md b/translations/pt-BR/content/index.md index 97d640e20c..4acba0acb2 100644 --- a/translations/pt-BR/content/index.md +++ b/translations/pt-BR/content/index.md @@ -1,16 +1,17 @@ --- title: '{% data variables.product.product_name %}{% if currentVersion == "free-pro-team@latest" %}.com{% endif %} Documentação de ajuda' -gettingStartedLinks: - - /github/getting-started-with-github/set-up-git - - /github/authenticating-to-github/connecting-to-github-with-ssh - - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github - - /github/writing-on-github/basic-writing-and-formatting-syntax -popularLinks: - - /github/collaborating-with-issues-and-pull-requests/about-pull-requests - - /github/authenticating-to-github - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - - /github/using-git/managing-remote-repositories - - /github/working-with-github-pages +featuredLinks: + gettingStarted: + - /github/getting-started-with-github/set-up-git + - /github/authenticating-to-github/connecting-to-github-with-ssh + - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github + - /github/writing-on-github/basic-writing-and-formatting-syntax + popular: + - /github/collaborating-with-issues-and-pull-requests/about-pull-requests + - /github/authenticating-to-github + - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /github/using-git/managing-remote-repositories + - /github/working-with-github-pages versions: '*' --- diff --git a/translations/pt-BR/content/insights/index.md b/translations/pt-BR/content/insights/index.md index e771b8febb..af0df86ad8 100644 --- a/translations/pt-BR/content/insights/index.md +++ b/translations/pt-BR/content/insights/index.md @@ -2,14 +2,15 @@ title: Documentação do GitHub Insights shortTitle: GitHub Insights intro: 'Entenda e melhore seu processo de entrega de software por meio de dados com o {% data variables.product.prodname_insights %}. Você pode visualizar relatórios personalizados com base em dados do {% data variables.product.prodname_enterprise %}.' -gettingStartedLinks: - - /insights/installing-and-configuring-github-insights/about-github-insights - - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights - - /insights/installing-and-configuring-github-insights/installing-github-insights - - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports -popularLinks: - - /insights/installing-and-configuring-github-insights/about-data-in-github-insights - - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights +featuredLinks: + gettingStarted: + - /insights/installing-and-configuring-github-insights/about-github-insights + - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights + - /insights/installing-and-configuring-github-insights/installing-github-insights + - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports + popular: + - /insights/installing-and-configuring-github-insights/about-data-in-github-insights + - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights redirect_from: - /github/installing-and-configuring-github-insights versions: diff --git a/translations/pt-BR/content/packages/index.md b/translations/pt-BR/content/packages/index.md index 57180ca3eb..e19eda88bc 100644 --- a/translations/pt-BR/content/packages/index.md +++ b/translations/pt-BR/content/packages/index.md @@ -2,18 +2,19 @@ title: Documentação de GitHub Packages shortTitle: GitHub Package Registry intro: 'Aprenda a publicar e consumir com segurança pacotes, armazene seus pacotes junto com o seu código e compartilhe seus pacotes de forma privada com sua equipe ou publicamente com a comunidade de código aberto. Você também pode automatizar seus pacotes com {% data variables.product.prodname_actions %}.' -gettingStartedLinks: - - /packages/publishing-and-managing-packages/about-github-packages - - /packages/getting-started-with-github-container-registry/about-github-container-registry - - /packages/getting-started-with-github-container-registry - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/publishing-and-managing-packages/publishing-a-package - - /packages/publishing-and-managing-packages/installing-a-package -popularLinks: - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions +featuredLinks: + gettingStarted: + - /packages/publishing-and-managing-packages/about-github-packages + - /packages/getting-started-with-github-container-registry/about-github-container-registry + - /packages/getting-started-with-github-container-registry + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/publishing-and-managing-packages/publishing-a-package + - /packages/publishing-and-managing-packages/installing-a-package + popular: + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions redirect_from: - /github/managing-packages-with-github-packages - /categories/managing-packages-with-github-package-registry diff --git a/translations/ru-RU/content/actions/index.md b/translations/ru-RU/content/actions/index.md index 888048e716..d4c9c05869 100644 --- a/translations/ru-RU/content/actions/index.md +++ b/translations/ru-RU/content/actions/index.md @@ -2,15 +2,16 @@ title: GitHub Actions Documentation shortTitle: GitHub Actions intro: 'Automate, customize, and execute your software development workflows right in your repository with {% data variables.product.prodname_actions %}. You can discover, create, and share actions to perform any job you''d like, including CI/CD, and combine actions in a completely customized workflow.' -gettingStartedLinks: - - /actions/quickstart - - /actions/learn-github-actions -guideLinks: - - /actions/managing-workflow-runs - - /actions/hosting-your-own-runners -popularLinks: - - /actions/reference/workflow-syntax-for-github-actions - - /actions/reference/events-that-trigger-workflows +featuredLinks: + gettingStarted: + - /actions/quickstart + - /actions/learn-github-actions + guide: + - /actions/managing-workflow-runs + - /actions/hosting-your-own-runners + popular: + - /actions/reference/workflow-syntax-for-github-actions + - /actions/reference/events-that-trigger-workflows redirect_from: - /articles/automating-your-workflow-with-github-actions/ - /articles/customizing-your-project-with-github-actions/ @@ -39,7 +40,7 @@ versions:

{% data ui.toc.getting_started %}

    - {% for link in gettingStartedLinks %} + {% for link in featuredLinks.gettingStarted %}
  • {% include featured-link %}
    • {% endfor %}
@@ -50,7 +51,7 @@ versions:

{% data ui.toc.popular_articles %}

    - {% for link in popularLinks %} + {% for link in featuredLinks.popular %}
  • {% include featured-link %}
    • {% endfor %}
@@ -61,7 +62,7 @@ versions:

Manage workflows

    - {% for link in guideLinks %} + {% for link in featuredLinks.guide %}
  • {% include featured-link %}
    • {% endfor %}
diff --git a/translations/ru-RU/content/index.md b/translations/ru-RU/content/index.md index 1800e3661d..c915b6dd27 100644 --- a/translations/ru-RU/content/index.md +++ b/translations/ru-RU/content/index.md @@ -1,16 +1,17 @@ --- title: '{% data variables.product.product_name %}{% if currentVersion == "free-pro-team@latest" %}.com{% endif %} Help Documentation' -gettingStartedLinks: - - /github/getting-started-with-github/set-up-git - - /github/authenticating-to-github/connecting-to-github-with-ssh - - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github - - /github/writing-on-github/basic-writing-and-formatting-syntax -popularLinks: - - /github/collaborating-with-issues-and-pull-requests/about-pull-requests - - /github/authenticating-to-github - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - - /github/using-git/managing-remote-repositories - - /github/working-with-github-pages +featuredLinks: + gettingStarted: + - /github/getting-started-with-github/set-up-git + - /github/authenticating-to-github/connecting-to-github-with-ssh + - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github + - /github/writing-on-github/basic-writing-and-formatting-syntax + popular: + - /github/collaborating-with-issues-and-pull-requests/about-pull-requests + - /github/authenticating-to-github + - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /github/using-git/managing-remote-repositories + - /github/working-with-github-pages versions: '*' --- diff --git a/translations/ru-RU/content/insights/index.md b/translations/ru-RU/content/insights/index.md index 552ed3fe31..068ac882f7 100644 --- a/translations/ru-RU/content/insights/index.md +++ b/translations/ru-RU/content/insights/index.md @@ -2,14 +2,15 @@ title: GitHub Insights Documentation shortTitle: GitHub Insights intro: 'Understand and improve your software delivery process through data with {% data variables.product.prodname_insights %}. You can view customized reports based on data from {% data variables.product.prodname_enterprise %}.' -gettingStartedLinks: - - /insights/installing-and-configuring-github-insights/about-github-insights - - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights - - /insights/installing-and-configuring-github-insights/installing-github-insights - - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports -popularLinks: - - /insights/installing-and-configuring-github-insights/about-data-in-github-insights - - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights +featuredLinks: + gettingStarted: + - /insights/installing-and-configuring-github-insights/about-github-insights + - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights + - /insights/installing-and-configuring-github-insights/installing-github-insights + - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports + popular: + - /insights/installing-and-configuring-github-insights/about-data-in-github-insights + - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights redirect_from: - /github/installing-and-configuring-github-insights versions: diff --git a/translations/ru-RU/content/packages/index.md b/translations/ru-RU/content/packages/index.md index 8fc138d889..e00d89f22a 100644 --- a/translations/ru-RU/content/packages/index.md +++ b/translations/ru-RU/content/packages/index.md @@ -2,18 +2,19 @@ title: GitHub Packages Documentation shortTitle: GitHub Packages intro: 'Learn to safely publish and consume packages, store your packages alongside your code, and share your packages privately with your team or publicly with the open source community. You can also automate your packages with {% data variables.product.prodname_actions %}.' -gettingStartedLinks: - - /packages/publishing-and-managing-packages/about-github-packages - - /packages/getting-started-with-github-container-registry/about-github-container-registry - - /packages/getting-started-with-github-container-registry - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/publishing-and-managing-packages/publishing-a-package - - /packages/publishing-and-managing-packages/installing-a-package -popularLinks: - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions +featuredLinks: + gettingStarted: + - /packages/publishing-and-managing-packages/about-github-packages + - /packages/getting-started-with-github-container-registry/about-github-container-registry + - /packages/getting-started-with-github-container-registry + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/publishing-and-managing-packages/publishing-a-package + - /packages/publishing-and-managing-packages/installing-a-package + popular: + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions redirect_from: - /github/managing-packages-with-github-packages - /categories/managing-packages-with-github-package-registry diff --git a/translations/zh-CN/content/actions/index.md b/translations/zh-CN/content/actions/index.md index c19ea3e41f..3f1b7f7290 100644 --- a/translations/zh-CN/content/actions/index.md +++ b/translations/zh-CN/content/actions/index.md @@ -2,15 +2,16 @@ title: GitHub Actions文档 shortTitle: GitHub Actions intro: '在 {% data variables.product.prodname_actions %} 的仓库中自动化、自定义和执行软件开发工作流程。 您可以发现、创建和共享操作以执行您喜欢的任何作业（包括 CI/CD），并将操作合并到完全自定义的工作流程中。' -gettingStartedLinks: - - /actions/quickstart - - /actions/learn-github-actions -guideLinks: - - /actions/managing-workflow-runs - - /actions/hosting-your-own-runners -popularLinks: - - /actions/reference/workflow-syntax-for-github-actions - - /actions/reference/events-that-trigger-workflows +featuredLinks: + gettingStarted: + - /actions/quickstart + - /actions/learn-github-actions + guide: + - /actions/managing-workflow-runs + - /actions/hosting-your-own-runners + popular: + - /actions/reference/workflow-syntax-for-github-actions + - /actions/reference/events-that-trigger-workflows redirect_from: - /articles/automating-your-workflow-with-github-actions/ - /articles/customizing-your-project-with-github-actions/ @@ -39,7 +40,7 @@ versions:

{% data ui.toc.getting_started %}

    - {% for link in gettingStartedLinks %} + {% for link in featuredLinks.gettingStarted %}
  • {% include featured-link %}
    • {% endfor %}
@@ -50,7 +51,7 @@ versions:

{% data ui.toc.popular_articles %}

    - {% for link in popularLinks %} + {% for link in featuredLinks.popular %}
  • {% include featured-link %}
    • {% endfor %}
@@ -61,7 +62,7 @@ versions:

管理工作流程

    - {% for link in guideLinks %} + {% for link in featuredLinks.guide %}
  • {% include featured-link %}
    • {% endfor %}
diff --git a/translations/zh-CN/content/index.md b/translations/zh-CN/content/index.md index 237fd3250b..c5d547abab 100644 --- a/translations/zh-CN/content/index.md +++ b/translations/zh-CN/content/index.md @@ -1,16 +1,17 @@ --- title: '{% data variables.product.product_name %}{% if currentVersion == "free-pro-team@latest" %}.com{% endif %} 帮助文档' -gettingStartedLinks: - - /github/getting-started-with-github/set-up-git - - /github/authenticating-to-github/connecting-to-github-with-ssh - - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github - - /github/writing-on-github/basic-writing-and-formatting-syntax -popularLinks: - - /github/collaborating-with-issues-and-pull-requests/about-pull-requests - - /github/authenticating-to-github - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - - /github/using-git/managing-remote-repositories - - /github/working-with-github-pages +featuredLinks: + gettingStarted: + - /github/getting-started-with-github/set-up-git + - /github/authenticating-to-github/connecting-to-github-with-ssh + - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github + - /github/writing-on-github/basic-writing-and-formatting-syntax + popular: + - /github/collaborating-with-issues-and-pull-requests/about-pull-requests + - /github/authenticating-to-github + - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /github/using-git/managing-remote-repositories + - /github/working-with-github-pages versions: '*' --- diff --git a/translations/zh-CN/content/insights/index.md b/translations/zh-CN/content/insights/index.md index d992cbb3dc..bf541533ae 100644 --- a/translations/zh-CN/content/insights/index.md +++ b/translations/zh-CN/content/insights/index.md @@ -2,14 +2,15 @@ title: GitHub Insights 文档 shortTitle: GitHub Insights intro: '通过 {% data variables.product.prodname_insights %} 的数据了解和改进软件交付过程。 您可以从 {% data variables.product.prodname_enterprise %} 查看基于数据的自定义报告。' -gettingStartedLinks: - - /insights/installing-and-configuring-github-insights/about-github-insights - - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights - - /insights/installing-and-configuring-github-insights/installing-github-insights - - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports -popularLinks: - - /insights/installing-and-configuring-github-insights/about-data-in-github-insights - - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights +featuredLinks: + gettingStarted: + - /insights/installing-and-configuring-github-insights/about-github-insights + - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights + - /insights/installing-and-configuring-github-insights/installing-github-insights + - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports + popular: + - /insights/installing-and-configuring-github-insights/about-data-in-github-insights + - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights redirect_from: - /github/installing-and-configuring-github-insights versions: diff --git a/translations/zh-CN/content/packages/index.md b/translations/zh-CN/content/packages/index.md index ba1cb14a22..fe9b85b45c 100644 --- a/translations/zh-CN/content/packages/index.md +++ b/translations/zh-CN/content/packages/index.md @@ -2,18 +2,19 @@ title: GitHub 包文档 shortTitle: GitHub Packages intro: '了解如何安全地发布和使用包，将包与代码存储在一起，以及与您的团队私下分享或与开源社区公开分享您的包。 还可以使用 {% data variables.product.prodname_actions %} 自动执行您的包。' -gettingStartedLinks: - - /packages/publishing-and-managing-packages/about-github-packages - - /packages/getting-started-with-github-container-registry/about-github-container-registry - - /packages/getting-started-with-github-container-registry - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/publishing-and-managing-packages/publishing-a-package - - /packages/publishing-and-managing-packages/installing-a-package -popularLinks: - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages - - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages - - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images - - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions +featuredLinks: + gettingStarted: + - /packages/publishing-and-managing-packages/about-github-packages + - /packages/getting-started-with-github-container-registry/about-github-container-registry + - /packages/getting-started-with-github-container-registry + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/publishing-and-managing-packages/publishing-a-package + - /packages/publishing-and-managing-packages/installing-a-package + popular: + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages + - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages + - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images + - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions redirect_from: - /github/managing-packages-with-github-packages - /categories/managing-packages-with-github-package-registry From 1fe4e51eaa3d0970ebcb5c3d38d450273bf81806 Mon Sep 17 00:00:00 2001 From: Rachael Sewell Date: Tue, 27 Oct 2020 11:28:33 -0700 Subject: [PATCH 24/40] update openapi schema name (#16231) --- lib/all-versions.js | 4 ++-- lib/rest.js | 4 ++++ package-lock.json | 6 +++--- package.json | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/all-versions.js b/lib/all-versions.js index e233a61e66..5f215de20c 100644 --- a/lib/all-versions.js +++ b/lib/all-versions.js @@ -13,7 +13,7 @@ const plans = [ releases: [latestNonNumberedRelease], latestRelease: latestNonNumberedRelease, nonEnterpriseDefault: true, // permanent way to refer to this plan if the name changes - openApiBaseName: 'dotcom' + openApiBaseName: 'api.github.com' }, { plan: 'enterprise-server', @@ -21,7 +21,7 @@ const plans = [ releases: enterpriseServerReleases.supported, latestRelease: enterpriseServerReleases.latest, hasNumberedReleases: true, - openApiBaseName: '' + openApiBaseName: 'ghes-' } ] diff --git a/lib/rest.js b/lib/rest.js index 426f788678..c7b21a5ef9 100644 --- a/lib/rest.js +++ b/lib/rest.js @@ -7,6 +7,10 @@ let allCategories = [] allVersionKeys.forEach(currentVersion => { // Translate the versions from the openapi to versions used in the docs const openApiVersion = allVersions[currentVersion].openApiVersionName + + // Check that the openApiVersion is configured in the OpenAPI + if (!operations[openApiVersion]) return + operations[currentVersion] = operations[openApiVersion] delete operations[openApiVersion] diff --git a/package-lock.json b/package-lock.json index ecdbd69070..955e64ecb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1156,9 +1156,9 @@ } }, "@github/rest-api-operations": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@github/rest-api-operations/-/rest-api-operations-3.2.1.tgz", - "integrity": "sha512-GRJ5NtdWAvamDHXMfmwCNZ7O3TI/h79MyloWnHH+uWEN37DJadpbg3l3tIN2QyC/sZU1lk3o90YhiRaPC80muA==" + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@github/rest-api-operations/-/rest-api-operations-3.2.2.tgz", + "integrity": "sha512-mCZ3caASdKyR7dEBWMpEbdUpo54EHpWAKdiK57jIfXzgCUhlQqH48gPhcsrdiRTmofUDfsXHFmvH05ERdraZHQ==" }, "@hapi/address": { "version": "2.1.4", diff --git a/package.json b/package.json index af56ebc65b..84abcbfdc7 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@github-docs/data-directory": "^1.2.0", "@github-docs/frontmatter": "^1.3.1", "@github-docs/render-content": "^5.2.0", - "@github/rest-api-operations": "^3.2.1", + "@github/rest-api-operations": "^3.2.2", "@octokit/rest": "^16.38.1", "@primer/css": "^15.1.0", "@primer/octicons": "^11.0.0", From 4936dacc7fb3b01cb4d7d7d9d2578038aa2c223f Mon Sep 17 00:00:00 2001 From: Lucas Costi Date: Wed, 28 Oct 2020 05:24:19 +1000 Subject: [PATCH 25/40] Update openapi preview script to clean tmp dir (#16232) --- script/preview-openapi-changes | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/script/preview-openapi-changes b/script/preview-openapi-changes index dc8109915e..f5d1076a86 100755 --- a/script/preview-openapi-changes +++ b/script/preview-openapi-changes @@ -72,13 +72,17 @@ elif [[ $OPTION == "unstitch" ]]; then echo "🔥 🔥 Unstitching the repos..." set -o xtrace + # clear the dump directory + rm -rf /tmp/dump/* + + # Undo any docs-internal changes and reinstall rest-api-operations cd docs-internal git reset --hard HEAD npm install + # Undo any rest-api-operations changes cd ../rest-api-operations git reset --hard HEAD - npm install set +o xtrace echo "🏁 🏁 Finished unstitching the repos!" From 307741432608918a3243e2ee5e7e7d63bf8b3ae9 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Wed, 28 Oct 2020 01:33:30 +0500 Subject: [PATCH 26/40] Remove the mention of HOME environment variable (#328) Co-authored-by: Sergey Dolin --- content/actions/reference/environment-variables.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/actions/reference/environment-variables.md b/content/actions/reference/environment-variables.md index c8acb6a91c..0d2a15674f 100644 --- a/content/actions/reference/environment-variables.md +++ b/content/actions/reference/environment-variables.md @@ -39,7 +39,6 @@ We strongly recommend that actions use environment variables to access the files | Environment variable | Description | | ---------------------|------------ | | `CI` | Always set to `true`. | -| `HOME` | The path to the {% data variables.product.prodname_dotcom %} home directory used to store user data. For example, `/github/home`. | | `GITHUB_WORKFLOW` | The name of the workflow. | | `GITHUB_RUN_ID` | {% data reusables.github-actions.run_id_description %} | | `GITHUB_RUN_NUMBER` | {% data reusables.github-actions.run_number_description %} | From 2c908294efd83ebabae3190500b6d9a82fde4316 Mon Sep 17 00:00:00 2001 From: Ben Emdon Date: Tue, 27 Oct 2020 16:36:51 -0400 Subject: [PATCH 27/40] Document the pull_requests array's behavior in the checks event (#15780) --- data/reusables/webhooks/check_run_properties.md | 1 + 1 file changed, 1 insertion(+) diff --git a/data/reusables/webhooks/check_run_properties.md b/data/reusables/webhooks/check_run_properties.md index 84e329d91d..78fd8759ef 100644 --- a/data/reusables/webhooks/check_run_properties.md +++ b/data/reusables/webhooks/check_run_properties.md @@ -6,5 +6,6 @@ Key | Type | Description `check_run[conclusion]`|`string` | The result of the completed check run. Can be one of `success`, `failure`, `neutral`, `cancelled`, `timed_out`, {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}`action_required` or `stale`{% else %}or `action_required`{% endif %}. This value will be `null` until the check run has `completed`. `check_run[name]`|`string` | The name of the check run. `check_run[check_suite][id]`|`integer` | The id of the check suite that this check run is part of. +`check_run[check_suite][pull_requests]`|`array`| An array of pull requests that match this check suite. A pull request matches a check suite if they have the same `head_sha` and `head_branch`. When the check suite's `head_branch` is in a forked repository it will be `null` and the `pull_requests` array will be empty. `requested_action`|`object` | The action requested by the user. `requested_action[identifier]`|`string` | The integrator reference of the action requested by the user. From a352fecee6c230030f29d097498afe00f9d7b394 Mon Sep 17 00:00:00 2001 From: Julia Metcalf <39204387+juliametcalf@users.noreply.github.com> Date: Tue, 27 Oct 2020 14:28:07 -0700 Subject: [PATCH 28/40] Update githubs-products.md (#16248) update from 99.95% to 99.9% --- content/github/getting-started-with-github/githubs-products.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/getting-started-with-github/githubs-products.md b/content/github/getting-started-with-github/githubs-products.md index 5b29e81ef4..22f2395c57 100644 --- a/content/github/getting-started-with-github/githubs-products.md +++ b/content/github/getting-started-with-github/githubs-products.md @@ -83,7 +83,7 @@ In addition to the features available with {% data variables.product.prodname_te - {% data variables.contact.enterprise_support %}. For more information, see "{% data variables.product.prodname_ghe_cloud %} support" and "{% data variables.product.prodname_ghe_cloud %} Addendum." - 50,000 {% data variables.product.prodname_actions %} minutes - 50GB {% data variables.product.prodname_registry %} storage -- A service level agreement for 99.95% monthly uptime +- A service level agreement for 99.9% monthly uptime - The option to centrally manage policy and billing for multiple {% data variables.product.prodname_dotcom_the_website %} organizations with an enterprise account. For more information, see "About enterprise accounts." You can set up a trial to evaluate {% data variables.product.prodname_ghe_cloud %}. For more information, see "[Setting up a trial of {% data variables.product.prodname_ghe_cloud %}](/articles/setting-up-a-trial-of-github-enterprise-cloud)." From b059af6d75a1c13c9d45b6a3cb8d81cf33a4f99f Mon Sep 17 00:00:00 2001 From: Octoglot Bot <44381218+octoglot@users.noreply.github.com> Date: Tue, 27 Oct 2020 15:10:42 -0700 Subject: [PATCH 29/40] New Crowdin translations by Github Action (#16108) * New Crowdin translations by Github Action * Revert broken translated files to English * Revert broken translated files to english Co-authored-by: Crowdin Bot Co-authored-by: Chiedo John <2156688+chiedo@users.noreply.github.com> Co-authored-by: Chiedo --- .../creating-a-composite-run-steps-action.md | 2 +- .../creating-a-javascript-action.md | 2 +- .../building-and-testing-java-with-maven.md | 2 +- .../guides/building-and-testing-nodejs.md | 2 +- .../guides/publishing-docker-images.md | 2 +- .../storing-workflow-data-as-artifacts.md | 4 +- .../about-self-hosted-runners.md | 2 +- .../adding-self-hosted-runners.md | 4 +- ...ess-to-self-hosted-runners-using-groups.md | 2 +- .../removing-self-hosted-runners.md | 4 +- translations/de-DE/content/actions/index.md | 32 +- .../finding-and-customizing-actions.md | 2 +- .../security-hardening-for-github-actions.md | 37 ++ .../disabling-and-enabling-a-workflow.md | 2 +- .../removing-workflow-artifacts.md | 2 +- .../de-DE/content/actions/quickstart.md | 2 +- ...nd-expression-syntax-for-github-actions.md | 10 +- ...pecifications-for-github-hosted-runners.md | 3 + ...usage-limits-billing-and-administration.md | 2 +- .../workflow-commands-for-github-actions.md | 4 +- .../workflow-syntax-for-github-actions.md | 4 +- ...ependencies-on-github-enterprise-server.md | 14 +- ...ng-a-failover-to-your-replica-appliance.md | 9 + .../upgrade-requirements.md | 4 +- .../about-github-enterprise-support.md | 2 +- .../providing-data-to-github-support.md | 14 +- .../enterprise-support/submitting-a-ticket.md | 4 +- ...-hosted-runners-without-internet-access.md | 2 +- ...erprise-server-on-google-cloud-platform.md | 4 +- ...managing-your-github-enterprise-license.md | 25 +- ...ctor-authentication-for-an-organization.md | 2 +- .../apps/authenticating-with-github-apps.md | 8 +- .../developers/apps/authorizing-oauth-apps.md | 101 ++- .../creating-a-github-app-from-a-manifest.md | 2 +- ...ating-a-github-app-using-url-parameters.md | 164 ++--- ...g-and-authorizing-users-for-github-apps.md | 68 +- .../developers/apps/installing-github-apps.md | 2 +- .../developers/apps/scopes-for-oauth-apps.md | 103 ++- .../about-github-marketplace.md | 2 +- .../overview/replacing-github-services.md | 2 +- .../webhooks-and-events/about-webhooks.md | 8 +- .../webhooks-and-events/creating-webhooks.md | 3 + .../webhooks-and-events/github-event-types.md | 4 +- .../webhooks-and-events/issue-event-types.md | 6 +- .../securing-your-webhooks.md | 1 + .../webhooks-and-events/testing-webhooks.md | 2 +- .../webhook-events-and-payloads.md | 30 +- ...fications-for-pushes-to-your-repository.md | 2 +- ...about-github-dependabot-version-updates.md | 2 +- .../about-required-commit-signing.md | 2 +- .../about-securing-your-repository.md | 8 +- ...classifying-your-repository-with-topics.md | 40 +- ...guration-options-for-dependency-updates.md | 14 +- ...imiting-github-actions-for-a-repository.md | 2 +- ...ling-force-pushes-to-a-protected-branch.md | 23 +- .../administering-a-repository/index.md | 2 +- ...ng-pull-requests-for-dependency-updates.md | 4 +- .../setting-repository-visibility.md | 2 +- ...deployment-activity-for-your-repository.md | 2 +- .../error-bad-file-number.md | 2 +- .../error-permission-denied-publickey.md | 81 ++- .../generating-a-new-gpg-key.md | 2 +- .../githubs-ssh-key-fingerprints.md | 2 +- ...moving-sensitive-data-from-a-repository.md | 4 +- .../reviewing-your-security-log.md | 329 +++++----- .../reviewing-your-ssh-keys.md | 47 +- .../adding-a-license-to-a-repository.md | 2 +- .../locking-conversations.md | 40 +- .../managing-disruptive-comments.md | 79 ++- ...ngle-issue-template-for-your-repository.md | 2 +- ...cking-a-user-from-your-personal-account.md | 2 +- .../about-pull-requests.md | 7 + .../about-status-checks.md | 2 +- ...nging-the-base-branch-of-a-pull-request.md | 6 + ...repositories-with-code-quality-features.md | 4 +- .../index.md | 2 +- .../resolving-a-merge-conflict-on-github.md | 63 +- .../syncing-a-fork.md | 14 +- ...sitory-is-deleted-or-changes-visibility.md | 2 +- .../changing-a-commit-message.md | 22 +- ...creating-a-commit-with-multiple-authors.md | 63 +- .../about-repository-visibility.md | 19 +- .../backing-up-a-repository.md | 36 +- .../creating-a-template-repository.md | 14 +- .../error-repository-not-found.md | 2 +- .../https-cloning-errors.md | 2 +- .../github-extensions-and-integrations.md | 10 +- .../about-integration-with-code-scanning.md | 2 +- .../configuring-code-scanning.md | 6 +- ...enabling-code-scanning-for-a-repository.md | 4 +- .../index.md | 2 + ...ode-scanning-alerts-for-your-repository.md | 72 ++- ...ing-codeql-code-scanning-in-a-container.md | 69 ++ ...-codeql-code-scanning-in-your-ci-system.md | 17 +- .../sarif-support-for-code-scanning.md | 2 + ...g-code-scanning-alerts-in-pull-requests.md | 34 +- ...-codeql-code-scanning-in-your-ci-system.md | 2 +- .../troubleshooting-the-codeql-workflow.md | 29 +- .../githubs-products.md | 2 +- .../supported-browsers.md | 2 +- ...roject-to-github-using-the-command-line.md | 6 +- .../adding-a-file-to-a-repository.md | 2 +- .../navigating-code-on-github.md | 1 + ...g-with-jupyter-notebook-files-on-github.md | 4 +- .../about-git-large-file-storage.md | 8 +- .../conditions-for-large-files.md | 2 +- .../configuring-git-large-file-storage.md | 2 +- ...oving-files-from-git-large-file-storage.md | 38 +- ...bout-alerts-for-vulnerable-dependencies.md | 59 +- ...bout-github-dependabot-security-updates.md | 33 + ...ilities-in-the-github-advisory-database.md | 1 + ...ring-github-dependabot-security-updates.md | 26 +- ...tifications-for-vulnerable-dependencies.md | 58 ++ .../index.md | 3 + ...roubleshooting-github-dependabot-errors.md | 82 +++ ...he-detection-of-vulnerable-dependencies.md | 6 +- ...nerable-dependencies-in-your-repository.md | 6 +- .../configuring-notifications.md | 21 +- .../managing-notifications-from-your-inbox.md | 2 + .../managing-your-subscriptions.md | 2 +- .../about-automation-for-project-boards.md | 5 +- ...attachments-on-issues-and-pull-requests.md | 29 +- ...linking-a-repository-to-a-project-board.md | 8 +- ...tracking-progress-on-your-project-board.md | 8 +- .../finding-files-on-github.md | 2 +- .../searching-for-packages.md | 2 +- .../searching-issues-and-pull-requests.md | 2 +- .../about-billing-for-github-actions.md | 2 +- .../about-teams.md | 4 +- .../about-your-organization-dashboard.md | 2 +- .../adding-organization-members-to-a-team.md | 13 +- ...-collaborator-to-an-organization-member.md | 13 +- ...ng-github-actions-for-your-organization.md | 2 +- ...ithub-pages-sites-for-your-organization.md | 8 +- .../index.md | 2 +- .../permission-levels-for-an-organization.md | 2 +- ...llaborators-access-to-your-organization.md | 50 +- ...ing-the-audit-log-for-your-organization.md | 41 +- ...ur-organizations-installed-integrations.md | 19 +- ...ssions-for-adding-outside-collaborators.md | 13 +- .../about-enterprise-accounts.md | 4 + .../index.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - .../managing-your-enterprise-account.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - ...n-and-usage-for-your-enterprise-account.md | 9 +- .../viewing-contributions-on-your-profile.md | 2 +- ...tributions-not-showing-up-on-my-profile.md | 6 +- .../changing-your-github-username.md | 54 +- .../index.md | 2 +- ...on-levels-for-a-user-account-repository.md | 76 +-- ...ithub-enterprise-subscription-agreement.md | 2 +- .../github-sensitive-data-removal-policy.md | 2 +- .../github-subprocessors-and-cookies.md | 62 +- ...al-terms-for-microsoft-volume-licensing.md | 2 +- .../site-policy/github-trademark-policy.md | 2 +- .../using-git/changing-a-remotes-url.md | 2 +- .../pushing-commits-to-a-remote-repository.md | 1 + .../about-the-dependency-graph.md | 4 +- ...loring-the-dependencies-of-a-repository.md | 4 +- .../viewing-a-projects-contributors.md | 2 +- .../viewing-traffic-to-a-repository.md | 17 +- .../about-github-pages-and-jekyll.md | 2 +- .../about-github-pages.md | 2 +- ...reating-a-github-pages-site-with-jekyll.md | 61 +- ...for-your-github-pages-site-using-jekyll.md | 2 +- ...yll-build-errors-for-github-pages-sites.md | 150 ++--- .../writing-on-github/creating-gists.md | 4 +- .../updating-github-insights.md | 1 - ...ub-container-registry-for-docker-images.md | 2 +- .../about-github-packages.md | 2 +- ...ache-maven-for-use-with-github-packages.md | 28 +- ...ing-docker-for-use-with-github-packages.md | 39 +- ...dotnet-cli-for-use-with-github-packages.md | 6 +- ...ing-gradle-for-use-with-github-packages.md | 2 +- ...guring-npm-for-use-with-github-packages.md | 65 +- ...g-rubygems-for-use-with-github-packages.md | 77 ++- .../content/rest/overview/api-previews.md | 20 +- .../overview/resources-in-the-rest-api.md | 8 +- .../de-DE/content/rest/reference/apps.md | 9 + .../rest/reference/enterprise-admin.md | 6 +- .../de-DE/content/rest/reference/gists.md | 2 +- .../de-DE/content/rest/reference/orgs.md | 2 +- .../permissions-required-for-github-apps.md | 6 +- .../de-DE/content/rest/reference/repos.md | 6 +- .../reusables/actions/actions-not-verified.md | 2 +- .../data/reusables/actions/enterprise-beta.md | 2 +- .../enterprise-github-hosted-runners.md | 2 +- .../actions/enterprise-marketplace-actions.md | 2 +- .../actions/enterprise-setup-prereq.md | 2 +- .../deprecating_auth_with_query_parameters.md | 2 +- .../apps/deprecating_github_services_ghe.md | 2 +- .../apps/deprecating_password_auth.md | 2 +- .../deprecating_token_oauth_authorizations.md | 2 +- .../choose-alert-dismissal-reason.md | 1 + .../false-positive-fix-codeql.md | 2 +- .../dependabot/automated-tests-note.md | 5 + .../dependabot/pull-request-introduction.md | 1 + .../dependabot/supported-package-managers.md | 2 +- .../access-enterprise-on-dotcom.md | 5 + .../enterprise-accounts/access-enterprise.md | 16 +- .../enterprise-accounts/license-tab.md | 10 +- .../data/reusables/enterprise/rate_limit.md | 2 +- .../submit-support-ticket-first-section.md | 2 +- .../submit-support-ticket-second-section.md | 2 +- .../aws-recommended-instance-types.md | 2 +- .../aws-supported-instance-types.md | 6 +- .../de-DE/data/reusables/files/add-file.md | 2 +- .../reusables/gated-features/code-scanning.md | 2 +- .../reusables/gated-features/draft-prs.md | 2 +- .../gist/anonymous-gists-cannot-be-deleted.md | 2 +- .../github-actions/macos-runner-preview.md | 5 + ...-runner-management-permissions-required.md | 4 +- ...-runner-navigate-to-repo-org-enterprise.md | 4 +- .../supported-github-runners.md | 1 + .../github-actions/usage-matrix-limits.md | 2 +- .../notifications/outbound_email_tip.md | 2 +- ...ification-delivery-method-customization.md | 3 + ...nerable-dependency-notification-options.md | 33 + .../admins-can-configure-package-types.md | 2 +- .../docker_registry_deprecation_status.md | 2 +- .../packages-ghes-release-stage.md | 2 +- .../pages/build-failure-email-server.md | 2 +- .../pages/private_pages_are_public_warning.md | 2 +- .../pre-release-program/fury-pre-release.md | 2 +- .../machine-man-preview.md | 2 +- .../pre-release-program/sailor-v-preview.md | 2 +- .../user_profile_page_block_or_report.md | 2 +- .../project-progress-locations.md | 2 +- .../pull_request_merges_and_contributions.md | 2 +- .../repositories/about-internal-repos.md | 2 +- .../reusables/repositories/copy-clone-url.md | 2 +- ...forks_from_private_repositories_warning.md | 2 +- .../repositories/enable-security-alerts.md | 2 +- .../repositories/new-pull-request.md | 2 +- .../repositories/open-with-github-desktop.md | 2 +- .../data/reusables/repositories/releases.md | 2 +- .../repositories/tracks-vulnerabilities.md | 1 - .../reusables/repositories/you-can-fork.md | 4 +- .../data/reusables/search/syntax_tips.md | 2 +- .../data/reusables/two_fa/auth_methods_2fa.md | 10 +- .../webhooks/webhooks-rest-api-links.md | 4 + .../creating-a-composite-run-steps-action.md | 6 +- .../creating-a-javascript-action.md | 8 +- .../building-and-testing-java-with-maven.md | 2 +- .../guides/building-and-testing-nodejs.md | 2 +- .../guides/publishing-docker-images.md | 2 +- .../storing-workflow-data-as-artifacts.md | 4 +- .../about-self-hosted-runners.md | 2 +- .../adding-self-hosted-runners.md | 4 +- ...ess-to-self-hosted-runners-using-groups.md | 2 +- .../removing-self-hosted-runners.md | 4 +- translations/ja-JP/content/actions/index.md | 34 +- .../finding-and-customizing-actions.md | 2 +- .../introduction-to-github-actions.md | 24 +- ...-from-azure-pipelines-to-github-actions.md | 136 ++-- ...ting-from-gitlab-cicd-to-github-actions.md | 92 +-- .../security-hardening-for-github-actions.md | 37 ++ ...haring-workflows-with-your-organization.md | 18 +- .../disabling-and-enabling-a-workflow.md | 32 +- .../downloading-workflow-artifacts.md | 4 +- .../actions/managing-workflow-runs/index.md | 4 +- .../manually-running-a-workflow.md | 8 +- .../re-running-a-workflow.md | 6 +- .../removing-workflow-artifacts.md | 6 +- .../using-workflow-run-logs.md | 20 +- .../viewing-job-execution-time.md | 8 +- .../viewing-workflow-run-history.md | 4 +- .../ja-JP/content/actions/quickstart.md | 48 +- .../reference/authentication-in-a-workflow.md | 2 +- ...nd-expression-syntax-for-github-actions.md | 2 +- .../actions/reference/encrypted-secrets.md | 2 +- .../reference/environment-variables.md | 2 +- .../events-that-trigger-workflows.md | 56 +- .../ja-JP/content/actions/reference/index.md | 14 +- ...pecifications-for-github-hosted-runners.md | 17 +- ...usage-limits-billing-and-administration.md | 36 +- .../workflow-commands-for-github-actions.md | 64 +- .../workflow-syntax-for-github-actions.md | 10 +- .../content/admin/authentication/using-cas.md | 2 +- .../admin/authentication/using-saml.md | 4 +- .../configuration/command-line-utilities.md | 4 +- .../configuration/configuring-applications.md | 4 +- ...guring-code-scanning-for-your-appliance.md | 10 +- ...prise-server-to-github-enterprise-cloud.md | 4 +- ...ependencies-on-github-enterprise-server.md | 32 +- .../enabling-subdomain-isolation.md | 4 +- .../content/admin/configuration/index.md | 2 +- .../about-cluster-nodes.md | 2 +- .../enterprise-management/about-clustering.md | 4 +- .../about-geo-replication.md | 2 +- .../about-high-availability-configuration.md | 2 +- .../cluster-network-configuration.md | 2 +- .../configuring-collectd.md | 2 +- ...-availability-replication-for-a-cluster.md | 28 +- .../creating-a-high-availability-replica.md | 2 +- ...ng-a-failover-to-your-replica-appliance.md | 9 + ...ting-a-failover-to-your-replica-cluster.md | 4 +- ...o-github-enterprise-server-214-or-later.md | 2 +- .../upgrade-requirements.md | 4 +- .../about-github-enterprise-support.md | 2 +- .../providing-data-to-github-support.md | 12 +- .../enterprise-support/submitting-a-ticket.md | 4 +- ...com-actions-on-github-enterprise-server.md | 18 +- ...-githubcom-actions-using-github-connect.md | 12 +- ...-github-actions-and-configuring-storage.md | 20 +- ...ub-actions-policies-for-your-enterprise.md | 8 +- .../content/admin/github-actions/index.md | 2 +- ...naging-access-to-actions-from-githubcom.md | 2 +- ...manually-syncing-actions-from-githubcom.md | 14 +- ...-hosted-runners-without-internet-access.md | 14 +- translations/ja-JP/content/admin/index.md | 2 +- ...erprise-server-on-google-cloud-platform.md | 4 +- ...thub-enterprise-server-on-openstack-kvm.md | 4 +- ...managing-your-github-enterprise-license.md | 27 +- .../admin/user-management/about-migrations.md | 2 +- .../admin/user-management/audit-logging.md | 2 +- .../configuring-email-for-notifications.md | 2 +- ...-large-file-storage-for-your-enterprise.md | 4 +- ...tomizing-user-messages-on-your-instance.md | 2 +- ...exporting-migration-data-from-githubcom.md | 4 +- ...ing-migration-data-from-your-enterprise.md | 6 +- ...rom-third-party-version-control-systems.md | 2 +- .../user-management/managing-dormant-users.md | 2 +- .../migrating-data-to-your-enterprise.md | 10 +- ...ring-to-migrate-data-to-your-enterprise.md | 4 +- .../rebuilding-contributions-data.md | 2 +- ...ctor-authentication-for-an-organization.md | 2 +- .../suspending-and-unsuspending-users.md | 2 +- ...epository-from-github-to-github-desktop.md | 4 +- .../authenticating-to-github.md | 8 +- .../installing-github-desktop.md | 6 +- .../setting-up-github-desktop.md | 42 +- .../supported-operating-systems.md | 22 +- .../content/developers/apps/about-apps.md | 86 +-- .../apps/activating-beta-features-for-apps.md | 13 +- .../apps/authenticating-with-github-apps.md | 92 +-- .../developers/apps/authorizing-oauth-apps.md | 235 ++++--- .../developers/apps/building-github-apps.md | 4 +- .../developers/apps/building-oauth-apps.md | 4 +- ...ting-a-custom-badge-for-your-github-app.md | 22 +- ...ating-a-custom-badge-for-your-oauth-app.md | 26 +- .../creating-a-github-app-from-a-manifest.md | 16 +- ...ating-a-github-app-using-url-parameters.md | 164 ++--- .../developers/apps/creating-a-github-app.md | 36 +- .../developers/apps/creating-an-oauth-app.md | 2 +- ...g-and-authorizing-users-for-github-apps.md | 132 ++-- .../developers/apps/installing-github-apps.md | 2 +- ...refreshing-user-to-server-access-tokens.md | 2 +- .../developers/apps/scopes-for-oauth-apps.md | 103 ++- ...ment-environment-to-create-a-github-app.md | 4 +- .../suspending-a-github-app-installation.md | 3 +- .../about-github-marketplace.md | 52 +- .../github-marketplace/billing-customers.md | 36 +- ...a-webhook-to-notify-you-of-plan-changes.md | 24 +- .../creating-apps-for-github-marketplace.md | 4 +- .../drafting-a-listing-for-your-app.md | 42 +- .../handling-new-purchases-and-free-trials.md | 14 +- .../viewing-metrics-for-your-listing.md | 3 +- .../viewing-transactions-for-your-listing.md | 3 +- ...k-events-for-the-github-marketplace-api.md | 10 +- .../overview/managing-deploy-keys.md | 8 +- .../overview/replacing-github-services.md | 2 +- .../webhooks-and-events/about-webhooks.md | 8 +- .../webhooks-and-events/creating-webhooks.md | 7 +- .../webhooks-and-events/github-event-types.md | 10 +- .../webhooks-and-events/issue-event-types.md | 62 +- .../securing-your-webhooks.md | 1 + .../webhooks-and-events/testing-webhooks.md | 2 +- .../webhook-events-and-payloads.md | 76 +-- ...fications-for-pushes-to-your-repository.md | 2 +- ...about-github-dependabot-version-updates.md | 2 +- .../about-required-commit-signing.md | 2 +- .../about-securing-your-repository.md | 8 +- .../changing-the-default-branch.md | 2 +- ...classifying-your-repository-with-topics.md | 40 +- ...guration-options-for-dependency-updates.md | 14 +- ...imiting-github-actions-for-a-repository.md | 2 +- ...ling-force-pushes-to-a-protected-branch.md | 23 +- .../administering-a-repository/index.md | 2 +- ...ng-pull-requests-for-dependency-updates.md | 4 +- .../setting-repository-visibility.md | 2 +- ...deployment-activity-for-your-repository.md | 2 +- ...-factor-authentication-recovery-methods.md | 2 +- .../error-bad-file-number.md | 2 +- .../generating-a-new-gpg-key.md | 2 +- .../githubs-ssh-key-fingerprints.md | 2 +- ...moving-sensitive-data-from-a-repository.md | 4 +- .../reviewing-your-security-log.md | 329 +++++----- .../adding-a-license-to-a-repository.md | 2 +- .../locking-conversations.md | 40 +- .../managing-disruptive-comments.md | 79 ++- ...ngle-issue-template-for-your-repository.md | 2 +- ...cking-a-user-from-your-personal-account.md | 2 +- .../about-pull-requests.md | 7 + .../about-status-checks.md | 2 +- ...nging-the-base-branch-of-a-pull-request.md | 6 + ...repositories-with-code-quality-features.md | 4 +- .../index.md | 2 +- .../resolving-a-merge-conflict-on-github.md | 63 +- .../syncing-a-fork.md | 14 +- ...sitory-is-deleted-or-changes-visibility.md | 2 +- .../changing-a-commit-message.md | 22 +- ...creating-a-commit-with-multiple-authors.md | 63 +- .../about-repository-visibility.md | 21 +- .../backing-up-a-repository.md | 42 +- .../creating-a-template-repository.md | 14 +- .../error-repository-not-found.md | 2 +- .../https-cloning-errors.md | 2 +- .../github-extensions-and-integrations.md | 10 +- .../about-integration-with-code-scanning.md | 2 +- .../configuring-code-scanning.md | 6 +- ...enabling-code-scanning-for-a-repository.md | 4 +- .../index.md | 2 + ...ode-scanning-alerts-for-your-repository.md | 72 ++- ...ing-codeql-code-scanning-in-a-container.md | 69 ++ ...-codeql-code-scanning-in-your-ci-system.md | 19 +- .../sarif-support-for-code-scanning.md | 2 + ...g-code-scanning-alerts-in-pull-requests.md | 34 +- ...-codeql-code-scanning-in-your-ci-system.md | 2 +- .../troubleshooting-the-codeql-workflow.md | 71 +- .../githubs-products.md | 2 +- .../saving-repositories-with-stars.md | 2 +- .../supported-browsers.md | 2 +- ...roject-to-github-using-the-command-line.md | 6 +- ...-differences-between-subversion-and-git.md | 4 +- .../adding-a-file-to-a-repository.md | 2 +- .../navigating-code-on-github.md | 1 + ...g-with-jupyter-notebook-files-on-github.md | 4 +- .../about-git-large-file-storage.md | 8 +- .../conditions-for-large-files.md | 2 +- .../configuring-git-large-file-storage.md | 2 +- ...oving-files-from-git-large-file-storage.md | 38 +- ...bout-alerts-for-vulnerable-dependencies.md | 37 +- ...bout-github-dependabot-security-updates.md | 33 + ...ilities-in-the-github-advisory-database.md | 1 + ...ring-github-dependabot-security-updates.md | 26 +- ...tifications-for-vulnerable-dependencies.md | 58 ++ .../index.md | 3 + ...roubleshooting-github-dependabot-errors.md | 82 +++ ...he-detection-of-vulnerable-dependencies.md | 6 +- ...nerable-dependencies-in-your-repository.md | 6 +- .../configuring-notifications.md | 21 +- .../managing-notifications-from-your-inbox.md | 2 + .../managing-your-subscriptions.md | 2 +- ...and-pull-requests-with-query-parameters.md | 18 +- .../about-automation-for-project-boards.md | 7 +- .../about-labels.md | 22 +- .../about-project-boards.md | 2 +- ...es-and-pull-requests-to-a-project-board.md | 2 +- ...ying-labels-to-issues-and-pull-requests.md | 2 +- ...and-pull-requests-to-other-github-users.md | 2 +- .../creating-a-label.md | 2 +- .../creating-a-project-board.md | 2 +- .../deleting-a-label.md | 2 +- .../disabling-issues.md | 4 +- .../editing-a-label.md | 2 +- ...attachments-on-issues-and-pull-requests.md | 27 +- .../filtering-cards-on-a-project-board.md | 6 +- ...g-issues-and-pull-requests-by-milestone.md | 2 +- .../linking-a-pull-request-to-an-issue.md | 16 +- ...linking-a-repository-to-a-project-board.md | 6 + ...tracking-progress-on-your-project-board.md | 8 +- ...sferring-an-issue-to-another-repository.md | 2 +- ...arch-to-filter-issues-and-pull-requests.md | 2 +- ...ng-all-of-your-issues-and-pull-requests.md | 2 +- .../about-notifications.md | 2 +- .../about-web-notifications.md | 2 +- ...to-and-unsubscribing-from-notifications.md | 2 +- .../watching-and-unwatching-repositories.md | 2 +- .../about-searching-on-github.md | 8 +- .../finding-files-on-github.md | 2 +- .../searching-code.md | 4 +- .../searching-for-packages.md | 6 +- .../searching-issues-and-pull-requests.md | 30 +- .../understanding-the-search-syntax.md | 8 +- .../about-billing-for-github-actions.md | 4 +- ...r-an-organization-on-behalf-of-a-client.md | 2 +- ...-your-spending-limit-for-github-actions.md | 8 +- ...your-spending-limit-for-github-packages.md | 8 +- .../upgrading-your-github-subscription.md | 4 +- .../viewing-your-github-actions-usage.md | 8 +- .../viewing-your-github-packages-usage.md | 6 +- .../about-ssh-certificate-authorities.md | 2 +- .../about-teams.md | 4 +- .../about-your-organization-dashboard.md | 2 +- .../about-your-organizations-news-feed.md | 2 +- ...f-your-identity-provider-is-unavailable.md | 2 +- ...to-a-project-board-in-your-organization.md | 4 +- ...ithub-app-managers-in-your-organization.md | 4 +- .../adding-organization-members-to-a-team.md | 13 +- ...artifacts-and-logs-in-your-organization.md | 6 +- ...ation-member-to-an-outside-collaborator.md | 2 +- ...-collaborator-to-an-organization-member.md | 19 +- ...reating-a-new-organization-from-scratch.md | 2 +- .../deleting-an-organization-account.md | 2 +- ...ng-github-actions-for-your-organization.md | 10 +- ...ithub-pages-sites-for-your-organization.md | 22 +- .../index.md | 2 +- ...nviting-users-to-join-your-organization.md | 4 +- ...access-to-an-organization-project-board.md | 4 +- ...ls-access-to-an-organization-repository.md | 2 +- ...anaging-membership-in-your-organization.md | 2 +- ...analysis-settings-for-your-organization.md | 2 +- ...e-for-repositories-in-your-organization.md | 2 +- ...he-forking-policy-for-your-organization.md | 6 +- ...ganizations-ssh-certificate-authorities.md | 2 +- .../permission-levels-for-an-organization.md | 176 ++--- ...tor-authentication-in-your-organization.md | 2 +- ...ng-a-former-member-of-your-organization.md | 4 +- ...llaborators-access-to-your-organization.md | 52 +- ...hub-app-managers-from-your-organization.md | 4 +- .../renaming-an-organization.md | 2 +- ...y-permission-levels-for-an-organization.md | 136 ++-- ...tor-authentication-in-your-organization.md | 18 +- ...epository-creation-in-your-organization.md | 6 +- ...ing-the-audit-log-for-your-organization.md | 606 +++++++++--------- ...ur-organizations-installed-integrations.md | 19 +- ...ng-base-permissions-for-an-organization.md | 2 +- ...ssions-for-adding-outside-collaborators.md | 13 +- .../transferring-organization-ownership.md | 2 +- ...ading-to-the-corporate-terms-of-service.md | 2 +- ...s-in-your-organization-have-2fa-enabled.md | 2 +- .../about-enterprise-accounts.md | 4 + ...ons-policies-in-your-enterprise-account.md | 2 +- ...ity-settings-in-your-enterprise-account.md | 2 +- .../index.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - .../managing-your-enterprise-account.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - ...n-and-usage-for-your-enterprise-account.md | 9 +- .../viewing-contributions-on-your-profile.md | 2 +- ...tributions-not-showing-up-on-my-profile.md | 6 +- .../changing-your-github-username.md | 54 +- .../index.md | 2 +- ...ss-to-your-user-accounts-project-boards.md | 4 +- ...fault-branch-name-for-your-repositories.md | 2 +- ...on-levels-for-a-user-account-repository.md | 76 +-- ...ithub-enterprise-subscription-agreement.md | 2 +- ...d-data-protection-for-your-organization.md | 4 +- .../github-sensitive-data-removal-policy.md | 2 +- .../github-subprocessors-and-cookies.md | 38 +- ...al-terms-for-microsoft-volume-licensing.md | 2 +- .../site-policy/github-trademark-policy.md | 2 +- .../using-git/changing-a-remotes-url.md | 2 +- .../pushing-commits-to-a-remote-repository.md | 1 + .../about-the-dependency-graph.md | 4 +- ...loring-the-dependencies-of-a-repository.md | 4 +- .../viewing-a-projects-contributors.md | 2 +- .../viewing-traffic-to-a-repository.md | 17 +- .../about-github-pages-and-jekyll.md | 2 +- .../about-github-pages.md | 4 +- ...shing-source-for-your-github-pages-site.md | 2 +- ...reating-a-github-pages-site-with-jekyll.md | 49 +- ...for-your-github-pages-site-using-jekyll.md | 2 +- ...yll-build-errors-for-github-pages-sites.md | 112 ++-- .../unpublishing-a-github-pages-site.md | 2 +- .../writing-on-github/creating-gists.md | 4 +- .../graphql/overview/about-the-graphql-api.md | 2 +- ...n-github-insights-and-github-enterprise.md | 2 +- .../updating-github-insights.md | 1 - ...ub-container-registry-for-docker-images.md | 2 +- .../about-github-packages.md | 2 +- ...ache-maven-for-use-with-github-packages.md | 64 +- ...ing-docker-for-use-with-github-packages.md | 83 ++- ...dotnet-cli-for-use-with-github-packages.md | 7 +- ...ing-gradle-for-use-with-github-packages.md | 2 +- ...guring-npm-for-use-with-github-packages.md | 111 ++-- ...g-rubygems-for-use-with-github-packages.md | 115 ++-- .../rest/guides/basics-of-authentication.md | 4 +- .../getting-started-with-the-rest-api.md | 1 - .../content/rest/overview/api-previews.md | 20 +- .../overview/resources-in-the-rest-api.md | 8 +- .../ja-JP/content/rest/reference/actions.md | 2 +- .../ja-JP/content/rest/reference/apps.md | 9 + .../rest/reference/enterprise-admin.md | 10 +- .../ja-JP/content/rest/reference/gists.md | 2 +- .../ja-JP/content/rest/reference/orgs.md | 2 +- .../permissions-required-for-github-apps.md | 6 +- .../ja-JP/content/rest/reference/repos.md | 10 +- .../reusables/actions/actions-not-verified.md | 2 +- .../data/reusables/actions/enterprise-beta.md | 4 +- .../enterprise-github-hosted-runners.md | 2 +- .../actions/enterprise-marketplace-actions.md | 2 +- .../actions/enterprise-setup-prereq.md | 2 +- .../deprecating_auth_with_query_parameters.md | 2 +- .../apps/deprecating_github_services_ghe.md | 2 +- .../apps/deprecating_password_auth.md | 2 +- .../deprecating_token_oauth_authorizations.md | 2 +- .../filter-issues-and-pull-requests-tip.md | 2 +- .../choose-alert-dismissal-reason.md | 1 + .../false-positive-fix-codeql.md | 2 +- .../dependabot/automated-tests-note.md | 5 + .../dependabot/pull-request-introduction.md | 1 + .../dependabot/supported-package-managers.md | 2 +- .../access-enterprise-on-dotcom.md | 5 + .../enterprise-accounts/access-enterprise.md | 16 +- .../enterprise-accounts/license-tab.md | 10 +- .../data/reusables/enterprise/rate_limit.md | 2 +- .../submit-support-ticket-first-section.md | 2 +- .../submit-support-ticket-second-section.md | 2 +- .../aws-recommended-instance-types.md | 2 +- .../aws-supported-instance-types.md | 6 +- .../ja-JP/data/reusables/files/add-file.md | 2 +- .../files/commit-author-email-options.md | 2 +- .../reusables/gated-features/code-scanning.md | 2 +- .../reusables/gated-features/draft-prs.md | 2 +- .../gist/anonymous-gists-cannot-be-deleted.md | 2 +- .../github-actions/macos-runner-preview.md | 5 + ...-runner-management-permissions-required.md | 4 +- ...-runner-navigate-to-repo-org-enterprise.md | 4 +- .../supported-github-runners.md | 1 + .../github-actions/usage-matrix-limits.md | 2 +- .../issue-event-common-properties.md | 20 +- .../marketplace/github_apps_preferred.md | 2 +- .../reusables/marketplace/unverified-apps.md | 2 +- .../notifications/outbound_email_tip.md | 2 +- ...ification-delivery-method-customization.md | 3 + ...nerable-dependency-notification-options.md | 33 + .../admins-can-configure-package-types.md | 2 +- .../docker_registry_deprecation_status.md | 2 +- .../packages-ghes-release-stage.md | 2 +- .../pages/build-failure-email-server.md | 2 +- .../pages/build-locally-download-cname.md | 2 +- .../pages/private_pages_are_public_warning.md | 2 +- .../pre-release-program/fury-pre-release.md | 2 +- .../machine-man-preview.md | 2 +- .../pre-release-program/sailor-v-preview.md | 2 +- .../user_profile_page_block_or_report.md | 2 +- .../project-progress-locations.md | 2 +- .../pull_request_merges_and_contributions.md | 2 +- .../repositories/about-internal-repos.md | 2 +- .../reusables/repositories/copy-clone-url.md | 2 +- ...forks_from_private_repositories_warning.md | 2 +- .../repositories/enable-security-alerts.md | 2 +- .../navigate-to-job-superlinter.md | 4 +- .../repositories/new-pull-request.md | 2 +- .../repositories/open-with-github-desktop.md | 2 +- .../data/reusables/repositories/releases.md | 2 +- .../repositories/tracks-vulnerabilities.md | 1 - .../reusables/repositories/you-can-fork.md | 4 +- .../data/reusables/search/syntax_tips.md | 2 +- .../data/reusables/two_fa/auth_methods_2fa.md | 10 +- .../user-settings/marketplace_apps.md | 2 +- .../webhooks/check_run_properties.md | 20 +- .../data/reusables/webhooks/content_type.md | 8 +- .../webhooks/project_card_properties.md | 14 +- .../webhooks/project_column_properties.md | 14 +- .../webhooks/webhooks-rest-api-links.md | 4 + .../creating-a-javascript-action.md | 2 +- .../guides/building-and-testing-nodejs.md | 2 +- .../guides/publishing-docker-images.md | 2 +- .../storing-workflow-data-as-artifacts.md | 2 +- .../about-self-hosted-runners.md | 2 +- .../adding-self-hosted-runners.md | 4 +- ...ess-to-self-hosted-runners-using-groups.md | 2 +- .../removing-self-hosted-runners.md | 4 +- translations/ko-KR/content/actions/index.md | 32 +- .../security-hardening-for-github-actions.md | 37 ++ .../disabling-and-enabling-a-workflow.md | 2 +- .../removing-workflow-artifacts.md | 2 +- .../ko-KR/content/actions/quickstart.md | 2 +- ...nd-expression-syntax-for-github-actions.md | 2 +- ...pecifications-for-github-hosted-runners.md | 3 + .../workflow-commands-for-github-actions.md | 4 +- .../workflow-syntax-for-github-actions.md | 4 +- ...ependencies-on-github-enterprise-server.md | 14 +- ...ng-a-failover-to-your-replica-appliance.md | 9 + .../upgrade-requirements.md | 4 +- .../about-github-enterprise-support.md | 2 +- .../providing-data-to-github-support.md | 4 +- .../enterprise-support/submitting-a-ticket.md | 4 +- ...-hosted-runners-without-internet-access.md | 2 +- ...erprise-server-on-google-cloud-platform.md | 4 +- ...managing-your-github-enterprise-license.md | 19 +- ...ctor-authentication-for-an-organization.md | 2 +- .../apps/authenticating-with-github-apps.md | 8 +- .../creating-a-github-app-from-a-manifest.md | 2 +- ...ating-a-github-app-using-url-parameters.md | 6 +- ...g-and-authorizing-users-for-github-apps.md | 8 +- .../developers/apps/installing-github-apps.md | 2 +- .../developers/apps/scopes-for-oauth-apps.md | 60 +- .../about-github-marketplace.md | 2 +- .../overview/replacing-github-services.md | 2 +- .../webhooks-and-events/about-webhooks.md | 4 +- .../webhooks-and-events/creating-webhooks.md | 3 + .../webhooks-and-events/github-event-types.md | 4 +- .../webhooks-and-events/issue-event-types.md | 6 +- .../securing-your-webhooks.md | 1 + .../webhooks-and-events/testing-webhooks.md | 2 +- .../webhook-events-and-payloads.md | 30 +- ...fications-for-pushes-to-your-repository.md | 2 +- ...about-github-dependabot-version-updates.md | 2 +- .../about-required-commit-signing.md | 2 +- .../about-securing-your-repository.md | 8 +- ...classifying-your-repository-with-topics.md | 2 +- ...guration-options-for-dependency-updates.md | 14 +- ...imiting-github-actions-for-a-repository.md | 2 +- ...ling-force-pushes-to-a-protected-branch.md | 2 +- .../administering-a-repository/index.md | 2 +- ...ng-pull-requests-for-dependency-updates.md | 4 +- .../setting-repository-visibility.md | 2 +- ...deployment-activity-for-your-repository.md | 2 +- .../generating-a-new-gpg-key.md | 2 +- ...moving-sensitive-data-from-a-repository.md | 4 +- .../reviewing-your-security-log.md | 26 +- .../adding-a-license-to-a-repository.md | 2 +- ...ngle-issue-template-for-your-repository.md | 2 +- ...cking-a-user-from-your-personal-account.md | 2 +- .../about-pull-requests.md | 7 + ...nging-the-base-branch-of-a-pull-request.md | 6 + ...repositories-with-code-quality-features.md | 2 +- .../index.md | 2 +- .../resolving-a-merge-conflict-on-github.md | 4 +- .../syncing-a-fork.md | 14 +- ...sitory-is-deleted-or-changes-visibility.md | 2 +- ...creating-a-commit-with-multiple-authors.md | 4 +- .../about-repository-visibility.md | 2 +- .../backing-up-a-repository.md | 4 +- .../creating-a-template-repository.md | 9 +- .../error-repository-not-found.md | 2 +- .../https-cloning-errors.md | 2 +- .../github-extensions-and-integrations.md | 10 +- .../about-integration-with-code-scanning.md | 2 +- .../configuring-code-scanning.md | 6 +- ...enabling-code-scanning-for-a-repository.md | 4 +- .../index.md | 2 + ...ode-scanning-alerts-for-your-repository.md | 72 ++- ...ing-codeql-code-scanning-in-a-container.md | 69 ++ ...-codeql-code-scanning-in-your-ci-system.md | 8 +- .../sarif-support-for-code-scanning.md | 2 + ...g-code-scanning-alerts-in-pull-requests.md | 34 +- ...-codeql-code-scanning-in-your-ci-system.md | 2 +- .../troubleshooting-the-codeql-workflow.md | 8 +- .../uploading-a-sarif-file-to-github.md | 4 +- .../githubs-products.md | 2 +- .../supported-browsers.md | 2 +- ...roject-to-github-using-the-command-line.md | 6 +- ...-differences-between-subversion-and-git.md | 4 +- .../adding-a-file-to-a-repository.md | 2 +- .../navigating-code-on-github.md | 1 + .../about-git-large-file-storage.md | 8 +- .../conditions-for-large-files.md | 2 +- .../configuring-git-large-file-storage.md | 2 +- ...bout-alerts-for-vulnerable-dependencies.md | 40 +- ...bout-github-dependabot-security-updates.md | 33 + ...ilities-in-the-github-advisory-database.md | 1 + ...ring-github-dependabot-security-updates.md | 26 +- ...tifications-for-vulnerable-dependencies.md | 58 ++ .../index.md | 3 + ...roubleshooting-github-dependabot-errors.md | 82 +++ ...he-detection-of-vulnerable-dependencies.md | 6 +- ...nerable-dependencies-in-your-repository.md | 6 +- .../configuring-notifications.md | 21 +- .../managing-notifications-from-your-inbox.md | 2 + .../managing-your-subscriptions.md | 2 +- .../about-automation-for-project-boards.md | 5 +- ...attachments-on-issues-and-pull-requests.md | 4 +- ...linking-a-repository-to-a-project-board.md | 6 + ...tracking-progress-on-your-project-board.md | 8 +- .../finding-files-on-github.md | 2 +- .../searching-for-packages.md | 2 +- .../searching-issues-and-pull-requests.md | 2 +- .../about-billing-for-github-actions.md | 2 +- .../about-teams.md | 4 +- .../about-your-organization-dashboard.md | 2 +- ...ng-github-actions-for-your-organization.md | 2 +- ...ithub-pages-sites-for-your-organization.md | 2 +- .../index.md | 2 +- .../permission-levels-for-an-organization.md | 2 +- ...ing-the-audit-log-for-your-organization.md | 113 ++-- .../about-enterprise-accounts.md | 4 + .../index.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - .../managing-your-enterprise-account.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - ...n-and-usage-for-your-enterprise-account.md | 9 +- .../viewing-contributions-on-your-profile.md | 2 +- ...tributions-not-showing-up-on-my-profile.md | 4 +- .../index.md | 2 +- ...ithub-enterprise-subscription-agreement.md | 2 +- .../github-sensitive-data-removal-policy.md | 2 +- ...al-terms-for-microsoft-volume-licensing.md | 2 +- .../site-policy/github-trademark-policy.md | 2 +- .../using-git/changing-a-remotes-url.md | 2 +- .../pushing-commits-to-a-remote-repository.md | 1 + .../about-the-dependency-graph.md | 4 +- ...loring-the-dependencies-of-a-repository.md | 4 +- .../viewing-a-projects-contributors.md | 2 +- .../about-github-pages-and-jekyll.md | 2 +- .../about-github-pages.md | 2 +- ...reating-a-github-pages-site-with-jekyll.md | 2 +- ...for-your-github-pages-site-using-jekyll.md | 2 +- .../writing-on-github/creating-gists.md | 4 +- .../updating-github-insights.md | 1 - ...ub-container-registry-for-docker-images.md | 2 +- .../about-github-packages.md | 2 +- ...ache-maven-for-use-with-github-packages.md | 12 +- ...ing-docker-for-use-with-github-packages.md | 12 +- ...dotnet-cli-for-use-with-github-packages.md | 6 +- ...ing-gradle-for-use-with-github-packages.md | 2 +- ...guring-npm-for-use-with-github-packages.md | 36 +- ...g-rubygems-for-use-with-github-packages.md | 10 +- .../content/rest/overview/api-previews.md | 20 +- .../overview/resources-in-the-rest-api.md | 8 +- .../ko-KR/content/rest/reference/apps.md | 9 + .../rest/reference/enterprise-admin.md | 6 +- .../ko-KR/content/rest/reference/gists.md | 2 +- .../ko-KR/content/rest/reference/orgs.md | 2 +- .../permissions-required-for-github-apps.md | 6 +- .../ko-KR/content/rest/reference/repos.md | 6 +- .../reusables/actions/actions-not-verified.md | 2 +- .../data/reusables/actions/enterprise-beta.md | 2 +- .../enterprise-github-hosted-runners.md | 2 +- .../actions/enterprise-marketplace-actions.md | 2 +- .../actions/enterprise-setup-prereq.md | 2 +- .../deprecating_auth_with_query_parameters.md | 2 +- .../apps/deprecating_github_services_ghe.md | 2 +- .../apps/deprecating_password_auth.md | 2 +- .../deprecating_token_oauth_authorizations.md | 2 +- .../choose-alert-dismissal-reason.md | 1 + .../false-positive-fix-codeql.md | 2 +- .../dependabot/automated-tests-note.md | 5 + .../dependabot/pull-request-introduction.md | 1 + .../dependabot/supported-package-managers.md | 2 +- .../access-enterprise-on-dotcom.md | 5 + .../enterprise-accounts/access-enterprise.md | 16 +- .../enterprise-accounts/license-tab.md | 10 +- .../data/reusables/enterprise/rate_limit.md | 2 +- .../submit-support-ticket-first-section.md | 2 +- .../submit-support-ticket-second-section.md | 2 +- .../aws-recommended-instance-types.md | 2 +- .../aws-supported-instance-types.md | 6 +- .../ko-KR/data/reusables/files/add-file.md | 2 +- .../reusables/gated-features/code-scanning.md | 2 +- .../reusables/gated-features/draft-prs.md | 2 +- .../gist/anonymous-gists-cannot-be-deleted.md | 2 +- .../github-actions/macos-runner-preview.md | 5 + ...-runner-management-permissions-required.md | 4 +- ...-runner-navigate-to-repo-org-enterprise.md | 4 +- .../supported-github-runners.md | 1 + .../github-actions/usage-matrix-limits.md | 2 +- .../notifications/outbound_email_tip.md | 2 +- ...ification-delivery-method-customization.md | 3 + ...nerable-dependency-notification-options.md | 33 + .../admins-can-configure-package-types.md | 2 +- .../docker_registry_deprecation_status.md | 2 +- .../packages-ghes-release-stage.md | 2 +- .../pages/build-failure-email-server.md | 2 +- .../pages/private_pages_are_public_warning.md | 2 +- .../pre-release-program/fury-pre-release.md | 2 +- .../machine-man-preview.md | 2 +- .../pre-release-program/sailor-v-preview.md | 2 +- .../user_profile_page_block_or_report.md | 2 +- .../project-progress-locations.md | 2 +- .../pull_request_merges_and_contributions.md | 2 +- .../repositories/about-internal-repos.md | 2 +- .../reusables/repositories/copy-clone-url.md | 2 +- ...forks_from_private_repositories_warning.md | 2 +- .../repositories/enable-security-alerts.md | 2 +- .../repositories/new-pull-request.md | 2 +- .../repositories/open-with-github-desktop.md | 2 +- .../data/reusables/repositories/releases.md | 2 +- .../repositories/tracks-vulnerabilities.md | 1 - .../data/reusables/search/syntax_tips.md | 2 +- .../data/reusables/two_fa/auth_methods_2fa.md | 10 +- .../webhooks/webhooks-rest-api-links.md | 4 + .../creating-a-composite-run-steps-action.md | 8 +- .../creating-a-javascript-action.md | 2 +- .../building-and-testing-java-with-maven.md | 2 +- .../guides/building-and-testing-nodejs.md | 2 +- .../guides/publishing-docker-images.md | 2 +- .../storing-workflow-data-as-artifacts.md | 2 +- .../about-self-hosted-runners.md | 2 +- .../adding-self-hosted-runners.md | 4 +- ...ess-to-self-hosted-runners-using-groups.md | 2 +- .../removing-self-hosted-runners.md | 4 +- translations/pt-BR/content/actions/index.md | 32 +- ...ting-from-gitlab-cicd-to-github-actions.md | 2 +- .../security-hardening-for-github-actions.md | 37 ++ .../disabling-and-enabling-a-workflow.md | 2 +- .../removing-workflow-artifacts.md | 2 +- .../using-workflow-run-logs.md | 10 +- .../pt-BR/content/actions/quickstart.md | 2 +- ...nd-expression-syntax-for-github-actions.md | 2 +- ...pecifications-for-github-hosted-runners.md | 15 +- ...usage-limits-billing-and-administration.md | 2 +- .../workflow-commands-for-github-actions.md | 4 +- .../workflow-syntax-for-github-actions.md | 4 +- ...ependencies-on-github-enterprise-server.md | 14 +- ...ng-a-failover-to-your-replica-appliance.md | 9 + .../upgrade-requirements.md | 4 +- .../about-github-enterprise-support.md | 2 +- .../providing-data-to-github-support.md | 12 +- .../enterprise-support/submitting-a-ticket.md | 4 +- ...-hosted-runners-without-internet-access.md | 2 +- ...erprise-server-on-google-cloud-platform.md | 4 +- ...managing-your-github-enterprise-license.md | 21 +- ...ctor-authentication-for-an-organization.md | 2 +- .../apps/authenticating-with-github-apps.md | 8 +- .../creating-a-github-app-from-a-manifest.md | 2 +- .../creating-ci-tests-with-the-checks-api.md | 200 +++--- ...g-and-authorizing-users-for-github-apps.md | 8 +- .../developers/apps/installing-github-apps.md | 2 +- .../developers/apps/scopes-for-oauth-apps.md | 4 +- .../about-github-marketplace.md | 2 +- .../overview/replacing-github-services.md | 2 +- .../webhooks-and-events/about-webhooks.md | 4 +- .../webhooks-and-events/creating-webhooks.md | 3 + .../webhooks-and-events/issue-event-types.md | 4 +- .../securing-your-webhooks.md | 3 +- .../webhooks-and-events/testing-webhooks.md | 2 +- .../webhook-events-and-payloads.md | 22 +- ...fications-for-pushes-to-your-repository.md | 2 +- ...about-github-dependabot-version-updates.md | 2 +- .../about-required-commit-signing.md | 2 +- .../about-securing-your-repository.md | 8 +- ...classifying-your-repository-with-topics.md | 2 +- ...guration-options-for-dependency-updates.md | 14 +- ...imiting-github-actions-for-a-repository.md | 2 +- ...ling-force-pushes-to-a-protected-branch.md | 2 +- .../administering-a-repository/index.md | 2 +- ...ng-pull-requests-for-dependency-updates.md | 4 +- .../setting-repository-visibility.md | 2 +- ...deployment-activity-for-your-repository.md | 2 +- .../generating-a-new-gpg-key.md | 2 +- .../githubs-ssh-key-fingerprints.md | 2 +- ...moving-sensitive-data-from-a-repository.md | 4 +- .../reviewing-your-security-log.md | 6 +- .../adding-a-license-to-a-repository.md | 2 +- ...reating-a-default-community-health-file.md | 2 +- ...ngle-issue-template-for-your-repository.md | 2 +- ...cking-a-user-from-your-personal-account.md | 2 +- .../about-pull-requests.md | 7 + ...nging-the-base-branch-of-a-pull-request.md | 6 + ...repositories-with-code-quality-features.md | 2 +- .../index.md | 2 +- .../resolving-a-merge-conflict-on-github.md | 4 +- .../syncing-a-fork.md | 14 +- ...sitory-is-deleted-or-changes-visibility.md | 2 +- .../working-with-pre-receive-hooks.md | 2 +- .../changing-a-commit-message.md | 8 +- ...creating-a-commit-with-multiple-authors.md | 4 +- .../about-repository-visibility.md | 2 +- .../backing-up-a-repository.md | 4 +- .../creating-a-template-repository.md | 9 +- .../error-repository-not-found.md | 2 +- .../https-cloning-errors.md | 2 +- .../github-extensions-and-integrations.md | 10 +- .../about-integration-with-code-scanning.md | 2 +- .../configuring-code-scanning.md | 6 +- ...enabling-code-scanning-for-a-repository.md | 4 +- .../index.md | 2 + ...ode-scanning-alerts-for-your-repository.md | 72 ++- ...ing-codeql-code-scanning-in-a-container.md | 69 ++ ...-codeql-code-scanning-in-your-ci-system.md | 7 +- .../sarif-support-for-code-scanning.md | 2 + ...g-code-scanning-alerts-in-pull-requests.md | 34 +- ...-codeql-code-scanning-in-your-ci-system.md | 2 +- .../troubleshooting-the-codeql-workflow.md | 105 +-- .../githubs-products.md | 2 +- .../supported-browsers.md | 2 +- ...roject-to-github-using-the-command-line.md | 6 +- .../adding-a-file-to-a-repository.md | 2 +- .../navigating-code-on-github.md | 1 + ...g-with-jupyter-notebook-files-on-github.md | 4 +- .../about-git-large-file-storage.md | 8 +- .../conditions-for-large-files.md | 2 +- .../configuring-git-large-file-storage.md | 2 +- ...bout-alerts-for-vulnerable-dependencies.md | 93 +-- ...bout-github-dependabot-security-updates.md | 33 + ...ilities-in-the-github-advisory-database.md | 1 + ...ring-github-dependabot-security-updates.md | 26 +- ...tifications-for-vulnerable-dependencies.md | 56 ++ .../index.md | 3 + ...roubleshooting-github-dependabot-errors.md | 82 +++ ...he-detection-of-vulnerable-dependencies.md | 6 +- ...nerable-dependencies-in-your-repository.md | 6 +- .../configuring-notifications.md | 21 +- .../managing-notifications-from-your-inbox.md | 2 + .../managing-your-subscriptions.md | 2 +- .../about-automation-for-project-boards.md | 5 +- ...attachments-on-issues-and-pull-requests.md | 4 +- .../linking-a-pull-request-to-an-issue.md | 4 +- ...linking-a-repository-to-a-project-board.md | 6 + ...tracking-progress-on-your-project-board.md | 8 +- .../finding-files-on-github.md | 2 +- .../searching-for-packages.md | 2 +- .../searching-issues-and-pull-requests.md | 2 +- .../about-billing-for-github-actions.md | 2 +- .../about-teams.md | 4 +- .../about-your-organization-dashboard.md | 2 +- ...ng-github-actions-for-your-organization.md | 2 +- ...ithub-pages-sites-for-your-organization.md | 2 +- .../index.md | 2 +- .../permission-levels-for-an-organization.md | 2 +- ...ing-the-audit-log-for-your-organization.md | 41 +- .../about-enterprise-accounts.md | 4 + ...cts-and-logs-in-your-enterprise-account.md | 6 +- .../index.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - .../managing-your-enterprise-account.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - ...n-and-usage-for-your-enterprise-account.md | 9 +- .../viewing-contributions-on-your-profile.md | 2 +- ...tributions-not-showing-up-on-my-profile.md | 6 +- .../index.md | 2 +- ...fault-branch-name-for-your-repositories.md | 6 +- ...ithub-enterprise-subscription-agreement.md | 2 +- ...d-data-protection-for-your-organization.md | 40 +- .../github-sensitive-data-removal-policy.md | 2 +- .../github-subprocessors-and-cookies.md | 76 +-- ...al-terms-for-microsoft-volume-licensing.md | 2 +- .../site-policy/github-trademark-policy.md | 2 +- .../using-git/changing-a-remotes-url.md | 2 +- .../using-git/managing-remote-repositories.md | 2 +- .../pushing-commits-to-a-remote-repository.md | 1 + .../about-the-dependency-graph.md | 4 +- ...loring-the-dependencies-of-a-repository.md | 4 +- .../viewing-a-projects-contributors.md | 2 +- .../about-github-pages-and-jekyll.md | 2 +- .../about-github-pages.md | 2 +- ...reating-a-github-pages-site-with-jekyll.md | 2 +- ...for-your-github-pages-site-using-jekyll.md | 2 +- .../writing-on-github/creating-gists.md | 4 +- .../updating-github-insights.md | 1 - ...ub-container-registry-for-docker-images.md | 2 +- .../about-github-packages.md | 2 +- ...ache-maven-for-use-with-github-packages.md | 12 +- ...ing-docker-for-use-with-github-packages.md | 12 +- ...dotnet-cli-for-use-with-github-packages.md | 6 +- ...ing-gradle-for-use-with-github-packages.md | 2 +- ...guring-npm-for-use-with-github-packages.md | 20 +- ...g-rubygems-for-use-with-github-packages.md | 10 +- .../rest/guides/basics-of-authentication.md | 4 +- .../getting-started-with-the-rest-api.md | 1 - .../content/rest/overview/api-previews.md | 20 +- .../overview/resources-in-the-rest-api.md | 8 +- .../pt-BR/content/rest/reference/apps.md | 9 + .../rest/reference/enterprise-admin.md | 6 +- .../pt-BR/content/rest/reference/gists.md | 2 +- .../pt-BR/content/rest/reference/orgs.md | 2 +- .../permissions-required-for-github-apps.md | 6 +- .../pt-BR/content/rest/reference/repos.md | 6 +- .../reusables/actions/actions-not-verified.md | 2 +- .../data/reusables/actions/enterprise-beta.md | 2 +- .../enterprise-github-hosted-runners.md | 2 +- .../actions/enterprise-marketplace-actions.md | 2 +- .../actions/enterprise-setup-prereq.md | 2 +- .../deprecating_auth_with_query_parameters.md | 2 +- .../apps/deprecating_github_services_ghe.md | 2 +- .../apps/deprecating_password_auth.md | 2 +- .../deprecating_token_oauth_authorizations.md | 2 +- .../choose-alert-dismissal-reason.md | 1 + .../false-positive-fix-codeql.md | 2 +- .../dependabot/automated-tests-note.md | 5 + .../dependabot/pull-request-introduction.md | 1 + .../dependabot/supported-package-managers.md | 2 +- .../access-enterprise-on-dotcom.md | 5 + .../enterprise-accounts/access-enterprise.md | 16 +- .../enterprise-accounts/license-tab.md | 10 +- .../data/reusables/enterprise/rate_limit.md | 2 +- .../submit-support-ticket-first-section.md | 2 +- .../submit-support-ticket-second-section.md | 2 +- .../aws-recommended-instance-types.md | 2 +- .../aws-supported-instance-types.md | 56 +- .../pt-BR/data/reusables/files/add-file.md | 2 +- .../reusables/gated-features/code-scanning.md | 2 +- .../reusables/gated-features/draft-prs.md | 2 +- .../gist/anonymous-gists-cannot-be-deleted.md | 2 +- .../github-actions/macos-runner-preview.md | 5 + ...-runner-management-permissions-required.md | 4 +- ...-runner-navigate-to-repo-org-enterprise.md | 4 +- .../supported-github-runners.md | 1 + .../github-actions/usage-matrix-limits.md | 2 +- .../notifications/outbound_email_tip.md | 2 +- ...ification-delivery-method-customization.md | 3 + ...nerable-dependency-notification-options.md | 33 + .../admins-can-configure-package-types.md | 2 +- .../docker_registry_deprecation_status.md | 2 +- .../packages-ghes-release-stage.md | 2 +- .../pages/build-failure-email-server.md | 2 +- .../pages/private_pages_are_public_warning.md | 2 +- .../pre-release-program/fury-pre-release.md | 2 +- .../machine-man-preview.md | 2 +- .../pre-release-program/sailor-v-preview.md | 2 +- .../user_profile_page_block_or_report.md | 2 +- .../project-progress-locations.md | 2 +- .../pull_request_merges_and_contributions.md | 2 +- .../repositories/about-internal-repos.md | 2 +- .../reusables/repositories/copy-clone-url.md | 2 +- ...forks_from_private_repositories_warning.md | 2 +- .../repositories/enable-security-alerts.md | 2 +- .../repositories/new-pull-request.md | 2 +- .../repositories/open-with-github-desktop.md | 2 +- .../data/reusables/repositories/releases.md | 2 +- .../repositories/tracks-vulnerabilities.md | 5 +- .../data/reusables/search/syntax_tips.md | 2 +- .../reusables/support/receiving-credits.md | 28 +- .../data/reusables/two_fa/auth_methods_2fa.md | 10 +- .../webhooks/check_run_properties.md | 20 +- .../webhooks/check_suite_properties.md | 20 +- .../reusables/webhooks/issue_properties.md | 2 +- .../webhooks/pull_request_properties.md | 2 +- .../pull_request_review_comment_properties.md | 2 +- .../webhooks/sponsorship_properties.md | 2 +- .../webhooks/webhooks-rest-api-links.md | 4 + .../data/reusables/webhooks/webhooks_intro.md | 2 +- .../data/reusables/webhooks/webhooks_ssl.md | 2 +- .../reusables/webhooks/workflow_run_desc.md | 4 +- translations/pt-BR/data/ui.yml | 36 +- translations/pt-BR/data/variables/contact.yml | 10 +- translations/pt-BR/data/variables/desktop.yml | 2 +- translations/pt-BR/data/variables/explore.yml | 6 +- translations/pt-BR/data/variables/gists.yml | 6 +- .../pt-BR/data/variables/migrations.yml | 6 +- .../pt-BR/data/variables/notifications.yml | 4 +- translations/pt-BR/data/variables/product.yml | 22 +- translations/pt-BR/data/variables/search.yml | 4 +- .../creating-a-javascript-action.md | 2 +- .../guides/building-and-testing-nodejs.md | 2 +- .../guides/publishing-docker-images.md | 2 +- .../storing-workflow-data-as-artifacts.md | 2 +- .../about-self-hosted-runners.md | 2 +- .../adding-self-hosted-runners.md | 4 +- ...ess-to-self-hosted-runners-using-groups.md | 2 +- .../removing-self-hosted-runners.md | 4 +- translations/ru-RU/content/actions/index.md | 32 +- .../security-hardening-for-github-actions.md | 37 ++ .../disabling-and-enabling-a-workflow.md | 2 +- .../removing-workflow-artifacts.md | 2 +- .../ru-RU/content/actions/quickstart.md | 2 +- ...nd-expression-syntax-for-github-actions.md | 2 +- ...pecifications-for-github-hosted-runners.md | 3 + .../workflow-commands-for-github-actions.md | 4 +- .../workflow-syntax-for-github-actions.md | 4 +- ...ependencies-on-github-enterprise-server.md | 14 +- ...ng-a-failover-to-your-replica-appliance.md | 9 + .../upgrade-requirements.md | 4 +- .../about-github-enterprise-support.md | 2 +- .../providing-data-to-github-support.md | 4 +- .../enterprise-support/submitting-a-ticket.md | 4 +- ...-hosted-runners-without-internet-access.md | 2 +- ...erprise-server-on-google-cloud-platform.md | 4 +- ...managing-your-github-enterprise-license.md | 19 +- ...ctor-authentication-for-an-organization.md | 2 +- .../apps/authenticating-with-github-apps.md | 8 +- .../creating-a-github-app-from-a-manifest.md | 2 +- .../creating-ci-tests-with-the-checks-api.md | 3 +- ...g-and-authorizing-users-for-github-apps.md | 8 +- .../developers/apps/installing-github-apps.md | 2 +- .../developers/apps/scopes-for-oauth-apps.md | 60 +- .../about-github-marketplace.md | 2 +- .../overview/replacing-github-services.md | 2 +- .../webhooks-and-events/about-webhooks.md | 4 +- .../webhooks-and-events/creating-webhooks.md | 3 + .../webhooks-and-events/github-event-types.md | 4 +- .../webhooks-and-events/issue-event-types.md | 6 +- .../securing-your-webhooks.md | 1 + .../webhooks-and-events/testing-webhooks.md | 2 +- .../webhook-events-and-payloads.md | 30 +- ...fications-for-pushes-to-your-repository.md | 2 +- ...about-github-dependabot-version-updates.md | 2 +- .../about-required-commit-signing.md | 2 +- .../about-securing-your-repository.md | 8 +- ...classifying-your-repository-with-topics.md | 2 +- ...guration-options-for-dependency-updates.md | 14 +- ...imiting-github-actions-for-a-repository.md | 2 +- ...ling-force-pushes-to-a-protected-branch.md | 2 +- .../administering-a-repository/index.md | 2 +- ...ng-pull-requests-for-dependency-updates.md | 4 +- .../setting-repository-visibility.md | 2 +- ...deployment-activity-for-your-repository.md | 2 +- .../error-bad-file-number.md | 2 +- .../generating-a-new-gpg-key.md | 2 +- ...moving-sensitive-data-from-a-repository.md | 4 +- .../reviewing-your-security-log.md | 26 +- .../adding-a-license-to-a-repository.md | 2 +- ...ngle-issue-template-for-your-repository.md | 2 +- ...cking-a-user-from-your-personal-account.md | 2 +- .../about-pull-requests.md | 7 + ...nging-the-base-branch-of-a-pull-request.md | 6 + ...repositories-with-code-quality-features.md | 2 +- .../index.md | 2 +- .../resolving-a-merge-conflict-on-github.md | 4 +- .../syncing-a-fork.md | 14 +- ...sitory-is-deleted-or-changes-visibility.md | 2 +- ...creating-a-commit-with-multiple-authors.md | 4 +- .../about-repository-visibility.md | 2 +- .../backing-up-a-repository.md | 4 +- .../creating-a-template-repository.md | 9 +- .../error-repository-not-found.md | 2 +- .../https-cloning-errors.md | 2 +- .../github-extensions-and-integrations.md | 10 +- .../about-integration-with-code-scanning.md | 2 +- .../configuring-code-scanning.md | 34 +- ...enabling-code-scanning-for-a-repository.md | 4 +- .../index.md | 2 + ...ode-scanning-alerts-for-your-repository.md | 72 ++- ...ing-codeql-code-scanning-in-a-container.md | 69 ++ ...-codeql-code-scanning-in-your-ci-system.md | 8 +- .../sarif-support-for-code-scanning.md | 2 + ...g-code-scanning-alerts-in-pull-requests.md | 34 +- ...-codeql-code-scanning-in-your-ci-system.md | 2 +- .../troubleshooting-the-codeql-workflow.md | 8 +- .../githubs-products.md | 2 +- .../supported-browsers.md | 2 +- ...roject-to-github-using-the-command-line.md | 6 +- .../adding-a-file-to-a-repository.md | 2 +- .../navigating-code-on-github.md | 1 + .../about-git-large-file-storage.md | 8 +- .../conditions-for-large-files.md | 2 +- .../configuring-git-large-file-storage.md | 2 +- ...bout-alerts-for-vulnerable-dependencies.md | 40 +- ...bout-github-dependabot-security-updates.md | 33 + ...ilities-in-the-github-advisory-database.md | 1 + ...ring-github-dependabot-security-updates.md | 26 +- ...tifications-for-vulnerable-dependencies.md | 58 ++ .../index.md | 3 + ...roubleshooting-github-dependabot-errors.md | 82 +++ ...he-detection-of-vulnerable-dependencies.md | 6 +- ...nerable-dependencies-in-your-repository.md | 6 +- .../configuring-notifications.md | 21 +- .../managing-notifications-from-your-inbox.md | 2 + .../managing-your-subscriptions.md | 2 +- .../about-automation-for-project-boards.md | 5 +- ...attachments-on-issues-and-pull-requests.md | 4 +- ...linking-a-repository-to-a-project-board.md | 6 + ...tracking-progress-on-your-project-board.md | 8 +- .../finding-files-on-github.md | 2 +- .../searching-for-packages.md | 2 +- .../searching-issues-and-pull-requests.md | 2 +- .../about-billing-for-github-actions.md | 2 +- .../about-teams.md | 4 +- .../about-your-organization-dashboard.md | 2 +- ...ng-github-actions-for-your-organization.md | 2 +- ...ithub-pages-sites-for-your-organization.md | 2 +- .../index.md | 2 +- .../permission-levels-for-an-organization.md | 2 +- ...ing-the-audit-log-for-your-organization.md | 113 ++-- .../about-enterprise-accounts.md | 4 + .../index.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - .../managing-your-enterprise-account.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - ...n-and-usage-for-your-enterprise-account.md | 9 +- .../viewing-contributions-on-your-profile.md | 2 +- ...tributions-not-showing-up-on-my-profile.md | 4 +- .../index.md | 2 +- ...ithub-enterprise-subscription-agreement.md | 2 +- .../github-sensitive-data-removal-policy.md | 2 +- ...al-terms-for-microsoft-volume-licensing.md | 2 +- .../site-policy/github-trademark-policy.md | 2 +- .../using-git/changing-a-remotes-url.md | 2 +- .../pushing-commits-to-a-remote-repository.md | 1 + .../about-the-dependency-graph.md | 4 +- ...loring-the-dependencies-of-a-repository.md | 4 +- .../viewing-a-projects-contributors.md | 2 +- .../about-github-pages-and-jekyll.md | 2 +- .../about-github-pages.md | 2 +- ...reating-a-github-pages-site-with-jekyll.md | 2 +- ...for-your-github-pages-site-using-jekyll.md | 2 +- .../writing-on-github/creating-gists.md | 4 +- .../updating-github-insights.md | 1 - ...ub-container-registry-for-docker-images.md | 2 +- .../about-github-packages.md | 2 +- ...ache-maven-for-use-with-github-packages.md | 12 +- ...ing-docker-for-use-with-github-packages.md | 12 +- ...dotnet-cli-for-use-with-github-packages.md | 6 +- ...ing-gradle-for-use-with-github-packages.md | 2 +- ...guring-npm-for-use-with-github-packages.md | 36 +- ...g-rubygems-for-use-with-github-packages.md | 10 +- .../content/rest/overview/api-previews.md | 20 +- .../endpoints-available-for-github-apps.md | 2 +- .../overview/resources-in-the-rest-api.md | 9 +- .../ru-RU/content/rest/reference/apps.md | 9 + .../rest/reference/enterprise-admin.md | 6 +- .../ru-RU/content/rest/reference/gists.md | 2 +- .../ru-RU/content/rest/reference/orgs.md | 2 +- .../permissions-required-for-github-apps.md | 6 +- .../ru-RU/content/rest/reference/repos.md | 6 +- .../ru-RU/data/glossaries/external.yml | 8 +- .../ru-RU/data/glossaries/internal.yml | 4 +- .../reusables/actions/actions-not-verified.md | 2 +- .../data/reusables/actions/enterprise-beta.md | 2 +- .../enterprise-github-hosted-runners.md | 2 +- .../actions/enterprise-marketplace-actions.md | 2 +- .../actions/enterprise-setup-prereq.md | 2 +- .../deprecating_auth_with_query_parameters.md | 2 +- .../apps/deprecating_github_services_ghe.md | 2 +- .../apps/deprecating_password_auth.md | 2 +- .../deprecating_token_oauth_authorizations.md | 2 +- .../choose-alert-dismissal-reason.md | 1 + .../false-positive-fix-codeql.md | 2 +- .../dependabot/automated-tests-note.md | 5 + .../dependabot/pull-request-introduction.md | 1 + .../dependabot/supported-package-managers.md | 2 +- .../access-enterprise-on-dotcom.md | 5 + .../enterprise-accounts/access-enterprise.md | 16 +- .../enterprise-accounts/license-tab.md | 10 +- .../data/reusables/enterprise/rate_limit.md | 2 +- .../submit-support-ticket-first-section.md | 2 +- .../submit-support-ticket-second-section.md | 2 +- .../aws-recommended-instance-types.md | 2 +- .../aws-supported-instance-types.md | 6 +- .../ru-RU/data/reusables/files/add-file.md | 2 +- .../reusables/gated-features/code-scanning.md | 2 +- .../reusables/gated-features/draft-prs.md | 2 +- .../gist/anonymous-gists-cannot-be-deleted.md | 2 +- .../github-actions/macos-runner-preview.md | 5 + ...-runner-management-permissions-required.md | 4 +- ...-runner-navigate-to-repo-org-enterprise.md | 4 +- .../supported-github-runners.md | 1 + .../github-actions/usage-matrix-limits.md | 2 +- .../notifications/outbound_email_tip.md | 2 +- ...ification-delivery-method-customization.md | 3 + ...nerable-dependency-notification-options.md | 33 + .../admins-can-configure-package-types.md | 2 +- .../docker_registry_deprecation_status.md | 2 +- .../packages-ghes-release-stage.md | 2 +- .../pages/build-failure-email-server.md | 2 +- .../pages/private_pages_are_public_warning.md | 2 +- .../pre-release-program/fury-pre-release.md | 2 +- .../machine-man-preview.md | 2 +- .../pre-release-program/sailor-v-preview.md | 2 +- .../user_profile_page_block_or_report.md | 2 +- .../project-progress-locations.md | 2 +- .../pull_request_merges_and_contributions.md | 2 +- .../repositories/about-internal-repos.md | 2 +- .../reusables/repositories/copy-clone-url.md | 2 +- ...forks_from_private_repositories_warning.md | 2 +- .../repositories/enable-security-alerts.md | 2 +- .../repositories/new-pull-request.md | 2 +- .../repositories/open-with-github-desktop.md | 2 +- .../data/reusables/repositories/releases.md | 2 +- .../repositories/tracks-vulnerabilities.md | 1 - .../data/reusables/search/syntax_tips.md | 2 +- .../data/reusables/two_fa/auth_methods_2fa.md | 10 +- .../webhooks/webhooks-rest-api-links.md | 4 + .../creating-a-composite-run-steps-action.md | 6 +- .../creating-a-javascript-action.md | 2 +- .../guides/building-and-testing-nodejs.md | 2 +- ...hing-dependencies-to-speed-up-workflows.md | 12 +- .../storing-workflow-data-as-artifacts.md | 16 +- .../about-self-hosted-runners.md | 2 +- .../adding-self-hosted-runners.md | 4 +- ...ess-to-self-hosted-runners-using-groups.md | 2 +- .../removing-self-hosted-runners.md | 6 +- translations/zh-CN/content/actions/index.md | 36 +- .../essential-features-of-github-actions.md | 10 +- .../finding-and-customizing-actions.md | 54 +- .../actions/learn-github-actions/index.md | 6 +- .../introduction-to-github-actions.md | 48 +- ...ting-from-gitlab-cicd-to-github-actions.md | 2 +- .../security-hardening-for-github-actions.md | 37 ++ .../disabling-and-enabling-a-workflow.md | 2 +- .../removing-workflow-artifacts.md | 2 +- .../zh-CN/content/actions/quickstart.md | 2 +- ...nd-expression-syntax-for-github-actions.md | 6 +- ...pecifications-for-github-hosted-runners.md | 3 + ...usage-limits-billing-and-administration.md | 12 +- .../workflow-commands-for-github-actions.md | 4 +- .../workflow-syntax-for-github-actions.md | 4 +- ...dress-using-the-virtual-machine-console.md | 2 +- ...ependencies-on-github-enterprise-server.md | 14 +- .../initializing-the-cluster.md | 4 +- ...ng-a-failover-to-your-replica-appliance.md | 9 + .../upgrade-requirements.md | 4 +- .../about-github-enterprise-support.md | 30 +- .../providing-data-to-github-support.md | 4 +- .../enterprise-support/submitting-a-ticket.md | 4 +- ...-hosted-runners-without-internet-access.md | 2 +- ...erprise-server-on-google-cloud-platform.md | 4 +- ...managing-your-github-enterprise-license.md | 19 +- ...ctor-authentication-for-an-organization.md | 2 +- .../apps/authenticating-with-github-apps.md | 8 +- .../developers/apps/authorizing-oauth-apps.md | 175 +++-- .../creating-a-github-app-from-a-manifest.md | 2 +- ...ating-a-github-app-using-url-parameters.md | 164 ++--- ...g-and-authorizing-users-for-github-apps.md | 132 ++-- .../developers/apps/installing-github-apps.md | 2 +- .../developers/apps/scopes-for-oauth-apps.md | 103 ++- .../about-github-marketplace.md | 2 +- .../overview/replacing-github-services.md | 2 +- .../webhooks-and-events/about-webhooks.md | 8 +- .../webhooks-and-events/creating-webhooks.md | 3 + .../webhooks-and-events/github-event-types.md | 4 +- .../webhooks-and-events/issue-event-types.md | 6 +- .../securing-your-webhooks.md | 1 + .../webhooks-and-events/testing-webhooks.md | 2 +- .../webhook-events-and-payloads.md | 56 +- .../about-branch-restrictions.md | 2 +- ...fications-for-pushes-to-your-repository.md | 2 +- ...about-github-dependabot-version-updates.md | 2 +- .../about-required-commit-signing.md | 4 +- .../about-securing-your-repository.md | 8 +- ...classifying-your-repository-with-topics.md | 42 +- ...guration-options-for-dependency-updates.md | 14 +- ...imiting-github-actions-for-a-repository.md | 2 +- ...ling-force-pushes-to-a-protected-branch.md | 23 +- .../administering-a-repository/index.md | 2 +- ...ng-pull-requests-for-dependency-updates.md | 4 +- .../setting-repository-visibility.md | 2 +- ...deployment-activity-for-your-repository.md | 2 +- .../error-permission-denied-publickey.md | 75 ++- .../generating-a-new-gpg-key.md | 2 +- .../githubs-ssh-key-fingerprints.md | 2 +- ...moving-sensitive-data-from-a-repository.md | 4 +- .../reviewing-your-security-log.md | 329 +++++----- .../reviewing-your-ssh-keys.md | 47 +- .../adding-a-license-to-a-repository.md | 2 +- .../locking-conversations.md | 40 +- .../managing-disruptive-comments.md | 79 ++- ...ngle-issue-template-for-your-repository.md | 2 +- ...cking-a-user-from-your-personal-account.md | 2 +- .../about-pull-requests.md | 7 + .../about-status-checks.md | 2 +- ...nging-the-base-branch-of-a-pull-request.md | 6 + ...repositories-with-code-quality-features.md | 4 +- .../index.md | 2 +- .../resolving-a-merge-conflict-on-github.md | 63 +- .../syncing-a-fork.md | 14 +- ...sitory-is-deleted-or-changes-visibility.md | 2 +- .../changing-a-commit-message.md | 28 +- ...creating-a-commit-with-multiple-authors.md | 63 +- .../about-repository-visibility.md | 21 +- .../backing-up-a-repository.md | 42 +- .../creating-a-template-repository.md | 14 +- .../error-repository-not-found.md | 2 +- .../https-cloning-errors.md | 2 +- .../github-extensions-and-integrations.md | 10 +- .../about-integration-with-code-scanning.md | 2 +- .../configuring-code-scanning.md | 6 +- ...enabling-code-scanning-for-a-repository.md | 4 +- .../index.md | 2 + ...ode-scanning-alerts-for-your-repository.md | 72 ++- ...ing-codeql-code-scanning-in-a-container.md | 69 ++ ...-codeql-code-scanning-in-your-ci-system.md | 123 ++-- .../sarif-support-for-code-scanning.md | 2 + ...g-code-scanning-alerts-in-pull-requests.md | 34 +- ...-codeql-code-scanning-in-your-ci-system.md | 2 +- .../troubleshooting-the-codeql-workflow.md | 8 +- .../githubs-products.md | 2 +- .../supported-browsers.md | 2 +- .../about-github-importer.md | 12 +- ...roject-to-github-using-the-command-line.md | 6 +- .../adding-a-file-to-a-repository.md | 2 +- .../navigating-code-on-github.md | 1 + ...g-with-jupyter-notebook-files-on-github.md | 4 +- .../about-git-large-file-storage.md | 8 +- .../conditions-for-large-files.md | 2 +- .../configuring-git-large-file-storage.md | 2 +- ...oving-files-from-git-large-file-storage.md | 38 +- ...bout-alerts-for-vulnerable-dependencies.md | 37 +- ...bout-github-dependabot-security-updates.md | 33 + ...ilities-in-the-github-advisory-database.md | 1 + ...ring-github-dependabot-security-updates.md | 26 +- ...tifications-for-vulnerable-dependencies.md | 58 ++ .../index.md | 3 + ...roubleshooting-github-dependabot-errors.md | 82 +++ ...he-detection-of-vulnerable-dependencies.md | 6 +- ...nerable-dependencies-in-your-repository.md | 6 +- .../configuring-notifications.md | 21 +- .../managing-notifications-from-your-inbox.md | 2 + .../managing-your-subscriptions.md | 2 +- .../about-automation-for-project-boards.md | 5 +- ...attachments-on-issues-and-pull-requests.md | 29 +- ...linking-a-repository-to-a-project-board.md | 6 + ...tracking-progress-on-your-project-board.md | 8 +- .../finding-files-on-github.md | 2 +- .../searching-for-packages.md | 2 +- .../searching-issues-and-pull-requests.md | 2 +- .../about-billing-for-github-actions.md | 2 +- .../about-teams.md | 4 +- .../about-your-organization-dashboard.md | 2 +- .../adding-organization-members-to-a-team.md | 13 +- ...-collaborator-to-an-organization-member.md | 15 +- ...ng-github-actions-for-your-organization.md | 2 +- ...ithub-pages-sites-for-your-organization.md | 22 +- .../index.md | 2 +- .../permission-levels-for-an-organization.md | 2 +- ...llaborators-access-to-your-organization.md | 52 +- ...ing-the-audit-log-for-your-organization.md | 41 +- ...ur-organizations-installed-integrations.md | 19 +- ...ssions-for-adding-outside-collaborators.md | 13 +- .../about-enterprise-accounts.md | 4 + .../index.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - .../managing-your-enterprise-account.md | 1 + ...rganizations-in-your-enterprise-account.md | 1 - ...n-and-usage-for-your-enterprise-account.md | 9 +- .../viewing-contributions-on-your-profile.md | 2 +- ...tributions-not-showing-up-on-my-profile.md | 4 +- .../changing-your-github-username.md | 54 +- .../index.md | 2 +- ...fault-branch-name-for-your-repositories.md | 4 +- ...on-levels-for-a-user-account-repository.md | 80 +-- ...ithub-enterprise-subscription-agreement.md | 2 +- ...d-data-protection-for-your-organization.md | 40 +- .../github-sensitive-data-removal-policy.md | 2 +- .../github-subprocessors-and-cookies.md | 124 ++-- ...al-terms-for-microsoft-volume-licensing.md | 2 +- .../site-policy/github-trademark-policy.md | 2 +- .../using-git/changing-a-remotes-url.md | 2 +- .../pushing-commits-to-a-remote-repository.md | 1 + .../about-the-dependency-graph.md | 4 +- ...loring-the-dependencies-of-a-repository.md | 4 +- .../viewing-a-projects-contributors.md | 2 +- .../viewing-traffic-to-a-repository.md | 17 +- .../about-github-pages-and-jekyll.md | 2 +- .../about-github-pages.md | 2 +- ...reating-a-github-pages-site-with-jekyll.md | 51 +- ...for-your-github-pages-site-using-jekyll.md | 2 +- ...yll-build-errors-for-github-pages-sites.md | 152 ++--- .../writing-on-github/creating-gists.md | 4 +- .../updating-github-insights.md | 1 - .../about-github-packages.md | 4 +- ...ache-maven-for-use-with-github-packages.md | 64 +- ...ing-docker-for-use-with-github-packages.md | 65 +- ...dotnet-cli-for-use-with-github-packages.md | 6 +- ...ing-gradle-for-use-with-github-packages.md | 6 +- ...guring-npm-for-use-with-github-packages.md | 111 ++-- ...g-rubygems-for-use-with-github-packages.md | 10 +- .../rest/guides/basics-of-authentication.md | 2 +- ...tting-started-with-the-git-database-api.md | 2 +- .../content/rest/overview/api-previews.md | 20 +- .../overview/resources-in-the-rest-api.md | 8 +- .../zh-CN/content/rest/reference/actions.md | 4 +- .../zh-CN/content/rest/reference/apps.md | 9 + .../rest/reference/enterprise-admin.md | 6 +- .../zh-CN/content/rest/reference/gists.md | 2 +- .../content/rest/reference/interactions.md | 6 +- .../zh-CN/content/rest/reference/orgs.md | 2 +- .../permissions-required-for-github-apps.md | 6 +- .../zh-CN/content/rest/reference/repos.md | 10 +- .../zh-CN/data/glossaries/external.yml | 4 +- .../reusables/actions/actions-not-verified.md | 2 +- .../data/reusables/actions/enterprise-beta.md | 2 +- .../enterprise-github-hosted-runners.md | 2 +- .../actions/enterprise-marketplace-actions.md | 2 +- .../actions/enterprise-setup-prereq.md | 2 +- .../deprecating_auth_with_query_parameters.md | 2 +- .../apps/deprecating_github_services_ghe.md | 2 +- .../apps/deprecating_password_auth.md | 2 +- .../deprecating_token_oauth_authorizations.md | 2 +- .../code-scanning/about-code-scanning.md | 2 +- .../choose-alert-dismissal-reason.md | 1 + .../false-positive-fix-codeql.md | 2 +- .../dependabot/automated-tests-note.md | 5 + .../dependabot/pull-request-introduction.md | 1 + .../dependabot/supported-package-managers.md | 2 +- .../access-enterprise-on-dotcom.md | 5 + .../enterprise-accounts/access-enterprise.md | 16 +- .../enterprise-accounts/license-tab.md | 10 +- .../data/reusables/enterprise/rate_limit.md | 2 +- .../submit-support-ticket-first-section.md | 2 +- .../submit-support-ticket-second-section.md | 2 +- .../aws-recommended-instance-types.md | 2 +- .../aws-supported-instance-types.md | 6 +- .../zh-CN/data/reusables/files/add-file.md | 2 +- .../reusables/gated-features/code-scanning.md | 2 +- .../reusables/gated-features/draft-prs.md | 2 +- .../gist/anonymous-gists-cannot-be-deleted.md | 2 +- .../github-actions/macos-runner-preview.md | 5 + ...-runner-management-permissions-required.md | 4 +- ...-runner-navigate-to-repo-org-enterprise.md | 4 +- .../supported-github-runners.md | 1 + .../github-actions/usage-matrix-limits.md | 2 +- .../notifications/outbound_email_tip.md | 2 +- ...ification-delivery-method-customization.md | 3 + ...nerable-dependency-notification-options.md | 33 + .../admins-can-configure-package-types.md | 2 +- .../docker_registry_deprecation_status.md | 2 +- .../packages-ghes-release-stage.md | 2 +- .../pages/build-failure-email-server.md | 2 +- .../pages/private_pages_are_public_warning.md | 2 +- .../pre-release-program/fury-pre-release.md | 2 +- .../machine-man-preview.md | 2 +- .../pre-release-program/sailor-v-preview.md | 2 +- .../user_profile_page_block_or_report.md | 2 +- .../project-progress-locations.md | 2 +- .../pull_request_merges_and_contributions.md | 2 +- .../repositories/about-internal-repos.md | 2 +- .../reusables/repositories/copy-clone-url.md | 2 +- ...forks_from_private_repositories_warning.md | 2 +- .../repositories/enable-security-alerts.md | 2 +- .../repositories/new-pull-request.md | 2 +- .../repositories/open-with-github-desktop.md | 2 +- .../data/reusables/repositories/releases.md | 2 +- .../repositories/tracks-vulnerabilities.md | 1 - .../reusables/repositories/you-can-fork.md | 4 +- .../data/reusables/search/syntax_tips.md | 2 +- .../data/reusables/two_fa/auth_methods_2fa.md | 10 +- .../webhooks/webhooks-rest-api-links.md | 4 + translations/zh-CN/data/variables/contact.yml | 10 +- translations/zh-CN/data/variables/explore.yml | 6 +- translations/zh-CN/data/variables/gists.yml | 4 +- 1597 files changed, 10993 insertions(+), 8286 deletions(-) create mode 100644 translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md create mode 100644 translations/de-DE/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md create mode 100644 translations/de-DE/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md create mode 100644 translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md create mode 100644 translations/de-DE/data/reusables/code-scanning/choose-alert-dismissal-reason.md create mode 100644 translations/de-DE/data/reusables/dependabot/automated-tests-note.md create mode 100644 translations/de-DE/data/reusables/dependabot/pull-request-introduction.md create mode 100644 translations/de-DE/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md create mode 100644 translations/de-DE/data/reusables/github-actions/macos-runner-preview.md create mode 100644 translations/de-DE/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md create mode 100644 translations/de-DE/data/reusables/notifications/vulnerable-dependency-notification-options.md create mode 100644 translations/de-DE/data/reusables/webhooks/webhooks-rest-api-links.md create mode 100644 translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md create mode 100644 translations/ja-JP/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md create mode 100644 translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md create mode 100644 translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md create mode 100644 translations/ja-JP/data/reusables/code-scanning/choose-alert-dismissal-reason.md create mode 100644 translations/ja-JP/data/reusables/dependabot/automated-tests-note.md create mode 100644 translations/ja-JP/data/reusables/dependabot/pull-request-introduction.md create mode 100644 translations/ja-JP/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md create mode 100644 translations/ja-JP/data/reusables/github-actions/macos-runner-preview.md create mode 100644 translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md create mode 100644 translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-options.md create mode 100644 translations/ja-JP/data/reusables/webhooks/webhooks-rest-api-links.md create mode 100644 translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md create mode 100644 translations/ko-KR/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md create mode 100644 translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md create mode 100644 translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md create mode 100644 translations/ko-KR/data/reusables/code-scanning/choose-alert-dismissal-reason.md create mode 100644 translations/ko-KR/data/reusables/dependabot/automated-tests-note.md create mode 100644 translations/ko-KR/data/reusables/dependabot/pull-request-introduction.md create mode 100644 translations/ko-KR/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md create mode 100644 translations/ko-KR/data/reusables/github-actions/macos-runner-preview.md create mode 100644 translations/ko-KR/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md create mode 100644 translations/ko-KR/data/reusables/notifications/vulnerable-dependency-notification-options.md create mode 100644 translations/ko-KR/data/reusables/webhooks/webhooks-rest-api-links.md create mode 100644 translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md create mode 100644 translations/pt-BR/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md create mode 100644 translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md create mode 100644 translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md create mode 100644 translations/pt-BR/data/reusables/code-scanning/choose-alert-dismissal-reason.md create mode 100644 translations/pt-BR/data/reusables/dependabot/automated-tests-note.md create mode 100644 translations/pt-BR/data/reusables/dependabot/pull-request-introduction.md create mode 100644 translations/pt-BR/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md create mode 100644 translations/pt-BR/data/reusables/github-actions/macos-runner-preview.md create mode 100644 translations/pt-BR/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md create mode 100644 translations/pt-BR/data/reusables/notifications/vulnerable-dependency-notification-options.md create mode 100644 translations/pt-BR/data/reusables/webhooks/webhooks-rest-api-links.md create mode 100644 translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md create mode 100644 translations/ru-RU/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md create mode 100644 translations/ru-RU/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md create mode 100644 translations/ru-RU/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md create mode 100644 translations/ru-RU/data/reusables/code-scanning/choose-alert-dismissal-reason.md create mode 100644 translations/ru-RU/data/reusables/dependabot/automated-tests-note.md create mode 100644 translations/ru-RU/data/reusables/dependabot/pull-request-introduction.md create mode 100644 translations/ru-RU/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md create mode 100644 translations/ru-RU/data/reusables/github-actions/macos-runner-preview.md create mode 100644 translations/ru-RU/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md create mode 100644 translations/ru-RU/data/reusables/notifications/vulnerable-dependency-notification-options.md create mode 100644 translations/ru-RU/data/reusables/webhooks/webhooks-rest-api-links.md create mode 100644 translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md create mode 100644 translations/zh-CN/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md create mode 100644 translations/zh-CN/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md create mode 100644 translations/zh-CN/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md create mode 100644 translations/zh-CN/data/reusables/code-scanning/choose-alert-dismissal-reason.md create mode 100644 translations/zh-CN/data/reusables/dependabot/automated-tests-note.md create mode 100644 translations/zh-CN/data/reusables/dependabot/pull-request-introduction.md create mode 100644 translations/zh-CN/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md create mode 100644 translations/zh-CN/data/reusables/github-actions/macos-runner-preview.md create mode 100644 translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md create mode 100644 translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-options.md create mode 100644 translations/zh-CN/data/reusables/webhooks/webhooks-rest-api-links.md diff --git a/translations/de-DE/content/actions/creating-actions/creating-a-composite-run-steps-action.md b/translations/de-DE/content/actions/creating-actions/creating-a-composite-run-steps-action.md index a8e127b61a..1f7b6e0716 100644 --- a/translations/de-DE/content/actions/creating-actions/creating-a-composite-run-steps-action.md +++ b/translations/de-DE/content/actions/creating-actions/creating-a-composite-run-steps-action.md @@ -93,7 +93,7 @@ Before you begin, you'll create a {% data variables.product.product_name %} repo git push ``` -1. From your terminal, add a tag. This example uses a tag called `v1`. Weitere Informationen finden Sie unter „[Informationen zu Aktionen](/actions/creating-actions/about-actions#using-release-management-for-actions)“. +1. From your terminal, add a tag. This example uses a tag called `v1`. For more information, see "[About actions](/actions/creating-actions/about-actions#using-release-management-for-actions)." ```shell git tag -a -m "Description of this release" v1 diff --git a/translations/de-DE/content/actions/creating-actions/creating-a-javascript-action.md b/translations/de-DE/content/actions/creating-actions/creating-a-javascript-action.md index d97b915373..1d44eb633e 100644 --- a/translations/de-DE/content/actions/creating-actions/creating-a-javascript-action.md +++ b/translations/de-DE/content/actions/creating-actions/creating-a-javascript-action.md @@ -262,4 +262,4 @@ Klicke in Deinem Repository auf die Registerkarte **Actions** (Aktionen), und w ![Ein Screenshot zur Verwendung Deiner Aktion in einem Workflow](/assets/images/help/repository/javascript-action-workflow-run-updated.png) {% else %} ![Ein Screenshot zur Verwendung Deiner Aktion in einem Workflow](/assets/images/help/repository/javascript-action-workflow-run.png) -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/de-DE/content/actions/guides/building-and-testing-java-with-maven.md b/translations/de-DE/content/actions/guides/building-and-testing-java-with-maven.md index 15f2f8d495..039becb6c2 100644 --- a/translations/de-DE/content/actions/guides/building-and-testing-java-with-maven.md +++ b/translations/de-DE/content/actions/guides/building-and-testing-java-with-maven.md @@ -30,7 +30,7 @@ Du solltest ein grundlegendes Verständnis von Java und dem Framework Maven habe ### Einstieg mit einer Maven-Workflow-Vorlage -{% data variables.product.prodname_dotcom %} bietet eine Maven-Workflow-Vorlage, die für die meisten Maven-basierten Java-Projekte funktionieren wird. Weitere Informationen findest Du im [Workflow-Template für Maven](https://github.com/actions/starter-workflows/blob/main/ci/maven.yml). +{% data variables.product.prodname_dotcom %} bietet eine Maven-Workflow-Vorlage, die für die meisten Maven-basierten Java-Projekte funktionieren wird. For more information, see the [Maven workflow template](https://github.com/actions/starter-workflows/blob/main/ci/maven.yml). Um schnell loszulegen, kannst Du beim Erstellen eines neuen Workflows die vorkonfigurierte Maven-Vorlage auswählen. For more information, see the "[{% data variables.product.prodname_actions %} quickstart](/actions/quickstart)." diff --git a/translations/de-DE/content/actions/guides/building-and-testing-nodejs.md b/translations/de-DE/content/actions/guides/building-and-testing-nodejs.md index d3d0625e64..30ecea56d0 100644 --- a/translations/de-DE/content/actions/guides/building-and-testing-nodejs.md +++ b/translations/de-DE/content/actions/guides/building-and-testing-nodejs.md @@ -33,7 +33,7 @@ Wir empfehlen, dass Du ein grundlegendes Verständnis von Node.js, YAML, Workflo Um schnell loszulegen, füge die Vorlage in das Verzeichnis `.github/workflows` Deines Repositorys ein. {% raw %} -```yaml +```yaml{:copy} name: Node.js CI on: [push] diff --git a/translations/de-DE/content/actions/guides/publishing-docker-images.md b/translations/de-DE/content/actions/guides/publishing-docker-images.md index 2f09b1a6ed..16314b3d8e 100644 --- a/translations/de-DE/content/actions/guides/publishing-docker-images.md +++ b/translations/de-DE/content/actions/guides/publishing-docker-images.md @@ -50,7 +50,7 @@ Um zum „Docker Hub“ zu pushen, benötigst Du ein Benutzerkonto auf „Docker „Docker Hub“ benötigt für `build-push-action` die folgenden Optionen: -* `username` und `password`: Dies ist Dein Benutzername und Passwort auf „Docker Hub“. Wir empfehlen Dir, Deinen „Docker Hub“-Benutzernamen und das -Passwort als verschlüsselte Geheimnisse in Deinem {% data variables.product.prodname_dotcom %}-Repository zu speichern, damit diese nicht in Deiner Workflow-Datei enthüllt werden. Weitere Informationen findest Du unter „[Verschlüsselte Geheimnisse erstellen und verwenden](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)“. +* `username` und `password`: Dies ist Dein Benutzername und Passwort auf „Docker Hub“. We recommend storing your Docker Hub username and password as encrypted secrets in your {% data variables.product.prodname_dotcom %} repository so they aren't exposed in your workflow file. Weitere Informationen findest Du unter „[Verschlüsselte Geheimnisse erstellen und verwenden](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)“. * `repository`: Dein „Docker Hub“-Repository im Format `DOCKER-HUB-NAMESPACE/DOCKER-HUB-REPOSITORY`. {% raw %} diff --git a/translations/de-DE/content/actions/guides/storing-workflow-data-as-artifacts.md b/translations/de-DE/content/actions/guides/storing-workflow-data-as-artifacts.md index de50a668f6..29644967a4 100644 --- a/translations/de-DE/content/actions/guides/storing-workflow-data-as-artifacts.md +++ b/translations/de-DE/content/actions/guides/storing-workflow-data-as-artifacts.md @@ -48,7 +48,7 @@ Daten zwischen Aufträgen freigeben: * **Dateien hochladen**: Gib der hochgeladenen Datei einen Namen und lade die Daten hoch, bevor der Job endet. * **Dateien herunterladen**: Du kannst nur Artefakte herunterladen, die während des gleichen Workflow-Laufs hochgeladen wurden. Wenn Du eine Datei herunterlädst, kannst Du sie mit Namen referenzieren. -Die Steps („Schritte“) eines Jobs teilen sich die selbe Umgebung auf der Runner-Maschine, laufen aber in ihren eigenen individuellen Prozessen. Mithilfe von Ein- und Ausgaben können Sie Daten zwischen den Schritten in einem Auftrag weitergeben. Weitere Informationen zu Ein- und Ausgaben finden Sie unter „[Metadatensyntax für {% data variables.product.prodname_actions %}](/articles/metadata-syntax-for-github-actions)“. +Die Steps („Schritte“) eines Jobs teilen sich die selbe Umgebung auf der Runner-Maschine, laufen aber in ihren eigenen individuellen Prozessen. Mithilfe von Ein- und Ausgaben können Sie Daten zwischen den Schritten in einem Auftrag weitergeben. Weitere Informationen zu Ein- und Ausgaben findest Du unter „[Metadatensyntax für {% data variables.product.prodname_actions %}](/articles/metadata-syntax-for-github-actions)“. ### Build- und Testartefakte hochladen @@ -74,7 +74,7 @@ Zum Beispiel kann Dein Projektarchiv oder eine Webanwendung SASS- und TypeScript | ``` -In diesem Beispiel wird gezeigt, wie Du einen Workflow für ein Node.js-Projekt erstellst, das den Code im `src`-Verzeichnis `erstellt` und die Tests im `tests`-Verzeichnis ausführt. Wenn `npm test` ausgeführt wird, wird im Verzeichnis `output/test/` ein Bericht zur Codeabdeckung mit dem Namen `code-coverage.html` erstellt und gespeichert. +In diesem Beispiel wird gezeigt, wie Sie einen Workflow für ein Node.js-Projekt erstellen, das den Code im src-Verzeichnis `erstellt` und die Tests im `tests`-Verzeichnis ausführt. Wenn `npm test` ausgeführt wird, wird im Verzeichnis `output/test/` ein Bericht zur Codeabdeckung mit dem Namen `code-coverage.html` erstellt und gespeichert. Der Workflow lädt die Produktionsartefakte in das `dist` Verzeichnis, schließt jedoch alle Markdowndateien aus. Es lädt auch die `code-coverage.html` Bericht als ein weiteres Artefakt. diff --git a/translations/de-DE/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/de-DE/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index 8b0d0b0239..8eba60c0dd 100644 --- a/translations/de-DE/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/translations/de-DE/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -91,7 +91,7 @@ The following operating systems are supported for the self-hosted runner applica - macOS 10.13 (High Sierra) oder höher -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Kommunikation zwischen selbst-gehosteten Runnern und {% data variables.product.prodname_dotcom %} diff --git a/translations/de-DE/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md b/translations/de-DE/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md index eb0edcf9d2..d684018c96 100644 --- a/translations/de-DE/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md +++ b/translations/de-DE/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md @@ -50,14 +50,14 @@ You can add self-hosted runners to an enterprise, where they can be assigned to {% if currentVersion == "free-pro-team@latest" %} To add a self-hosted runner to an enterprise account, you must be an enterprise owner. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} To add a self-hosted runner at the enterprise level of {% data variables.product.product_location %}, you must be a site administrator. {% endif %} {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/de-DE/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/translations/de-DE/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index 00b4c59f46..7c3e4a45e9 100644 --- a/translations/de-DE/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/translations/de-DE/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -56,7 +56,7 @@ When creating a group, you must choose a policy that grants access to all organi {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/de-DE/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md b/translations/de-DE/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md index e2a86b7df4..e1886a10ad 100644 --- a/translations/de-DE/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md +++ b/translations/de-DE/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md @@ -62,7 +62,7 @@ Um einen selbst-gehosteten Runner aus einer Organisation zu entfernen, musst Du {% if currentVersion == "free-pro-team@latest" %} To remove a self-hosted runner from an enterprise account, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} To remove a self-hosted runner at the enterprise level of {% data variables.product.product_location %}, you must be a site administrator. We recommend that you also have access to the self-hosted runner machine. {% endif %} @@ -71,7 +71,7 @@ To remove a self-hosted runner at the enterprise level of {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/de-DE/content/actions/index.md b/translations/de-DE/content/actions/index.md index b486e5addf..38e5538695 100644 --- a/translations/de-DE/content/actions/index.md +++ b/translations/de-DE/content/actions/index.md @@ -37,7 +37,7 @@ versions:
-

{% data ui.toc.getting_started %}

+

{% data ui.toc.guides %}

    {% for link in featuredLinks.gettingStarted %} @@ -68,34 +68,10 @@ versions:
- -
-
- -
{% octicon "bookmark" width="24" %}
-

Create actions

-

A complete guide to creating and sharing actions with the community.

- -
-
- -
{% octicon "rocket" width="24" %}
-

Starter workflows

-

A collection of workflow files to help you get started with GitHub Actions.

- -
-
- -
{% octicon "light-bulb" width="24" %}
-

GitHub Actions Marketplace

-

Explore community actions and supercharge your workflow.

- -
-
-

Leitfäden

+

More guides

@@ -184,7 +160,7 @@ versions:

Publishing Node.js packages

Use GitHub Actions to push your Node.js package to GitHub Packages or npm.

- Java + JavaScript/TypeScript CI
@@ -196,5 +172,5 @@ versions:
- More guides {% octicon "arrow-right" %} + Show all guides {% octicon "arrow-right" %} diff --git a/translations/de-DE/content/actions/learn-github-actions/finding-and-customizing-actions.md b/translations/de-DE/content/actions/learn-github-actions/finding-and-customizing-actions.md index 6fe5b07a53..de40098d3f 100644 --- a/translations/de-DE/content/actions/learn-github-actions/finding-and-customizing-actions.md +++ b/translations/de-DE/content/actions/learn-github-actions/finding-and-customizing-actions.md @@ -149,7 +149,7 @@ jobs: verwendet: docker://alpine:3.8 ``` -Einige Beispiele für Docker-Aktionen findest Du im [Docker-image.yml-Workflow](https://github.com/actions/starter-workflows/blob/main/ci/docker-image.yml) oder unter „[Eine Docker-Container-Aktion erstellen](/articles/creating-a-docker-container-action)“. +For some examples of Docker actions, see the [Docker-image.yml workflow](https://github.com/actions/starter-workflows/blob/main/ci/docker-image.yml) and "[Creating a Docker container action](/articles/creating-a-docker-container-action)." ### Nächste Schritte: diff --git a/translations/de-DE/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/translations/de-DE/content/actions/learn-github-actions/security-hardening-for-github-actions.md index c63522aa45..14801aeb3a 100644 --- a/translations/de-DE/content/actions/learn-github-actions/security-hardening-for-github-actions.md +++ b/translations/de-DE/content/actions/learn-github-actions/security-hardening-for-github-actions.md @@ -95,3 +95,40 @@ As a result, self-hosted runners should almost [never be used for public reposit You should also consider the environment of the self-hosted runner machines: - What sensitive information resides on the machine configured as a self-hosted runner? For example, private SSH keys, API access tokens, among others. - Does the machine have network access to sensitive services? For example, Azure or AWS metadata services. The amount of sensitive information in this environment should be kept to a minimum, and you should always be mindful that any user capable of invoking workflows has access to this environment. + +### Auditing {% data variables.product.prodname_actions %} events + +You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account perfomed the action. + +For example, you can use the audit log to track the `action:org.update_actions_secret` event, which tracks changes to organization secrets: ![Audit log entries](/assets/images/help/repository/audit-log-entries.png) + +The following tables describe the {% data variables.product.prodname_actions %} events that you can find in the audit log. For more information on using the audit log, see "[Reviewing the audit log for your organization](/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization#searching-the-audit-log)." + +#### Events for secret management +| Aktion | Beschreibung | +| ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `action:org.create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization). | +| `action:org.remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret. | +| `action:org.update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret. | +| `action:repo.create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository). | +| `action:repo.remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret. | +| `action:repo.update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret. | + +#### Events for self-hosted runners +| Aktion | Beschreibung | +| ----------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). | +| `action:org.remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). | +| `action:repo.register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). | +| `action:repo.remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). | + +#### Events for self-hosted runner groups +| Aktion | Beschreibung | +| ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). | +| `action:org.runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. | +| `action:org.runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. | +| `action:org.runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). | +| `action:org.runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. | + + diff --git a/translations/de-DE/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md b/translations/de-DE/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md index 37f4a8ab31..8e237cb48c 100644 --- a/translations/de-DE/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md +++ b/translations/de-DE/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md @@ -1,6 +1,6 @@ --- title: Disabling and enabling a workflow -intro: You can disable and re-enable a workflow using {% data variables.product.prodname_dotcom %} or the REST API. +intro: 'You can disable and re-enable a workflow using {% data variables.product.prodname_dotcom %} or the REST API.' product: '{% data reusables.gated-features.actions %}' versions: free-pro-team: '*' diff --git a/translations/de-DE/content/actions/managing-workflow-runs/removing-workflow-artifacts.md b/translations/de-DE/content/actions/managing-workflow-runs/removing-workflow-artifacts.md index 74f559eb57..59250dcfca 100644 --- a/translations/de-DE/content/actions/managing-workflow-runs/removing-workflow-artifacts.md +++ b/translations/de-DE/content/actions/managing-workflow-runs/removing-workflow-artifacts.md @@ -38,4 +38,4 @@ You can also define a custom retention period for individual artifacts using the ### Finding the expiration date of an artifact You can use the API to confirm the date that an artifact is scheduled to be deleted. For more information, see the `expires_at` value returned by "[List artifacts for a repository](/rest/reference/actions#artifacts)." -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/de-DE/content/actions/quickstart.md b/translations/de-DE/content/actions/quickstart.md index 612ccf4cd0..501739723c 100644 --- a/translations/de-DE/content/actions/quickstart.md +++ b/translations/de-DE/content/actions/quickstart.md @@ -21,7 +21,7 @@ You only need an existing {% data variables.product.prodname_dotcom %} repositor 1. From your repository on {% data variables.product.prodname_dotcom %}, create a new file in the `.github/workflows` directory named `superlinter.yml`. Weitere Informationen finden Sie unter „[Neue Dateien erstellen](/github/managing-files-in-a-repository/creating-new-files)“. 2. Copy the following YAML contents into the `superlinter.yml` file. **Note:** If your default branch is not `main`, update the value of `DEFAULT_BRANCH` to match your repository's default branch name. {% raw %} - ```yaml + ```yaml{:copy} name: Super-Linter # Run this workflow every time a new commit pushed to your repository diff --git a/translations/de-DE/content/actions/reference/context-and-expression-syntax-for-github-actions.md b/translations/de-DE/content/actions/reference/context-and-expression-syntax-for-github-actions.md index 8cf27ab82a..0691692498 100644 --- a/translations/de-DE/content/actions/reference/context-and-expression-syntax-for-github-actions.md +++ b/translations/de-DE/content/actions/reference/context-and-expression-syntax-for-github-actions.md @@ -86,21 +86,21 @@ Der `github`-Kontext enthält Informationen zum Workflow-Lauf und zu dem Ereigni | `github` | `Objekt` | Der Top-Level-Kontext, der bei jedem Job oder Schritt im Workflow verfügbar ist. | | `github.action` | `string` | Der Name der aktuell laufenden Aktion. {% data variables.product.prodname_dotcom %} entfernt Sonderzeichen oder verwendet den Namen `run` wenn der aktuelle Schritt ein Skript ausführt. Wenn Du dieselbe Aktion mehr als einmal im selben Job verwendest, enthält der Name ein Suffix mit der Sequenznummer. Zum Beispiel wird das erste Skript, das Du ausführst, den Namen `run1`haben, und das zweite Skript heißt `run2`. Ebenso wird die zweite Anrufung von `actions/checkout` `actionscheckout2` sein. | | `github.action_path` | `string` | The path where your action is located. You can use this path to easily access files located in the same repository as your action. This attribute is only supported in composite run steps actions. | -| `github.actor` | `string` | Der Anmeldename des Benutzers, der den Workflow-Lauf initiiert hat. | +| `github.actor` | `string` | Der Anmeldename des Benutzers, der den Workflow-Lauf initiiert hat | | `github.base_ref` | `string` | Das `base_ref` oder der Ziel-Branch des Pull Requests in einem Workflow-Lauf. Diese Eigenschaft ist nur verfügbar, wenn das Ereignis, das einen Workflow auslöst, ein `pull_request` (Pull Request) ist. | | `github.event` | `Objekt` | Die vollständige Nutzlast des Ereignis-Webhooks. Weitere Informationen findest Du unter „[Ereignisse, die Workflows auslösen](/articles/events-that-trigger-workflows)“. You can access individual properties of the event using this context. | | `github.event_name` | `string` | Der Name des Ereignisses, das den Workflow-Lauf ausgelöst hat. | | `github.event_path` | `string` | Der Pfad zur vollständigen Event-Webhook-Nutzlast auf dem Runner. | | `github.head_ref` | `string` | Das `head_ref` oder der Quell-Branch des Pull Requests in einem Workflow-Lauf. Diese Eigenschaft ist nur verfügbar, wenn das Ereignis, das einen Workflow auslöst, ein `pull_request` (Pull Request) ist. | | `github.job` | `string` | Die [`job_id`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_id) des aktuellen Jobs. | -| `github.ref` | `string` | Das Branch- oder Tag-Ref, das den Workflow-Lauf ausgelöst hat. | -| `github.repository` | `string` | Der Inhaber- und Repository-Name, Beispielsweise `Codertocat/Hello-World`. | +| `github.ref` | `string` | Das Branch- oder Tag-Ref, das den Workflow-Lauf ausgelöst hat. For branches this in the format `refs/heads/`, and for tags it is `refs/tags/`. | +| `github.repository` | `string` | Der Inhaber- und Repository-Name, z. B. `Codertocat/Hello-World`. | | `github.repository_owner` | `string` | Der Name des Repository-Besitzers. Beispielsweise `Codertocat`. | | `github.run_id` | `string` | {% data reusables.github-actions.run_id_description %} | `github.run_number` | `string` | {% data reusables.github-actions.run_number_description %} | `github.sha` | `string` | Die Commit-SHA, die den Workflow-Lauf ausgelöst hat. | | `github.token` | `string` | Ein Token zum Authentifizieren im Namen der in Deinem Repository installierten GitHub-App. Funktionell entspricht dies dem Geheimnis `GITHUB_TOKEN`. Weitere Informationen findest Du unter „[Authentifizierung mit dem GITHUB_TOKEN](/actions/automating-your-workflow-with-github-actions/authenticating-with-the-github_token)". | -| `github.workflow` | `string` | Der Name des Workflows. Wenn in der Workflow-Datei kein `name` festgelegt ist, entspricht der Wert dieser Eigenschaft dem vollständigen Pfad der Workflow-Datei im Repository. | +| `github.workflow` | `string` | Der Name des Workflows. Wenn in der Workflow-Datei kein `name` (Name) festgelegt ist, entspricht der Wert dieser Eigenschaft dem vollständigen Pfad der Workflow-Datei im Repository. | | `github.workspace` | `string` | Das Standardarbeitsverzeichnis für Schritte und der Standardspeicherort Deines Repositorys bei Verwendung der Aktion [ `checkout`](https://github.com/actions/checkout). | #### **`env`-Kontext** @@ -128,7 +128,7 @@ Der `job`-Kontext enthält Informationen zum gerade ausgeführten Auftrag. | `job.container.id` | `string` | Die ID des Containers | | `job.container.network` | `string` | Die ID des Container-Netzwerks. Der Runner erstellt das Netzwerk, das von allen Containern in einem Auftrag genutzt wird. | | `job.services` | `Objekt` | Die für einen Auftrag erstellten Dienstcontainer. Weitere Informationen zu Dienstcontainern findest Du unter „[Workflow-Syntax für {% data variables.product.prodname_actions %}](/articles/workflow-syntax-for-github-actions#jobsjob_idservices)“. | -| `job.services..id` | `string` | Die ID des Service-Containers. | +| `job.services..id` | `string` | Die ID des Dienstcontainers | | `job.services..network` | `string` | Die ID des Dienstcontainer-Netzwerks. Der Runner erstellt das Netzwerk, das von allen Containern in einem Auftrag genutzt wird. | | `job.services..ports` | `Objekt` | Die offengelegten Ports des Service-Containers | | `job.status` | `string` | Der aktuelle Status des Auftrags. Mögliche Werte sind `success` (erfolgreich), `failure` (fehlgeschlagen) oder `cancelled` (abgebrochen). | diff --git a/translations/de-DE/content/actions/reference/specifications-for-github-hosted-runners.md b/translations/de-DE/content/actions/reference/specifications-for-github-hosted-runners.md index edb3413aeb..e77a19176c 100644 --- a/translations/de-DE/content/actions/reference/specifications-for-github-hosted-runners.md +++ b/translations/de-DE/content/actions/reference/specifications-for-github-hosted-runners.md @@ -50,6 +50,7 @@ Für jede virtuelle Maschine stehen die gleichen Hardware-Ressourcen zur Verfüg {% data reusables.github-actions.supported-github-runners %} {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} Workflow logs list the runner used to run a job. For more information, see "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history)." @@ -63,8 +64,10 @@ The software tools included in {% data variables.product.prodname_dotcom %}-host * [Windows Server 2019](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md) * [Windows Server 2016](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md) * [MacOS 10.15](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md) +* [MacOS 11.0](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md) {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} {% data variables.product.prodname_dotcom %}-gehostete Runner enthalten zusätzlich zu den oben aufgeführten Paketen die standardmäßig integrierten Tools des Betriebssystems. Zum Beispiel beinhalten Ubuntu und macOS Läufer `grep`, `find`, und `which` neben anderen Standard-Tools. diff --git a/translations/de-DE/content/actions/reference/usage-limits-billing-and-administration.md b/translations/de-DE/content/actions/reference/usage-limits-billing-and-administration.md index f8e212f335..217da3c6f4 100644 --- a/translations/de-DE/content/actions/reference/usage-limits-billing-and-administration.md +++ b/translations/de-DE/content/actions/reference/usage-limits-billing-and-administration.md @@ -70,7 +70,7 @@ Weitere Informationen findest Du unter: - [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your enterprise](/github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account) {% endif %} -### {% data variables.product.prodname_actions %} für Dein Repository oder Deine Organisation deaktivieren oder beschränken +### Disabling or limiting {% data variables.product.prodname_actions %} for your repository or organization {% data reusables.github-actions.disabling-github-actions %} diff --git a/translations/de-DE/content/actions/reference/workflow-commands-for-github-actions.md b/translations/de-DE/content/actions/reference/workflow-commands-for-github-actions.md index 86916dd1ce..20c544a042 100644 --- a/translations/de-DE/content/actions/reference/workflow-commands-for-github-actions.md +++ b/translations/de-DE/content/actions/reference/workflow-commands-for-github-actions.md @@ -53,13 +53,15 @@ core.setOutput('SELECTED_COLOR', 'green'); You can use the `set-output` command in your workflow to set the same value: +{% raw %} ``` yaml - name: Set selected color run: echo '::set-output name=SELECTED_COLOR::green' id: random-color-generator - name: Get color - run: echo 'The selected color is' ${steps.random-color-generator.outputs.SELECTED_COLOR} + run: echo "The selected color is ${{ steps.random-color-generator.outputs.SELECTED_COLOR }}" ``` +{% endraw %} Die folgende Tabelle zeigt, welche Toolkit-Funktionen innerhalb eines Workflows verfügbar sind: diff --git a/translations/de-DE/content/actions/reference/workflow-syntax-for-github-actions.md b/translations/de-DE/content/actions/reference/workflow-syntax-for-github-actions.md index a7de591baf..732091080a 100644 --- a/translations/de-DE/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/translations/de-DE/content/actions/reference/workflow-syntax-for-github-actions.md @@ -946,7 +946,7 @@ jobs: #### **`jobs..container.image`** -Docker-Image, das beim Ausführen der Aktion als Container herangezogen wird. The value can be the Docker Hub image name or a {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. +Docker-Image, das beim Ausführen der Aktion als Container herangezogen wird. The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..container.credentials`** @@ -1029,7 +1029,7 @@ services: #### **`jobs..services..image`** -Docker-Image, das beim Ausführen der Aktion als Dienstcontainer herangezogen wird. The value can be the Docker Hub image name or a {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. +Docker-Image, das beim Ausführen der Aktion als Dienstcontainer herangezogen wird. The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..services..credentials`** diff --git a/translations/de-DE/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/translations/de-DE/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md index 75b38a5fe4..e11acb05d7 100644 --- a/translations/de-DE/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md +++ b/translations/de-DE/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md @@ -18,10 +18,13 @@ You can connect {% data variables.product.product_location_enterprise %} to {% d After connecting {% data variables.product.product_location_enterprise %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. Sie können die Schwachstellendaten auch jederzeit manuell synchronisieren. Es werden weder Code noch Informationen zu Code von {% data variables.product.product_location_enterprise %} auf {% data variables.product.prodname_dotcom_the_website %} hochgeladen. -{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send {% data variables.product.prodname_dependabot_short %} alerts to owners and people with admin access in those repositories. They can customize how they receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)." | +{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send {% data variables.product.prodname_dependabot_short %} alerts. You can customize how you receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)." {% endif %} -{% if currentVersion ver_lt "enterprise-server@2.21" or currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts to owners and people with admin access in those repositories. Sie können anpassen, wie sie Sicherheitsmeldungen empfangen möchten. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)." | +{% if currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts. You can customize how you receive security alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)." +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts. You can customize how you receive security alerts. Weitere Informationen finden Sie unter „[Auslieferungsmethode für Ihre Benachrichtigungen wählen](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications#choosing-the-delivery-method-for-security-alerts-for-vulnerable-dependencies)“. {% endif %} {% if currentVersion ver_gt "enterprise-server@2.21" %} @@ -45,7 +48,14 @@ Before enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data v ``` shell $ ghe-dep-graph-enable ``` + {% note %} + + **Note**: For more information about enabling access to the administrative shell via SSH, see "[Accessing the administrative shell (SSH)](/enterprise/{{ currentVersion }}/admin/configuration/accessing-the-administrative-shell-ssh)." + + {% endnote %} + 3. Return to + {% data variables.product.prodname_ghe_server %}. {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} diff --git a/translations/de-DE/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md b/translations/de-DE/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md index 46c87986cf..88c402a15d 100644 --- a/translations/de-DE/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md +++ b/translations/de-DE/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md @@ -30,6 +30,15 @@ Die für das Failover erforderliche Zeit hängt davon ab, wie lange es dauert, d 5. Aktualisieren Sie den DNS-Eintrag so, dass er auf die IP-Adresse des Replikats verweist. Nach dem Verstreichen des TTL-Zeitraums wird der Traffic an das Replikat geleitet. Stellen Sie bei der Verwendung eines Load-Balancers sicher, dass er so konfiguriert ist, den Traffic an das Replikat zu senden. 6. Benachrichtigen Sie die Benutzer, dass sie die normalen Vorgänge wieder aufnehmen können. 7. Richten Sie bei Bedarf die Replikation von der neuen primären Instanz auf die bestehenden Appliances und die vorherige primäre Instanz ein. Weitere Informationen finden Sie unter „[Informationen zur Hochverfügbarkeitskonfiguration](/enterprise/{{ currentVersion }}/admin/guides/installation/about-high-availability-configuration/#utilities-for-replication-management)“. +8. Appliances you do not intend to setup replication to that were part of the high availability configuration prior the failover, need to be removed from the high availability configuration by UUID. + - On the former appliances, get their UUID via `cat /data/user/common/uuid`. + ```shell + $ cat /data/user/common/uuid + ``` + - On the new primary, remove the UUIDs using `ghe-repl-teardown`. Please replace *`UUID`* with a UUID you retrieved in the previous step. + ```shell + $ ghe-repl-teardown -u UUNID + ``` ### Weiterführende Informationen diff --git a/translations/de-DE/content/admin/enterprise-management/upgrade-requirements.md b/translations/de-DE/content/admin/enterprise-management/upgrade-requirements.md index e01ea72eda..e7339bf2d2 100644 --- a/translations/de-DE/content/admin/enterprise-management/upgrade-requirements.md +++ b/translations/de-DE/content/admin/enterprise-management/upgrade-requirements.md @@ -21,7 +21,7 @@ versions: ### Empfehlungen -- Sie sollten möglichst wenig Upgrades in Ihren Upgrade-Prozess einbeziehen. Anstatt beispielsweise ein Upgrade von {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} auf {{ enterpriseVersions.supported[1] }} auf {{ enterpriseVersions.latest }} vorzunehmen, können Sie ein Upgrade von {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} auf {{ enterpriseVersions.latest }} vornehmen. +- Sie sollten möglichst wenig Upgrades in Ihren Upgrade-Prozess einbeziehen. For example, instead of upgrading from {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} to {{ enterpriseServerReleases.supported[1] }} to {{ enterpriseServerReleases.latest }}, you could upgrade from {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} to {{ enterpriseServerReleases.latest }}. - Wenn Sie mehrere Versionen zurückliegen, sollten Sie {% data variables.product.product_location_enterprise %} so weit wie möglich mit jedem Schritt Ihres Upgrade-Prozesses upgraden. Wenn Sie die nach Möglichkeit neueste Version für jedes Upgrade verwenden, können Sie von Leistungsverbesserungen und Bug-Korrekturen profitieren. So können Sie beispielsweise ein Upgrade von {% data variables.product.prodname_enterprise %} 2.7 auf 2.8 auf 2.10 vornehmen. Beim Upgrade von {% data variables.product.prodname_enterprise %} 2.7 auf 2.9 auf 2.10 wird im zweiten Schritt jedoch eine neuere Version verwendet. - Verwenden Sie beim Upgraden die neueste Patch-Veröffentlichung. {% data reusables.enterprise_installation.enterprise-download-upgrade-pkg %} - Verwenden Sie eine Testinstanz zum Testen der Upgrade-Schritte. Weitere Informationen finden Sie unter „[Testinstanz einrichten](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-staging-instance/)“. @@ -29,7 +29,7 @@ versions: ### Anforderungen -- Sie müssen ein Upgrade von einer Feature-Veröffentlichung vornehmen, die **höchstens** zwei Versionen zurückliegt. Wenn Sie beispielsweise ein Upgrade auf {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.latest }} vornehmen, müssen Sie {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[1] }} oder {{ enterpriseVersions.supported[2] }} verwenden. +- Sie müssen ein Upgrade von einer Feature-Veröffentlichung vornehmen, die **höchstens** zwei Versionen zurückliegt. For example, to upgrade to {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.latest }}, you must be on {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[1] }} or {{ enterpriseServerReleases.supported[2] }}. - {% data reusables.enterprise_installation.hotpatching-explanation %} - Ein Hotpatch kann Ausfallzeiten nach sich ziehen, falls für die betroffenen Dienste (z. B. der Kernel, MySQL oder ElasticSearch) ein VM- oder Dienstneustart erforderlich ist. Sie werden benachrichtigt, falls ein Neustart erforderlich ist. Sie können den Neustart zu einem späteren Zeitpunkt abschließen. - Beim Upgrade mittels Hotpatching muss zusätzlicher Root-Storage verfügbar sein, da bis zum Abschluss des Upgrades mehrere Versionen bestimmter Dienste installiert werden. Preflight-Checks benachrichtigen Sie, falls nicht genügend Root-Disk-Storage verfügbar ist. diff --git a/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md index 1078991877..3bd963297d 100644 --- a/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,7 +59,7 @@ For urgent issues, we can help you in English 24 hours per day, 7 days per week, {% data variables.contact.enterprise_support %} beobachtet diese Feiertage in den USA. dessen ungeachtet steht unser Support-Team zur Verfügung, um dringende Tickets zu beantworten. -| U.S. Weihnachtsfeiertag | Beobachtetes Datum | +| U.S. Weihnachtsfeiertag | Date observed | | ----------------------- | ------------------------------ | | Neujahr | 1. Januar | | Martin Luther King Day | Dritter Montag im Januar | diff --git a/translations/de-DE/content/admin/enterprise-support/providing-data-to-github-support.md b/translations/de-DE/content/admin/enterprise-support/providing-data-to-github-support.md index 252b806643..651a49634f 100644 --- a/translations/de-DE/content/admin/enterprise-support/providing-data-to-github-support.md +++ b/translations/de-DE/content/admin/enterprise-support/providing-data-to-github-support.md @@ -99,12 +99,12 @@ Mit diesen Schritten können Sie ein Support-Bundle erstellen und freigeben, wen #### Ein Support-Paket wird mit Deinem Unternehmenskonto hochladen -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} -4. Klicke unter „{% data variables.product.prodname_enterprise %} Help“ (Hilfe zu {% data variables.product.prodname_enterprise %}) auf **Upload a support bundle** (Ein Support-Paket hochladen). ![Einen Link zum Support-Paket hochladen](/assets/images/enterprise/support/upload-support-bundle.png) +3. Klicke in der linken Seitenleiste auf **Enterprise licensing** (Enterprise-Lizenzierung). !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) +4. Under "{% data variables.product.prodname_enterprise %} Help", click **Upload a support bundle**. ![Einen Link zum Support-Paket hochladen](/assets/images/enterprise/support/upload-support-bundle.png) 5. Wähle unter „Select an enterprise account“ (Unternehmenskonto auswählen) das zugehörige Konto des Support-Pakets aus dem Dropdown-Menü aus. ![Firmenkonto des Support-Pakets auswählen](/assets/images/enterprise/support/support-bundle-account.png) -6. Um Dein Support-Paket auszuwählen, klickst Du unter „Upload a support bundle for {% data variables.contact.enterprise_support %}“ (Ein Support-Bundle für {% data variables.contact.enterprise_support %} hochladen) auf **Choose file** (Datei auswählen) oder Du ziehst Deine Support-Paket-Datei auf **Choose file**. ![Support-Paket-Datei hochladen](/assets/images/enterprise/support/choose-support-bundle-file.png) +6. Under "Upload a support bundle for {% data variables.contact.enterprise_support %}", to select your support bundle, click **Choose file**, or drag your support bundle file onto **Choose file**. ![Support-Paket-Datei hochladen](/assets/images/enterprise/support/choose-support-bundle-file.png) 7. Klicke **Upload**. #### Support-Bundle mithilfe von SSH direkt hochladen @@ -120,13 +120,13 @@ Unter folgenden Voraussetzungen können Sie ein Support-Bundle direkt auf unsere ### Erweiterte Support-Bundles erstellen und freigeben -Support-Bundles beinhalten Protokolle der letzten zwei Tage, wohingegen _erweiterte_ Support-Bundles Protokolle der letzten sieben Tage beinhalten. Wenn die vom {% data variables.contact.github_support %} untersuchten Ereignisse vor mehr als zwei Tagen aufgetreten sind, bitten wir Sie möglicherweise, ein erweitertes Support-Bundle bereitzustellen. Sie benötigen SSH-Zugriff, um ein erweitertes Bundle herunterzuladen. Sie können ein erweitertes Bundle nicht über die {% data variables.enterprise.management_console %} herunterladen. +Support-Bundles beinhalten Protokolle der letzten zwei Tage, wohingegen _erweiterte_ Support-Bundles Protokolle der letzten sieben Tage beinhalten. If the events that {% data variables.contact.github_support %} is investigating occurred more than two days ago, we may ask you to share an extended support bundle. You will need SSH access to download an extended bundle - you cannot download an extended bundle from the {% data variables.enterprise.management_console %}. -Damit die Pakete nicht zu groß werden, enthalten sie nur Protokolle, die nicht rotiert und komprimiert wurden. Die Protokollrotation unter {% data variables.product.prodname_ghe_server %} erfolgt in verschiedenen Intervallen (täglich oder wöchentlich) für verschiedene Protokolldateien, je nachdem, wie groß die Protokolle schätzungsweise sein werden. +Damit die Pakete nicht zu groß werden, enthalten sie nur Protokolle, die nicht rotiert und komprimiert wurden. Log rotation on {% data variables.product.prodname_ghe_server %} happens at various frequencies (daily or weekly) for different log files, depending on how large we expect the logs to be. #### Erweitertes Support-Bundle mithilfe von SSH erstellen -Mit diesen Schritten können Sie ein erweitertes Support-Bundle erstellen und freigeben, wenn Sie SSH-Zugriff auf Ihre {% data variables.product.prodname_ghe_server %}-Appliance und ausgehenden Internetzugang haben. +You can use these steps to create and share an extended support bundle if you have SSH access to your {% data variables.product.prodname_ghe_server %} appliance and you have outbound internet access. 1. Laden Sie das erweiterte Support-Bundle über SSH herunter, indem Sie den Flag `-x` zum Befehl `ghe-support-bundle` hinzufügen: ```shell diff --git a/translations/de-DE/content/admin/enterprise-support/submitting-a-ticket.md b/translations/de-DE/content/admin/enterprise-support/submitting-a-ticket.md index b868882424..e1c6b04176 100644 --- a/translations/de-DE/content/admin/enterprise-support/submitting-a-ticket.md +++ b/translations/de-DE/content/admin/enterprise-support/submitting-a-ticket.md @@ -22,9 +22,9 @@ Nachdem Sie Ihre Supportanfrage und optionale Diagnoseinformationen abgesendet h ### Ein Ticket über Dein Firmenkonto einreichen -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. Klicke in der linken Seitenleiste auf **Enterprise licensing** (Enterprise-Lizenzierung). !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Klicke unter „{% data variables.product.prodname_enterprise %} Help“ (Hilfe für {% data variables.product.prodname_enterprise %}), auf **{% data variables.contact.enterprise_support %} Portal**. ![Link zum Navigieren zur Enterprise-Support-Seite](/assets/images/enterprise/support/enterprise-support-link.png) 5. Klicke auf **Submit a Ticket** (Ticket einreichen) ![Ein Ticket beim Enterprise-Support-Team einreichen](/assets/images/enterprise/support/submit-ticket-button.png) {% data reusables.enterprise_enterprise_support.submit-support-ticket-first-section %} diff --git a/translations/de-DE/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md b/translations/de-DE/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md index 3fb5f51521..3a62e64192 100644 --- a/translations/de-DE/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md +++ b/translations/de-DE/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md @@ -34,7 +34,7 @@ You can populate the runner tool cache by running a {% data variables.product.pr ### Populating the tool cache for a self-hosted runner -1. On {% data variables.product.prodname_dotcom_the_website %}, navigate to a repostory that you can use to run a {% data variables.product.prodname_actions %} workflow. +1. On {% data variables.product.prodname_dotcom_the_website %}, navigate to a repository that you can use to run a {% data variables.product.prodname_actions %} workflow. 1. Create a new workflow file in the repository's `.github/workflows` folder that uploads an artifact containing the {% data variables.product.prodname_dotcom %}-hosted runner's tool cache. The following example demonstrates a workflow that uploads the tool cache for an Ubuntu 18.04 environment, using the `setup-node` action with Node.js versions 10 and 12. diff --git a/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md b/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md index a7a135e452..3899b0ee7f 100644 --- a/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md +++ b/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md @@ -25,8 +25,7 @@ Bevor Sie {% data variables.product.product_location_enterprise %} auf Google Cl #### Unterstützte Maschinentypen {% data variables.product.prodname_ghe_server %} wird auf den folgenden Google Compute Engine-Maschinentypen (GCE) unterstützt. Weitere Informationen finden Sie im Google Cloud Platform-Artikel zu den „[Maschinentypen](https://cloud.google.com/compute/docs/machine-types)“. -| -{% if currentVersion != "free-pro-team@latest" %} + | | Oberer Speicher | | | --------------- | | | n1-highmem-4 | @@ -35,7 +34,6 @@ Bevor Sie {% data variables.product.product_location_enterprise %} auf Google Cl | | n1-highmem-32 | | | n1-highmem-64 | | | n1-highmem-96 | -{% endif %} #### Empfohlene Maschinentypen diff --git a/translations/de-DE/content/admin/overview/managing-your-github-enterprise-license.md b/translations/de-DE/content/admin/overview/managing-your-github-enterprise-license.md index 4982cb0787..27b6a28888 100644 --- a/translations/de-DE/content/admin/overview/managing-your-github-enterprise-license.md +++ b/translations/de-DE/content/admin/overview/managing-your-github-enterprise-license.md @@ -30,9 +30,9 @@ Nach dem Kauf einer neuen Lizenz oder einem Upgrade einer bestehenden Lizenz von Wenn Du Benutzerlizenzen erneuern oder zu {% data variables.product.prodname_enterprise %} hinzufügen möchtest, kontaktiere {% data variables.contact.contact_enterprise_sales %}. Ihre neue Lizenzdatei steht sofort nach dem Abschluss Ihrer Bestellung zum Download zur Verfügung. -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. Klicke in der linken Seitenleiste auf **Enterprise licensing** (Enterprise-Lizenzierung). !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Under "Enterprise Server Instances", click {% octicon "download" aria-label="The download icon" %} to download your license file. ![GitHub Enterprise Server-Lizenz herunterladen](/assets/images/help/business-accounts/download-ghes-license.png) 5. Log into your {% data variables.product.prodname_ghe_server %} instance as a site administrator. @@ -46,28 +46,29 @@ Wenn Du Benutzerlizenzen erneuern oder zu {% data variables.product.prodname_ent ### Lizenznutzung anzeigen -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} -4. Überprüfe Deine aktuelle {% data variables.product.prodname_enterprise %}-Lizenz sowie verbrauchte und verfügbare Benutzerlizenzen. +3. Klicke in der linken Seitenleiste auf **Enterprise licensing** (Enterprise-Lizenzierung). !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) +4. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses. ### Nutzung der Benutzerlizenzen mit {% data variables.product.prodname_ghe_cloud %} automatisch synchronisieren -Mithilfe von {% data variables.product.prodname_github_connect %} können Sie die Anzahl und Nutzung der Benutzerlizenzen automatisch zwischen {% data variables.product.prodname_ghe_server %} und {% data variables.product.prodname_ghe_cloud %} synchronisieren. Weitere Informationen finden Sie unter „[Automatische Synchronisierung von Benutzerlizenzen zwischen {% data variables.product.prodname_ghe_server %} und {% data variables.product.prodname_ghe_cloud %} aktivieren](/enterprise/{{currentVersion}}/admin/installation/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud)“. +You can use {% data variables.product.prodname_github_connect %} to automatically sync user license count and usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[Enabling automatic user license sync between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{currentVersion}}/admin/installation/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud)." ### Manuelle Synchronisierung der Benutzerlizenz-Nutzung zwischen {% data variables.product.prodname_ghe_server %} und {% data variables.product.prodname_ghe_cloud %} -Auf {% data variables.product.prodname_ghe_server %} können Sie eine JSON-Datei herunterladen und die Datei auf {% data variables.product.prodname_ghe_cloud %} hochladen, um die Nutzung der Benutzerlizenzen zwischen den zwei Bereitstellungen manuell zu synchronisieren. +You can download a JSON file from {% data variables.product.prodname_ghe_server %} and upload the file to {% data variables.product.prodname_ghe_cloud %} to manually sync user license usage between the two deployments. {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.license-tab %} -5. Klicken Sie unter „Quick links“ (Schnellzugriff) auf **Export license usage** (Lizenznutzung exportieren), um eine Datei herunterzuladen, in der Ihre aktuelle Lizenznutzung auf {% data variables.product.prodname_ghe_server %} enthalten ist. ![Link zum Exportieren der Lizenznutzung](/assets/images/enterprise/business-accounts/export-license-usage-link.png) -6. Navigate to -{% data variables.product.prodname_ghe_cloud %}. -{% data reusables.enterprise-accounts.access-enterprise %} +5. Under "Quick links", to download a file containing your current license usage on +{% data variables.product.prodname_ghe_server %}, click **Export license usage**. + ![Link zum Exportieren der Lizenznutzung](/assets/images/enterprise/business-accounts/export-license-usage-link.png) +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +8. Klicke in der linken Seitenleiste auf **Enterprise licensing** (Enterprise-Lizenzierung). !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) +{% data reusables.enterprise-accounts.license-tab %} 10. Klicke unter "Enterprise Server-Instanzen" auf **Servernutzung hinzufügen**. ![Link zum Hochladen der GitHub Enterprise Server-Nutzung](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png) 11. Laden Sie die JSON-Datei hoch, die Sie von {% data variables.product.prodname_ghe_server %} heruntergeladen haben.![„Drag and drop or select a file to upload“ (Hochzuladende Datei per Drag-and-Drop auswählen oder suchen)](/assets/images/help/business-accounts/upload-ghe-server-usage-file.png) diff --git a/translations/de-DE/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md b/translations/de-DE/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md index 1c73909886..da3a9b87ec 100644 --- a/translations/de-DE/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md +++ b/translations/de-DE/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md @@ -11,7 +11,7 @@ Bei Verwendung von LDAP oder der integrierten Authentifizierung wird die Zwei-Fa {% data reusables.enterprise_user_management.external_auth_disables_2fa %} -Weitere Informationen finden Sie in „[dieser Tabelle zu den Authentifizierungsmethoden, welche die 2FA unterstützen](/enterprise/{{ currentVersion }}/user/articles/about-two-factor-authentication/#authentication-methods-that-support-2fa)“. +Weitere Informationen findest Du unter „[Informationen zur Zwei-Faktor-Authentifizierung](/github/authenticating-to-github/about-two-factor-authentication).“ ### Anforderungen für die Erzwingung der Zwei-Faktor-Authentifizierung diff --git a/translations/de-DE/content/developers/apps/authenticating-with-github-apps.md b/translations/de-DE/content/developers/apps/authenticating-with-github-apps.md index 79dd1fc619..db6f497430 100644 --- a/translations/de-DE/content/developers/apps/authenticating-with-github-apps.md +++ b/translations/de-DE/content/developers/apps/authenticating-with-github-apps.md @@ -10,7 +10,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -92,7 +92,7 @@ Use your {% data variables.product.prodname_github_app %}'s identifier (`YOUR_AP After creating the JWT, set it in the `Header` of the API request: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -H "Authorization: Bearer YOUR_JWT" -H "Accept: application/vnd.github.machine-man-preview+json" {% data variables.product.api_url_pre %}/app ``` @@ -127,7 +127,7 @@ By default, installation access tokens are scoped to all the repositories that a To create an installation access token, include the JWT [generated above](#jwt-payload) in the Authorization header in the API request: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -X POST \ -H "Authorization: Bearer YOUR_JWT" \ @@ -147,7 +147,7 @@ The response will include your installation access token, the expiration date, t To authenticate with an installation access token, include it in the Authorization header in the API request: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i \ -H "Authorization: token YOUR_INSTALLATION_ACCESS_TOKEN" \ diff --git a/translations/de-DE/content/developers/apps/authorizing-oauth-apps.md b/translations/de-DE/content/developers/apps/authorizing-oauth-apps.md index 87f8be6975..bbd78f5a87 100644 --- a/translations/de-DE/content/developers/apps/authorizing-oauth-apps.md +++ b/translations/de-DE/content/developers/apps/authorizing-oauth-apps.md @@ -1,5 +1,5 @@ --- -title: Authorizing OAuth Apps +title: OAuth-Apps autorisieren intro: '{% data reusables.shortdesc.authorizing_oauth_apps %}' redirect_from: - /apps/building-integrations/setting-up-and-registering-oauth-apps/about-authorization-options-for-oauth-apps/ @@ -52,14 +52,14 @@ When your GitHub App specifies a `login` parameter, it prompts users with a spec ##### Parameters -Name | Type | Description ------|------|-------------- -`client_id`|`string` | **Required**. The client ID you received from GitHub when you {% if currentVersion == "free-pro-team@latest" %}[registered](https://github.com/settings/applications/new){% else %}registered{% endif %}. -`redirect_uri`|`string` | The URL in your application where users will be sent after authorization. See details below about [redirect urls](#redirect-urls). -`login` | `string` | Suggests a specific account to use for signing in and authorizing the app. -`scope`|`string` | A space-delimited list of [scopes](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/). If not provided, `scope` defaults to an empty list for users that have not authorized any scopes for the application. For users who have authorized scopes for the application, the user won't be shown the OAuth authorization page with the list of scopes. Instead, this step of the flow will automatically complete with the set of scopes the user has authorized for the application. For example, if a user has already performed the web flow twice and has authorized one token with `user` scope and another token with `repo` scope, a third web flow that does not provide a `scope` will receive a token with `user` and `repo` scope. -`state` | `string` | {% data reusables.apps.state_description %} -`allow_signup`|`string` | Whether or not unauthenticated users will be offered an option to sign up for GitHub during the OAuth flow. The default is `true`. Use `false` when a policy prohibits signups. +| Name | Typ | Beschreibung | +| -------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `string` | **Required**. The client ID you received from GitHub when you {% if currentVersion == "free-pro-team@latest" %}[registered](https://github.com/settings/applications/new){% else %}registered{% endif %}. | +| `redirect_uri` | `string` | The URL in your application where users will be sent after authorization. See details below about [redirect urls](#redirect-urls). | +| `login` | `string` | Suggests a specific account to use for signing in and authorizing the app. | +| `Umfang` | `string` | A space-delimited list of [scopes](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/). If not provided, `scope` defaults to an empty list for users that have not authorized any scopes for the application. For users who have authorized scopes for the application, the user won't be shown the OAuth authorization page with the list of scopes. Instead, this step of the flow will automatically complete with the set of scopes the user has authorized for the application. For example, if a user has already performed the web flow twice and has authorized one token with `user` scope and another token with `repo` scope, a third web flow that does not provide a `scope` will receive a token with `user` and `repo` scope. | +| `state` | `string` | {% data reusables.apps.state_description %} +| `allow_signup` | `string` | Whether or not unauthenticated users will be offered an option to sign up for GitHub during the OAuth flow. The default is `true`. Use `false` when a policy prohibits signups. | #### 2. Users are redirected back to your site by GitHub @@ -71,13 +71,13 @@ Exchange this `code` for an access token: ##### Parameters -Name | Type | Description ------|------|-------------- -`client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_github_app %}. -`client_secret` | `string` | **Required.** The client secret you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_github_app %}. -`code` | `string` | **Required.** The code you received as a response to Step 1. -`redirect_uri` | `string` | The URL in your application where users are sent after authorization. -`state` | `string` | The unguessable random string you provided in Step 1. +| Name | Typ | Beschreibung | +| --------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_github_app %}. | +| `client_secret` | `string` | **Required.** The client secret you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_github_app %}. | +| `Code` | `string` | **Required.** The code you received as a response to Step 1. | +| `redirect_uri` | `string` | The URL in your application where users are sent after authorization. | +| `state` | `string` | The unguessable random string you provided in Step 1. | ##### Response @@ -85,12 +85,11 @@ By default, the response takes the following form: access_token=e72e16c7e42f292c6912e7710c838347ae178b4a&token_type=bearer -You can also receive the content in different formats depending on the Accept -header: +You can also receive the content in different formats depending on the Accept header: Accept: application/json {"access_token":"e72e16c7e42f292c6912e7710c838347ae178b4a", "scope":"repo,gist", "token_type":"bearer"} - + Accept: application/xml bearer @@ -136,10 +135,10 @@ Your app must request a user verification code and verification URL that the app ##### Input Parameters -Name | Type | Description ------|------|-------------- -`client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your app. -`scope` | `string` | The scope that your app is requesting access to. +| Name | Typ | Beschreibung | +| ----------- | -------- | ----------------------------------------------------------------------------------------------------- | +| `client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your app. | +| `Umfang` | `string` | The scope that your app is requesting access to. | ##### Response @@ -167,13 +166,13 @@ Name | Type | Description ##### Response parameters -Name | Type | Description ------|------|-------------- -`device_code` | `string` | The device verification code is 40 characters and used to verify the device. -`user_code` | `string` | The user verification code is displayed on the device so the user can enter the code in a browser. This code is 8 characters with a hyphen in the middle. -`verification_uri` | `string` | The verification URL where users need to enter the `user_code`: {% data variables.product.device_authorization_url %}. -`expires_in` | `integer`| The number of seconds before the `device_code` and `user_code` expire. The default is 900 seconds or 15 minutes. -`interval` | `integer` | The minimum number of seconds that must pass before you can make a new access token request (`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`) to complete the device authorization. For example, if the interval is 5, then you cannot make a new request until 5 seconds pass. If you make more than one request over 5 seconds, then you will hit the rate limit and receive a `slow_down` error. +| Name | Typ | Beschreibung | +| ------------------ | --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `device_code` | `string` | The device verification code is 40 characters and used to verify the device. | +| `user_code` | `string` | The user verification code is displayed on the device so the user can enter the code in a browser. This code is 8 characters with a hyphen in the middle. | +| `verification_uri` | `string` | The verification URL where users need to enter the `user_code`: {% data variables.product.device_authorization_url %}. | +| `expires_in` | `integer` | The number of seconds before the `device_code` and `user_code` expire. The default is 900 seconds or 15 minutes. | +| `interval` | `integer` | The minimum number of seconds that must pass before you can make a new access token request (`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`) to complete the device authorization. For example, if the interval is 5, then you cannot make a new request until 5 seconds pass. If you make more than one request over 5 seconds, then you will hit the rate limit and receive a `slow_down` error. | #### Step 2: Prompt the user to enter the user code in a browser @@ -193,11 +192,11 @@ Once the user has authorized, the app will receive an access token that can be u ##### Input parameters -Name | Type | Description ------|------|-------------- -`client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_oauth_app %}. -`device_code` | `string` | **Required.** The device verification code you received from the `POST {% data variables.product.oauth_host_code %}/login/device/code` request. -`grant_type` | `string` | **Required.** The grant type must be `urn:ietf:params:oauth:grant-type:device_code`. +| Name | Typ | Beschreibung | +| ------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_oauth_app %}. | +| `device_code` | `string` | **Required.** The device verification code you received from the `POST {% data variables.product.oauth_host_code %}/login/device/code` request. | +| `grant_type` | `string` | **Required.** The grant type must be `urn:ietf:params:oauth:grant-type:device_code`. | ##### Response @@ -217,15 +216,15 @@ If you make more than one access token request (`POST {% data variables.product. #### Error codes for the device flow -| Error code | Description | -|----|----| -| `authorization_pending`| This error occurs when the authorization request is pending and the user hasn't entered the user code yet. The app is expected to keep polling the `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token` request without exceeding the [`interval`](#response-parameters), which requires a minimum number of seconds between each request. | -| `slow_down` | When you receive the `slow_down` error, 5 extra seconds are added to the minimum `interval` or timeframe required between your requests using `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`. For example, if the starting interval required at least 5 seconds between requests and you get a `slow_down` error response, you must now wait a minimum of 10 seconds before making a new request for an OAuth access token. The error response includes the new `interval` that you must use. -| `expired_token` | If the device code expired, then you will see the `token_expired` error. You must make a new request for a device code. -| `unsupported_grant_type` | The grant type must be `urn:ietf:params:oauth:grant-type:device_code` and included as an input parameter when you poll the OAuth token request `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`. -| `incorrect_client_credentials` | For the device flow, you must pass your app's client ID, which you can find on your app settings page. The `client_secret` is not needed for the device flow. -| `incorrect_device_code` | The device_code provided is not valid. -| `access_denied` | When a user clicks cancel during the authorization process, you'll receive a `access_denied` error and the user won't be able to use the verification code again. +| Error code | Beschreibung | +| ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `authorization_pending` | This error occurs when the authorization request is pending and the user hasn't entered the user code yet. The app is expected to keep polling the `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token` request without exceeding the [`interval`](#response-parameters), which requires a minimum number of seconds between each request. | +| `slow_down` | When you receive the `slow_down` error, 5 extra seconds are added to the minimum `interval` or timeframe required between your requests using `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`. For example, if the starting interval required at least 5 seconds between requests and you get a `slow_down` error response, you must now wait a minimum of 10 seconds before making a new request for an OAuth access token. The error response includes the new `interval` that you must use. | +| `expired_token` | If the device code expired, then you will see the `token_expired` error. You must make a new request for a device code. | +| `unsupported_grant_type` | The grant type must be `urn:ietf:params:oauth:grant-type:device_code` and included as an input parameter when you poll the OAuth token request `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`. | +| `incorrect_client_credentials` | For the device flow, you must pass your app's client ID, which you can find on your app settings page. The `client_secret` is not needed for the device flow. | +| `incorrect_device_code` | The device_code provided is not valid. | +| `access_denied` | When a user clicks cancel during the authorization process, you'll receive a `access_denied` error and the user won't be able to use the verification code again. | For more information, see the "[OAuth 2.0 Device Authorization Grant](https://tools.ietf.org/html/rfc8628#section-3.5)." @@ -237,22 +236,16 @@ Non-web authentication is available for limited situations like testing. If you {% note %} -**Note:** When using the non-web application flow to create an OAuth2 token, make sure to understand how to [work with -two-factor authentication](/v3/auth/#working-with-two-factor-authentication) if -you or your users have two-factor authentication enabled. +**Note:** When using the non-web application flow to create an OAuth2 token, make sure to understand how to [work with two-factor authentication](/v3/auth/#working-with-two-factor-authentication) if you or your users have two-factor authentication enabled. {% endnote %} ### Redirect URLs -The `redirect_uri` parameter is optional. If left out, GitHub will -redirect users to the callback URL configured in the OAuth Application -settings. If provided, the redirect URL's host and port must exactly -match the callback URL. The redirect URL's path must reference a -subdirectory of the callback URL. +The `redirect_uri` parameter is optional. If left out, GitHub will redirect users to the callback URL configured in the OAuth Application settings. If provided, the redirect URL's host and port must exactly match the callback URL. The redirect URL's path must reference a subdirectory of the callback URL. CALLBACK: http://example.com/path - + GOOD: http://example.com/path GOOD: http://example.com/path/subdir/other BAD: http://example.com/bar @@ -295,7 +288,7 @@ To build this link, you'll need your OAuth Apps `client_id` that you received fr {% endtip %} -### Troubleshooting +### Problemlösungen * "[Troubleshooting authorization request errors](/apps/managing-oauth-apps/troubleshooting-authorization-request-errors)" * "[Troubleshooting OAuth App access token request errors](/apps/managing-oauth-apps/troubleshooting-oauth-app-access-token-request-errors)" diff --git a/translations/de-DE/content/developers/apps/creating-a-github-app-from-a-manifest.md b/translations/de-DE/content/developers/apps/creating-a-github-app-from-a-manifest.md index a9eea1a0df..9ac0aaad9d 100644 --- a/translations/de-DE/content/developers/apps/creating-a-github-app-from-a-manifest.md +++ b/translations/de-DE/content/developers/apps/creating-a-github-app-from-a-manifest.md @@ -162,7 +162,7 @@ You must complete this step of the GitHub App Manifest flow within one hour. {% endnote %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% data reusables.pre-release-program.fury-pre-release %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/de-DE/content/developers/apps/creating-a-github-app-using-url-parameters.md b/translations/de-DE/content/developers/apps/creating-a-github-app-using-url-parameters.md index d718d3f89b..e0f4137fa9 100644 --- a/translations/de-DE/content/developers/apps/creating-a-github-app-using-url-parameters.md +++ b/translations/de-DE/content/developers/apps/creating-a-github-app-using-url-parameters.md @@ -27,93 +27,93 @@ The complete list of available query parameters, permissions, and events is list ### {% data variables.product.prodname_github_app %} configuration parameters - Name | Type | Description ------|------|------------- -`name` | `string` | The name of the {% data variables.product.prodname_github_app %}. Give your app a clear and succinct name. Your app cannot have the same name as an existing GitHub user, unless it is your own user or organization name. A slugged version of your app's name will be shown in the user interface when your integration takes an action. -`description` | `string` | A description of the {% data variables.product.prodname_github_app %}. -`url` | `string` | The full URL of your {% data variables.product.prodname_github_app %}'s website homepage. -`callback_url` | `string` | The full URL to redirect to after someone authorizes an installation. This URL is used if your app needs to identify and authorize user-to-server requests. -`request_oauth_on_install` | `boolean` | If your app authorizes users using the OAuth flow, you can set this option to `true` to allow people to authorize the app when they install it, saving a step. If you select this option, the `setup_url` becomes unavailable and users will be redirected to your `callback_url` after installing the app. -`setup_url` | `string` | The full URL to redirect to after someone installs the {% data variables.product.prodname_github_app %} if the app requires additional setup after installation. -`setup_on_update` | `boolean` | Set to `true` to redirect people to the setup URL when installations have been updated, for example, after repositories are added or removed. -`public` | `boolean` | Set to `true` when your {% data variables.product.prodname_github_app %} is available to the public or `false` when it is only accessible to the owner of the app. -`webhook_url` | `string` | The full URL that you would like to send webhook event payloads to. -`webhook_secret` | `string` | You can specify a secret to secure your webhooks. See "[Securing your webhooks](/webhooks/securing/)" for more details. -`events` | `array of strings` | Webhook events. Some webhook events require `read` or `write` permissions for a resource before you can select the event when registering a new {% data variables.product.prodname_github_app %}. See the "[{% data variables.product.prodname_github_app %} webhook events](#github-app-webhook-events)" section for available events and their required permissions. You can select multiple events in a query string. For example, `events[]=public&events[]=label`. -`domain` | `string` | The URL of a content reference. -`single_file_name` | `string` | When you grant `read` or `write` access to the `single_file` permission, this field provides the path to the single file your {% data variables.product.prodname_github_app %} will manage. + | Name | Typ | Beschreibung | + | -------------------------- | ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | + | `name` | `string` | The name of the {% data variables.product.prodname_github_app %}. Give your app a clear and succinct name. Your app cannot have the same name as an existing GitHub user, unless it is your own user or organization name. A slugged version of your app's name will be shown in the user interface when your integration takes an action. | + | `Beschreibung` | `string` | A description of the {% data variables.product.prodname_github_app %}. | + | `url` | `string` | The full URL of your {% data variables.product.prodname_github_app %}'s website homepage. | + | `callback_url` | `string` | The full URL to redirect to after someone authorizes an installation. This URL is used if your app needs to identify and authorize user-to-server requests. | + | `request_oauth_on_install` | `boolean` | If your app authorizes users using the OAuth flow, you can set this option to `true` to allow people to authorize the app when they install it, saving a step. If you select this option, the `setup_url` becomes unavailable and users will be redirected to your `callback_url` after installing the app. | + | `setup_url` | `string` | The full URL to redirect to after someone installs the {% data variables.product.prodname_github_app %} if the app requires additional setup after installation. | + | `setup_on_update` | `boolean` | Set to `true` to redirect people to the setup URL when installations have been updated, for example, after repositories are added or removed. | + | `public` | `boolean` | Set to `true` when your {% data variables.product.prodname_github_app %} is available to the public or `false` when it is only accessible to the owner of the app. | + | `webhook_url` | `string` | The full URL that you would like to send webhook event payloads to. | + | `webhook_secret` | `string` | You can specify a secret to secure your webhooks. See "[Securing your webhooks](/webhooks/securing/)" for more details. | + | `ereignisse` | `array of strings` | Webhook-Ereignisse. Some webhook events require `read` or `write` permissions for a resource before you can select the event when registering a new {% data variables.product.prodname_github_app %}. See the "[{% data variables.product.prodname_github_app %} webhook events](#github-app-webhook-events)" section for available events and their required permissions. You can select multiple events in a query string. For example, `events[]=public&events[]=label`. | + | `Domäne` | `string` | The URL of a content reference. | + | `single_file_name` | `string` | When you grant `read` or `write` access to the `single_file` permission, this field provides the path to the single file your {% data variables.product.prodname_github_app %} will manage. | ### {% data variables.product.prodname_github_app %} permissions You can select permissions in a query string using the permission name in the following table as the query parameter name and the permission type as the query value. For example, to select `Read & write` permissions in the user interface for `contents`, your query string would include `&contents=write`. To select `Read-only` permissions in the user interface for `blocking`, your query string would include `&blocking=read`. To select `no-access` in the user interface for `checks`, your query string would not include the `checks` permission. -Permission | Description ----------- | ----------- -[`administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-administration) | Grants access to various endpoints for organization and repository administration. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} -[`blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-blocking) | Grants access to the [Blocking Users API](/v3/users/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} -[`checks`](/rest/reference/permissions-required-for-github-apps/#permission-on-checks) | Grants access to the [Checks API](/v3/checks/). Can be one of: `none`, `read`, or `write`. -`content_references` | Grants access to the "[Create a content attachment](/v3/apps/installations/#create-a-content-attachment)" endpoint. Can be one of: `none`, `read`, or `write`. -[`contents`](/rest/reference/permissions-required-for-github-apps/#permission-on-contents) | Grants access to various endpoints that allow you to modify repository contents. Can be one of: `none`, `read`, or `write`. -[`deployments`](/rest/reference/permissions-required-for-github-apps/#permission-on-deployments) | Grants access to the [Deployments API](/rest/reference/repos#deployments). Can be one of: `none`, `read`, or `write`. -[`emails`](/rest/reference/permissions-required-for-github-apps/#permission-on-emails) | Grants access to the [Emails API](/v3/users/emails/). Can be one of: `none`, `read`, or `write`. -[`followers`](/rest/reference/permissions-required-for-github-apps/#permission-on-followers) | Grants access to the [Followers API](/v3/users/followers/). Can be one of: `none`, `read`, or `write`. -[`gpg_keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-gpg-keys) | Grants access to the [GPG Keys API](/v3/users/gpg_keys/). Can be one of: `none`, `read`, or `write`. -[`issues`](/rest/reference/permissions-required-for-github-apps/#permission-on-issues) | Grants access to the [Issues API](/v3/issues/). Can be one of: `none`, `read`, or `write`. -[`keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-keys) | Grants access to the [Public Keys API](/v3/users/keys/). Can be one of: `none`, `read`, or `write`. -[`members`](/rest/reference/permissions-required-for-github-apps/#permission-on-members) | Grants access to manage an organization's members. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} -[`metadata`](/rest/reference/permissions-required-for-github-apps/#metadata-permissions) | Grants access to read-only endpoints that do not leak sensitive data. Can be `read` or `none`. Defaults to `read` when you set any permission, or defaults to `none` when you don't specify any permissions for the {% data variables.product.prodname_github_app %}. -[`organization_administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-administration) | Grants access to "[Update an organization](/v3/orgs/#update-an-organization)" endpoint and the [Organization Interaction Restrictions API](/v3/interactions/orgs/#set-interaction-restrictions-for-an-organization). Can be one of: `none`, `read`, or `write`.{% endif %} -[`organization_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-hooks) | Grants access to the [Organization Webhooks API](/rest/reference/orgs#webhooks/). Can be one of: `none`, `read`, or `write`. -`organization_plan` | Grants access to get information about an organization's plan using the "[Get an organization](/v3/orgs/#get-an-organization)" endpoint. Can be one of: `none` or `read`. -[`organization_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`.{% if currentVersion == "free-pro-team@latest" %} -[`organization_user_blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Blocking Organization Users API](/v3/orgs/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} -[`pages`](/rest/reference/permissions-required-for-github-apps/#permission-on-pages) | Grants access to the [Pages API](/rest/reference/repos#pages). Can be one of: `none`, `read`, or `write`. -`plan` | Grants access to get information about a user's GitHub plan using the "[Get a user](/v3/users/#get-a-user)" endpoint. Can be one of: `none` or `read`. -[`pull_requests`](/rest/reference/permissions-required-for-github-apps/#permission-on-pull-requests) | Grants access to various pull request endpoints. Can be one of: `none`, `read`, or `write`. -[`repository_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-hooks) | Grants access to the [Repository Webhooks API](/v3/repos/hooks/). Can be one of: `none`, `read`, or `write`. -[`repository_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`. -[`single_file`](/rest/reference/permissions-required-for-github-apps/#permission-on-single-file) | Grants access to the [Contents API](/v3/repos/contents/). Can be one of: `none`, `read`, or `write`. -[`starring`](/rest/reference/permissions-required-for-github-apps/#permission-on-starring) | Grants access to the [Starring API](/v3/activity/starring/). Can be one of: `none`, `read`, or `write`. -[`statuses`](/rest/reference/permissions-required-for-github-apps/#permission-on-statuses) | Grants access to the [Statuses API](/v3/repos/statuses/). Can be one of: `none`, `read`, or `write`. -[`team_discussions`](/rest/reference/permissions-required-for-github-apps/#permission-on-team-discussions) | Grants access to the [Team Discussions API](/v3/teams/discussions/) and the [Team Discussion Comments API](/v3/teams/discussion_comments/). Can be one of: `none`, `read`, or `write`. -`vulnerability_alerts`| Grants access to receive security alerts for vulnerable dependencies in a repository. See "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies)" to learn more. Can be one of: `none` or `read`. -`watching` | Grants access to list and change repositories a user is subscribed to. Can be one of: `none`, `read`, or `write`. +| Berechtigung | Beschreibung | +| -------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| [`administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-administration) | Grants access to various endpoints for organization and repository administration. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} +| [`blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-blocking) | Grants access to the [Blocking Users API](/v3/users/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} +| [`checks (Prüfungen)`](/rest/reference/permissions-required-for-github-apps/#permission-on-checks) | Grants access to the [Checks API](/v3/checks/). Can be one of: `none`, `read`, or `write`. | +| `content_references` | Grants access to the "[Create a content attachment](/v3/apps/installations/#create-a-content-attachment)" endpoint. Can be one of: `none`, `read`, or `write`. | +| [`contents (Inhalte)`](/rest/reference/permissions-required-for-github-apps/#permission-on-contents) | Grants access to various endpoints that allow you to modify repository contents. Can be one of: `none`, `read`, or `write`. | +| [`deployments`](/rest/reference/permissions-required-for-github-apps/#permission-on-deployments) | Grants access to the [Deployments API](/rest/reference/repos#deployments). Can be one of: `none`, `read`, or `write`. | +| [`emails`](/rest/reference/permissions-required-for-github-apps/#permission-on-emails) | Grants access to the [Emails API](/v3/users/emails/). Can be one of: `none`, `read`, or `write`. | +| [`follower`](/rest/reference/permissions-required-for-github-apps/#permission-on-followers) | Grants access to the [Followers API](/v3/users/followers/). Can be one of: `none`, `read`, or `write`. | +| [`gpg_keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-gpg-keys) | Grants access to the [GPG Keys API](/v3/users/gpg_keys/). Can be one of: `none`, `read`, or `write`. | +| [`Issues (Lieferungen)`](/rest/reference/permissions-required-for-github-apps/#permission-on-issues) | Grants access to the [Issues API](/v3/issues/). Can be one of: `none`, `read`, or `write`. | +| [`keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-keys) | Grants access to the [Public Keys API](/v3/users/keys/). Can be one of: `none`, `read`, or `write`. | +| [`members`](/rest/reference/permissions-required-for-github-apps/#permission-on-members) | Grants access to manage an organization's members. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} +| [`Metadaten`](/rest/reference/permissions-required-for-github-apps/#metadata-permissions) | Grants access to read-only endpoints that do not leak sensitive data. Can be `read` or `none`. Defaults to `read` when you set any permission, or defaults to `none` when you don't specify any permissions for the {% data variables.product.prodname_github_app %}. | +| [`organization_administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-administration) | Grants access to "[Update an organization](/v3/orgs/#update-an-organization)" endpoint and the [Organization Interaction Restrictions API](/v3/interactions/orgs/#set-interaction-restrictions-for-an-organization). Can be one of: `none`, `read`, or `write`.{% endif %} +| [`organization_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-hooks) | Grants access to the [Organization Webhooks API](/rest/reference/orgs#webhooks/). Can be one of: `none`, `read`, or `write`. | +| `organization_plan` | Grants access to get information about an organization's plan using the "[Get an organization](/v3/orgs/#get-an-organization)" endpoint. Can be one of: `none` or `read`. | +| [`organization_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`.{% if currentVersion == "free-pro-team@latest" %} +| [`organization_user_blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Blocking Organization Users API](/v3/orgs/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} +| [`Seiten`](/rest/reference/permissions-required-for-github-apps/#permission-on-pages) | Grants access to the [Pages API](/rest/reference/repos#pages). Can be one of: `none`, `read`, or `write`. | +| `plan` | Grants access to get information about a user's GitHub plan using the "[Get a user](/v3/users/#get-a-user)" endpoint. Can be one of: `none` or `read`. | +| [`pull_requests`](/rest/reference/permissions-required-for-github-apps/#permission-on-pull-requests) | Grants access to various pull request endpoints. Can be one of: `none`, `read`, or `write`. | +| [`repository_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-hooks) | Grants access to the [Repository Webhooks API](/v3/repos/hooks/). Can be one of: `none`, `read`, or `write`. | +| [`repository_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`. | +| [`single_file`](/rest/reference/permissions-required-for-github-apps/#permission-on-single-file) | Grants access to the [Contents API](/v3/repos/contents/). Can be one of: `none`, `read`, or `write`. | +| [`starring`](/rest/reference/permissions-required-for-github-apps/#permission-on-starring) | Grants access to the [Starring API](/v3/activity/starring/). Can be one of: `none`, `read`, or `write`. | +| [`statuses (Statusangaben)`](/rest/reference/permissions-required-for-github-apps/#permission-on-statuses) | Grants access to the [Statuses API](/v3/repos/statuses/). Can be one of: `none`, `read`, or `write`. | +| [`team_discussions`](/rest/reference/permissions-required-for-github-apps/#permission-on-team-discussions) | Grants access to the [Team Discussions API](/v3/teams/discussions/) and the [Team Discussion Comments API](/v3/teams/discussion_comments/). Can be one of: `none`, `read`, or `write`. | +| `vulnerability_alerts` | Grants access to receive security alerts for vulnerable dependencies in a repository. See "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies)" to learn more. Can be one of: `none` or `read`. | +| `beobachten` | Grants access to list and change repositories a user is subscribed to. Can be one of: `none`, `read`, or `write`. | ### {% data variables.product.prodname_github_app %} webhook events -Webhook event name | Required permission | Description ------------------- | ------------------- | ----------- -[`check_run`](/webhooks/event-payloads/#check_run) |`checks` | {% data reusables.webhooks.check_run_short_desc %} -[`check_suite`](/webhooks/event-payloads/#check_suite) |`checks` | {% data reusables.webhooks.check_suite_short_desc %} -[`commit_comment`](/webhooks/event-payloads/#commit_comment) | `contents` | {% data reusables.webhooks.commit_comment_short_desc %} -[`content_reference`](/webhooks/event-payloads/#content_reference) |`content_references` | {% data reusables.webhooks.content_reference_short_desc %} -[`create`](/webhooks/event-payloads/#create) | `contents` | {% data reusables.webhooks.create_short_desc %} -[`delete`](/webhooks/event-payloads/#delete) | `contents` | {% data reusables.webhooks.delete_short_desc %} -[`deployment`](/webhooks/event-payloads/#deployment) | `deployments` | {% data reusables.webhooks.deployment_short_desc %} -[`deployment_status`](/webhooks/event-payloads/#deployment_status) | `deployments` | {% data reusables.webhooks.deployment_status_short_desc %} -[`fork`](/webhooks/event-payloads/#fork) | `contents` | {% data reusables.webhooks.fork_short_desc %} -[`gollum`](/webhooks/event-payloads/#gollum) | `contents` | {% data reusables.webhooks.gollum_short_desc %} -[`issues`](/webhooks/event-payloads/#issues) | `issues` | {% data reusables.webhooks.issues_short_desc %} -[`issue_comment`](/webhooks/event-payloads/#issue_comment) | `issues` | {% data reusables.webhooks.issue_comment_short_desc %} -[`label`](/webhooks/event-payloads/#label) | `metadata` | {% data reusables.webhooks.label_short_desc %} -[`member`](/webhooks/event-payloads/#member) | `members` | {% data reusables.webhooks.member_short_desc %} -[`membership`](/webhooks/event-payloads/#membership) | `members` | {% data reusables.webhooks.membership_short_desc %} -[`milestone`](/webhooks/event-payloads/#milestone) | `pull_request` | {% data reusables.webhooks.milestone_short_desc %}{% if currentVersion == "free-pro-team@latest" %} -[`org_block`](/webhooks/event-payloads/#org_block) | `organization_administration` | {% data reusables.webhooks.org_block_short_desc %}{% endif %} -[`organization`](/webhooks/event-payloads/#organization) | `members` | {% data reusables.webhooks.organization_short_desc %} -[`page_build`](/webhooks/event-payloads/#page_build) | `pages` | {% data reusables.webhooks.page_build_short_desc %} -[`project`](/webhooks/event-payloads/#project) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_short_desc %} -[`project_card`](/webhooks/event-payloads/#project_card) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_card_short_desc %} -[`project_column`](/webhooks/event-payloads/#project_column) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_column_short_desc %} -[`public`](/webhooks/event-payloads/#public) | `metadata` | {% data reusables.webhooks.public_short_desc %} -[`pull_request`](/webhooks/event-payloads/#pull_request) | `pull_requests` | {% data reusables.webhooks.pull_request_short_desc %} -[`pull_request_review`](/webhooks/event-payloads/#pull_request_review) | `pull_request` | {% data reusables.webhooks.pull_request_review_short_desc %} -[`pull_request_review_comment`](/webhooks/event-payloads/#pull_request_review_comment) | `pull_request` | {% data reusables.webhooks.pull_request_review_comment_short_desc %} -[`push`](/webhooks/event-payloads/#push) | `contents` | {% data reusables.webhooks.push_short_desc %} -[`release`](/webhooks/event-payloads/#release) | `contents` | {% data reusables.webhooks.release_short_desc %} -[`repository`](/webhooks/event-payloads/#repository) |`metadata` | {% data reusables.webhooks.repository_short_desc %}{% if currentVersion == "free-pro-team@latest"%} -[`repository_dispatch`](/webhooks/event-payloads/#repository_dispatch) | `contents` | Allows integrators using GitHub Actions to trigger custom events.{% endif %} -[`status`](/webhooks/event-payloads/#status) | `statuses` | {% data reusables.webhooks.status_short_desc %} -[`team`](/webhooks/event-payloads/#team) | `members` | {% data reusables.webhooks.team_short_desc %} -[`team_add`](/webhooks/event-payloads/#team_add) | `members` | {% data reusables.webhooks.team_add_short_desc %} -[`watch`](/webhooks/event-payloads/#watch) | `metadata` | {% data reusables.webhooks.watch_short_desc %} +| Name von Webhook-Ereignis | Required permission | Beschreibung | +| -------------------------------------------------------------------------------------- | ------------------------------------------------ | ----------------------------------------------------------------------------------------------------- | +| [`check_run`](/webhooks/event-payloads/#check_run) | `checks (Prüfungen)` | {% data reusables.webhooks.check_run_short_desc %} +| [`check_suite`](/webhooks/event-payloads/#check_suite) | `checks (Prüfungen)` | {% data reusables.webhooks.check_suite_short_desc %} +| [`commit_comment`](/webhooks/event-payloads/#commit_comment) | `contents (Inhalte)` | {% data reusables.webhooks.commit_comment_short_desc %} +| [`content_reference`](/webhooks/event-payloads/#content_reference) | `content_references` | {% data reusables.webhooks.content_reference_short_desc %} +| [`create`](/webhooks/event-payloads/#create) | `contents (Inhalte)` | {% data reusables.webhooks.create_short_desc %} +| [`delete`](/webhooks/event-payloads/#delete) | `contents (Inhalte)` | {% data reusables.webhooks.delete_short_desc %} +| [`deployment`](/webhooks/event-payloads/#deployment) | `deployments` | {% data reusables.webhooks.deployment_short_desc %} +| [`deployment_status`](/webhooks/event-payloads/#deployment_status) | `deployments` | {% data reusables.webhooks.deployment_status_short_desc %} +| [`Fork`](/webhooks/event-payloads/#fork) | `contents (Inhalte)` | {% data reusables.webhooks.fork_short_desc %} +| [`gollum`](/webhooks/event-payloads/#gollum) | `contents (Inhalte)` | {% data reusables.webhooks.gollum_short_desc %} +| [`Issues (Lieferungen)`](/webhooks/event-payloads/#issues) | `Issues (Lieferungen)` | {% data reusables.webhooks.issues_short_desc %} +| [`issue_comment`](/webhooks/event-payloads/#issue_comment) | `Issues (Lieferungen)` | {% data reusables.webhooks.issue_comment_short_desc %} +| [`Kennzeichnung`](/webhooks/event-payloads/#label) | `Metadaten` | {% data reusables.webhooks.label_short_desc %} +| [`Mitglied`](/webhooks/event-payloads/#member) | `members` | {% data reusables.webhooks.member_short_desc %} +| [`membership`](/webhooks/event-payloads/#membership) | `members` | {% data reusables.webhooks.membership_short_desc %} +| [`Meilensteine`](/webhooks/event-payloads/#milestone) | `pull_request` | {% data reusables.webhooks.milestone_short_desc %}{% if currentVersion == "free-pro-team@latest" %} +| [`org_block`](/webhooks/event-payloads/#org_block) | `organization_administration` | {% data reusables.webhooks.org_block_short_desc %}{% endif %} +| [`Organisation`](/webhooks/event-payloads/#organization) | `members` | {% data reusables.webhooks.organization_short_desc %} +| [`page_build`](/webhooks/event-payloads/#page_build) | `Seiten` | {% data reusables.webhooks.page_build_short_desc %} +| [`project (Projekt)`](/webhooks/event-payloads/#project) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_short_desc %} +| [`project_card`](/webhooks/event-payloads/#project_card) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_card_short_desc %} +| [`project_column`](/webhooks/event-payloads/#project_column) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_column_short_desc %} +| [`public`](/webhooks/event-payloads/#public) | `Metadaten` | {% data reusables.webhooks.public_short_desc %} +| [`pull_request`](/webhooks/event-payloads/#pull_request) | `pull_requests` | {% data reusables.webhooks.pull_request_short_desc %} +| [`pull_request_review`](/webhooks/event-payloads/#pull_request_review) | `pull_request` | {% data reusables.webhooks.pull_request_review_short_desc %} +| [`pull_request_review_comment`](/webhooks/event-payloads/#pull_request_review_comment) | `pull_request` | {% data reusables.webhooks.pull_request_review_comment_short_desc %} +| [`Push`](/webhooks/event-payloads/#push) | `contents (Inhalte)` | {% data reusables.webhooks.push_short_desc %} +| [`Release`](/webhooks/event-payloads/#release) | `contents (Inhalte)` | {% data reusables.webhooks.release_short_desc %} +| [`Repository`](/webhooks/event-payloads/#repository) | `Metadaten` | {% data reusables.webhooks.repository_short_desc %}{% if currentVersion == "free-pro-team@latest"%} +| [`repository_dispatch`](/webhooks/event-payloads/#repository_dispatch) | `contents (Inhalte)` | Allows integrators using GitHub Actions to trigger custom events.{% endif %} +| [`Status`](/webhooks/event-payloads/#status) | `statuses (Statusangaben)` | {% data reusables.webhooks.status_short_desc %} +| [`Team`](/webhooks/event-payloads/#team) | `members` | {% data reusables.webhooks.team_short_desc %} +| [`team_add`](/webhooks/event-payloads/#team_add) | `members` | {% data reusables.webhooks.team_add_short_desc %} +| [`beobachten`](/webhooks/event-payloads/#watch) | `Metadaten` | {% data reusables.webhooks.watch_short_desc %} diff --git a/translations/de-DE/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/translations/de-DE/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md index 95d7ec2ffc..ba86754366 100644 --- a/translations/de-DE/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md +++ b/translations/de-DE/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md @@ -43,12 +43,12 @@ When your GitHub App specifies a `login` parameter, it prompts users with a spec ##### Parameters -Name | Type | Description ------|------|------------ -`client_id` | `string` | **Required.** The client ID for your GitHub App. You can find this in your [GitHub App settings](https://github.com/settings/apps) when you select your app. -`redirect_uri` | `string` | The URL in your application where users will be sent after authorization. This must be an exact match to the URL you provided in the **User authorization callback URL** field when setting up your GitHub App and can't contain any additional parameters. -`state` | `string` | This should contain a random string to protect against forgery attacks and could contain any other arbitrary data. -`login` | `string` | Suggests a specific account to use for signing in and authorizing the app. +| Name | Typ | Beschreibung | +| -------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `client_id` | `string` | **Required.** The client ID for your GitHub App. You can find this in your [GitHub App settings](https://github.com/settings/apps) when you select your app. | +| `redirect_uri` | `string` | The URL in your application where users will be sent after authorization. This must be an exact match to the URL you provided in the **User authorization callback URL** field when setting up your GitHub App and can't contain any additional parameters. | +| `state` | `string` | This should contain a random string to protect against forgery attacks and could contain any other arbitrary data. | +| `login` | `string` | Suggests a specific account to use for signing in and authorizing the app. | {% note %} @@ -74,13 +74,13 @@ Expiring user tokens are currently part of the user-to-server token expiration b ##### Parameters -Name | Type | Description ------|------|------------ -`client_id` | `string` | **Required.** The client ID for your GitHub App. -`client_secret` | `string` | **Required.** The client secret for your GitHub App. -`code` | `string` | **Required.** The code you received as a response to Step 1. -`redirect_uri` | `string` | The URL in your application where users are sent after authorization. -`state` | `string` | The unguessable random string you provided in Step 1. +| Name | Typ | Beschreibung | +| --------------- | -------- | --------------------------------------------------------------------- | +| `client_id` | `string` | **Required.** The client ID for your GitHub App. | +| `client_secret` | `string` | **Required.** The client secret for your GitHub App. | +| `Code` | `string` | **Required.** The code you received as a response to Step 1. | +| `redirect_uri` | `string` | The URL in your application where users are sent after authorization. | +| `state` | `string` | The unguessable random string you provided in Step 1. | ##### Response @@ -136,7 +136,7 @@ For more information about authorizing users using the device flow, see "[Author ### Check which installation's resources a user can access -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -226,7 +226,7 @@ While most of your API interaction should occur using your server-to-server inst * [List check runs in a check suite](/v3/checks/runs/#list-check-runs-in-a-check-suite) * [List check runs for a Git reference](/v3/checks/runs/#list-check-runs-for-a-git-reference) -##### Check Suites +##### Prüfsuiten * [Create a check suite](/v3/checks/suites/#create-a-check-suite) * [Get a check suite](/v3/checks/suites/#get-a-check-suite) @@ -245,14 +245,14 @@ While most of your API interaction should occur using your server-to-server inst * [Create a deployment status](/rest/reference/repos#create-a-deployment-status) * [Get a deployment status](/rest/reference/repos#get-a-deployment-status) -##### Deployments +##### Bereitstellungen * [List deployments](/rest/reference/repos#list-deployments) * [Create a deployment](/rest/reference/repos#create-a-deployment) * [Get a deployment](/rest/reference/repos#get-a-deployment){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} * [Delete a deployment](/rest/reference/repos#delete-a-deployment){% endif %} -##### Events +##### Ereignisse * [List public events for a network of repositories](/rest/reference/activity#list-public-events-for-a-network-of-repositories) * [List public organization events](/rest/reference/activity#list-public-organization-events) @@ -336,7 +336,7 @@ While most of your API interaction should occur using your server-to-server inst * [List assignees](/v3/issues/assignees/#list-assignees) * [Check if a user can be assigned](/v3/issues/assignees/#check-if-a-user-can-be-assigned) * [List repository issues](/v3/issues/#list-repository-issues) -* [Create an issue](/v3/issues/#create-an-issue) +* [Hiermit wird ein Issue erstellt.](/v3/issues/#create-an-issue) * [Get an issue](/v3/issues/#get-an-issue) * [Update an issue](/v3/issues/#update-an-issue) * [Lock an issue](/v3/issues/#lock-an-issue) @@ -350,7 +350,7 @@ While most of your API interaction should occur using your server-to-server inst * [List jobs for a workflow run](/v3/actions/workflow-jobs/#list-jobs-for-a-workflow-run) {% endif %} -##### Labels +##### Kennzeichnungen * [List labels for an issue](/v3/issues/labels/#list-labels-for-an-issue) * [Add labels to an issue](/v3/issues/labels/#add-labels-to-an-issue) @@ -378,7 +378,7 @@ While most of your API interaction should occur using your server-to-server inst * [Meta](/v3/meta/#meta) -##### Milestones +##### Meilensteine * [List milestones](/v3/issues/milestones/#list-milestones) * [Create a milestone](/v3/issues/milestones/#create-a-milestone) @@ -422,7 +422,7 @@ While most of your API interaction should occur using your server-to-server inst * [Convert an organization member to outside collaborator](/v3/orgs/outside_collaborators/#convert-an-organization-member-to-outside-collaborator) * [Remove outside collaborator from an organization](/v3/orgs/outside_collaborators/#remove-outside-collaborator-from-an-organization) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Organization Pre Receive Hooks * [List pre-receive hooks for an organization](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-an-organization) @@ -460,7 +460,7 @@ While most of your API interaction should occur using your server-to-server inst * [List teams](/v3/teams/#list-teams) * [Create a team](/v3/teams/#create-a-team) * [Get a team by name](/v3/teams/#get-a-team-by-name) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} * [Get a team](/v3/teams/#get-a-team) {% endif %} * [Update a team](/v3/teams/#update-a-team) @@ -475,7 +475,7 @@ While most of your API interaction should occur using your server-to-server inst * [List child teams](/v3/teams/#list-child-teams) * [List teams for the authenticated user](/v3/teams/#list-teams-for-the-authenticated-user) -##### Organizations +##### Organisationen * [List organizations](/v3/orgs/#list-organizations) * [Get an organization](/v3/orgs/#get-an-organization) @@ -524,7 +524,7 @@ While most of your API interaction should occur using your server-to-server inst * [Remove project collaborator](/v3/projects/collaborators/#remove-project-collaborator) * [Get project permission for a user](/v3/projects/collaborators/#get-project-permission-for-a-user) -##### Projects +##### Projekte * [List organization projects](/v3/projects/#list-organization-projects) * [Create an organization project](/v3/projects/#create-an-organization-project) @@ -607,9 +607,9 @@ While most of your API interaction should occur using your server-to-server inst * [Delete team discussion reaction](/v3/reactions/#delete-team-discussion-reaction) * [Delete team discussion comment reaction](/v3/reactions/#delete-team-discussion-comment-reaction){% endif %} -##### Repositories +##### Repositorys -* [List organization repositories](/v3/repos/#list-organization-repositories) +* [Repositorys einer Organisation auflisten](/v3/repos/#list-organization-repositories) * [Create a repository for the authenticated user](/v3/repos/#create-a-repository-for-the-authenticated-user) * [Get a repository](/v3/repos/#get-a-repository) * [Update a repository](/v3/repos/#update-a-repository) @@ -762,7 +762,7 @@ While most of your API interaction should occur using your server-to-server inst * [Get GitHub Pages build](/rest/reference/repos#get-github-pages-build) * [Get latest pages build](/rest/reference/repos#get-latest-pages-build) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Repository Pre Receive Hooks * [List pre-receive hooks for a repository](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-a-repository) @@ -773,10 +773,10 @@ While most of your API interaction should occur using your server-to-server inst ##### Repository Releases -* [List releases](/rest/reference/repos/#list-releases) +* [Veröffentlichungen auflisten](/rest/reference/repos/#list-releases) * [Create a release](/rest/reference/repos/#create-a-release) * [Get a release](/rest/reference/repos/#get-a-release) -* [Update a release](/rest/reference/repos/#update-a-release) +* [Einen Release aktualisieren](/rest/reference/repos/#update-a-release) * [Delete a release](/rest/reference/repos/#delete-a-release) * [List release assets](/rest/reference/repos/#list-release-assets) * [Get a release asset](/rest/reference/repos/#get-a-release-asset) @@ -806,16 +806,16 @@ While most of your API interaction should occur using your server-to-server inst * [Emojis](/v3/emojis/#emojis) * [Get rate limit status for the authenticated user](/v3/rate_limit/#get-rate-limit-status-for-the-authenticated-user) -##### Search +##### Suche * [Search code](/v3/search/#search-code) * [Search commits](/v3/search/#search-commits) * [Search labels](/v3/search/#search-labels) -* [Search repositories](/v3/search/#search-repositories) +* [Repositorys suchen](/v3/search/#search-repositories) * [Search topics](/v3/search/#search-topics) * [Search users](/v3/search/#search-users) -##### Statuses +##### Status * [Get the combined status for a specific reference](/v3/repos/statuses/#get-the-combined-status-for-a-specific-reference) * [List commit statuses for a reference](/v3/repos/statuses/#list-commit-statuses-for-a-reference) @@ -834,7 +834,7 @@ While most of your API interaction should occur using your server-to-server inst * [Update a discussion comment](/v3/teams/discussion_comments/#update-a-discussion-comment) * [Delete a discussion comment](/v3/teams/discussion_comments/#delete-a-discussion-comment) -##### Topics +##### Themen * [Get all repository topics](/v3/repos#get-all-repository-topics) * [Replace all repository topics](/v3/repos/#replace-all-repository-topics) @@ -896,7 +896,7 @@ While most of your API interaction should occur using your server-to-server inst * [Delete a public SSH key for the authenticated user](/v3/users/keys/#delete-a-public-ssh-key-for-the-authenticated-user) * [List public keys for a user](/v3/users/keys/#list-public-keys-for-a-user) -##### Users +##### Benutzer * [Get the authenticated user](/v3/users/#get-the-authenticated-user) * [List app installations accessible to the user access token](/v3/apps/installations/#list-app-installations-accessible-to-the-user-access-token) diff --git a/translations/de-DE/content/developers/apps/installing-github-apps.md b/translations/de-DE/content/developers/apps/installing-github-apps.md index 85a635fff5..ff6dd370a9 100644 --- a/translations/de-DE/content/developers/apps/installing-github-apps.md +++ b/translations/de-DE/content/developers/apps/installing-github-apps.md @@ -52,7 +52,7 @@ These steps assume you have [built a {% data variables.product.prodname_github_a You can simplify the authorization process by completing it during app installation. To do this, select **Request user authorization (OAuth) during installation** when creating or modifying your app in GitHub. See "[Creating a GitHub App](/apps/building-github-apps/creating-a-github-app/)" to learn more. -Once someone has installed your app, you will need to get an access token for the user. See steps 2 and 3 in "[Identifying a users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. +Once someone has installed your app, you will need to get an access token for the user. See steps 2 and 3 in "[Identifying users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. ### Preserving an application state during installation You can provide a `state` parameter in an app's installation URL to preserve the state of the application page and return people back to that state after they install, authenticate, or accept updates to your GitHub App. For example, you could use the `state` to correlate an installation to a user or account. diff --git a/translations/de-DE/content/developers/apps/scopes-for-oauth-apps.md b/translations/de-DE/content/developers/apps/scopes-for-oauth-apps.md index ff5b4dc331..1cb0b4ab4f 100644 --- a/translations/de-DE/content/developers/apps/scopes-for-oauth-apps.md +++ b/translations/de-DE/content/developers/apps/scopes-for-oauth-apps.md @@ -19,7 +19,8 @@ When setting up an OAuth App on GitHub, requested scopes are displayed to the us {% endnote %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -If your {% data variables.product.prodname_oauth_app %} doesn't have access to a browser, such as a CLI tool, then you don't need to specify a scope for users to authenticate to your app. For more information, see "[Authorizing OAuth apps](/developers/apps/authorizing-oauth-apps#device-flow)." +If your +{% data variables.product.prodname_oauth_app %} doesn't have access to a browser, such as a CLI tool, then you don't need to specify a scope for users to authenticate to your app. For more information, see "[Authorizing OAuth apps](/developers/apps/authorizing-oauth-apps#device-flow)." {% endif %} Check headers to see what OAuth scopes you have, and what the API action accepts: @@ -36,47 +37,46 @@ X-Accepted-OAuth-Scopes: user ### Available scopes -Name | Description ------|-----------| -**`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if currentVersion != "free-pro-team@latest" %} -**`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/v3/enterprise-admin).{% endif %} -**`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects. - `repo:status`| Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. - `repo_deployment`| Grants access to [deployment statuses](/v3/repos/deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code. - `public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories. - `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21"%} - `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/v3/code-scanning).{% endif %} -**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. - `write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories. - `read:repo_hook`| Grants read and ping access to hooks in public or private repositories. -**`admin:org`** | Fully manage the organization and its teams, projects, and memberships. - `write:org`| Read and write access to organization membership, organization projects, and team membership. - `read:org`| Read-only access to organization membership, organization projects, and team membership. -**`admin:public_key`** | Fully manage public keys. - `write:public_key`| Create, list, and view details for public keys. - `read:public_key`| List and view details for public keys. -**`admin:org_hook`** | Grants read, write, ping, and delete access to organization hooks. **Note:** OAuth tokens will only be able to perform these actions on organization hooks which were created by the OAuth App. Personal access tokens will only be able to perform these actions on organization hooks created by a user. -**`gist`** | Grants write access to gists. -**`notifications`** | Grants:
* read access to a user's notifications
* mark as read access to threads
* watch and unwatch access to a repository, and
* read, write, and delete access to thread subscriptions. -**`user`** | Grants read/write access to profile info only. Note that this scope includes `user:email` and `user:follow`. - `read:user`| Grants access to read a user's profile data. - `user:email`| Grants read access to a user's email addresses. - `user:follow`| Grants access to follow or unfollow other users. -**`delete_repo`** | Grants access to delete adminable repositories. -**`write:discussion`** | Allows read and write access for team discussions. - `read:discussion` | Allows read access for team discussions.{% if currentVersion == "free-pro-team@latest" %} -**`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[Publishing a package](/github/managing-packages-with-github-packages/publishing-a-package)". -**`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[Installing a package](/github/managing-packages-with-github-packages/installing-a-package)". -**`delete:packages`** | Grants access to delete packages from {% data variables.product.prodname_registry %}. For more information, see "[Deleting packages](/github/managing-packages-with-github-packages/deleting-a-package)".{% endif %} -**`admin:gpg_key`** | Fully manage GPG keys. - `write:gpg_key`| Create, list, and view details for GPG keys. - `read:gpg_key`| List and view details for GPG keys.{% if currentVersion == "free-pro-team@latest" %} -**`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository.{% endif %} +| Name | Beschreibung | +| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if enterpriseServerVersions contains currentVersion %} +| **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/v3/enterprise-admin).{% endif %} +| **`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects. | +|  `repo:status` | Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. | +|  `repo_deployment` | Grants access to [deployment statuses](/v3/repos/deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code. | +|  `public_repo` | Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories. | +|  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21"%} +|  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/v3/code-scanning).{% endif %} +| **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. | +|  `write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories. | +|  `read:repo_hook` | Grants read and ping access to hooks in public or private repositories. | +| **`admin:org`** | Fully manage the organization and its teams, projects, and memberships. | +|  `write:org` | Read and write access to organization membership, organization projects, and team membership. | +|  `read:org` | Read-only access to organization membership, organization projects, and team membership. | +| **`admin:public_key`** | Fully manage public keys. | +|  `write:public_key` | Create, list, and view details for public keys. | +|  `read:public_key` | List and view details for public keys. | +| **`admin:org_hook`** | Grants read, write, ping, and delete access to organization hooks. **Note:** OAuth tokens will only be able to perform these actions on organization hooks which were created by the OAuth App. Personal access tokens will only be able to perform these actions on organization hooks created by a user. | +| **`gist`** | Grants write access to gists. | +| **`benachrichtigungen`** | Grants:
* read access to a user's notifications
* mark as read access to threads
* watch and unwatch access to a repository, and
* read, write, and delete access to thread subscriptions. | +| **`Benutzer`** | Grants read/write access to profile info only. Note that this scope includes `user:email` and `user:follow`. | +|  `read:user` | Grants access to read a user's profile data. | +|  `user:email` | Grants read access to a user's email addresses. | +|  `user:follow` | Grants access to follow or unfollow other users. | +| **`delete_repo`** | Grants access to delete adminable repositories. | +| **`write:discussion`** | Allows read and write access for team discussions. | +|  `read:discussion` | Allows read access for team discussions.{% if currentVersion == "free-pro-team@latest" %} +| **`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[Publishing a package](/github/managing-packages-with-github-packages/publishing-a-package)". | +| **`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[Installing a package](/github/managing-packages-with-github-packages/installing-a-package)". | +| **`delete:packages`** | Grants access to delete packages from {% data variables.product.prodname_registry %}. For more information, see "[Deleting packages](/github/managing-packages-with-github-packages/deleting-a-package)".{% endif %} +| **`admin:gpg_key`** | Fully manage GPG keys. | +|  `write:gpg_key` | Create, list, and view details for GPG keys. | +|  `read:gpg_key` | List and view details for GPG keys.{% if currentVersion == "free-pro-team@latest" %} +| **`Workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes, see https://docs.github.com/en/free-pro-team@latest/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token for details.{% endif %} {% note %} -**Note:** Your OAuth App can request the scopes in the initial redirection. You -can specify multiple scopes by separating them with a space: +**Note:** Your OAuth App can request the scopes in the initial redirection. You can specify multiple scopes by separating them with a space: https://github.com/login/oauth/authorize? client_id=...& @@ -86,29 +86,14 @@ can specify multiple scopes by separating them with a space: ### Requested scopes and granted scopes -The `scope` attribute lists scopes attached to the token that were granted by -the user. Normally, these scopes will be identical to what you requested. -However, users can edit their scopes, effectively -granting your application less access than you originally requested. Also, users -can edit token scopes after the OAuth flow is completed. -You should be aware of this possibility and adjust your application's behavior -accordingly. +The `scope` attribute lists scopes attached to the token that were granted by the user. Normally, these scopes will be identical to what you requested. However, users can edit their scopes, effectively granting your application less access than you originally requested. Also, users can edit token scopes after the OAuth flow is completed. You should be aware of this possibility and adjust your application's behavior accordingly. -It's important to handle error cases where a user chooses to grant you -less access than you originally requested. For example, applications can warn -or otherwise communicate with their users that they will see reduced -functionality or be unable to perform some actions. +It's important to handle error cases where a user chooses to grant you less access than you originally requested. For example, applications can warn or otherwise communicate with their users that they will see reduced functionality or be unable to perform some actions. -Also, applications can always send users back through the flow again to get -additional permission, but don’t forget that users can always say no. +Also, applications can always send users back through the flow again to get additional permission, but don’t forget that users can always say no. -Check out the [Basics of Authentication guide](/guides/basics-of-authentication/), which -provides tips on handling modifiable token scopes. +Check out the [Basics of Authentication guide](/guides/basics-of-authentication/), which provides tips on handling modifiable token scopes. ### Normalized scopes -When requesting multiple scopes, the token is saved with a normalized list -of scopes, discarding those that are implicitly included by another requested -scope. For example, requesting `user,gist,user:email` will result in a -token with `user` and `gist` scopes only since the access granted with -`user:email` scope is included in the `user` scope. +When requesting multiple scopes, the token is saved with a normalized list of scopes, discarding those that are implicitly included by another requested scope. For example, requesting `user,gist,user:email` will result in a token with `user` and `gist` scopes only since the access granted with `user:email` scope is included in the `user` scope. diff --git a/translations/de-DE/content/developers/github-marketplace/about-github-marketplace.md b/translations/de-DE/content/developers/github-marketplace/about-github-marketplace.md index 0322055eb9..8f20b883d4 100644 --- a/translations/de-DE/content/developers/github-marketplace/about-github-marketplace.md +++ b/translations/de-DE/content/developers/github-marketplace/about-github-marketplace.md @@ -14,7 +14,7 @@ versions: {% data reusables.actions.actions-not-verified %} -To learn about publishing {% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}, see "[{% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}](/marketplace/actions/)." +To learn about publishing {% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}, see "[Publishing actions in GitHub Marketplace](/actions/creating-actions/publishing-actions-in-github-marketplace)." ### Apps diff --git a/translations/de-DE/content/developers/overview/replacing-github-services.md b/translations/de-DE/content/developers/overview/replacing-github-services.md index eb1925fc9e..7cc93257bf 100644 --- a/translations/de-DE/content/developers/overview/replacing-github-services.md +++ b/translations/de-DE/content/developers/overview/replacing-github-services.md @@ -29,7 +29,7 @@ As an alternative to the email service, you can now start using email notificati GitHub Services (sometimes referred to as Service Hooks) is the legacy method of integrating where GitHub hosted a portion of our integrator’s services via [the `github-services` repository](https://github.com/github/github-services). Actions performed on GitHub trigger these services, and you can use these services to trigger actions outside of GitHub. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Finding repositories that use GitHub Services We provide a command-line script that helps you identify which repositories on your appliance use GitHub Services. For more information, see [ghe-legacy-github-services-report](/enterprise/{{currentVersion}}/admin/articles/command-line-utilities/#ghe-legacy-github-services-report).{% endif %} diff --git a/translations/de-DE/content/developers/webhooks-and-events/about-webhooks.md b/translations/de-DE/content/developers/webhooks-and-events/about-webhooks.md index 64b973bcf5..a01e021f3a 100644 --- a/translations/de-DE/content/developers/webhooks-and-events/about-webhooks.md +++ b/translations/de-DE/content/developers/webhooks-and-events/about-webhooks.md @@ -1,5 +1,5 @@ --- -title: About webhooks +title: Informationen zu Webhooks intro: Learn the basics of how webhooks work to help you build and set up integrations. redirect_from: - /webhooks @@ -11,11 +11,11 @@ versions: Webhooks allow you to build or set up integrations, such as [{% data variables.product.prodname_github_app %}s](/apps/building-github-apps/) or [{% data variables.product.prodname_oauth_app %}s](/apps/building-oauth-apps/), which subscribe to certain events on GitHub.com. When one of those events is triggered, we'll send a HTTP POST payload to the webhook's configured URL. Webhooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server. You're only limited by your imagination. -Webhooks can be installed on{% if currentVersion != "free-pro-team@latest" %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. +Webhooks can be installed on{% if enterpriseServerVersions contains currentVersion %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. -You can create up to {% if currentVersion != "free-pro-team@latest" %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if currentVersion != "free-pro-team@latest" %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} +You can create up to {% if enterpriseServerVersions contains currentVersion %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if enterpriseServerVersions contains currentVersion %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} -### Events +### Ereignisse {% data reusables.webhooks.webhooks_intro %} diff --git a/translations/de-DE/content/developers/webhooks-and-events/creating-webhooks.md b/translations/de-DE/content/developers/webhooks-and-events/creating-webhooks.md index 00d7754d8c..5a5107a721 100644 --- a/translations/de-DE/content/developers/webhooks-and-events/creating-webhooks.md +++ b/translations/de-DE/content/developers/webhooks-and-events/creating-webhooks.md @@ -14,6 +14,9 @@ Now that we understand [the basics of webhooks][webhooks-overview], let's go thr Creating a webhook is a two-step process. You'll first need to set up how you want your webhook to behave through {% data variables.product.product_name %}--what events should it listen to. After that, you'll set up your server to receive and manage the payload. + +{% data reusables.webhooks.webhooks-rest-api-links %} + ### Setting up a Webhook You can install webhooks on an organization or on a specific repository. diff --git a/translations/de-DE/content/developers/webhooks-and-events/github-event-types.md b/translations/de-DE/content/developers/webhooks-and-events/github-event-types.md index 8cecb61ceb..293d6bba3f 100644 --- a/translations/de-DE/content/developers/webhooks-and-events/github-event-types.md +++ b/translations/de-DE/content/developers/webhooks-and-events/github-event-types.md @@ -28,13 +28,13 @@ The event objects returned from the Events API endpoints have the same structure | `actor.id` | The unique identifier for the actor. | | `actor.login` | The username of the actor. | | `actor.display_login` | The specific display format of the username. | -| `actor.gravatar_id` | The unique indentifier of the Gravatar profile for the actor. | +| `actor.gravatar_id` | The unique identifier of the Gravatar profile for the actor. | | `actor.url` | The REST API URL used to retrieve the user object, which includes additional user information. | | `actor.avatar_url` | The URL of the actor's profile image. | | `repo` | The repository object where the event occurred. | | `repo.id` | The unique identifier of the repository. | | `repo.name` | The name of the repository, which includes the owner and repository name. For example, `octocat/hello-world` is the name of the `hello-world` repository owned by the `octocat` user account. | -| `repo.url` | The REST API URL used to retrive the repository object, which includes additional repository information. | +| `repo.url` | The REST API URL used to retrieve the repository object, which includes additional repository information. | | `payload` | The event payload object is unique to the event type. See the event type below for the event API `payload` object. | #### Example WatchEvent event object diff --git a/translations/de-DE/content/developers/webhooks-and-events/issue-event-types.md b/translations/de-DE/content/developers/webhooks-and-events/issue-event-types.md index 80c4264671..fedad23253 100644 --- a/translations/de-DE/content/developers/webhooks-and-events/issue-event-types.md +++ b/translations/de-DE/content/developers/webhooks-and-events/issue-event-types.md @@ -229,7 +229,7 @@ The issue or pull request was referenced from another issue or pull request. | --------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `actor` | `Objekt` | The person who generated the event. | | `created_at` | `string` | The timestamp indicating when the cross-reference was added. | -| `updated_at` | `string` | The timestamp indicating when the cross-refererence was updated or created, if the cross-reference is never updated. | +| `updated_at` | `string` | The timestamp indicating when the cross-reference was updated or created, if the cross-reference is never updated. | | `source` | `Objekt` | The issue or pull request that added a cross-reference. | | `source[type]` | `string` | This value will always be `"issue"` because pull requests are of type issue. Only cross-reference events triggered by issues or pull requests are returned in the Timeline Events API. To determine if the issue that triggered the event is a pull request, you can check if the `source[issue][pull_request` object exists. | | `source[issue]` | `Objekt` | The `issue` object that added the cross-reference. | @@ -347,7 +347,7 @@ The issue or pull request was locked. #### Event object properties -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -664,7 +664,7 @@ The issue was unlocked. #### Event object properties -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/de-DE/content/developers/webhooks-and-events/securing-your-webhooks.md b/translations/de-DE/content/developers/webhooks-and-events/securing-your-webhooks.md index 0a5ed84359..09dd7373c1 100644 --- a/translations/de-DE/content/developers/webhooks-and-events/securing-your-webhooks.md +++ b/translations/de-DE/content/developers/webhooks-and-events/securing-your-webhooks.md @@ -12,6 +12,7 @@ versions: Once your server is configured to receive payloads, it'll listen for any payload sent to the endpoint you configured. For security reasons, you probably want to limit requests to those coming from GitHub. There are a few ways to go about this--for example, you could opt to allow requests from GitHub's IP address--but a far easier method is to set up a secret token and validate the information. +{% data reusables.webhooks.webhooks-rest-api-links %} ### Setting your secret token diff --git a/translations/de-DE/content/developers/webhooks-and-events/testing-webhooks.md b/translations/de-DE/content/developers/webhooks-and-events/testing-webhooks.md index 459c8bc69b..3e1f058296 100644 --- a/translations/de-DE/content/developers/webhooks-and-events/testing-webhooks.md +++ b/translations/de-DE/content/developers/webhooks-and-events/testing-webhooks.md @@ -13,7 +13,7 @@ Now that you've [configured your local server](/webhooks/configuring/), you migh ### Listing recent deliveries -Every webhook has its own "Recent Deliveries" section, which lists, at a glance whether a deployment was successful (green check) or failed (red x). You can also identify when each delivery was attempted. +Every webhook has its own "Recent Deliveries" section, which lists, at a glance whether a delivery was successful (green check) or failed (red x). You can also identify when each delivery was attempted. {% data variables.product.product_name %} keeps a log of each webhook delivery for {% if currentVersion == "free-pro-team@latest" %} 30 {% else %} 8 {% endif %} days. diff --git a/translations/de-DE/content/developers/webhooks-and-events/webhook-events-and-payloads.md b/translations/de-DE/content/developers/webhooks-and-events/webhook-events-and-payloads.md index 458467a173..fbfe457a96 100644 --- a/translations/de-DE/content/developers/webhooks-and-events/webhook-events-and-payloads.md +++ b/translations/de-DE/content/developers/webhooks-and-events/webhook-events-and-payloads.md @@ -47,7 +47,7 @@ HTTP POST payloads that are delivered to your webhook's configured URL endpoint | Header | Beschreibung | | ----------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `X-GitHub-Event` | Name of the event that triggered the delivery. | -| `X-GitHub-Delivery` | A [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) to identify the delivery.{% if currentVersion != "free-pro-team@latest" %} +| `X-GitHub-Delivery` | A [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) to identify the delivery.{% if enterpriseServerVersions contains currentVersion %} | `X-GitHub-Enterprise-Version` | The version of the {% data variables.product.prodname_ghe_server %} instance that sent the HTTP POST payload. | | `X-GitHub-Enterprise-Host` | The hostname of the {% data variables.product.prodname_ghe_server %} instance that sent the HTTP POST payload.{% endif %}{% if currentVersion != "private-instances@latest" %} | `X-Hub-Signature` | This header is sent if the webhook is configured with a [`secret`](/v3/repos/hooks/#create-hook-config-params). This is the HMAC hex digest of the request body, and is generated using the SHA-1 hash function and the `secret` as the HMAC `key`.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} `X-Hub-Signature` is provided for compatibility with existing integrations, and we recommend that you use the more secure `X-Hub-Signature-256` instead.{% endif %}{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -61,7 +61,7 @@ Also, the `User-Agent` for the requests will have the prefix `GitHub-Hookshot/`. > POST /payload HTTP/1.1 > Host: localhost:4567 -> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if currentVersion != "free-pro-team@latest" %} +> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: 2.15.0 > X-GitHub-Enterprise-Host: example.com{% endif %}{% if currentVersion != "private-instances@latest" %} > X-Hub-Signature: sha1=7d38cdd689735b008b3c702edd92eea23791c5f6{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -332,7 +332,7 @@ Only {% data variables.product.prodname_github_app %}s can receive this event. { {{ webhookPayloadsForCurrentVersion.deployment_status }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Unternehmen @@ -617,7 +617,7 @@ For a detailed description of this payload and the payload for each type of `act ### meta -The webhook this event is configured on was deleted. This event will only listen for changes to the particular hook the event is installed on. Therefore, it must be selected for each hook that you'd like to recieve meta events for. +The webhook this event is configured on was deleted. This event will only listen for changes to the particular hook the event is installed on. Therefore, it must be selected for each hook that you'd like to receive meta events for. #### Availability @@ -667,18 +667,18 @@ The webhook this event is configured on was deleted. This event will only listen #### Availability -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} - GitHub Enterprise webhooks only receive `created` and `deleted` events. For more information, "[Global webhooks](/rest/reference/enterprise-admin#global-webhooks/).{% endif %} - Organization webhooks only receive the `deleted`, `added`, `removed`, `renamed`, and `invited` events - {% data variables.product.prodname_github_app %}s with the `members` permission #### Webhook payload object -| Schlüssel | Typ | Beschreibung | -| ------------ | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `action` | `string` | die Aktion, die durchgeführt wurde. Can be one of:{% if currentVersion != "free-pro-team@latest" %} `created`,{% endif %} `deleted`, `renamed`, `member_added`, `member_removed`, or `member_invited`. | -| `Einladung` | `Objekt` | The invitation for the user or email if the action is `member_invited`. | -| `membership` | `Objekt` | The membership between the user and the organization. Not present when the action is `member_invited`. | +| Schlüssel | Typ | Beschreibung | +| ------------ | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action` | `string` | die Aktion, die durchgeführt wurde. Can be one of:{% if enterpriseServerVersions contains currentVersion %} `created`,{% endif %} `deleted`, `renamed`, `member_added`, `member_removed`, or `member_invited`. | +| `Einladung` | `Objekt` | The invitation for the user or email if the action is `member_invited`. | +| `membership` | `Objekt` | The membership between the user and the organization. Not present when the action is `member_invited`. | {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} {% data reusables.webhooks.sender_desc %} @@ -974,13 +974,17 @@ Deliveries for `review_requested` and `review_request_removed` events will have | `before` | `string` | The SHA of the most recent commit on `ref` before the push. | | `after` | `string` | The SHA of the most recent commit on `ref` after the push. | | `commits` | `array` | An array of commit objects describing the pushed commits. (The array includes a maximum of 20 commits. If necessary, you can use the [Commits API](/v3/repos/commits/) to fetch additional commits. This limit is applied to timeline events only and isn't applied to webhook deliveries.) | -| `commits[][sha]` | `string` | The SHA of the commit. | +| `commits[][id]` | `string` | The SHA of the commit. | +| `commits[][timestamp]` | `string` | The ISO 8601 timestamp of the commit. | | `commits[][message]` | `string` | The commit message. | | `commits[][author]` | `Objekt` | The git author of the commit. | | `commits[][author][name]` | `string` | The git author's name. | | `commits[][author][email]` | `string` | The git author's email address. | | `commits[][url]` | `url` | URL that points to the commit API resource. | | `commits[][distinct]` | `boolean` | Whether this commit is distinct from any that have been pushed before. | +| `commits[][added]` | `array` | An array of files added in the commit. | +| `commits[][modified]` | `array` | An array of files modified by the commit. | +| `commits[][removed]` | `array` | An array of files removed in the commit. | | `pusher` | `Objekt` | The user who pushed the commits. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} @@ -1042,7 +1046,7 @@ This event occurs when a {% data variables.product.prodname_github_app %} sends | Schlüssel | Typ | Beschreibung | | --------- | -------- | -------------------------------------------------------------------------------- | -| `action` | `string` | die Aktion, die durchgeführt wurde. This can be one of:
  • `created` - A repository is created.
  • `deleted` - A repository is deleted. This event type is only available to [organization hooks](/rest/reference/orgs#webhooks/)
  • `archived` - A repository is archived.
  • `unarchived` - A repository is unarchived.
    • {% if currentVersion != "free-pro-team@latest" %}
  • `anonymous_access_enabled` - A repository is [enabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories), `anonymous_access_disabled` - A repository is [disabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories)
    • {% endif %}
  • `edited` - A repository's information is edited.
  • `renamed` - A repository is renamed.
  • `transferred` - A repository is transferred.
  • `publicized` - A repository is made public.
  • `privatized` - A repository is made private.
| +| `action` | `string` | die Aktion, die durchgeführt wurde. This can be one of:
  • `created` - A repository is created.
  • `deleted` - A repository is deleted. This event type is only available to [organization hooks](/rest/reference/orgs#webhooks/)
  • `archived` - A repository is archived.
  • `unarchived` - A repository is unarchived.
    • {% if enterpriseServerVersions contains currentVersion %}
  • `anonymous_access_enabled` - A repository is [enabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories), `anonymous_access_disabled` - A repository is [disabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories)
    • {% endif %}
  • `edited` - A repository's information is edited.
  • `renamed` - A repository is renamed.
  • `transferred` - A repository is transferred.
  • `publicized` - A repository is made public.
  • `privatized` - A repository is made private.
| {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -1244,7 +1248,7 @@ You can only create a sponsorship webhook on {% data variables.product.prodname_ {{ webhookPayloadsForCurrentVersion.team_add }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Benutzer diff --git a/translations/de-DE/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md b/translations/de-DE/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md index 684719ea58..11e8ff903c 100644 --- a/translations/de-DE/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md +++ b/translations/de-DE/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md @@ -12,7 +12,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" %}{% data reusables.notifications.outbound_email_tip %}{% endif %} +{% if enterpriseServerVersions contains currentVersion %}{% data reusables.notifications.outbound_email_tip %}{% endif %} In jeder E-Mail-Benachrichtigung für einen Push an ein Repository werden die neuen Commits und Links zu einem Diff aufgelistet, der nur diese Commits enthält. In der E-Mail-Benachrichtigung siehst Du Folgendes: diff --git a/translations/de-DE/content/github/administering-a-repository/about-github-dependabot-version-updates.md b/translations/de-DE/content/github/administering-a-repository/about-github-dependabot-version-updates.md index b70d5e7e98..6462c187f5 100644 --- a/translations/de-DE/content/github/administering-a-repository/about-github-dependabot-version-updates.md +++ b/translations/de-DE/content/github/administering-a-repository/about-github-dependabot-version-updates.md @@ -17,7 +17,7 @@ You enable {% data variables.product.prodname_dependabot_version_updates %} by c When {% data variables.product.prodname_dependabot_short %} identifies an outdated dependency, it raises a pull request to update the manifest to the latest version of the dependency. For vendored dependencies, {% data variables.product.prodname_dependabot_short %} raises a pull request to directly replace the outdated dependency with the new version. You check that your tests pass, review the changelog and release notes included in the pull request summary, and then merge it. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." -If you enable security updates, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +If you enable security updates, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. Weitere Informationen findest Du unter „[ Über {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." {% data reusables.dependabot.dependabot-tos %} diff --git a/translations/de-DE/content/github/administering-a-repository/about-required-commit-signing.md b/translations/de-DE/content/github/administering-a-repository/about-required-commit-signing.md index ca40db4f35..16575ddb8e 100644 --- a/translations/de-DE/content/github/administering-a-repository/about-required-commit-signing.md +++ b/translations/de-DE/content/github/administering-a-repository/about-required-commit-signing.md @@ -11,7 +11,7 @@ versions: Wenn Du in Deinem Repository Branch-Schutzmaßnahmen erzwungen hast, kannst Du die obligatorische Commit-Signatur einrichten. Weitere Informationen findest Du unter „[Geschützte Branches konfigurieren](/articles/configuring-protected-branches/).“ -When you enable required commit signing on a branch, contibutors {% if currentVersion == "free-pro-team@latest" %}and bots{% endif %} can only push commits that have been signed and verified to the branch. Weitere Informationen findest Du unter „[Über die Verifikation von Commit-Signaturen](/articles/about-commit-signature-verification)." +When you enable required commit signing on a branch, contributors {% if currentVersion == "free-pro-team@latest" %}and bots{% endif %} can only push commits that have been signed and verified to the branch. Weitere Informationen findest Du unter „[Über die Verifikation von Commit-Signaturen](/articles/about-commit-signature-verification)." Du kannst jederzeit lokale Commits zum Branch übertragen, wenn die Commits signiert und verifiziert sind. {% if currentVersion == "free-pro-team@latest" %}You can also merge signed and verified commits into the branch using a pull request on {% data variables.product.product_name %}. However, you cannot squash and merge a pull request into the branch on {% data variables.product.product_name %} unless you are the author of the pull request.{% else %} However, you cannot merge pull requests into the branch on {% data variables.product.product_name %}.{% endif %} You can {% if currentVersion == "free-pro-team@latest" %}squash and {% endif %}merge pull requests locally. For more information, see "[Checking out pull requests locally](/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally)."{% if currentVersion == "free-pro-team@latest" %} For more information about merge methods, see "[About merge methods on {% data variables.product.prodname_dotcom %}](/github/administering-a-repository/about-merge-methods-on-github)."{% endif %} diff --git a/translations/de-DE/content/github/administering-a-repository/about-securing-your-repository.md b/translations/de-DE/content/github/administering-a-repository/about-securing-your-repository.md index ea5782b898..024439503d 100644 --- a/translations/de-DE/content/github/administering-a-repository/about-securing-your-repository.md +++ b/translations/de-DE/content/github/administering-a-repository/about-securing-your-repository.md @@ -21,9 +21,13 @@ The first step to securing a repository is to set up who can see and modify your Privately discuss and fix security vulnerabilities in your repository's code. You can then publish a security advisory to alert your community to the vulnerability and encourage them to upgrade. Weitere Informationen findest Du unter „[ Über {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." -- **{% data variables.product.prodname_dependabot_short %} alerts** +- **{% data variables.product.prodname_dependabot_short %} alerts and security updates** - View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." + +- **{% data variables.product.prodname_dependabot_short %} version updates** + + Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. Weitere Informationen findest Du unter „[Informationen zu {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot-version-updates)“. - **{% data variables.product.prodname_code_scanning_capc %} alerts** diff --git a/translations/de-DE/content/github/administering-a-repository/classifying-your-repository-with-topics.md b/translations/de-DE/content/github/administering-a-repository/classifying-your-repository-with-topics.md index 1adf59df66..37e2875ba0 100644 --- a/translations/de-DE/content/github/administering-a-repository/classifying-your-repository-with-topics.md +++ b/translations/de-DE/content/github/administering-a-repository/classifying-your-repository-with-topics.md @@ -1,6 +1,6 @@ --- -title: Classifying your repository with topics -intro: 'To help other people find and contribute to your project, you can add topics to your repository related to your project''s intended purpose, subject area, affinity groups, or other important qualities.' +title: Repository mit Themen klassifizieren +intro: 'Damit andere Personen Dein Projekt leichter finden und Beiträge dazu leisten können, kannst Du zu Deinem Repository Themen hinzufügen, die in Zusammenhang mit dem beabsichtigten Zweck, dem Themenbereich, verbundenen Gruppen oder anderen wichtigen Eigenschaften des Projekts stehen.' redirect_from: - /articles/about-topics/ - /articles/classifying-your-repository-with-topics @@ -9,36 +9,30 @@ versions: enterprise-server: '*' --- -### About topics +### Informationen zu Themen -With topics, you can explore repositories in a particular subject area, find projects to contribute to, and discover new solutions to a specific problem. Topics appear on the main page of a repository. You can click a topic name to {% if currentVersion == "free-pro-team@latest" %}see related topics and a list of other repositories classified with that topic{% else %}search for other repositories with that topic{% endif %}. +Mithilfe von Themen kannst Du Repositorys zu einem bestimmten Themenbereich erkunden, Projekte finden, zu denen Du einen Beitrag leisten kannst, und neue Lösungen für ein bestimmtes Problem entdecken. Themen werden auf der Hauptseite eines Repositorys angezeigt. You can click a topic name to {% if currentVersion == "free-pro-team@latest" %}see related topics and a list of other repositories classified with that topic{% else %}search for other repositories with that topic{% endif %}. -![Main page of the test repository showing topics](/assets/images/help/repository/os-repo-with-topics.png) +![Hauptseite des Test-Repositorys, auf der Themen angezeigt werden](/assets/images/help/repository/os-repo-with-topics.png) -To browse the most used topics, go to https://github.com/topics/. +Rufe https://github.com/topics/ auf, um die am häufigsten verwendeten Themen zu durchsuchen. {% if currentVersion == "free-pro-team@latest" %}You can contribute to {% data variables.product.product_name %}'s set of featured topics in the [github/explore](https://github.com/github/explore) repository. {% endif %} -Repository admins can add any topics they'd like to a repository. Helpful topics to classify a repository include the repository's intended purpose, subject area, community, or language.{% if currentVersion == "free-pro-team@latest" %} Additionally, {% data variables.product.product_name %} analyzes public repository content and generates suggested topics that repository admins can accept or reject. Private repository content is not analyzed and does not receive topic suggestions.{% endif %} +Repository-Administratoren können beliebige Themen zu einem Repository hinzufügen. Helpful topics to classify a repository include the repository's intended purpose, subject area, community, or language.{% if currentVersion == "free-pro-team@latest" %} Additionally, {% data variables.product.product_name %} analyzes public repository content and generates suggested topics that repository admins can accept or reject. Die Inhalte privater Repositorys werden nicht analysiert, und es gibt keine Themenvorschläge für private Repositorys.{% endif %} -Public and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. +Öffentliche und private Repositorys können Themen haben, aber in den Resultaten der Themensuche wirst Du nur die privaten Repositorys sehen, auf die Du Zugriff hast. -You can search for repositories that are associated with a particular topic. For more information, see "[Searching for repositories](/articles/searching-for-repositories#search-by-topic)." You can also search for a list of topics on {% data variables.product.product_name %}. For more information, see "[Searching topics](/articles/searching-topics)." +Du kannst nach Repositorys suchen, die mit einem bestimmten Thema verknüpft sind. Weitere Informationen finden Sie unter „[Nach Repositorys suchen](/articles/searching-for-repositories/#search-by-topic)“. Sie können auch nach einer Liste von Themen auf {% data variables.product.product_name %} suchen. Weitere Informationen findest Du unter „[Themen suchen](/articles/searching-topics).“ -### Adding topics to your repository +### Themen zum Repository hinzufügen -{% data reusables.repositories.navigate-to-repo %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} -2. Under your repository description, click **Add topics**. - ![Add topics link on a repository's main page](/assets/images/help/repository/add-topics-link.png) -3. Type the topic you want to add to your repository, then type a space. - ![Form to enter topics](/assets/images/help/repository/add-topic-form.png) -4. After you've finished adding topics, click **Done**. - ![Form with a list of topics and Done button](/assets/images/help/repository/add-topics-done-button.png) +{% data reusables.repositories.navigate-to-repo %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +2. Klicke unter der Beschreibung des Repositorys auf **Add topics** (Themen hinzufügen). ![Link „Add topics“ (Themen hinzufügen) auf der Hauptseite eines Repositorys](/assets/images/help/repository/add-topics-link.png) +3. Gib das Thema ein, das Du zum Repository hinzufügen möchtest, gefolgt von einem Leerzeichen. ![Formular zur Eingabe von Themen](/assets/images/help/repository/add-topic-form.png) +4. Wenn Du mit dem Hinzufügen von Themen fertig bist, klicke auf **Done** (Fertig). ![Formular mit einer Liste an Themen und Schaltfläche „Done“ (Fertig)](/assets/images/help/repository/add-topics-done-button.png) {% else %} -2. To the right of "About", click {% octicon "gear" aria-label="The Gear icon" %}. - ![Gear icon on main page of a repository](/assets/images/help/repository/edit-repository-details-gear.png) -3. Under "Topics", type the topic you want to add to your repository, then type a space. - ![Form to enter topics](/assets/images/help/repository/add-topic-form.png) -4. After you've finished adding topics, click **Save changes**. - !["Save changes" button in "Edit repository details"](/assets/images/help/repository/edit-repository-details-save-changes-button.png) +2. To the right of "About", click {% octicon "gear" aria-label="The Gear icon" %}. ![Gear icon on main page of a repository](/assets/images/help/repository/edit-repository-details-gear.png) +3. Under "Topics", type the topic you want to add to your repository, then type a space. ![Formular zur Eingabe von Themen](/assets/images/help/repository/add-topic-form.png) +4. After you've finished adding topics, click **Save changes**. !["Save changes" button in "Edit repository details"](/assets/images/help/repository/edit-repository-details-save-changes-button.png) {% endif %} diff --git a/translations/de-DE/content/github/administering-a-repository/configuration-options-for-dependency-updates.md b/translations/de-DE/content/github/administering-a-repository/configuration-options-for-dependency-updates.md index 4e52277f6c..d700f7091b 100644 --- a/translations/de-DE/content/github/administering-a-repository/configuration-options-for-dependency-updates.md +++ b/translations/de-DE/content/github/administering-a-repository/configuration-options-for-dependency-updates.md @@ -545,12 +545,6 @@ updates: Use the `vendor` option to tell {% data variables.product.prodname_dependabot_short %} to vendor dependencies when updating them. -{% note %} - -Currently, {% data variables.product.prodname_dependabot_short %} only supports vendoring dependencies for Bundler. - -{% endnote %} - ```yaml # Configure version updates for both dependencies defined in manifests and vendored dependencies @@ -564,7 +558,13 @@ updates: interval: "weekly" ``` -{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. For Bundler, the dependencies must be in the _vendor/cache_ directory. Other file paths are not supported. For more information, see the [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html). +{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. + +| Paketmanager | Required file path for vendored dependencies | Weitere Informationen | +| ------------ | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------- | +| `bundler` | The dependencies must be in the _vendor/cache_ directory.
Other file paths are not supported. | [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html) | +| `gomod` | No path requirement (dependencies are usually located in the _vendor_ directory) | [`go mod vendor` documentation](https://golang.org/ref/mod#go-mod-vendor) | + ### `versioning-strategy` diff --git a/translations/de-DE/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/translations/de-DE/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md index a48d92319d..9409ecd79a 100644 --- a/translations/de-DE/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md +++ b/translations/de-DE/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md @@ -17,7 +17,7 @@ Du kannst {% data variables.product.prodname_actions %} für Dein Repository akt Alternativ kannst Du {% data variables.product.prodname_actions %} in Deinem Repository aktivieren, aber die Aktionen limitieren, die ein Workflow ausführen kann. {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### {% data variables.product.prodname_actions %}-Berechtigungen für Dein Repository verwalten diff --git a/translations/de-DE/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md b/translations/de-DE/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md index 3cb9b4f7eb..1919c425e0 100644 --- a/translations/de-DE/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md +++ b/translations/de-DE/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md @@ -1,32 +1,31 @@ --- -title: Enabling force pushes to a protected branch -intro: You can allow force pushes to a protected branch. +title: Erzwungene Pushes zu einem geschützten Branch aktivieren +intro: Du kannst erzwungene Pushes in einen geschützten Branch erlauben. product: '{% data reusables.gated-features.protected-branches %}' versions: free-pro-team: '*' enterprise-server: '>=2.20' --- -Anyone with admin permissions to a repository can enable force pushes. +Jeder Benutzer mit Administratorberechtigungen in einem Repository kann erzwungene Pushes aktivieren. -### About force pushes to protected branches +### Über erzwungene Pushes zu geschützten Branches -By default, force pushes are blocked on all protected branches. When you enable force pushes to a protected branch, anyone with at least write permissions to the repository can force push to the branch, including those with admin permissions. +Standardmäßig sind erzwungene Pushes auf allen geschützten Branches blockiert. Wenn Du erzwungene Pushes zu einem geschützten Branch aktivierst, kann jeder Benutzer mit mindestens Schreibberechtigungen im Repository Pushes zum Branch erzwingen, inbegriffen Benutzer mit Administratorberechtigungen. -Enabling force pushes will not override any other branch protection rules. For example, if a branch requires a linear commit history, you cannot force push merge commits to that branch. +Das Aktivieren erzwungener Pushes wird keine anderen Branch-Schutzregeln überschreiben. Wenn ein Branch beispielsweise einen linearen Commit-Verlauf verlangt, kannst Du keine Merge-Commit-Pushes zu diesem Branch erzwingen. -{% if currentVersion != "free-pro-team@latest" %}You cannot enable force pushes for a protected branch if a site administrator has blocked force pushes to all branches in your repository. For more information, see "[Blocking force pushes to repositories owned by a user account or organization](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)." +{% if enterpriseServerVersions contains currentVersion %}Du kannst keine erzwungenen Pushes für einen geschützten Branch aktivieren, wenn ein Websiteadministrator erzwungene Pushes auf alle Branches in Deinem Repository blockiert hat. Weitere Informationen findest Du unter „[Blockieren von erzwungenen Pushes zu Repositorys, die einem Benutzerkonto oder einer Organisation gehören](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)." -If a site administrator has blocked force pushes to the default branch only, you can still enable force pushes for any other protected branch.{% endif %} +Wenn ein Websiteadministrator erzwungene Pushes nur auf den Standardbranch blockiert hat, kannst Du erzwungene Pushes trotzdem für jeden anderen geschützten Branch aktivieren.{% endif %} {% data reusables.repositories.protected-branches-options %} -### Enabling force pushes +### Erzwungene Pushes aktivieren {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.repositories.repository-branches %} {% data reusables.repositories.add-branch-protection-rules %} -6. Under "Rules applied to everyone including administrators", select **Allow force pushes**. -![Allow force pushes option](/assets/images/help/repository/allow-force-pushes.png) -7. Click **Create**. +6. Wähle unter „Rules applied to everyone including administrators" (Regeln für jedermann, Administratoren inbegriffen) **Allow force pushes** (Erlaube erzwungene Pushes). ![Option „Allow force pushes" (Erlaube erzwungene Pushes)](/assets/images/help/repository/allow-force-pushes.png) +7. Klicke auf **Create** (Erstellen). diff --git a/translations/de-DE/content/github/administering-a-repository/index.md b/translations/de-DE/content/github/administering-a-repository/index.md index f664019edb..5351c63b96 100644 --- a/translations/de-DE/content/github/administering-a-repository/index.md +++ b/translations/de-DE/content/github/administering-a-repository/index.md @@ -26,7 +26,7 @@ versions: {% link_in_list /viewing-deployment-activity-for-your-repository %} {% link_in_list /managing-the-forking-policy-for-your-repository %} - + {% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-repository %} {% link_in_list /disabling-or-limiting-github-actions-for-a-repository %} {% link_in_list /managing-git-lfs-objects-in-archives-of-your-repository %} diff --git a/translations/de-DE/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/translations/de-DE/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md index d59bf97cc3..6f93905e1f 100644 --- a/translations/de-DE/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md +++ b/translations/de-DE/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md @@ -9,9 +9,9 @@ versions: ### About {% data variables.product.prodname_dependabot %} pull requests -{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot_short %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." +{% data reusables.dependabot.pull-request-introduction %} -When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package management system. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package manager. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." If you have many dependencies to manage, you may want to customize the configuration for each package manager so that pull requests have specific reviewers, assignees, and labels. For more information, see "[Customizing dependency updates](/github/administering-a-repository/customizing-dependency-updates)." diff --git a/translations/de-DE/content/github/administering-a-repository/setting-repository-visibility.md b/translations/de-DE/content/github/administering-a-repository/setting-repository-visibility.md index 41e916b277..9efcf5d60c 100644 --- a/translations/de-DE/content/github/administering-a-repository/setting-repository-visibility.md +++ b/translations/de-DE/content/github/administering-a-repository/setting-repository-visibility.md @@ -23,7 +23,7 @@ We recommend reviewing the following caveats before you change the visibility of {% if currentVersion == "free-pro-team@latest" %}* If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. {% data reusables.gated-features.more-info %} * Jede veröffentlichte {% data variables.product.prodname_pages %}-Website wird automatisch zurückgezogen. Wenn Sie Ihrer {% data variables.product.prodname_pages %}-Website eine benutzerdefinierte Domain hinzugefügt hatten, sollten Sie Ihre DNS-Einträge vor der Umschaltung des Repositorys in ein privates Repository entfernen oder aktualisieren, um das Risiko eines Domain-Takeovers auszuschließen. Weitere Informationen findest Du unter „[Eine benutzerdefinierte Domäne für Deine {% data variables.product.prodname_pages %}-Website verwalten](/articles/managing-a-custom-domain-for-your-github-pages-site).“ * {% data variables.product.prodname_dotcom %} will no longer included the repository in the {% data variables.product.prodname_archive %}. For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)."{% endif %} - {% if currentVersion != "free-pro-team@latest" %}* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} + {% if enterpriseServerVersions contains currentVersion %}* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} #### Repository als öffentlich festlegen diff --git a/translations/de-DE/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md b/translations/de-DE/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md index 55b46777b1..45209245ca 100644 --- a/translations/de-DE/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md +++ b/translations/de-DE/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md @@ -14,7 +14,7 @@ versions: {% endnote %} -Personen mit Lesezugriff auf ein Repository können eine Zusammenfassung sämtlicher aktueller Bereitstellungen und ein Protokoll der letzten Bereitstellungsaktivitäten anzeigen, sofern der Bereitstellungs-Workflow des Repositorys über die API für Bereitstellungen oder über eine App aus [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment) in {% data variables.product.product_name %} integriert ist. For more information, see "[Deployments](/v3/repos/deployments/)." +Personen mit Lesezugriff auf ein Repository können eine Zusammenfassung sämtlicher aktueller Bereitstellungen und ein Protokoll der letzten Bereitstellungsaktivitäten anzeigen, sofern der Bereitstellungs-Workflow des Repositorys über die API für Bereitstellungen oder über eine App aus [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment) in {% data variables.product.product_name %} integriert ist. For more information, see "[Deployments](/rest/reference/repos#deployments)." Darüber hinaus können Bereitstellungsinformationen auf der Registerkarte „Conversation“ (Unterhaltung) eines Pull-Requests angezeigt werden. diff --git a/translations/de-DE/content/github/authenticating-to-github/error-bad-file-number.md b/translations/de-DE/content/github/authenticating-to-github/error-bad-file-number.md index f5f7598c33..9dd3635f86 100644 --- a/translations/de-DE/content/github/authenticating-to-github/error-bad-file-number.md +++ b/translations/de-DE/content/github/authenticating-to-github/error-bad-file-number.md @@ -12,7 +12,7 @@ Beim Ausführen von Remote-Git-Befehlen oder SSH kann es bei Deiner Verbindung z ```shell $ ssh -vT git@{% data variables.command_line.codeblock %} -> OpenSSH_5.8p1, OpenSSL 1.0.0d 8 Feb 2011 +> OpenSSH_8.1p1, LibreSSL 2.7.3 > debug1: Connecting to {% data variables.command_line.codeblock %} [207.97.227.239] port 22. > debug1: connect to address 207.97.227.239 port 22: Connection timed out > ssh: connect to host {% data variables.command_line.codeblock %} port 22: Connection timed out diff --git a/translations/de-DE/content/github/authenticating-to-github/error-permission-denied-publickey.md b/translations/de-DE/content/github/authenticating-to-github/error-permission-denied-publickey.md index 75af14ce41..490e05943a 100644 --- a/translations/de-DE/content/github/authenticating-to-github/error-permission-denied-publickey.md +++ b/translations/de-DE/content/github/authenticating-to-github/error-permission-denied-publickey.md @@ -1,6 +1,6 @@ --- -title: 'Error: Permission denied (publickey)' -intro: 'A "Permission denied" error means that the server rejected your connection. There could be several reasons why, and the most common examples are explained below.' +title: 'Fehler: „Permission denied (publickey)“ (Berechtigung verweigert: öffentlicher Schlüssel)' +intro: 'Die Fehlermeldung „Permission denied“ (Berechtigung verweigert) bedeutet, dass der Server Deine Verbindung abgelehnt hat. Dafür kann es verschiedene Gründe geben. Die häufigsten werden nachfolgend erläutert.' redirect_from: - /articles/error-permission-denied-publickey versions: @@ -8,15 +8,15 @@ versions: enterprise-server: '*' --- -### Should the `sudo` command be used with Git? +### Kann ich den Befehl `sudo` bei Git verwenden? -You should not be using the `sudo` command with Git. If you have a *very good reason* you must use `sudo`, then ensure you are using it with every command (it's probably just better to use `su` to get a shell as root at that point). If you [generate SSH keys](/articles/generating-an-ssh-key) without `sudo` and then try to use a command like `sudo git push`, you won't be using the same keys that you generated. +Du solltest den Befehl `sudo` nicht bei Git verwenden. Wenn Du `sudo` aus einem *sehr guten Grund* verwenden musst, stelle sicher, dass Du ihn bei jedem Befehl verwendest (wahrscheinlich ist es besser, `su` zu verwenden, um an dieser Stelle eine Shell als Root zu bekommen). Wenn Du [SSH-Schlüssel](/articles/generating-an-ssh-key) ohne `sudo` erzeugst und dann versuchst, einen Befehl wie `sudo git push` auszuführen, verwendest Du andere Schlüssel als die von Dir erzeugten. -### Check that you are connecting to the correct server +### Überprüfen, ob Du eine Verbindung mit dem richtigen Server herstellst -Typing is hard, we all know it. Pay attention to what you type; you won't be able to connect to "githib.com" or "guthub.com". In some cases, a corporate network may cause issues resolving the DNS record as well. +Tippen ist fehleranfällig, das wissen wir alle. Achte darauf, was Du eingibst. Du kannst keine Verbindung mit „githib.com“ oder „guthub.com“ herstellen. In einigen Fällen kann ein Unternehmensnetzwerk auch Probleme bei der Auflösung des DNS-Eintrags verursachen. -To make sure you are connecting to the right domain, you can enter the following command: +Um sicherzustellen, dass Du die Verbindung mit der richtigen Domäne herstellst, kannst Du den folgenden Befehl eingeben: ```shell $ ssh -vT git@{% data variables.command_line.codeblock %} @@ -29,40 +29,40 @@ $ ssh -vT git@{% data variables.command_line.codeblock %} The connection should be made on port 22{% if currentVersion == "free-pro-team@latest" %}, unless you're overriding settings to use [SSH over HTTPS](/articles/using-ssh-over-the-https-port){% endif %}. -### Always use the "git" user +### Immer den „git“-Benutzer verwenden -All connections, including those for remote URLs, must be made as the "git" user. If you try to connect with your {% data variables.product.product_name %} username, it will fail: +Alle Verbindungen, auch die zu Remote-URLs, müssen als „git“-Benutzer hergestellt werden. Wenn Sie versuchen, die Verbindung unter Ihrem {% data variables.product.product_name %}-Benutzernamen herzustellen, tritt ein Fehler auf: ```shell $ ssh -T GITHUB-USERNAME@{% data variables.command_line.codeblock %} > Permission denied (publickey). ``` -If your connection failed and you're using a remote URL with your {% data variables.product.product_name %} username, you can [change the remote URL to use the "git" user](/articles/changing-a-remote-s-url/). +Wenn Ihre Verbindung fehlgeschlagen ist und Sie eine Remote-URL mit Ihrem {% data variables.product.product_name %}-Benutzernamen verwenden, können Sie [die Remote-URL für die Verwendung des „git“-Benutzers ändern](/articles/changing-a-remote-s-url/). -You should verify your connection by typing: +Du solltest Deine Verbindung mit der folgenden Eingabe überprüfen: ```shell $ ssh -T git@{% data variables.command_line.codeblock %} > Hi username! You've successfully authenticated... ``` -### Make sure you have a key that is being used +### Stelle sicher, dass Du einen Schlüssel hast, der verwendet wird {% mac %} {% data reusables.command_line.open_the_multi_os_terminal %} -2. Verify that you have a private key generated and loaded into SSH. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +2. Überprüfen Sie, dass Sie einen privaten Schlüssel erzeugt und in SSH geladen haben. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell - # start the ssh-agent in the background + # starte den ssh-agent im Hintergrund $ eval "$(ssh-agent -s)" > Agent pid 59566 $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + Bei Verwendung von OpenSSH 6.8 oder neuer: ```shell - # start the ssh-agent in the background + # starte den ssh-agent im Hintergrund $ eval "$(ssh-agent -s)" > Agent pid 59566 $ ssh-add -l -E md5 @@ -86,13 +86,13 @@ $ ssh -T git@{% data variables.command_line.codeblock %} 1. {% data reusables.desktop.windows_git_bash_turn_on_ssh_agent %} {% data reusables.desktop.windows_git_for_windows_turn_on_ssh_agent %} -2. Verify that you have a private key generated and loaded into SSH. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +2. Überprüfen Sie, dass Sie einen privaten Schlüssel erzeugt und in SSH geladen haben. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + Bei Verwendung von OpenSSH 6.8 oder neuer: ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) @@ -108,7 +108,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} {% linux %} {% data reusables.command_line.open_the_multi_os_terminal %} -2. Verify that you have a private key generated and loaded into SSH. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +2. Überprüfen Sie, dass Sie einen privaten Schlüssel erzeugt und in SSH geladen haben. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell # start the ssh-agent in the background $ eval "$(ssh-agent -s)" @@ -117,9 +117,9 @@ $ ssh -T git@{% data variables.command_line.codeblock %} > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + Bei Verwendung von OpenSSH 6.8 oder neuer: ```shell - # start the ssh-agent in the background + # starte den ssh-agent im Hintergrund $ eval "$(ssh-agent -s)" > Agent pid 59566 $ ssh-add -l -E md5 @@ -130,7 +130,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} $ ssh-add -l -E sha256 > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) ```{% endif %} - + {% endlinux %} @@ -162,7 +162,7 @@ $ ssh -vT git@{% data variables.command_line.codeblock %} > Permission denied (publickey). ``` -In that example, we did not have any keys for SSH to use. The "-1" at the end of the "identity file" lines means SSH couldn't find a file to use. Later on, the "Trying private key" lines also indicate that no file was found. If a file existed, those lines would be "1" and "Offering public key", respectively: +In diesem Beispiel hatten wir keine Schlüssel, die SSH verwenden konnte. Die „-1“ am Ende der „identitiy file“-Zeilen bedeutet, dass SSH keine entsprechende Datei finden konnte. Weiter unten weisen auch die „Trying private key“-Zeilen darauf hin, dass keine Datei gefunden wurde. Wenn eine Datei vorhanden wäre, würde dort „1“ bzw. „Offering public key“ stehen: ```shell $ ssh -vT git@{% data variables.command_line.codeblock %} @@ -174,25 +174,25 @@ $ ssh -vT git@{% data variables.command_line.codeblock %} > debug1: Offering RSA public key: /Users/you/.ssh/id_rsa ``` -### Verify the public key is attached to your account +### Überprüfen, ob der öffentliche Schlüssel an Dein Konto angehängt ist -You must provide your public key to {% data variables.product.product_name %} to establish a secure connection. +Du musst Deinen öffentlichen Schlüssel für {% data variables.product.product_name %} bereitstellen, um eine sichere Verbindung herzustellen. {% mac %} -1. Open Terminal. -2. Start SSH agent in the background. +1. Öffne das Terminal. +2. Starten Sie den SSH-Agenten im Hintergrund. ```shell $ eval "$(ssh-agent -s)" > Agent pid 59566 ``` -3. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +3. Suchen und notieren Sie Ihren öffentlichen Schlüssel-Fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + Bei Verwendung von OpenSSH 6.8 oder neuer: ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -212,19 +212,19 @@ You must provide your public key to {% data variables.product.product_name %} to {% windows %} -1. Open the command line. -2. Start SSH agent in the background. +1. Öffnen Sie die Befehlszeile. +2. Starten Sie den SSH-Agenten im Hintergrund. ```shell $ ssh-agent -s > Agent pid 59566 ``` -3. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +3. Suchen und notieren Sie Ihren öffentlichen Schlüssel-Fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + Bei Verwendung von OpenSSH 6.8 oder neuer: ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -244,19 +244,19 @@ You must provide your public key to {% data variables.product.product_name %} to {% linux %} -1. Open Terminal. -2. Start SSH agent in the background. +1. Öffne das Terminal. +2. Starten Sie den SSH-Agenten im Hintergrund. ```shell $ eval "$(ssh-agent -s)" > Agent pid 59566 ``` -3. Find and take a note of your public key fingerprint. If you're using OpenSSH 6.7 or older: +3. Suchen und notieren Sie Ihren öffentlichen Schlüssel-Fingerprint. Bei Verwendung von OpenSSH 6.7 oder älter: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + Bei Verwendung von OpenSSH 6.8 oder neuer: ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -264,15 +264,14 @@ You must provide your public key to {% data variables.product.product_name %} to {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.ssh %} -6. Compare the list of SSH keys with the output from the `ssh-add` command. -![SSH key listing in {% data variables.product.product_name %}](/assets/images/help/settings/ssh_key_listing.png) +6. Vergleichen Sie die Liste der SSH-Schlüssel mit der Ausgabe des Befehls `ssh-add`. ![SSH-Schlüssel-Auflistung in {% data variables.product.product_name %}](/assets/images/help/settings/ssh_key_listing.png) {% endlinux %} -If you don't see your public key in {% data variables.product.product_name %}, you'll need to [add your SSH key to {% data variables.product.product_name %}](/articles/adding-a-new-ssh-key-to-your-github-account) to associate it with your computer. +Wenn Du Deinen öffentlichen Schlüssel in {% data variables.product.product_name %} nicht siehst, musst Du [Deinen SSH-Schlüssel zu {% data variables.product.product_name %} hinzufügen](/articles/adding-a-new-ssh-key-to-your-github-account), um ihn mit Deinem Computer zu verknüpfen. {% warning %} -**Warning**: If you see an SSH key you're not familiar with on {% data variables.product.product_name %}, delete it immediately and contact {% data variables.contact.contact_support %}, for further help. An unidentified public key may indicate a possible security concern. For more information, see "[Reviewing your SSH keys](/articles/reviewing-your-ssh-keys)." +**Warnung:** Wenn Du einen SSH-Schlüssel siehst, der Dir auf {% data variables.product.product_name %} unbekannt ist, solltest Du ihn sofort löschen und Dich für weitere Hilfe an den {% data variables.contact.contact_support %} wenden. Ein Dir unbekannter öffentlicher Schlüssel kann ein Hinweis auf ein Sicherheitsproblem sein. Weitere Informationen finden Sie unter „[SSH-Schlüssel überprüfen](/articles/reviewing-your-ssh-keys)“. {% endwarning %} diff --git a/translations/de-DE/content/github/authenticating-to-github/generating-a-new-gpg-key.md b/translations/de-DE/content/github/authenticating-to-github/generating-a-new-gpg-key.md index c9cc24b220..5a83ebc61c 100644 --- a/translations/de-DE/content/github/authenticating-to-github/generating-a-new-gpg-key.md +++ b/translations/de-DE/content/github/authenticating-to-github/generating-a-new-gpg-key.md @@ -29,7 +29,7 @@ versions: ```shell $ gpg --default-new-key-algo rsa4096 --gen-key ``` -4. Lege bei der Eingabeaufforderung die Art des Schlüssels fest, den Du willst, oder drücke `Enter` (Eingabetaste), um die Standardeinstellung `RAS and DSA` zu akzeptieren. +4. Legen Sie bei der Eingabeaufforderung die gewünschte Schlüsselart fest, oder drücken Sie die **Eingabetaste**, um die Standardeinstellung `RSA and RSA` (RSA und RSA) zu akzeptieren. 5. Gib die gewünschte Schlüsselgröße ein. Den Schlüssel muss mindestens `4096` Bits sein. 6. Gib die Zeitdauer für die Gültigkeit des Schlüssels ein. Drücke `Enter` (Eingabetaste), um die Standardeinstellung festzulegen, die vorgibt, dass der Schlüssel nicht abläuft. 7. Überprüfe, dass Deine Einstellungen korrekt sind. diff --git a/translations/de-DE/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/de-DE/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index 798c333ccd..df2b59be06 100644 --- a/translations/de-DE/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/de-DE/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,7 +9,7 @@ versions: free-pro-team: '*' --- -Dies sind die öffentlichen Schlüssel-Fingerprints von {% data variables.product.prodname_dotcom %}: +These are {% data variables.product.prodname_dotcom %}'s public key fingerprints: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/de-DE/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md b/translations/de-DE/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md index 0d470f1c10..1b413f5146 100644 --- a/translations/de-DE/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md +++ b/translations/de-DE/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md @@ -134,7 +134,7 @@ Zur Veranschaulichung der Funktionsweise von `git filter-branch` zeigen wir Dir, {% endnote %} -## Versehentliche Commits künftig vermeiden +### Versehentliche Commits künftig vermeiden Durch einige einfache Tricks vermeidest Du den versehentlichen Commit von Änderungen, die nicht festgeschrieben werden sollen: @@ -145,5 +145,5 @@ Durch einige einfache Tricks vermeidest Du den versehentlichen Commit von Änder ### Weiterführende Informationen -- [Hauptseite zu `git filter-branch`](https://git-scm.com/docs/git-filter-branch) +- [`git filter-branch` man page](https://git-scm.com/docs/git-filter-branch) - [Pro Git: Git-Tools – Verlauf umschreiben](https://git-scm.com/book/en/Git-Tools-Rewriting-History) diff --git a/translations/de-DE/content/github/authenticating-to-github/reviewing-your-security-log.md b/translations/de-DE/content/github/authenticating-to-github/reviewing-your-security-log.md index 38e9334771..33fedf1606 100644 --- a/translations/de-DE/content/github/authenticating-to-github/reviewing-your-security-log.md +++ b/translations/de-DE/content/github/authenticating-to-github/reviewing-your-security-log.md @@ -1,6 +1,6 @@ --- -title: Reviewing your security log -intro: You can review the security log for your user account to better understand actions you've performed and actions others have performed that involve you. +title: Dein Sicherheitsprotokoll überprüfen +intro: Du kannst das Sicherheitsprotokoll für Dein Benutzerkonto überprüfen, um Dich betreffende Aktionen besser zu verstehen, die von Dir oder anderen Benutzern durchgeführt wurden. redirect_from: - /articles/reviewing-your-security-log versions: @@ -8,238 +8,233 @@ versions: enterprise-server: '*' --- -### Accessing your security log +### Zugriff auf Dein Sicherheitsprotokoll The security log lists all actions performed within the last 90 days{% if currentVersion ver_lt "enterprise-server@2.20" %}, up to 50{% endif %}. {% data reusables.user_settings.access_settings %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -2. In the user settings sidebar, click **Security log**. - ![Security log tab](/assets/images/help/settings/audit-log-tab.png) +2. Klicke in der Seitenleiste für Benutzereinstellungen auf **Security log** (Sicherheitsprotokoll). ![Registerkarte „Security log" (Sicherheitsprotokoll)](/assets/images/help/settings/audit-log-tab.png) {% else %} {% data reusables.user_settings.security %} -3. Under "Security history," your log is displayed. - ![Security log](/assets/images/help/settings/user_security_log.png) -4. Click on an entry to see more information about the event. - ![Security log](/assets/images/help/settings/user_security_history_action.png) +3. Dein Protokoll wird unter dem Eintrag „Security history“ (Sicherheitsverlauf) angezeigt. ![Sicherheitsprotokoll](/assets/images/help/settings/user_security_log.png) +4. Klicken Sie auf einen Eintrag, um weitere Informationen zum betreffenden Ereignis anzuzeigen. ![Sicherheitsprotokoll](/assets/images/help/settings/user_security_history_action.png) {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -### Searching your security log +### Dein Sicherheitsprotokoll durchsuchen {% data reusables.audit_log.audit-log-search %} -#### Search based on the action performed +#### Suche nach der Art der durchgeführten Aktion {% else %} -### Understanding events in your security log +### Ereignisse im Sicherheitsprotokoll verstehen -Actions listed in your security log are grouped within the following categories: -{% endif %} +Die Aktionen in Deinem Sicherheitsprotokoll sind nach folgenden Kategorien gruppiert:{% endif %} +| Kategoriename | Beschreibung | +| --------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest" %} +| `account_recovery_token` | Umfasst alle Aktivitäten in Verbindung mit dem [Hinzufügen eines Wiederherstellungstokens](/articles/configuring-two-factor-authentication-recovery-methods). | +| `Abrechnung` | Umfasst alle Aktivitäten in Verbindung mit Deinen Abrechnungsinformationen. | +| `marketplace_agreement_signature (Unterzeichnung Marketplace-Vereinbarung)` | Umfasst alle Aktivitäten in Verbindung mit der Signierung der {% data variables.product.prodname_marketplace %}-Entwicklervereinbarung. | +| `marketplace_listing (Eintrag auf Marketplace)` | Umfasst alle Aktivitäten in Verbindung mit dem Eintragen von Apps auf {% data variables.product.prodname_marketplace %}.{% endif %} +| `oauth_access` | Contains all activities related to [{% data variables.product.prodname_oauth_app %}s](/articles/authorizing-oauth-apps) you've connected with.{% if currentVersion == "free-pro-team@latest" %} +| `payment_method` | Umfasst alle Aktivitäten in Verbindung mit der Bezahlung Deines {% data variables.product.prodname_dotcom %}-Abonnements.{% endif %} +| `profile_picture` | Umfasst alle Aktivitäten in Verbindung mit Deinem Profilbild. | +| `project (Projekt)` | Umfasst alle Aktivitäten in Verbindung mit Projektboards. | +| `public_key` | Umfasst alle Aktivitäten in Verbindung mit [Deinen öffentlichen SSH-Schlüsseln](/articles/adding-a-new-ssh-key-to-your-github-account). | +| `repo` | Contains all activities related to the repositories you own.{% if currentVersion == "free-pro-team@latest" %} +| `sponsors` | Umfasst alle Ereignisse in Verbindung mit {% data variables.product.prodname_sponsors %} und Sponsorenschaltflächen (siehe „[Informationen zu {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)“ und „[Sponsorenschaltfläche in Deinem Repository anzeigen](/articles/displaying-a-sponsor-button-in-your-repository)“){% endif %}{% if enterpriseServerVersions contains currentVersion %} +| `Team` | Umfasst alle Aktivitäten in Verbindung mit Teams, deren Mitglied Du bist.{% endif %} +| `two_factor_authentication` | Umfasst alle Aktivitäten in Verbindung mit der [Zwei-Faktor-Authentifizierung](/articles/securing-your-account-with-two-factor-authentication-2fa). | +| `Benutzer` | Umfasst alle Aktivitäten in Verbindung mit Deinem Konto. | -| Category Name | Description -|------------------|-------------------{% if currentVersion == "free-pro-team@latest" %} -| `account_recovery_token` | Contains all activities related to [adding a recovery token](/articles/configuring-two-factor-authentication-recovery-methods). -| `billing` | Contains all activities related to your billing information. -| `marketplace_agreement_signature` | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. -| `marketplace_listing` | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %} -| `oauth_access` | Contains all activities related to [{% data variables.product.prodname_oauth_app %}s](/articles/authorizing-oauth-apps) you've connected with.{% if currentVersion == "free-pro-team@latest" %} -| `payment_method` | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %} -| `profile_picture` | Contains all activities related to your profile picture. -| `project` | Contains all activities related to project boards. -| `public_key` | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). -| `repo` | Contains all activities related to the repositories you own.{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to {% data variables.product.prodname_sponsors %} and sponsor buttons (see "[About {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)" and "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} -| `team` | Contains all activities related to teams you are a part of.{% endif %} -| `two_factor_authentication` | Contains all activities related to [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa). -| `user` | Contains all activities related to your account. - -A description of the events within these categories is listed below. +Eine Beschreibung der Ereignisse dieser Kategorien findest Du nachfolgend. {% if currentVersion == "free-pro-team@latest" %} -#### The `account_recovery_token` category +#### Kategorie `account_recovery_token` -| Action | Description -|------------------|------------------- -| confirm | Triggered when you successfully [store a new token with a recovery provider](/articles/configuring-two-factor-authentication-recovery-methods). -| recover | Triggered when you successfully [redeem an account recovery token](/articles/recovering-your-account-if-you-lose-your-2fa-credentials). -| recover_error | Triggered when a token is used but {% data variables.product.prodname_dotcom %} is not able to validate it. +| Aktion | Beschreibung | +| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| confirm | Wird ausgelöst, wenn Du [ein neues Token erfolgreich bei einem Wiederherstellungsanbieter speicherst](/articles/configuring-two-factor-authentication-recovery-methods). | +| recover | Wird ausgelöst, wenn Du [ein Kontowiederherstellungstoken erfolgreich einlöst](/articles/recovering-your-account-if-you-lose-your-2fa-credentials). | +| recover_error | Wird ausgelöst, wenn ein Token verwendet wird, {% data variables.product.prodname_dotcom %} dieses aber nicht validieren kann. | -#### The `billing` category +#### Kategorie `billing` (Abrechnung) -| Action | Description -|------------------|------------------- -| change_billing_type | Triggered when you [change how you pay](/articles/adding-or-editing-a-payment-method) for {% data variables.product.prodname_dotcom %}. -| change_email | Triggered when you [change your email address](/articles/changing-your-primary-email-address). +| Aktion | Beschreibung | +| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | +| change_billing_type | Wird ausgelöst, wenn Sie Ihre [Zahlungsmethode](/articles/adding-or-editing-a-payment-method) für {% data variables.product.prodname_dotcom %} ändern. | +| change_email | Wird ausgelöst, wenn Du [Deine E-Mail-Adresse änderst](/articles/changing-your-primary-email-address). | -#### The `marketplace_agreement_signature` category +#### Kategorie `marketplace_agreement_signature` -| Action | Description -|------------------|------------------- -| create | Triggered when you sign the {% data variables.product.prodname_marketplace %} Developer Agreement. +| Aktion | Beschreibung | +| ------ | --------------------------------------------------------------------------------------------------------------- | +| create | Wird ausgelöst, wenn Du die {% data variables.product.prodname_marketplace %}-Entwicklervereinbarung signierst. | -#### The `marketplace_listing` category +#### Kategorie `marketplace_listing` (Eintrag auf Marketplace) -| Action | Description -|------------------|------------------- -| approve | Triggered when your listing is approved for inclusion in {% data variables.product.prodname_marketplace %}. -| create | Triggered when you create a listing for your app in {% data variables.product.prodname_marketplace %}. -| delist | Triggered when your listing is removed from {% data variables.product.prodname_marketplace %}. -| redraft | Triggered when your listing is sent back to draft state. -| reject | Triggered when your listing is not accepted for inclusion in {% data variables.product.prodname_marketplace %}. +| Aktion | Beschreibung | +| ---------- | ----------------------------------------------------------------------------------------------------------------------------- | +| genehmigen | Wird ausgelöst, wenn Dein Eintrag für die Aufnahme in {% data variables.product.prodname_marketplace %} genehmigt wird. | +| create | Wird ausgelöst, wenn Du einen Eintrag für Deine App in {% data variables.product.prodname_marketplace %} erstellst. | +| delist | Wird ausgelöst, wenn Ihr Listing von {% data variables.product.prodname_marketplace %} entfernt wird. | +| redraft | Wird ausgelöst, wenn Dein Eintrag in den Entwurfsstatus zurückversetzt wird. | +| reject | Wird ausgelöst, wenn Dein Eintrag für die Aufnahme in {% data variables.product.prodname_marketplace %} nicht genehmigt wird. | {% endif %} -#### The `oauth_access` category +#### Kategorie `oauth_access` -| Action | Description -|------------------|------------------- -| create | Triggered when you [grant access to an {% data variables.product.prodname_oauth_app %}](/articles/authorizing-oauth-apps). -| destroy | Triggered when you [revoke an {% data variables.product.prodname_oauth_app %}'s access to your account](/articles/reviewing-your-authorized-integrations). +| Aktion | Beschreibung | +| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| create | Wird ausgelöst, wenn Sie einer [{% data variables.product.prodname_oauth_app %} Zugriff erteilen](/articles/authorizing-oauth-apps). | +| destroy | Wird ausgelöst, wenn Sie einer [{% data variables.product.prodname_oauth_app %} den Zugriff auf Ihr Konto entziehen](/articles/reviewing-your-authorized-integrations). | {% if currentVersion == "free-pro-team@latest" %} -#### The `payment_method` category +#### Kategorie `payment_method` -| Action | Description -|------------------|------------------- -| clear | Triggered when [a payment method](/articles/removing-a-payment-method) on file is removed. -| create | Triggered when a new payment method is added, such as a new credit card or PayPal account. -| update | Triggered when an existing payment method is updated. +| Aktion | Beschreibung | +| ------------- | ------------------------------------------------------------------------------------------------------------------- | +| clear | Wird ausgelöst, wenn eine [registrierte Zahlungsmethode](/articles/removing-a-payment-method) entfernt wird. | +| create | Wird ausgelöst, wenn eine Zahlungsmethode, beispielsweise eine Kreditkarte oder ein PayPal-Konto, hinzugefügt wird. | +| aktualisieren | Wird ausgelöst, wenn eine vorhandene Zahlungsmethode geändert wird. | {% endif %} -#### The `profile_picture` category +#### Kategorie `profile_picture` -| Action | Description -|------------------|------------------- -| update | Triggered when you [set or update your profile picture](/articles/setting-your-profile-picture/). +| Aktion | Beschreibung | +| ------------- | ---------------------------------------------------------------------------------------------------------- | +| aktualisieren | Wird ausgelöst, wenn Du [Dein Profilbild festlegst oder änderst](/articles/setting-your-profile-picture/). | -#### The `project` category +#### Kategorie `project` -| Action | Description -|--------------------|--------------------- -| `create` | Triggered when a project board is created. -| `rename` | Triggered when a project board is renamed. -| `update` | Triggered when a project board is updated. -| `delete` | Triggered when a project board is deleted. -| `link` | Triggered when a repository is linked to a project board. -| `unlink` | Triggered when a repository is unlinked from a project board. -| `project.access` | Triggered when a project board's visibility is changed. -| `update_user_permission` | Triggered when an outside collaborator is added to or removed from a project board or has their permission level changed. +| Aktion | Beschreibung | +| ------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------- | +| `create` | Wird bei der Erstellung eines Projektboards ausgelöst. | +| `rename` | Wird ausgelöst, wenn ein Projektboard umbenannt wird. | +| `aktualisieren` | Wird ausgelöst, wenn ein Projektboard geändert wird. | +| `delete` | Wird ausgelöst, wenn ein Projektboard gelöscht wird. | +| `link` | Wird ausgelöst, wenn ein Repository mit einem Projektboard verknüpft wird. | +| `unlink` | Wird ausgelöst, wenn die Verknüpfung eines Repositorys mit einem Projektboard aufgehoben wird. | +| `project.access` | Wird ausgelöst, wenn die Sichtbarkeit eines Projektboards geändert wird. | +| `update_user_permission` | Wird ausgelöst, wenn ein externer Mitarbeiter einem Projektboard hinzugefügt oder entfernt wird oder wenn sich seine Berechtigungsebene verändert. | -#### The `public_key` category +#### Kategorie `public_key` -| Action | Description -|------------------|------------------- -| create | Triggered when you [add a new public SSH key to your {% data variables.product.product_name %} account](/articles/adding-a-new-ssh-key-to-your-github-account). -| delete | Triggered when you [remove a public SSH key to your {% data variables.product.product_name %} account](/articles/reviewing-your-ssh-keys). +| Aktion | Beschreibung | +| ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| create | Wird ausgelöst, wenn Sie [Ihrem {% data variables.product.product_name %}-Konto einen neuen öffentlichen SSH-Schlüssel hinzufügen](/articles/adding-a-new-ssh-key-to-your-github-account). | +| delete | Wird ausgelöst, wenn Sie [einen öffentlichen SSH-Schlüssel aus Ihrem {% data variables.product.product_name %}-Konto entfernen](/articles/reviewing-your-ssh-keys). | -#### The `repo` category +#### Kategorie `repo` -| Action | Description -|------------------|------------------- -| access | Triggered when you a repository you own is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). -| add_member | Triggered when a {% data variables.product.product_name %} user is {% if currentVersion == "free-pro-team@latest" %}[invited to have collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% else %}[given collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% endif %} to a repository. -| add_topic | Triggered when a repository owner [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. -| archived | Triggered when a repository owner [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} -| config.disable_anonymous_git_access | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. -| config.enable_anonymous_git_access | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. -| config.lock_anonymous_git_access | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). -| config.unlock_anonymous_git_access | Triggered when a repository's [anonymous Git read access setting is unlocked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access).{% endif %} -| create | Triggered when [a new repository is created](/articles/creating-a-new-repository). -| destroy | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} -| disable | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %}{% if currentVersion == "free-pro-team@latest" %} -| enable | Triggered when a repository is re-enabled.{% endif %} -| remove_member | Triggered when a {% data variables.product.product_name %} user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository). -| remove_topic | Triggered when a repository owner removes a topic from a repository. -| rename | Triggered when [a repository is renamed](/articles/renaming-a-repository). -| transfer | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). -| transfer_start | Triggered when a repository transfer is about to occur. -| unarchived | Triggered when a repository owner unarchives a repository. +| Aktion | Beschreibung | +| ------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| access | Wird ausgelöst, wenn die Sichtbarkeit eines Repositorys, dessen Inhaber Du bist, [von „privat“ auf „öffentlich“ gesetzt wird](/articles/making-a-private-repository-public) (oder umgekehrt). | +| add_member | Triggered when a {% data variables.product.product_name %} user is {% if currentVersion == "free-pro-team@latest" %}[invited to have collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% else %}[given collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% endif %} to a repository. | +| add_topic | Wird ausgelöst, wenn ein Repository-Inhaber einem Repository [ein Thema hinzufügt](/articles/classifying-your-repository-with-topics). | +| archived | Wird ausgelöst, wenn ein Repository-Inhaber ein [Repository archiviert](/articles/about-archiving-repositories).{% if enterpriseServerVersions contains currentVersion %} +| config.disable_anonymous_git_access | Wird ausgelöst, wenn für ein öffentliches Repository der [anonyme Git-Lesezugriff deaktiviert](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) wird. | +| config.enable_anonymous_git_access | Wird ausgelöst, wenn für ein öffentliches Repository der [anonyme Git-Lesezugriff aktiviert](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) wird. | +| config.lock_anonymous_git_access | Wird ausgelöst, wenn für ein Repository die [Einstellung für den anonymen Git-Lesezugriff gesperrt](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access) wird. | +| config.unlock_anonymous_git_access | Wird ausgelöst, wenn für ein Repository die [Einstellungssperre für den anonymen Git-Lesezugriff aufgehoben](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access) wird.{% endif %} +| create | Wird ausgelöst, wenn [ein neues Repository erstellt](/articles/creating-a-new-repository) wird. | +| destroy | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} +| deaktivieren | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| aktivieren | Wird ausgelöst, wenn ein Repository wieder aktiviert wird.{% endif %} +| remove_member | Wird ausgelöst, wenn ein {% data variables.product.product_name %}-Benutzer [als Mitarbeiter aus einem Repository entfernt wird](/articles/removing-a-collaborator-from-a-personal-repository). | +| remove_topic | Wird ausgelöst, wenn ein Repository-Inhaber ein Thema aus einem Repository entfernt. | +| rename | Wird ausgelöst, wenn ein [Repository umbenannt](/articles/renaming-a-repository) wird. | +| übertragen | Wird ausgelöst, wenn ein [Repository übertragen](/articles/how-to-transfer-a-repository) wird. | +| transfer_start | Wird ausgelöst, wenn die Übertragung eines Repositorys initiiert wurde. | +| unarchived | Wird ausgelöst, wenn ein Repository-Inhaber die Archivierung eines Repositorys aufhebt. | {% if currentVersion == "free-pro-team@latest" %} -#### The `sponsors` category +#### Kategorie `sponsors` -| Action | Description -|------------------|------------------- -| repo_funding_link_button_toggle | Triggered when you enable or disable a sponsor button in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") -| repo_funding_links_file_action | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") -| sponsor_sponsorship_cancel | Triggered when you cancel a sponsorship (see "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)") -| sponsor_sponsorship_create | Triggered when you sponsor a developer (see "[Sponsoring an open source contributor](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor#sponsoring-a-developer)") -| sponsor_sponsorship_preference_change | Triggered when you change whether you receive email updates from a sponsored developer (see "[Managing your sponsorship](/articles/managing-your-sponsorship)") -| sponsor_sponsorship_tier_change | Triggered when you upgrade or downgrade your sponsorship (see "[Upgrading a sponsorship](/articles/upgrading-a-sponsorship)" and "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)") -| sponsored_developer_approve | Triggered when your {% data variables.product.prodname_sponsors %} account is approved (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| sponsored_developer_create | Triggered when your {% data variables.product.prodname_sponsors %} account is created (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| sponsored_developer_profile_update | Triggered when you edit your sponsored developer profile (see "[Editing your profile details for {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/editing-your-profile-details-for-github-sponsors)") -| sponsored_developer_request_approval | Triggered when you submit your application for {% data variables.product.prodname_sponsors %} for approval (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| sponsored_developer_tier_description_update | Triggered when you change the description for a sponsorship tier (see "[Changing your sponsorship tiers](/articles/changing-your-sponsorship-tiers)") -| sponsored_developer_update_newsletter_send | Triggered when you send an email update to your sponsors (see "[Contacting your sponsors](/articles/contacting-your-sponsors)") -| waitlist_invite_sponsored_developer | Triggered when you are invited to join {% data variables.product.prodname_sponsors %} from the waitlist (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| waitlist_join | Triggered when you join the waitlist to become a sponsored developer (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") +| Aktion | Beschreibung | +| ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| repo_funding_link_button_toggle | Wird ausgelöst, wenn Du eine Sponsorenschaltfläche in Deinem Repository aktivierst oder deaktivierst (siehe „[Sponsorenschaltfläche in Deinem Repository anzeigen](/articles/displaying-a-sponsor-button-in-your-repository)“) | +| repo_funding_links_file_action | Wird ausgelöst, wenn Du die FUNDING-Datei in Deinem Repository änderst (siehe „[Sponsorenschaltfläche in Deinem Repository anzeigen](/articles/displaying-a-sponsor-button-in-your-repository)“) | +| sponsor_sponsorship_cancel | Wird ausgelöst, wenn Du ein Sponsoring beendest (siehe „[Sponsoring herabstufen](/articles/downgrading-a-sponsorship)“) | +| sponsor_sponsorship_create | Wird ausgelöst, wenn Du einen Entwickler unterstützt (siehe „[Unterstützen eines Open-Source-Mitarbeiters](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor#sponsoring-a-developer)") | +| sponsor_sponsorship_preference_change | Wird ausgelöst, wenn Du Deine Einstellung zum Empfangen von E-Mail-Updates von einem unterstützten Entwickler änderst (siehe „[Dein Sponsoring verwalten](/articles/managing-your-sponsorship)“) | +| sponsor_sponsorship_tier_change | Wird ausgelöst, wenn Du Dein Sponsoring herauf- oder herabstufst (siehe „[Sponsoring heraufstufen](/articles/upgrading-a-sponsorship)“ und „[Sponsoring herabstufen](/articles/downgrading-a-sponsorship)“) | +| sponsored_developer_approve | Wird ausgelöst, wenn Dein {% data variables.product.prodname_sponsors %}-Konto genehmigt ist (siehe „[{% data variables.product.prodname_sponsors %} für Dein Benutzerkonto aufsetzen](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") | +| sponsored_developer_create | Wird aufgelöst, wenn Dein {% data variables.product.prodname_sponsors %}-Konto erstellt wird (siehe „[{% data variables.product.prodname_sponsors %} für Dein Benutzerkonto aufsetzen](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") | +| sponsored_developer_profile_update | Wird ausgelöst, wenn Du Dein „unterstützter Benutzer"-Profil veränderst (siehe „[Deine Profildetails für {% data variables.product.prodname_sponsors %} verändern](/github/supporting-the-open-source-community-with-github-sponsors/editing-your-profile-details-for-github-sponsors)") | +| sponsored_developer_request_approval | Wird ausgelöst, wenn Du Deine Bewerbung für {% data variables.product.prodname_sponsors %} für die Bewilligung einreichst (siehe „[{% data variables.product.prodname_sponsors %} für Dein Benutzerkonto aufsetzen](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") | +| sponsored_developer_tier_description_update | Wird ausgelöst, wenn Du die Beschreibung einer Sponsoring-Stufe änderst (siehe „[Sponsoring-Stufen ändern](/articles/changing-your-sponsorship-tiers)“) | +| sponsored_developer_update_newsletter_send | Wird ausgelöst, wenn Du Deinen Sponsoren einen E-Mail-Update sendest (siehe „[Sponsoren kontaktieren](/articles/contacting-your-sponsors)“) | +| waitlist_invite_sponsored_developer | Wird ausgelöst, wenn Du eingeladen wirst, {% data variables.product.prodname_sponsors %} von der Warteliste her beizutreten (siehe „[{% data variables.product.prodname_sponsors %} für Dein Benutzerkonto aufsetzen](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") | +| waitlist_join | Wird ausgelöst, wenn Du der Warteliste beitrittst, um ein „unterstützter Entwickler" zu werden (siehe [{% data variables.product.prodname_sponsors %} für Dein Benutzerkonto aufsetzen](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") | {% endif %} {% if currentVersion == "free-pro-team@latest" %} -#### The `successor_invitation` category +#### Kategorie `successor_invitation` -| Action | Description -|------------------|------------------- -| accept | Triggered when you accept a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| cancel | Triggered when you cancel a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| create | Triggered when you create a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| decline | Triggered when you decline a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| revoke | Triggered when you revoke a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") +| Aktion | Beschreibung | +| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| accept | Wird ausgelöst, wenn du eine Erneuerungseinladung annimmst (siehe „[Inhaber-Kontinuität Deiner Benutzerkonto-Repositorys aufrechterhalten](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") | +| cancel | Wird ausgelöst, wenn du eine Erneuerungseinladung kündigst (siehe „[Inhaber-Kontinuität Deiner Benutzerkonto-Repositorys aufrechterhalten](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") | +| create | Wird ausgelöst, wenn du eine Erneuerungseinladung erstellst (siehe „[Inhaber-Kontinuität Deiner Benutzerkonto-Repositorys aufrechterhalten](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") | +| decline | Wird ausgelöst, wenn du eine Erneuerungseinladung ablehnst (siehe „[Inhaber-Kontinuität Deiner Benutzerkonto-Repositorys aufrechterhalten](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") | +| revoke | Wird ausgelöst, wenn du eine Erneuerungseinladung zurückziehst (siehe „[Inhaber-Kontinuität Deiner Benutzerkonto-Repositorys aufrechterhalten](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") | {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} -#### The `team` category +#### Kategorie `team` -| Action | Description -|------------------|------------------- -| add_member | Triggered when a member of an organization you belong to [adds you to a team](/articles/adding-organization-members-to-a-team). -| add_repository | Triggered when a team you are a member of is given control of a repository. -| create | Triggered when a new team in an organization you belong to is created. -| destroy | Triggered when a team you are a member of is deleted from the organization. -| remove_member | Triggered when a member of an organization is [removed from a team](/articles/removing-organization-members-from-a-team) you are a member of. -| remove_repository | Triggered when a repository is no longer under a team's control. +| Aktion | Beschreibung | +| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| add_member | Wird ausgelöst, wenn ein Mitglied einer Organisation, zu der Du gehörst, [Dich zu einem Team hinzufügt](/articles/adding-organization-members-to-a-team). | +| add_repository | Wird ausgelöst, wenn ein Team, dessen Mitglied Du bist, die Kontrolle über ein Repository erhält. | +| create | Wird ausgelöst, wenn in einer Organisation, zu der Du gehörst, ein neues Team erstellt wird. | +| destroy | Wird ausgelöst, wenn ein Team, dessen Mitglied Du bist, aus einer Organisation gelöscht wird. | +| remove_member | Wird ausgelöst, wenn ein Mitglied einer Organisation [aus einem Team entfernt wird](/articles/removing-organization-members-from-a-team), dessen Mitglied Du bist. | +| remove_repository | Wird ausgelöst, wenn ein Repository nicht mehr unter der Kontrolle eines Teams steht. | {% endif %} -#### The `two_factor_authentication` category +#### Kategorie `two_factor_authentication` -| Action | Description -|------------------|------------------- -| enabled | Triggered when [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) is enabled. -| disabled | Triggered when two-factor authentication is disabled. +| Aktion | Beschreibung | +| -------- | ------------------------------------------------------------------------------------------------------------------------------------------- | +| enabled | Wird bei der Aktivierung der [Zwei-Faktor-Authentifizierung](/articles/securing-your-account-with-two-factor-authentication-2fa) ausgelöst. | +| disabled | Wird bei der Deaktivierung der Zwei-Faktor-Authentifizierung ausgelöst. | -#### The `user` category +#### Kategorie `user` -| Action | Description -|--------------------|--------------------- -| add_email | Triggered when you [add a new email address](/articles/changing-your-primary-email-address). -| create | Triggered when you create a new user account. -| remove_email | Triggered when you remove an email address. -| rename | Triggered when you rename your account. -| change_password | Triggered when you change your password. -| forgot_password | Triggered when you ask for [a password reset](/articles/how-can-i-reset-my-password). -| login | Triggered when you log in to {% data variables.product.product_location %}. -| failed_login | Triggered when you failed to log in successfully. -| two_factor_requested | Triggered when {% data variables.product.product_name %} asks you for [your two-factor authentication code](/articles/accessing-github-using-two-factor-authentication). -| show_private_contributions_count | Triggered when you [publicize private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile). +| Aktion | Beschreibung | +| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| add_email | Wird ausgelöst, wenn Du [eine neue E-Mail-Adresse hinzufügst](/articles/changing-your-primary-email-address). | +| create | Wird ausgelöst, wenn Du ein neues Benutzerkonto erstellst. | +| remove_email | Wird ausgelöst, wenn Du eine E-Mail-Adresse entfernst. | +| rename | Wird ausgelöst, wenn Du Dein Konto umbenennst. | +| change_password | Wird ausgelöst, wenn Du Dein Passwort änderst. | +| forgot_password | Wird ausgelöst, wenn Du die [Zurücksetzung Deines Passworts anforderst](/articles/how-can-i-reset-my-password). | +| login | Wird ausgelöst, wenn Du Dich bei {% data variables.product.product_location %} anmeldest. | +| failed_login | Wird ausgelöst, wenn Deine Anmeldung fehlschlägt. | +| two_factor_requested | Wird ausgelöst, wenn Du von {% data variables.product.product_name %} nach [Deinem Code für die Zwei-Faktor-Authentifizierung](/articles/accessing-github-using-two-factor-authentication) gefragt wirst. | +| show_private_contributions_count | Wird ausgelöst, wenn Du [private Beiträge in Deinem Profil veröffentlichst](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile). | | hide_private_contributions_count | Triggered when you [hide private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile).{% if currentVersion == "free-pro-team@latest" %} -| report_content | Triggered when you [report an issue or pull request, or a comment on an issue, pull request, or commit](/articles/reporting-abuse-or-spam).{% endif %} +| report_content | Wird ausgelöst, wenn Du [einen Issue oder Pull Request, oder einen Kommentar zu einem Issue, einem Pull Request oder einem Commit meldest](/articles/reporting-abuse-or-spam).{% endif %} -#### The `user_status` category +#### Kategorie `user_status` -| Action | Description -|--------------------|--------------------- -| update | Triggered when you set or change the status on your profile. For more information, see "[Setting a status](/articles/personalizing-your-profile/#setting-a-status)." -| destroy | Triggered when you clear the status on your profile. +| Aktion | Beschreibung | +| ------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| aktualisieren | Wird ausgelöst, wenn Du den Status Deines Profils festlegst oder änderst. Weitere Informationen findest Du unter „[Status festlegen](/articles/personalizing-your-profile/#setting-a-status).“ | +| destroy | Wird ausgelöst, wenn Du den Status Deines Profils löschst. | {% if currentVersion == "free-pro-team@latest" %} -### Exporting your security log +### Dein Sicherheitsprotokoll exportieren {% data reusables.audit_log.export-log %} {% data reusables.audit_log.exported-log-keys-and-values %} diff --git a/translations/de-DE/content/github/authenticating-to-github/reviewing-your-ssh-keys.md b/translations/de-DE/content/github/authenticating-to-github/reviewing-your-ssh-keys.md index 71ea5e3d05..d802609c33 100644 --- a/translations/de-DE/content/github/authenticating-to-github/reviewing-your-ssh-keys.md +++ b/translations/de-DE/content/github/authenticating-to-github/reviewing-your-ssh-keys.md @@ -1,6 +1,6 @@ --- -title: Reviewing your SSH keys -intro: 'To keep your credentials secure, you should regularly audit your SSH keys, deploy keys, and review authorized applications that access your {% data variables.product.product_name %} account.' +title: SSH-Schlüssel überprüfen +intro: 'Zum Schutz Ihrer Anmeldeinformationen sollten Sie Ihre SSH- und Deployment-Schlüssel regelmäßig überprüfen. Dabei sollten Sie auch die für den Zugriff auf Ihr {% data variables.product.product_name %}-Konto autorisierten Anwendungen überprüfen.' redirect_from: - /articles/keeping-your-application-access-tokens-safe/ - /articles/keeping-your-ssh-keys-and-application-access-tokens-safe/ @@ -10,32 +10,31 @@ versions: enterprise-server: '*' --- -You can delete unauthorized (or possibly compromised) SSH keys to ensure that an attacker no longer has access to your repositories. You can also approve existing SSH keys that are valid. +Nicht autorisierte (oder möglicherweise kompromittierte) SSH-Schlüssel solltest Du löschen, um möglichen Angreifern den Zugriff auf Deine Repositorys zu verwehren. Vorhandene SSH-Schlüssel, die gültig sind, kannst Du genehmigen. {% mac %} {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.ssh %} -3. On the SSH Settings page, take note of the SSH keys associated with your account. For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid SSH keys you'd like to keep, click **Approve**. - ![SSH key list](/assets/images/help/settings/settings-ssh-key-review.png) +3. Überprüfe auf der Seite mit den SSH-Einstellungen die Deinem Konto zugeordneten SSH-Schlüssel. Klicke bei Dir unbekannten oder veralteten Schlüsseln auf **Delete** (Löschen). Bei gültigen SSH-Schlüsseln, die Du behalten möchtest, klicke auf **Approve** (Genehmigen). ![Liste mit SSH-Schlüsseln](/assets/images/help/settings/settings-ssh-key-review.png) {% tip %} - **Note:** If you're auditing your SSH keys due to an unsuccessful Git operation, the unverified key that caused the [SSH key audit error](/articles/error-we-re-doing-an-ssh-key-audit) will be highlighted in the list of SSH keys. + **Hinweis:** Falls Du Deine SSH-Schlüssel aufgrund einer fehlgeschlagenen Git-Operation überprüfst, ist der nicht verifizierte Schlüssel, der den [SSH-Schlüssel-Auditfehler](/articles/error-we-re-doing-an-ssh-key-audit) verursacht hat, in der Liste der SSH-Schlüssel hervorgehoben. {% endtip %} -4. Open Terminal. +4. Öffne das Terminal. 5. {% data reusables.command_line.start_ssh_agent %} -6. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +6. Suchen und notieren Sie Ihren öffentlichen Schlüssel-Fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + Bei Verwendung von OpenSSH 6.8 oder neuer: ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -54,8 +53,8 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.ssh %} -3. On the SSH Settings page, take note of the SSH keys associated with your account. For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid SSH keys you'd like to keep, click **Approve**. - ![SSH key list](/assets/images/help/settings/settings-ssh-key-review.png) +3. Überprüfe auf der Seite mit den SSH-Einstellungen die Deinem Konto zugeordneten SSH-Schlüssel. For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid SSH keys you'd like to keep, click **Approve**. + ![SSH key list](/assets/images/help/settings/settings-ssh-key-review.png) {% tip %} @@ -63,19 +62,19 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% endtip %} -4. Open Git Bash. If you're using Git Shell, which is included in {% data variables.product.prodname_desktop %}, open Git Shell and skip to step 6. +4. Öffnen Sie Git Bash. Wenn Du das in {% data variables.product.prodname_desktop %} integrierte Git Shell verwendest, öffne Git Shell, und fahre mit Schritt 6 fort. 5. {% data reusables.desktop.windows_git_bash_turn_on_ssh_agent %} {% data reusables.desktop.windows_git_for_windows_turn_on_ssh_agent %} -6. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +6. Suchen und notieren Sie Ihren öffentlichen Schlüssel-Fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + Bei Verwendung von OpenSSH 6.8 oder neuer: ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -94,8 +93,8 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.ssh %} -3. On the SSH Settings page, take note of the SSH keys associated with your account. For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid SSH keys you'd like to keep, click **Approve**. - ![SSH key list](/assets/images/help/settings/settings-ssh-key-review.png) +3. Überprüfe auf der Seite mit den SSH-Einstellungen die Deinem Konto zugeordneten SSH-Schlüssel. For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid SSH keys you'd like to keep, click **Approve**. + ![SSH key list](/assets/images/help/settings/settings-ssh-key-review.png) {% tip %} @@ -103,33 +102,31 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% endtip %} -4. Open Terminal. +4. Öffne das Terminal. 5. {% data reusables.command_line.start_ssh_agent %} -6. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +6. Suchen und notieren Sie Ihren öffentlichen Schlüssel-Fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + Bei Verwendung von OpenSSH 6.8 oder neuer: ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` {% else %} - ```shell - $ ssh-add -l -E sha256 - > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) - ```{% endif %} +```shell $ ssh-add -l -E sha256 +> 2048 *SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ* /Users/*USERNAME*/.ssh/id_rsa (RSA) ```{% endif %} -7. The SSH keys on {% data variables.product.product_name %} *should* match the same keys on your computer. +7. Die SSH-Schlüssel auf {% data variables.product.product_name %} *sollten* den zugehörigen Schlüsseln auf Deinem Computer entsprechen. {% endlinux %} {% warning %} -**Warning**: If you see an SSH key you're not familiar with on {% data variables.product.product_name %}, delete it immediately and contact {% data variables.contact.contact_support %} for further help. An unidentified public key may indicate a possible security concern. +**Warnung**: Wenn Du einen SSH-Schlüssel siehst, der Dir auf {% data variables.product.product_name %} unbekannt ist, solltest Du ihn sofort löschen und Dich für weitere Anweisungen an den {% data variables.contact.contact_support %} wenden. Ein Dir unbekannter öffentlicher Schlüssel kann ein Hinweis auf ein Sicherheitsproblem sein. {% endwarning %} diff --git a/translations/de-DE/content/github/building-a-strong-community/adding-a-license-to-a-repository.md b/translations/de-DE/content/github/building-a-strong-community/adding-a-license-to-a-repository.md index 6c8aab53cc..b2a7207f10 100644 --- a/translations/de-DE/content/github/building-a-strong-community/adding-a-license-to-a-repository.md +++ b/translations/de-DE/content/github/building-a-strong-community/adding-a-license-to-a-repository.md @@ -32,7 +32,7 @@ Open-Source-Lizenzen ermöglichen es anderen, das Projekt in Deinem Repository k {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.files.add-file %} diff --git a/translations/de-DE/content/github/building-a-strong-community/locking-conversations.md b/translations/de-DE/content/github/building-a-strong-community/locking-conversations.md index 5e86b60383..735dfe97a8 100644 --- a/translations/de-DE/content/github/building-a-strong-community/locking-conversations.md +++ b/translations/de-DE/content/github/building-a-strong-community/locking-conversations.md @@ -1,6 +1,6 @@ --- -title: Locking conversations -intro: 'Repository owners and collaborators, and people with write access to a repository, can lock conversations on issues, pull requests, and commits permanently or temporarily to defuse a heated interaction.' +title: Unterhaltungen sperren +intro: 'Repository-Inhaber und -Mitarbeiter sowie Personen mit Schreibzugriff auf ein Repository können Unterhaltungen zu Issues, Pull-Requests und Commits dauerhaft oder temporär sperren, um eine hitzige Diskussion zu entschärfen.' redirect_from: - /articles/locking-conversations versions: @@ -8,32 +8,28 @@ versions: enterprise-server: '*' --- -It's appropriate to lock a conversation when the entire conversation is not constructive or violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. When you lock a conversation, you can also specify a reason, which is publicly visible. +It's appropriate to lock a conversation when the entire conversation is not constructive or violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. Wenn Du eine Unterhaltung sperrst, kannst Du auch einen Grund dafür angeben, der dann öffentlich sichtbar ist. -Locking a conversation creates a timeline event that is visible to anyone with read access to the repository. However, the username of the person who locked the conversation is only visible to people with write access to the repository. For anyone without write access, the timeline event is anonymized. +Das Sperren einer Unterhaltung erstellt ein Zeitleistenereignis, das für alle Benutzer mit Lesezugriff auf das Repository sichtbar ist. Der Benutzername der Person, die die Unterhaltung gesperrt hat, ist jedoch nur für Benutzer mit Schreibzugriff auf das Repository zu sehen. Für Personen ohne Schreibzugriff ist das Zeitleistenereignis anonymisiert. -![Anonymized timeline event for a locked conversation](/assets/images/help/issues/anonymized-timeline-entry-for-locked-conversation.png) +![Anonymisiertes Zeitleistenereignis für eine gesperrte Unterhaltung](/assets/images/help/issues/anonymized-timeline-entry-for-locked-conversation.png) -While a conversation is locked, only [people with write access](/articles/repository-permission-levels-for-an-organization/) and [repository owners and collaborators](/articles/permission-levels-for-a-user-account-repository/#collaborator-access-on-a-repository-owned-by-a-user-account) can add, hide, and delete comments. +Solange eine Unterhaltung gesperrt ist, können nur [Personen mit Schreibzugriff](/articles/repository-permission-levels-for-an-organization/) und [Repository-Inhaber und -Mitarbeiter](/articles/permission-levels-for-a-user-account-repository/#collaborator-access-on-a-repository-owned-by-a-user-account) Kommentare hinzufügen, ausblenden und löschen. -To search for locked conversations in a repository that is not archived, you can use the search qualifiers `is:locked` and `archived:false`. Conversations are automatically locked in archived repositories. For more information, see "[Searching issues and pull requests](/articles/searching-issues-and-pull-requests#search-based-on-whether-a-conversation-is-locked)." +Um nach gesperrten Unterhaltungen in einem nicht archivierten Repository zu suchen, kannst Du die Qualifizierer `is:locked` und `archived:false` verwenden. In archivierten Repositorys sind Unterhaltungen automatisch gesperrt. Weitere Informationen findest Du unter „[Issues und Pull Requests durchsuchen](/articles/searching-issues-and-pull-requests#search-based-on-whether-a-conversation-is-locked).“ -1. Optionally, write a comment explaining why you're locking the conversation. -2. In the right margin of the issue or pull request, or above the comment box on the commit page, click **Lock conversation**. -![Lock conversation link](/assets/images/help/repository/lock-conversation.png) -3. Optionally, choose a reason for locking the conversation. -![Reason for locking a conversation menu](/assets/images/help/repository/locking-conversation-reason-menu.png) -4. Read the information about locking conversations and click **Lock conversation on this issue**, **Lock conversation on this pull request**, or **Lock conversation on this commit**. -![Confirm lock with a reason dialog box](/assets/images/help/repository/lock-conversation-confirm-with-reason.png) -5. When you're ready to unlock the conversation, click **Unlock conversation**. -![Unlock conversation link](/assets/images/help/repository/unlock-conversation.png) +1. Verfasse optional einen Kommentar, in dem Du erklärst, weshalb Du die Unterhaltung sperrst. +2. Klicke am rechten Rand des Issues respektive Pull Requests oder oberhalb des Kommentarfelds auf der Commit-Seite auf **Lock conversation** (Unterhaltung sperren). ![Link „Lock conversation“ (Unterhaltung sperren)](/assets/images/help/repository/lock-conversation.png) +3. Optional kannst Du einen Grund für das Sperren der Unterhaltung auswählen. ![Menü „Reason for locking a conversation" (Grund für das Sperren einer Unterhaltung)](/assets/images/help/repository/locking-conversation-reason-menu.png) +4. Lies die Informationen zum Sperren von Unterhaltungen, und klicke auf **Lock conversation on this issue** (Unterhaltung zu diesem Issue sperren), **Lock conversation on this pull request** (Unterhaltung zu diesem Pull Request sperren) oder **Lock conversation on this commit** (Unterhaltung zu diesem Commit sperren). ![Dialogfeld „Confirm lock with a reason" (Bestätigen der Sperre mit Begründung)](/assets/images/help/repository/lock-conversation-confirm-with-reason.png) +5. Wenn Du die Sperre der Unterhaltung beenden möchtest, klicke auf **Unlock conversation** (Unterhaltung entsperren). ![Link „Unlock conversation“ (Unterhaltung entsperren)](/assets/images/help/repository/unlock-conversation.png) -### Further reading +### Weiterführende Informationen -- "[Setting up your project for healthy contributions](/articles/setting-up-your-project-for-healthy-contributions)" -- "[Using templates to encourage useful issues and pull requests](/github/building-a-strong-community/using-templates-to-encourage-useful-issues-and-pull-requests)" +- „[Dein Projekt für sinnvolle Beiträge einrichten](/articles/setting-up-your-project-for-healthy-contributions)“ +- „[Vorlagen benutzen, um hilfreiche Issues und Pull Requests zu ermutigen](/github/building-a-strong-community/using-templates-to-encourage-useful-issues-and-pull-requests)" - "[Managing disruptive comments](/articles/managing-disruptive-comments)"{% if currentVersion == "free-pro-team@latest" %} -- "[Maintaining your safety on {% data variables.product.prodname_dotcom %}](/github/building-a-strong-community/maintaining-your-safety-on-github)" -- "[Reporting abuse or spam](/articles/reporting-abuse-or-spam)" -- "[Limiting interactions in your repository](/github/building-a-strong-community/limiting-interactions-in-your-repository)" +- „[Deine Sicherheit auf {% data variables.product.prodname_dotcom %} aufrechterhalten](/github/building-a-strong-community/maintaining-your-safety-on-github)" +- „[Missbrauch oder Spam melden](/articles/reporting-abuse-or-spam)“ +- „[Interaktionen in Deinem Repository einschränken](/github/building-a-strong-community/limiting-interactions-in-your-repository)" {% endif %} diff --git a/translations/de-DE/content/github/building-a-strong-community/managing-disruptive-comments.md b/translations/de-DE/content/github/building-a-strong-community/managing-disruptive-comments.md index 809825ccfb..1edabc1ae3 100644 --- a/translations/de-DE/content/github/building-a-strong-community/managing-disruptive-comments.md +++ b/translations/de-DE/content/github/building-a-strong-community/managing-disruptive-comments.md @@ -1,5 +1,5 @@ --- -title: Managing disruptive comments +title: Störende Kommentare verwalten intro: 'You can {% if currentVersion == "free-pro-team@latest" %}hide, edit,{% else %}edit{% endif %} or delete comments on issues, pull requests, and commits.' redirect_from: - /articles/editing-a-comment/ @@ -10,76 +10,69 @@ versions: enterprise-server: '*' --- -### Hiding a comment +### Einen Kommentar ausblenden -Anyone with write access to a repository can hide comments on issues, pull requests, and commits. +Jeder mit Schreibzugriff auf ein Repository kann Kommentare zu Issues, Pull Requests und Commits ausblenden. -If a comment is off-topic, outdated, or resolved, you may want to hide a comment to keep a discussion focused or make a pull request easier to navigate and review. Hidden comments are minimized but people with read access to the repository can expand them. +Wenn ein Kommentar nicht zum Thema passt, veraltet oder gelöst ist, kannst Du ihn ausblenden, damit die Diskussion zielgerichtet bleibt oder die Navigation sowie der Review eines Pull Requests vereinfacht wird. Ausgeblendete Kommentare werden minimiert, aber Personen mit Lesezugriff auf das Repository können sie einblenden. -![Minimized comment](/assets/images/help/repository/hidden-comment.png) +![Minimierter Kommentar](/assets/images/help/repository/hidden-comment.png) -1. Navigate to the comment you'd like to hide. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Hide**. - ![The horizontal kebab icon and comment moderation menu showing the edit, hide, delete options](/assets/images/help/repository/comment-menu.png) -3. Using the "Choose a reason" drop-down menu, click a reason to hide the comment. Then click, **Hide comment**. +1. Navigiere zum Kommentar, den Du ausblenden möchtest. +2. Klicke oben rechts im Kommentar auf {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} und anschließend auf **Hide** (Ausblenden). ![Horizontales 3-Punkte-Symbol und Menü zum Moderieren der Unterhaltung mit den Optionen zum Bearbeiten, Ausblenden und Löschen](/assets/images/help/repository/comment-menu.png) +3. Wähle im Dropdownmenü „Choose a reason" (Grund auswählen) einen Grund für das Ausblenden des Kommentars aus. Klicke anschließend auf **Hide comment** (Kommentar ausblenden). {% if currentVersion == "free-pro-team@latest" %} - ![Choose reason for hiding comment drop-down menu](/assets/images/help/repository/choose-reason-for-hiding-comment.png) + ![Dropdownmenü zur Auswahl des Grundes für das Ausblenden des Kommentars](/assets/images/help/repository/choose-reason-for-hiding-comment.png) {% else %} - ![Choose reason for hiding comment drop-down menu](/assets/images/help/repository/choose-reason-for-hiding-comment-ghe.png) + ![Dropdownmenü zur Auswahl des Grundes für das Ausblenden des Kommentars](/assets/images/help/repository/choose-reason-for-hiding-comment-ghe.png) {% endif %} -### Unhiding a comment +### Einen ausgeblendeten Kommentar wieder anzeigen -Anyone with write access to a repository can unhide comments on issues, pull requests, and commits. +Jeder mit Schreibzugriff auf ein Repository kann Kommentare zu Issues, Pull Requests und Commits wieder anzeigen. -1. Navigate to the comment you'd like to unhide. -2. In the upper-right corner of the comment, click **{% octicon "fold" aria-label="The fold icon" %} Show comment**. - ![Show comment text](/assets/images/help/repository/hidden-comment-show.png) -3. On the right side of the expanded comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then **Unhide**. - ![The horizontal kebab icon and comment moderation menu showing the edit, unhide, delete options](/assets/images/help/repository/comment-menu-hidden.png) +1. Navigiere zu dem Kommentar, den Du wieder anzeigen möchten. +2. Klicke in der oberen rechten Ecke des Kommentars auf **{% octicon "fold" aria-label="The fold icon" %} Show comment** (Kommentar anzeigen). ![Text „Show comment“ (Kommentar anzeigen)](/assets/images/help/repository/hidden-comment-show.png) +3. Klicke auf der rechten Seite des angezeigten Kommentars auf {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} und anschließend auf **Unhide** (Wieder anzeigen). ![Horizontales 3-Punkte-Symbol und Menü zum Moderieren der Unterhaltung mit den Optionen zum Bearbeiten, Wiederanzeigen und Löschen](/assets/images/help/repository/comment-menu-hidden.png) -### Editing a comment +### Einen Kommentar bearbeiten -Anyone with write access to a repository can edit comments on issues, pull requests, and commits. +Jeder mit Schreibzugriff auf ein Repository kann Kommentare zu Issues, Pull Requests und Commits bearbeiten. It's appropriate to edit a comment and remove content that doesn't contribute to the conversation and violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. -When you edit a comment, note the location that the content was removed from and optionally, the reason for removing it. +Wenn Du einen Kommentar bearbeitest, notiere den Ort, von dem der Inhalt entfernt wurde, und optional den Grund für das Entfernen. -Anyone with read access to a repository can view a comment's edit history. The **edited** dropdown at the top of the comment contains a history of edits showing the user and timestamp for each edit. +Jede Person mit Lesezugriff auf ein Repository kann den Änderungsverlauf eines Kommentars anzeigen. Das Dropdownmenü **edited** (Bearbeitet) oben im Kommentar enthält einen Verlauf der Bearbeitungen mit dem Benutzer und dem Zeitstempel für jede Bearbeitung. -![Comment with added note that content was redacted](/assets/images/help/repository/content-redacted-comment.png) +![Kommentar mit hinzugefügtem Hinweis, dass Inhalte redigiert wurden](/assets/images/help/repository/content-redacted-comment.png) -Comment authors and anyone with write access to a repository can also delete sensitive information from a comment's edit history. For more information, see "[Tracking changes in a comment](/github/building-a-strong-community/tracking-changes-in-a-comment)." +Verfasser von Kommentaren und Personen mit Schreibzugriff auf ein Repository können auch vertrauliche Informationen aus dem Änderungsverlauf eines Kommentars löschen. Weitere Informationen findest Du unter „[Änderungen in einem Kommentar verfolgen](/github/building-a-strong-community/tracking-changes-in-a-comment)." -1. Navigate to the comment you'd like to edit. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Edit**. - ![The horizontal kebab icon and comment moderation menu showing the edit, hide, delete, and report options](/assets/images/help/repository/comment-menu.png) -3. In the comment window, delete the content you'd like to remove, then type `[REDACTED]` to replace it. - ![Comment window with redacted content](/assets/images/help/issues/redacted-content-comment.png) -4. At the bottom of the comment, type a note indicating that you have edited the comment, and optionally, why you edited the comment. - ![Comment window with added note that content was redacted](/assets/images/help/issues/note-content-redacted-comment.png) -5. Click **Update comment**. +1. Navigiere zu dem Kommentar, den Du bearbeiten möchtest. +2. Klicke oben rechts im Kommentar auf {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} und anschließend auf **Edit** (Bearbeiten). ![Horizontales 3-Punkte-Symbol und Menü zum Moderieren der Unterhaltung mit den Optionen zum Bearbeiten, Ausblenden, Löschen und Melden](/assets/images/help/repository/comment-menu.png) +3. Lösche im Kommentarfenster den Inhalt, den Du entfernen möchtest, und gib dann `[REDACTED]` ein, um ihn zu ersetzen. ![Kommentarfenster mit redigiertem Inhalt](/assets/images/help/issues/redacted-content-comment.png) +4. Gib unten im Kommentar eine Notiz ein, in der Du auf die Bearbeitung hinweist und optional den Grund dafür nennst. ![Kommentarfenster mit hinzugefügtem Hinweis, dass Inhalte redigiert wurden](/assets/images/help/issues/note-content-redacted-comment.png) +5. Klicke auf **Update comment** (Kommentar aktualisieren). -### Deleting a comment +### Einen Kommentar löschen -Anyone with write access to a repository can delete comments on issues, pull requests, and commits. Organization owners, team maintainers, and the comment author can also delete a comment on a team page. +Personen mit Schreibzugriff auf ein Repository können Kommentare zu Issues, Pull Requests und Commits löschen. Organisationsinhaber, Team-Betreuer und die Verfasser des Kommentars können auch einen Kommentar auf einer Teamseite löschen. -Deleting a comment is your last resort as a moderator. It's appropriate to delete a comment if the entire comment adds no constructive content to a conversation and violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. +Das Löschen eines Kommentars ist die letzte Option für Dich als Moderator. It's appropriate to delete a comment if the entire comment adds no constructive content to a conversation and violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. -Deleting a comment creates a timeline event that is visible to anyone with read access to the repository. However, the username of the person who deleted the comment is only visible to people with write access to the repository. For anyone without write access, the timeline event is anonymized. +Das Löschen eines Kommentars erstellt ein Zeitleistenereignis, das für alle Benutzer mit Lesezugriff auf das Repository sichtbar ist. Der Benutzername der Person, die den Kommentar gelöscht hat, ist jedoch nur für Benutzer mit Schreibzugriff auf das Repository zu sehen. Für Personen ohne Schreibzugriff ist das Zeitleistenereignis anonymisiert. -![Anonymized timeline event for a deleted comment](/assets/images/help/issues/anonymized-timeline-entry-for-deleted-comment.png) +![Anonymisiertes Zeitleistenereignis für einen gelöschten Kommentar](/assets/images/help/issues/anonymized-timeline-entry-for-deleted-comment.png) -If a comment contains some constructive content that adds to the conversation in the issue or pull request, you can edit the comment instead. +Wenn ein Kommentar auch Inhalte aufweist, die einen konstruktiven Beitrag zur Unterhaltung im Issue oder Pull Request darstellen, kannst Du den Kommentar bearbeiten, anstatt ihn komplett zu löschen. {% note %} -**Note:** The initial comment (or body) of an issue or pull request can't be deleted. Instead, you can edit issue and pull request bodies to remove unwanted content. +**Hinweis:** Der anfängliche Kommentar (oder Text) eines Issues oder Pull Requests kann nicht gelöscht werden. Stattdessen kannst Du den Text von Issues und Pull Requests bearbeiten und dabei unerwünschte Inhalte entfernen. {% endnote %} -1. Navigate to the comment you'd like to delete. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Delete**. - ![The horizontal kebab icon and comment moderation menu showing the edit, hide, delete, and report options](/assets/images/help/repository/comment-menu.png) -3. Optionally, write a comment noting that you deleted a comment and why. +1. Navigiere zu dem Kommentar, den Du löschen möchtest. +2. Klicke oben rechts im Kommentar auf {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} und anschließend auf **Delete** (Löschen). ![Horizontales 3-Punkte-Symbol und Menü zum Moderieren der Unterhaltung mit den Optionen zum Bearbeiten, Ausblenden, Löschen und Melden](/assets/images/help/repository/comment-menu.png) +3. Verfasse optional einen Kommentar mit dem Hinweis, dass und warum Du einen Kommentar gelöscht hast. diff --git a/translations/de-DE/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md b/translations/de-DE/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md index bb994978bf..0a12b44031 100644 --- a/translations/de-DE/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md +++ b/translations/de-DE/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md @@ -28,7 +28,7 @@ assignees: octocat ``` {% note %} -**Hinweis:** Du musst reserviert YAML-Zeichen wie beispielsweise `:` in Anführungszeichen setzen. Beispiel: `":bug: Bug"`. +**Note:** If a front matter value includes a YAML-reserved character such as `:` , you must put the whole value in quotes. For example, `":bug: Bug"` or `":new: triage needed, :bug: bug"`. {% endnote %} diff --git a/translations/de-DE/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md b/translations/de-DE/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md index 6224f52da0..9c61526e19 100644 --- a/translations/de-DE/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md +++ b/translations/de-DE/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md @@ -22,7 +22,7 @@ Du kannst eines Benutzers in Deinen Kontoeinstellungen oder auf der Profilseite ### Sperre eines Benutzers auf seiner Profilseite aufheben {% data reusables.profile.user_profile_page_navigation %} -2. Klicke in der linken Seitenleiste unter dem Profilbild des Benutzers auf **Unblock or report user** (Benutzer entsperren oder melden). ![Link „Unblock or report user" (Benutzer entsperren oder melden)](/assets/images/help/profile/profile-unblock-or-report-user.png) +2. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Unblock or report user**. ![Link „Unblock or report user" (Benutzer entsperren oder melden)](/assets/images/help/profile/profile-unblock-or-report-user.png) 3. Klicke auf **Unblock user** (Benutzer entsperren). ![Modales Feld mit Option zum Entsperren eines Benutzers oder Melden von Missbrauch](/assets/images/help/profile/profile-unblockuser.png) {% tip %} diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md index f025565c2c..e10d5da54a 100644 --- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md +++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md @@ -53,6 +53,13 @@ Wenn Du einen Pull Request erstellst, kannst Du wählen, ob Du einen für den Re {% data reusables.pull_requests.mark-ready-review %} Du kannst einen Pull Request jederzeit in einen Entwurf umwandeln. Weitere Informationen findest Du unter „[Den Zustand eines Pull Requests ändern](/articles/changing-the-stage-of-a-pull-request).“ +### Differences between commits on compare and pull request pages + +The compare and pull request pages use different methods to calculate the diff for changed files: + +- Compare pages show the diff between the tip of the head ref and the current common ancestor (that is, the merge base) of the head and base ref. +- Pull request pages show the diff between the tip of the head ref and the common ancestor of the head and base ref at the time when the pull request was created. Consequently, the merge base used for the comparison might be different. + ### Weiterführende Informationen - „[Pull Request](/articles/github-glossary/#pull-request)“ im {% data variables.product.prodname_dotcom %}-Glossar diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md index c1c2b28d02..3386103b48 100644 --- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md +++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md @@ -46,7 +46,7 @@ Du kannst zwischen den Prüfungszusammenfassungen für verschiedene Commits in e #### Prüfungen für einzelne Commits überspringen und anfordern -Wenn ein Repository so konfiguriert ist, dass es automatisch Prüfungen für Pushes anfordert, kannst Du die Prüfungen für einen einzelnen Commit überspringen, den Du überträgst. Wenn ein Repository _nicht_ so konfiguriert ist, dass es automatisch Prüfungen für Pushes anfordert, kannst Du Prüfungen für einen einzelnen Commit anfordern, den Du überträgst. For more information on these settings, see "[Check Suites](/v3/checks/suites/#set-preferences-for-check-suites-on-a-repository)." +Wenn ein Repository so konfiguriert ist, dass es automatisch Prüfungen für Pushes anfordert, kannst Du die Prüfungen für einen einzelnen Commit überspringen, den Du überträgst. Wenn ein Repository _nicht_ so konfiguriert ist, dass es automatisch Prüfungen für Pushes anfordert, kannst Du Prüfungen für einen einzelnen Commit anfordern, den Du überträgst. For more information on these settings, see "[Check Suites](/rest/reference/checks#update-repository-preferences-for-check-suites)." Um Prüfungen für Deinen Commit zu überspringen oder anzufordern, füge eine der folgenden Trailerzeilen an das Ende Deiner Commit-Mitteilung an: diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md index d7fb13faab..272c57a8a7 100644 --- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md +++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md @@ -20,6 +20,12 @@ versions: 4. Wähle im Basis-Branch-Dropdownmenü den Basis-Branch aus, mit dem Du [die Änderungen vergleichen](/github/committing-changes-to-your-project/comparing-commits#comparing-branches) möchtest. ![Basis-Branch-Dropdownmenü ](/assets/images/help/pull_requests/pull-request-edit-base-branch.png) 5. Lies die Informationen zum Ändern des Basis-Branch, und klicke auf **Change base** (Basis ändern). ![Schaltfläche „Base branch change confirmation" (Bestätigen der Basis-Branch-Änderung) ](/assets/images/help/pull_requests/pull-request-base-branch-confirm.png) +{% tip %} + +**Tip:** When you open a pull request, {% data variables.product.product_name %} will set the base to the commit that branch references. If the branch is updated in the future, {% data variables.product.product_name %} will not update the base branch's commit. + +{% endtip %} + ### Weiterführende Informationen - „[Einen Pull Request erstellen](/articles/creating-a-pull-request)“ diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md index 95ca378e1e..9c07db7c09 100644 --- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md +++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md @@ -1,6 +1,6 @@ --- -title: Collaborating on repositories with code quality features -intro: 'Workflow quality features like statuses, {% if currentVersion != "free-pro-team@latest" %}pre-receive hooks, {% endif %}protected branches, and required status checks help collaborators make contributions that meet conditions set by organization and repository administrators.' +title: An Repositorys mit Codequalität-Funktionen zusammenarbeiten +intro: 'Workflow-Qualitätsfunktionen wie Status, {% if enterpriseServerVersions contains currentVersion %}Pre-Receive-Hooks, {% endif %}geschützte Branches und erforderliche Statuschecks helfen Mitarbeitern dabei, Beiträge zu leisten, die den Bedingungen der Organisations- und Repository-Administratoren entsprechen.' mapTopic: true redirect_from: - /articles/collaborating-on-repositories-with-code-quality-features-enabled/ diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/index.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/index.md index 44e594fadf..9e767b2665 100644 --- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/index.md +++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/index.md @@ -28,7 +28,7 @@ versions: {% link_in_list /what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility %} {% topic_link_in_list /collaborating-on-repositories-with-code-quality-features %} {% link_in_list /about-status-checks %} - + {% link_in_list /working-with-pre-receive-hooks %} {% topic_link_in_list /proposing-changes-to-your-work-with-pull-requests %} diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md index 1b9ed3f8d8..913b4ff795 100644 --- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md +++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md @@ -1,6 +1,6 @@ --- -title: Resolving a merge conflict on GitHub -intro: 'You can resolve simple merge conflicts that involve competing line changes on GitHub, using the conflict editor.' +title: Mergekonflikt auf GitHub beheben +intro: 'Einfache Mergekonflikte auf GitHub, bei denen Zeilenänderungen in Konflikt stehen, kannst Du mit dem Konflikteditor beheben.' redirect_from: - /articles/resolving-a-merge-conflict-on-github versions: @@ -8,56 +8,53 @@ versions: enterprise-server: '*' --- -You can only resolve merge conflicts on {% data variables.product.product_name %} that are caused by competing line changes, such as when people make different changes to the same line of the same file on different branches in your Git repository. For all other types of merge conflicts, you must resolve the conflict locally on the command line. For more information, see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line/)." +Auf {% data variables.product.product_name %} können Sie nur Mergekonflikte beheben, die durch konkurrierende Zeilenänderungen verursacht werden, beispielsweise, wenn mehrere Personen unterschiedliche Änderungen an der gleichen Zeile in der gleichen Datei in verschiedenen Branches Ihres Git-Repositorys vornehmen. Alle anderen Mergekonflikte musst Du lokal in der Befehlszeile beheben. Weitere Informationen findest Du unter „[Einen Mergekonflikt in der Befehlszeile beheben](/articles/resolving-a-merge-conflict-using-the-command-line/).“ -{% if currentVersion != "free-pro-team@latest" %} -If a site administrator disables the merge conflict editor for pull requests between repositories, you cannot use the conflict editor on {% data variables.product.product_name %} and must resolve merge conflicts on the command line. For example, if the merge conflict editor is disabled, you cannot use it on a pull request between a fork and upstream repository. +{% if enterpriseServerVersions contains currentVersion %} +If a site administrator disables the merge conflict editor for pull requests between repositories, you cannot use the conflict editor on +{% data variables.product.product_name %} and must resolve merge conflicts on the command line. Beispielsweise können Sie den Mergekonflikteditor, sofern er deaktiviert ist, nicht für Pull Requests zwischen einem Fork und einem vorgelagerten Repository verwenden. {% endif %} {% warning %} {% if currentVersion ver_lt "enterprise-server@2.22" %} -**Warning:** When you resolve a merge conflict on {% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch), even if the head branch is the default branch of your repository or a protected branch. Make sure you really want to commit to this branch. +**Warning:** When you resolve a merge conflict on +{% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch), even if the head branch is the default branch of your repository or a protected branch. Vergewissern Sie sich, dass es wirklich dieser Branch ist, den Sie festschreiben möchten. {% else %} -**Warning:** When you resolve a merge conflict on {% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch). Make sure you really want to commit to this branch. If the head branch is the default branch of your repository, you'll be given the option of creating a new branch to serve as the head branch for your pull request. If the head branch is protected you won't be able to merge your conflict resolution into it, so you'll be prompted to create a new head branch. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches)." +**Warning:** When you resolve a merge conflict on +{% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch). Vergewissern Sie sich, dass es wirklich dieser Branch ist, den Sie festschreiben möchten. If the head branch is the default branch of your repository, you'll be given the option of creating a new branch to serve as the head branch for your pull request. Wenn der Head-Branch geschützt ist, kannst Du Deine Konflikt-Auflösung nicht zusammenführen, deshalb wirst Du aufgefordert werden, einen neuen Head-Branch zu erstellen. Weitere Informationen findest Du unter „[Informationen zu geschützten Branches](/github/administering-a-repository/about-protected-branches).“ {% endif %} {% endwarning %} {% data reusables.repositories.sidebar-pr %} -1. In the "Pull Requests" list, click the pull request with a merge conflict that you'd like to resolve. -1. Near the bottom of your pull request, click **Resolve conflicts**. -![Resolve merge conflicts button](/assets/images/help/pull_requests/resolve-merge-conflicts-button.png) +1. Klicke in der Liste der Pull Requests auf den Pull Request mit dem Mergekonflikt, den Du beheben möchtest. +1. Klicke im unteren Teil Deines Pull Requests auf **Resolve conflicts** (Konflikte beheben). ![Schaltfläche „Resolve merge conflicts" (Mergekonflikte beheben)](/assets/images/help/pull_requests/resolve-merge-conflicts-button.png) {% tip %} - **Tip:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line)." + **Tipp:** Wenn die Schaltfläche **Resolve conflicts** (Konflikte beheben) deaktiviert ist, ist der Mergekonflikt Deines Pull Requests für eine Behebung auf {% data variables.product.product_name %} zu komplex{% if enterpriseServerVersions contains currentVersion %} oder der Konflikteditor wurde vom Websiteadministrator für Pull Requests zwischen Repositorys deaktiviert{% endif %}. Du musst den Mergekonflikt mit einem alternativen Git-Client auflösen, oder durch Verwendung von Git auf der Befehlszeile. Weitere Informationen findest Du unter „[Mergekonflikt in der Befehlszeile beheben](/articles/resolving-a-merge-conflict-using-the-command-line).“ {% endtip %} {% data reusables.pull_requests.decide-how-to-resolve-competing-line-change-merge-conflict %} - ![View merge conflict example with conflict markers](/assets/images/help/pull_requests/view-merge-conflict-with-markers.png) -1. If you have more than one merge conflict in your file, scroll down to the next set of conflict markers and repeat steps four and five to resolve your merge conflict. -1. Once you've resolved all the conflicts in the file, click **Mark as resolved**. - ![Click mark as resolved button](/assets/images/help/pull_requests/mark-as-resolved-button.png) -1. If you have more than one file with a conflict, select the next file you want to edit on the left side of the page under "conflicting files" and repeat steps four through seven until you've resolved all of your pull request's merge conflicts. - ![Select next conflicting file if applicable](/assets/images/help/pull_requests/resolve-merge-conflict-select-conflicting-file.png) -1. Once you've resolved all your merge conflicts, click **Commit merge**. This merges the entire base branch into your head branch. - ![Resolve merge conflicts button](/assets/images/help/pull_requests/merge-conflict-commit-changes.png){% if currentVersion ver_lt "enterprise-server@2.22" %} -1. If prompted, review the branch that you are committing to. If you want to commit to this branch, click **I understand, update _BRANCH_**. -![Merge conflict confirmation window](/assets/images/help/pull_requests/merge-conflict-confirmation.png){% else %} -1. If prompted, review the branch that you are committing to. + ![Beispiel für die Anzeige eines Mergekonflikts mit Konflikthinweisen](/assets/images/help/pull_requests/view-merge-conflict-with-markers.png) +1. Wenn Deine Datei mehrere Mergekonflikte enthält, scrolle nach unten zum nächsten Konflikthinweis, und wiederhole dort die Schritte 4 und 5, um auch diesen Mergekonflikt zu beheben. +1. Wenn Du alle Konflikte in der Datei behoben hast, klicke auf **Mark as resolved** (Als behoben markieren). ![Klicke die Schaltfläche „Mark as resolved“ (Als behoben markieren)](/assets/images/help/pull_requests/mark-as-resolved-button.png) +1. Wenn mehrere Dateien Konflikte enthalten, wähle auf der linken Seite unter „Conflicting files“ (Dateien mit Konflikten) die nächste Datei aus, und wiederhole die Schritte 4 bis 7, bis Du alle Mergekonflikte Deines Pull Request behoben hast. ![Wähle die nächste Datei mit Konflikten aus, sofern zutreffend](/assets/images/help/pull_requests/resolve-merge-conflict-select-conflicting-file.png) +1. Wenn alle Mergekonflikte behoben sind, klicke auf **Commit merge** (Merge freigeben). Dadurch wird der gesamte Basis-Branch in Deinen Head-Branch zusammengeführt. ![Resolve merge conflicts button](/assets/images/help/pull_requests/merge-conflict-commit-changes.png){% if currentVersion ver_lt "enterprise-server@2.22" %} +1. Sofern Du eine entsprechende Aufforderung erhältst, überprüfe den Branch, in den der Commit erfolgt. Wenn Du den Commit in diesen Branch durchführen möchtest, klicke auf **I understand, update _BRANCH_** (Ich habe verstanden und möchte *BRANCH* aktualisieren). ![Bestätigungsfenster zum Beheben von Mergekonflikten](/assets/images/help/pull_requests/merge-conflict-confirmation.png){% else %} +1. Sofern Du eine entsprechende Aufforderung erhältst, überprüfe den Branch, in den der Commit erfolgt. - If the head branch is the default branch of the repository, you can choose either to update this branch with the changes you made to resolve the conflict, or to create a new branch and use this as the head branch of the pull request. - ![Prompt to review the branch that will be updated](/assets/images/help/pull_requests/conflict-resolution-merge-dialog-box.png) - - If you choose to create a new branch, enter a name for the branch. - - If the head branch of your pull request is protected you must create a new branch. You won't get the option to update the protected branch. - - Click **Create branch and update my pull request** or **I understand, continue updating _BRANCH_**. The button text corresponds to the action you are performing. + Wenn der Head-Branch der Standardbranch Deines Repositorys ist, kannst Du wählen, entweder diesen Branch mit den Änderungen zu aktualisieren, die Du zur Auflösung des Konfliktes gemacht hast, oder einen neuen Branch zu erstellen und diesen als Head-Branch des Pull Requests zu verwenden. ![Aufforderung zum Überprüfen des Branch, der aktualisiert wird](/assets/images/help/pull_requests/conflict-resolution-merge-dialog-box.png) + + Wenn Du Dich für einen neuen Branch entscheidest, gib den Namen für den Branch ein. + + Wenn der Head-Branch Deines Pull-Requests geschützt ist, musst Du einen neuen Branch erstellen. Du hast keine Möglichkeit, den geschützten Branch zu aktualisieren. + + Klicke auf **Create branch and update my pull request** (Erstelle den Branch und aktualisiere meinen Pull Request) oder **I understand, continue updating _BRANCH_** (Ich verstehe, bitte mit der Aktualisierung des BRANCH fortfahren). Der Text der Schaltfläche entspricht der Aktion, die Du durchführst. {% endif %} -1. To merge your pull request, click **Merge pull request**. For more information about other pull request merge options, see "[Merging a pull request](/articles/merging-a-pull-request/)." +1. Zum Zusammenführen Deines Pull Requests klicke auf **Merge pull request** (Pull Request zusammenführen). Weitere Informationen finden Sie unter „[Pull Request mergen](/articles/merging-a-pull-request/)“. -### Further reading +### Weiterführende Informationen -- "[About pull request merges](/articles/about-pull-request-merges)" +- „[Informationen zum Mergen von Pull Requests](/articles/about-pull-request-merges)“ diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md index 90f5febcc5..1110b0290d 100644 --- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md +++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md @@ -20,16 +20,16 @@ Bevor Du einen Fork mit dem ihm vorgelagerten Repository synchronisieren kannst, > remote: Total 62 (delta 27), reused 44 (delta 9) > Unpacking objects: 100% (62/62), done. > From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY - > * [new branch] master -> upstream/master + > * [new branch] main -> upstream/main ``` -4. Checke den lokalen `master`-Branch Deiner Fork aus. +4. Check out your fork's local `main` branch. ```shell - $ git checkout master - > Switched to branch 'master' + $ git checkout main + > Switched to branch 'main' ``` -5. Führe die Änderungen aus dem Branch `upstream/master` in Deinen lokalen `master`-Branch zusammen. Dadurch wird der `master`-Branch Deiner Fork ohne Verlust der lokalen Änderungen mit dem vorgelagerten Repository synchronisiert. +5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes. ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating a422352..5fdff0f > Fast-forward > README | 9 ------- @@ -39,7 +39,7 @@ Bevor Du einen Fork mit dem ihm vorgelagerten Repository synchronisieren kannst, > create mode 100644 README.md ``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward": ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating 34e91da..16c56ad > Fast-forward > README.md | 5 +++-- diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index 844e403d8d..03d16b8ce3 100644 --- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -29,7 +29,7 @@ Wenn ein öffentliches Repository auf privat festgelegt wird, werden die zugehö Die Forks eines öffentlichen Repositorys bleiben demnach in ihrem eigenen separaten Repository-Netzwerk öffentlich, selbst nachdem das übergeordnete Repository auf privat eingestellt wurde. Dadurch können Fork-Inhaber ohne Unterbrechung weiterhin arbeiten und zusammenarbeiten. Wenn öffentliche Forks nicht auf diese Weise in ein separates Netzwerk verschoben wurden, benötigen die Inhaber dieser Forks die entsprechenden [Zugriffsberechtigungen](/articles/access-permissions-on-github), um Änderungen vom (inzwischen privaten) übergeordneten Repository abzurufen und um Pull Requests an das übergeordnete Repository abzusenden, auch wenn sie zuvor diese Berechtigungen nicht benötigt haben. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Wenn für ein öffentliches Repository der anonyme Git-Lesezugriff aktiviert ist und das Repository auf privat festgelegt wird, verlieren alle Forks des Repositorys den anonymen Git-Lesezugriff und verwenden wieder die standardmäßig deaktivierte Einstellung. Wenn ein geforktes Repository als öffentlich festgelegt wird, kann der anonyme Git-Lesezugriff durch die Repository-Administratoren wieder aktiviert werden. Weitere Informationen finden Sie unter „[Anonymen Git-Lesezugriff für ein Repository aktivieren](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)“. {% endif %} diff --git a/translations/de-DE/content/github/committing-changes-to-your-project/changing-a-commit-message.md b/translations/de-DE/content/github/committing-changes-to-your-project/changing-a-commit-message.md index 802836e8eb..9da0f8c827 100644 --- a/translations/de-DE/content/github/committing-changes-to-your-project/changing-a-commit-message.md +++ b/translations/de-DE/content/github/committing-changes-to-your-project/changing-a-commit-message.md @@ -13,11 +13,11 @@ versions: Die letzte Commit-Mitteilung kannst Du mit dem Befehl `git commit --amend` ändern. -In Git ist der Text der Commit-Mitteilung Teil des Commits. Durch das Ändern der Commit-Mitteilung ändert sich auch die Commit-ID, also die SHA1-Prüfsumme, die den Commit benennt. Effektiv erstellst Du einen neuen Commit, der den alten ersetzt. +In Git, the text of the commit message is part of the commit. Changing the commit message will change the commit ID--i.e., the SHA1 checksum that names the commit. Effectively, you are creating a new commit that replaces the old one. -### Commit wurde nicht online veröffentlicht +### Commit has not been pushed online -Wenn der Commit nur in Ihrem lokalen Repository vorhanden ist und nicht zu {% data variables.product.product_location %} gepusht wurde, können Sie die Commit-Mitteilung mit dem Befehl `git comimt --amend` ändern. +If the commit only exists in your local repository and has not been pushed to {% data variables.product.product_location %}, you can amend the commit message with the `git commit --amend` command. 1. Navigiere in der Befehlszeile zu dem Repository, das den Commit enthält, den Du ändern möchtest. 2. Gib `git commit --amend` ein, und drücke die **Eingabetaste**. @@ -31,17 +31,17 @@ Der neue Commit und die neue Commit-Mitteilung werden beim nächsten Push auf {% {% tip %} -Du kannst den standardmäßigen Texteditor für Git ändern, indem Du die Einstellung `core.editor` änderst. Weitere Informationen findest Du unter „[Grundlegende Client-Konfiguration](https://git-scm.com/book/en/Customizing-Git-Git-Configuration#_basic_client_configuration)“ im Git-Handbuch. +You can change the default text editor for Git by changing the `core.editor` setting. For more information, see "[Basic Client Configuration](https://git-scm.com/book/en/Customizing-Git-Git-Configuration#_basic_client_configuration)" in the Git manual. {% endtip %} -### Ältere oder mehrere Commit-Mitteilungen ändern +### Amending older or multiple commit messages -Wenn Sie den Commit bereits zu {% data variables.product.product_location %} gepusht haben, müssen Sie den Push des Commits mit einer geänderten Mitteilung erzwingen. +If you have already pushed the commit to {% data variables.product.product_location %}, you will have to force push a commit with an amended message. {% warning %} -Wir raten dringend von einem erzwungenen Push ab, da sich dadurch der Verlauf Deines Repositorys ändert. Wenn Du den Push erzwingst, müssen alle, die Dein Repository bereits geklont haben, ihren lokalen Verlauf manuell korrigieren. Weitere Informationen findest Du unter „[Von einem vorgelagerten Rebase wiederherstellen](https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase)“ im Git-Handbuch. +We strongly discourage force pushing, since this changes the history of your repository. If you force push, people who have already cloned your repository will have to manually fix their local history. For more information, see "[Recovering from upstream rebase](https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase)" in the Git manual. {% endwarning %} @@ -55,7 +55,7 @@ Wir raten dringend von einem erzwungenen Push ab, da sich dadurch der Verlauf De **Changing the message of older or multiple commit messages** -Wenn Du die Mitteilungen für mehrere Commits oder für ältere Commits ändern musst, kannst Du den interaktive Rebase nutzen und anschließend den Push zum Ändern des Commit-Verlaufs erzwingen. +If you need to amend the message for multiple commits or an older commit, you can use interactive rebase, then force push to change the commit history. 1. Navigiere in der Befehlszeile zu dem Repository, das den Commit enthält, den Du ändern möchtest. 2. Gib den Befehl `git rebase -i HEAD~n` ein, um eine Liste der letzten `n` Commits in Deinem standardmäßigen Texteditor anzuzeigen. @@ -102,17 +102,17 @@ Wenn Du die Mitteilungen für mehrere Commits oder für ältere Commits ändern $ git push --force example-branch ``` -Weitere Informationen zur interaktiven Rebase findest Du unter „[Interaktiver Modus](https://git-scm.com/docs/git-rebase#_interactive_mode)“ im Git-Handbuch. +For more information on interactive rebase, see "[Interactive mode](https://git-scm.com/docs/git-rebase#_interactive_mode)" in the Git manual. {% tip %} -Auch hier gilt: Das Ändern der Commit-Mitteilung führt zu einem neuen Commit mit einer neuen ID. In diesem Fall erhält aber auch jeder Commit, der nach dem geänderten Commit folgt, eine neue ID, da jeder Commit auch die ID des übergeordneten Commits enthält. +As before, amending the commit message will result in a new commit with a new ID. However, in this case, every commit that follows the amended commit will also get a new ID because each commit also contains the id of its parent. {% endtip %} {% warning %} -Wenn eine Commit-Mitteilung vertrauliche Informationen enthält, wird beim erzwungenen Push eines Commits mit geändertem Commit der ursprüngliche Commit möglicherweise nicht von {% data variables.product.product_name %} entfernt. Der alte Commit wird nicht Teil eines nachfolgenden Klons, kann aber noch auf {% data variables.product.product_name %} zwischengespeichert und über die Commit-ID zugänglich sein. Wenden Sie sich mit der alten Commit-ID an {% data variables.contact.contact_support %}, um ihn vom Remote-Repository löschen zu lassen. +If you have included sensitive information in a commit message, force pushing a commit with an amended commit may not remove the original commit from {% data variables.product.product_name %}. The old commit will not be a part of a subsequent clone; however, it may still be cached on {% data variables.product.product_name %} and accessible via the commit ID. You must contact {% data variables.contact.contact_support %} with the old commit ID to have it purged from the remote repository. {% endwarning %} diff --git a/translations/de-DE/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md b/translations/de-DE/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md index 079e81663f..688dda601e 100644 --- a/translations/de-DE/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md +++ b/translations/de-DE/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md @@ -1,6 +1,6 @@ --- -title: Creating a commit with multiple authors -intro: 'You can attribute a commit to more than one author by adding one or more `Co-authored-by` trailers to the commit''s message. Co-authored commits are visible on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} and can be included in the profile contributions graph and the repository''s statistics{% endif %}.' +title: Einen Commit mit mehreren Autoren erstellen +intro: 'Du kannst einen Commit mehreren Autoren zuordnen, indem Du einen oder mehrere `Co-authored-by`-Trailer zur Commit-Mitteilung hinzufügst. Commits mit Co-Autor sind auf {% data variables.product.product_name %} sichtbar{% if enterpriseServerVersions contains currentVersion %} und können in das Beteiligungsdiagramm des Profils sowie in die Statistik des Repositorys aufgenommen werden{% endif %}.' redirect_from: - /articles/creating-a-commit-with-multiple-authors versions: @@ -8,41 +8,41 @@ versions: enterprise-server: '*' --- -### Required co-author information +### Erforderliche Co-Autor-Informationen -Before you can add a co-author to a commit, you must know the appropriate email to use for each co-author. For the co-author's commit to count as a contribution, you must use the email associated with their {% data variables.product.product_name %} account. +Bevor Du einen Co-Autor zu einem Commit hinzufügen kannst, musst Du die richtige E-Mail-Adresse für jeden Co-Autor kennen. Damit der Commit des Co-Autors als Beitrag zählt, musst Du die E-Mail-Adresse verwenden, die mit seinem {% data variables.product.product_name %}-Konto verknüpft ist. {% if currentVersion == "free-pro-team@latest" %} -If a person chooses to keep their email address private, you should use their {% data variables.product.product_name %}-provided `no-reply` email to protect their privacy. Otherwise, the co-author's email will be available to the public in the commit message. If you want to keep your email private, you can choose to use a {% data variables.product.product_name %}-provided `no-reply` email for Git operations and ask other co-authors to list your `no-reply` email in commit trailers. +Wenn ein Co-Autor seine E-Mail-Adresse als privat festgelegt hat, musst Du die von {% data variables.product.product_name %} bereitgestellte `no-reply`-E-Mail-Adresse verwenden, um die Daten des Co-Autors zu schützen. Andernfalls ist die E-Mail-Adresse des Co-Autors in der Commit-Mitteilung öffentlich einsehbar. Wenn Sie Ihre E-Mail-Adresse öffentlich machen möchten, können Sie die von {% data variables.product.product_name %} bereitgestellte `no-reply`-E-Mail-Adresse für Git-Vorgänge verwenden und andere Co-Autoren bitten, Ihre `no-reply`-Adresse in Commit-Trailern zu verwenden. -For more information, see "[Setting your commit email address](/articles/setting-your-commit-email-address)." +Weitere Informationen findest Du unter „[Deine Commit-E-Mail-Adresse festlegen](/articles/setting-your-commit-email-address).“ {% tip %} - **Tip:** You can help a co-author find their preferred email address by sharing this information: - - To find your {% data variables.product.product_name %}-provided `no-reply` email, navigate to your email settings page under "Keep my email address private." - - To find the email you used to configure Git on your computer, run `git config user.email` on the command line. + **Tipp:** Um Co-Autoren dabei zu helfen, die bevorzugte E-Mail-Adresse zu finden, gib die folgenden Informationen weiter: + - Die von {% data variables.product.product_name %} bereitgestellte `no-reply`-E-Mail-Adresse findest Du auf der Seite mit Deinen E-Mail-Einstellungen unter „Keep my email address private“ (E-Mail-Adresse privat halten). + - Um die E-Mail-Adresse zu ermitteln, die Du bei der Git-Konfiguration auf Deinem Computer verwendet hast, führe in der Befehlszeile `git config user.email` aus. {% endtip %} {% endif %} -### Creating co-authored commits using {% data variables.product.prodname_desktop %} +### Commits mit Co-Autor mit {% data variables.product.prodname_desktop %} erstellen -You can use {% data variables.product.prodname_desktop %} to create a commit with a co-author. For more information, see "[Write a commit message and push your changes](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)" and [{% data variables.product.prodname_desktop %}](https://desktop.github.com). +Sie können mit {% data variables.product.prodname_desktop %} einen Commit mit einem Co-Autor erstellen. Weitere Informationen findest Du unter „[Commit-Mitteilung schreiben und Deine Änderungen via Push übertragen](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)“ und „[{% data variables.product.prodname_desktop %}](https://desktop.github.com)“. -![Add a co-author to the commit message](/assets/images/help/desktop/co-authors-demo-hq.gif) +![Einen Co-Autor zur Commit-Mitteilung hinzufügen](/assets/images/help/desktop/co-authors-demo-hq.gif) -### Creating co-authored commits on the command line +### Commits mit Co-Autor in der Befehlszeile erstellen {% data reusables.pull_requests.collect-co-author-commit-git-config-info %} {% data reusables.pull_requests.commit-message-with-trailer-beginning %} -3. On the next line of the commit message, type `Co-authored-by: name ` with specific information for each co-author. After the co-author information, add a closing quotation mark. +3. Gib in der nächsten Zeile der Commit-Mitteilung `Co-authored-by: name ` mit spezifischen Informationen zu jedem Co-Autor ein. Füge nach den Angaben zu den Co-Autoren ein abschließendes Anführungszeichen ein. - If you're adding multiple co-authors, give each co-author their own line and `Co-authored-by:` commit trailer. + Wenn Sie mehrere Co-Autoren hinzufügen, fügen Sie für jeden Co-Autor eine eigene Zeile und einen eigenen `Co-authored-by:`-Commit-Trailer hinzu. ```shell $ git commit -m "Refactor usability tests. > @@ -51,27 +51,26 @@ You can use {% data variables.product.prodname_desktop %} to create a commit wit Co-authored-by: another-name <another-name@example.com>" ``` -The new commit and message will appear on {% data variables.product.product_location %} the next time you push. For more information, see "[Pushing changes to a remote repository](/articles/pushing-commits-to-a-remote-repository/)." +Der neue Commit und die neue Commit-Mitteilung werden beim nächsten Push auf {% data variables.product.product_location %} angezeigt. Weitere Informationen findest Du unter „[Änderungen zu einem Remote-Repository übertragen](/articles/pushing-commits-to-a-remote-repository/).“ -### Creating co-authored commits on {% data variables.product.product_name %} +### Commits mit Co-Autor auf {% data variables.product.product_name %} erstellen -After you've made changes in a file using the web editor on {% data variables.product.product_name %}, you can create a co-authored commit by adding a `Co-authored-by:` trailer to the commit's message. +Wenn Sie mit dem Web-Editor Änderungen an einer Datei auf {% data variables.product.product_name %} vorgenommen haben, können Sie einen Commit mit Co-Autor erstellen, indem Sie den Trailer `Co-authored-by:` zur Commit-Mitteilung hinzufügen. {% data reusables.pull_requests.collect-co-author-commit-git-config-info %} -2. After making your changes together, at the bottom of the page, type a short, meaningful commit message that describes the changes you made. - ![Commit message for your change](/assets/images/help/repository/write-commit-message-quick-pull.png) -3. In the text box below your commit message, add `Co-authored-by: name ` with specific information for each co-author. If you're adding multiple co-authors, give each co-author their own line and `Co-authored-by:` commit trailer. +2. Nachdem Du alle Deine Änderungen vorgenommen hast, gib unten auf der Seite eine kurze, aussagekräftige Commit-Mitteilung ein, die die von Dir gemachten Änderungen beschreibt. ![Commit-Mitteilung für Deine Änderung](/assets/images/help/repository/write-commit-message-quick-pull.png) +3. Füge im Textfeld unter Deiner Commit-Mitteilung `Co-authored-by: name ` mit spezifischen Informationen für jeden Co-Autor ein. Wenn Sie mehrere Co-Autoren hinzufügen, fügen Sie für jeden Co-Autor eine eigene Zeile und einen eigenen `Co-authored-by:`-Commit-Trailer hinzu. - ![Commit message co-author trailer example in second commit message text box](/assets/images/help/repository/write-commit-message-co-author-trailer.png) -4. Click **Commit changes** or **Propose changes**. + ![Beispiel für Co-Autor-Trailer in Commit-Mitteilung im Textfeld der zweiten Commit-Mitteilung](/assets/images/help/repository/write-commit-message-co-author-trailer.png) +4. Klicken Sie auf **Commit changes** (Änderungen committen) oder **Propose changes** (Änderungen vorschlagen). -The new commit and message will appear on {% data variables.product.product_location %}. +Der neue Commit samt Mitteilung wird auf {% data variables.product.product_location %} angezeigt. -### Further reading -{% if currentVersion != "free-pro-team@latest" %} -- "[Viewing contributions on your profile](/articles/viewing-contributions-on-your-profile)" -- "[Why are my contributions not showing up on my profile?](/articles/why-are-my-contributions-not-showing-up-on-my-profile)"{% endif %} -- "[Viewing a summary of repository activity](/articles/viewing-a-summary-of-repository-activity)" -- "[Viewing a project's contributors](/articles/viewing-a-projects-contributors)" -- "[Changing a commit message](/articles/changing-a-commit-message)" -- "[Committing and reviewing changes to your project](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)" in the {% data variables.product.prodname_desktop %} documentation +### Weiterführende Informationen +{% if enterpriseServerVersions contains currentVersion %} +- „"[Beiträge auf Deinem Profil anzeigen](/articles/viewing-contributions-on-your-profile)“ +- „[Warum werden meine Beiträge nicht in meinem Profil angezeigt?](/articles/why-are-my-contributions-not-showing-up-on-my-profile)“{% endif %} +- „[Eine Zusammenfassung der Repository-Aktivitäten anzeigen](/articles/viewing-a-summary-of-repository-activity)“ +- „[Die Mitarbeiter eines Projekts anzeigen](/articles/viewing-a-projects-contributors)“ +- „[Eine Commit-Mitteilung ändern](/articles/changing-a-commit-message)“ +- „[Änderungen an Deinem Projekt freigeben und überprüfen](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)“ in der {% data variables.product.prodname_desktop %}-Dokumentation diff --git a/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md b/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md index d8c3f2ea37..fd7ac13605 100644 --- a/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md +++ b/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md @@ -1,23 +1,23 @@ --- -title: About repository visibility +title: Informationen zur Sichtbarkeit eines Repositorys intro: 'You can restrict who has access to a repository by choosing a repository''s visibility: {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}public, internal, or private{% else %} public or private{% endif %}.' versions: free-pro-team: '*' enterprise-server: '*' --- -### About repository visibility +### Informationen zur Sichtbarkeit eines Repositorys -When you create a repository, you can choose to make the repository public or private. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you're creating the repository in an organization{% if currentVersion == "free-pro-team@latest" %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %} +Wenn Du ein Repository erstellst, kannst Du es öffentlich oder privat machen. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you're creating the repository in an organization{% if currentVersion == "free-pro-team@latest" %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %} -{% if currentVersion != "free-pro-team@latest" %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if currentVersion != "free-pro-team@latest" %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to {% if currentVersion == "free-pro-team@latest" %}members of your enterprise account{% else %}members of any organization on your instance{% endif %}. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} +{% if enterpriseServerVersions contains currentVersion %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if enterpriseServerVersions contains currentVersion %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to members of your enterprise. Weitere Informationen findest Du unter "[Über interne Repositorys](#about-internal-repositories)."{% endif %} -Organization owners always have access to every repository created in an organization. For more information, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +Organisationsinhaber haben immer Zugriff auf jedes Repository, das in einer Organisation erstellt wurde. Weitere Informationen findest Du unter„[Berechtigungsebenen für die Repositorys einer Organisation](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization).“ -People with admin permissions for a repository can change an existing repository's visibility. For more information, see "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)." +Personen mit Administratorberechtigungen für ein Repository können die Sichtbarkeit eines vorhandenen Repositorys ändern. Weitere Informationen findest Du unter „[Sichtbarkeit eines Repositorys festlegen](/github/administering-a-repository/setting-repository-visibility).“ {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -### About internal repositories +### Informationen zu internen Repositorys {% note %} @@ -25,11 +25,12 @@ People with admin permissions for a repository can change an existing repository {% endnote %} -{% data reusables.repositories.about-internal-repos %} For more information on innersource, see {% data variables.product.prodname_dotcom %}'s whitepaper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." +{% data reusables.repositories.about-internal-repos %} Weitere Informationen zu innersource findest Du im Whitepaper von {% data variables.product.prodname_dotcom %} „[Eine Einführung zu innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." All {% if currentVersion == "free-pro-team@latest" %}enterprise members{% else %}organization members{% endif %} have read permissions to the internal repository, but internal repositories are not visible to people {% if currentVersion == "free-pro-team@latest" %}outside of the enterprise account{% else %}who are not members of an organization{% endif %}, including outside collaborators on organization repositories. For more information, see {% if currentVersion == "free-pro-team@latest" %}"[Roles for an enterprise account](/articles/roles-for-an-enterprise-account#enterprise-members)" and {% endif %}"[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)." {% data reusables.repositories.internal-repo-default %} +Wenn ein Benutzer entfernt wird von -If a user is removed from {% if currentVersion == "free-pro-team@latest" %}an enterprise account{% else %}all organizations on the instance{% endif %}, that user's forks of internal repositories are removed automatically. +{% if currentVersion == "free-pro-team@latest" %}an enterprise account{% else %}all organizations on the instance{% endif %}, that user's forks of internal repositories are removed automatically. {% endif %} diff --git a/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md b/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md index 5364873fbe..a76cbf18be 100644 --- a/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md +++ b/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md @@ -1,41 +1,43 @@ --- -title: Backing up a repository -intro: 'You can use{% if currentVersion != "free-pro-team@latest" %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' +title: Sicherung eines Repositorys durchführen +intro: 'You can use{% if enterpriseServerVersions contains currentVersion %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' redirect_from: - /articles/backing-up-a-repository versions: free-pro-team: '*' enterprise-server: '*' --- + {% if currentVersion == "free-pro-team@latest" %} -To download an archive of your repository, you can use the API for user or organization migrations. For more information, see "[Migrations](/v3/migrations/)." +Um ein Archiv Deines Repositorys herunterzuladen, kannst du die API für die Migration von Benutzern oder Organisationen verwenden. For more information, see "[Migrations](/v3/migrations/)." {% else %} -You can download and back up your repositories manually: +Du kannst Deine Repositorys manuell herunterladen und sichern: -- To download a repository's Git data to your local machine, you'll need to clone the repository. For more information, see "[Cloning a repository](/articles/cloning-a-repository)." -- You can also download your repository's wiki. For more information, see "[Adding or editing wiki pages](/articles/adding-or-editing-wiki-pages)." +- Um die Git-Daten eines Repositorys auf Deinen lokalen Computer herunterzuladen, musst Du das Repository klonen. Weitere Informationen findest Du unter „[Ein Repository clonen](/articles/cloning-a-repository)“. +- Du kannst auch das Wiki Deines Repositorys herunterladen. Weitere Informationen findest Du unter „[Wiki-Seiten hinzufügen oder bearbeiten](/articles/adding-or-editing-wiki-pages).“ -When you clone a repository or wiki, only Git data, such as project files and commit history, is downloaded. You can use our API to export other elements of your {% data variables.product.product_name %} repository to your local machine: +Wenn Du ein Repository oder Wiki klonst, werden nur Git-Daten wie Projektdateien und der Commit-Verlauf heruntergeladen. Mithilfe unserer API kannst Du andere Elemente Deines {% data variables.product.product_name %}-Repositorys auf Deinen lokalen Computer herunterladen: - [Issues](/v3/issues/#list-issues-for-a-repository) -- [Pull requests](/v3/pulls/#list-pull-requests) +- [Pull Requests](/v3/pulls/#list-pull-requests) - [Forks](/rest/reference/repos#list-forks) -- [Comments](/rest/reference/issues#list-issue-comments-for-a-repository) -- [Milestones](/rest/reference/issues#list-milestones) -- [Labels](/rest/reference/issues#list-labels-for-a-repository) -- [Watchers](/rest/reference/activity#list-watchers) +- [Kommentare](/rest/reference/issues#list-issue-comments-for-a-repository) +- [Meilensteine](/rest/reference/issues#list-milestones) +- [Kennzeichnungen](/rest/reference/issues#list-labels-for-a-repository) +- [Watcher](/rest/reference/activity#list-watchers) - [Stargazers](/rest/reference/activity#list-stargazers) -- [Projects](/v3/projects/#list-repository-projects) +- [Projekte](/v3/projects/#list-repository-projects) {% endif %} -Once you have {% if currentVersion != "free-pro-team@latest" %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). +Sobald Sie {% if enterpriseServerVersions contains currentVersion %}eine lokale Version aller Inhalte haben, die Sie sichern möchten, können Sie ein ZIP-Archiv erstellen und {% else %}Ihr Archiv heruntergeladen haben, können Sie {% endif %}es auf eine externe Festplatte kopieren und/oder auf einen Cloud-basierten Dienst wie [Google Drive](https://www.google.com/drive/) oder [Dropbox](https://www.dropbox.com/) hochladen. {% if currentVersion == "free-pro-team@latest" %} -### Third-party backup tools +### Backup-Tools (Sicherungswerkzeuge) von Drittanbietern -A number of self-service tools exist that automate backups of repositories. Unlike archival projects, which archive _all_ public repositories on {% data variables.product.product_name %} that have not opted out and make the data accessible to anyone, backup tools will download data from _specific_ repositories and organize it within a new branch or directory. For more information about archival projects, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)." +Es sind mehrere Self-Service-Tools verfügbar, mit denen Du die Sicherung von Repositorys automatisieren kannst. Im Gegensatz zu Archivierungsprojekten, welche _alle_ nicht ausgeschlossenen öffentlichen Repositorys auf {% data variables.product.product_name %} archivieren und ihre Daten für jedermann zugänglich machen, werden Sicherungswerkzeuge die Daten von _spezifischen_ Repositorys herunterladen und sie in einem neuen Branch oder Verzeichnis organisieren. Weitere Informationen zu Archivierungsprojekten findest Du unter „[Über die Archivierung von Inhalt und Daten auf {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)." +You can back up all of a repository's Git data (such as project files and commit history), as well as much data from -You can back up all of a repository's Git data (such as project files and commit history), as well as much data from {% data variables.product.product_name %} (such as issues and pull requests), with [BackHub](https://github.com/marketplace/backhub), which creates daily recurring backups of your repositories with snapshots up to 30 days back in time. BackHub is available in {% data variables.product.prodname_marketplace %}. +{% data variables.product.product_name %} (such as issues and pull requests), with [BackHub](https://github.com/marketplace/backhub), which creates daily recurring backups of your repositories with snapshots up to 30 days back in time. BackHub ist auf {% data variables.product.prodname_marketplace %} verfügbar. {% endif %} diff --git a/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md b/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md index 985918901d..1aca2c1b72 100644 --- a/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md +++ b/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md @@ -1,6 +1,7 @@ --- -title: Creating a template repository +title: Eine Repository-Vorlage erstellen intro: 'You can make an existing repository a template, so you and others can generate new repositories with the same directory structure{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}, branches,{% endif %} and files.' +permissions: 'Jeder, der über Administratorberechtigungen für ein Repository verfügt, kann das Repository zu einer Vorlage machen.' redirect_from: - /articles/creating-a-template-repository versions: @@ -8,13 +9,16 @@ versions: enterprise-server: '*' --- -Anyone with admin permissions to a repository can make the repository a template. +{% note %} -To create a template repository, you must create a repository, then make the repository a template. For more information about creating a repository, see "[Creating a new repository](/articles/creating-a-new-repository)." +**Note**: Your template repository cannot include files stored using {% data variables.large_files.product_name_short %}. + +{% endnote %} + +Um eine Repository-Vorlage zu erstellen, musst Du ein Repository erstellen und es anschließend zu einer Vorlage machen. Weitere Informationen zum Erstellen eines Repositorys findest Du unter „[Ein neues Repository erstellen](/articles/creating-a-new-repository).“ After you make your repository a template, anyone with access to the repository can generate a new repository with the same directory structure and files as your default branch.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} They can also choose to include all the other branches in your repository.{% endif %} For more information, see "[Creating a repository from a template](/articles/creating-a-repository-from-a-template)." {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -3. Select **Template repository**. - ![Checkbox to make a repository a template](/assets/images/help/repository/template-repository-checkbox.png) +1. Wähle **Template repository** (Repository-Vorlage) aus. ![Kontrollkästchen zum Umwandeln eines Repositorys in eine Vorlage](/assets/images/help/repository/template-repository-checkbox.png) diff --git a/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md b/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md index bb6a246c3b..a4a45d2b9a 100644 --- a/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md +++ b/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md @@ -42,7 +42,7 @@ Wenn das Repository zu einer Organisation gehört und Du einen SSH-Schlüssel ve Weitere Informationen findest Du unter „[Einen neuen SSH-Schlüssel zum GitHub-Konto hinzufügen](/articles/adding-a-new-ssh-key-to-your-github-account)“. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Überprüfe, ob sich Deine Instanz im privaten Modus befindet diff --git a/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md b/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md index 90eae58cbf..53fe6a966f 100644 --- a/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md +++ b/translations/de-DE/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md @@ -70,7 +70,7 @@ Wenn Du zur Eingabe eines Benutzernamens und Passworts aufgefordert wirst, stell {% tip %} -**Tip**: If you don't want to enter your credentials every time you interact with the remote repository, you can turn on [credential caching](/github/using-git/caching-your-github-credentials-in-git). +**Tip**: If you don't want to enter your credentials every time you interact with the remote repository, you can turn on [credential caching](/github/using-git/caching-your-github-credentials-in-git). If you are already using credential caching, please make sure that your computer has the correct credentials cached. Incorrect or out of date credentials will cause authentication to fail. {% endtip %} diff --git a/translations/de-DE/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md b/translations/de-DE/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md index cc8fb61015..6f66c4eca7 100644 --- a/translations/de-DE/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md +++ b/translations/de-DE/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md @@ -10,7 +10,7 @@ versions: ### Editor-Tools -Um Deinen Workflow zu optimieren, kannst Du in Editor-Werkzeugen von Drittanbietern wie Atom, Unity oder Visual Studio eine Verbindung zu {% data variables.product.product_name %} herstellen. +You can connect to {% data variables.product.product_name %} repositories within third-party editor tools, such as Atom, Unity, and Visual Studio. #### {% data variables.product.product_name %} für Atom @@ -30,8 +30,12 @@ Mit der {% data variables.product.prodname_dotcom %}-Erweiterung für Visual Stu ### Projektmanagement-Tools -Um Deinen Workflow zu optimieren, kannst Du Dein persönliches {% data variables.product.product_name %}-Konto oder Deine Organisation in Projektmanagement-Tools von Drittanbietern wie Jira integrieren. +You can integrate your {% data variables.product.product_name %} personal account or organization with third-party project management tools, such as Jira or Slack. #### Jira Cloud und {% data variables.product.product_name %}.com-Integration -Du kannst Jira Cloud in Dein persönliches Organisations-Konto integrieren, um Commits und Pull Requests zu scannen und relevante Metadaten und Hyperlinks in allen erwähnten Jira-Issues zu erstellen. +Sie können Jira Cloud in Ihr persönliches Konto oder Organisations-Konto integrieren, um Commits und Pull Requests zu scannen und relevante Metadaten und Hyperlinks in allen erwähnten Jira-Issues zu erstellen. For more information, visit the [Jira integration app](https://github.com/marketplace/jira-software-github) in the marketplace. + +#### Slack and {% data variables.product.product_name %} integration + +You can integrate Slack with your personal or organization account to subscribe for notifications, close or open issues, and provide rich references to issues and pull requests without leaving Slack. For more information, visit the [Slack integration app](https://github.com/marketplace/slack-github) in the marketplace. diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md index fdbab9030d..3a3055bf09 100644 --- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md @@ -22,5 +22,5 @@ You can use {% data variables.product.prodname_code_scanning %} webhooks to buil ### Weiterführende Informationen * "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" -* "[Using {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} with your existing CI system +* "[Using {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} with your existing CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/using-codeql-code-scanning-with-your-existing-ci-system)" * "[SARIF support for {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning)" diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md index af2300e7a3..0cc08d5b3c 100644 --- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md @@ -48,7 +48,7 @@ By default, the {% data variables.product.prodname_codeql_workflow %} uses the ` #### Scanning pull requests -The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on the `HEAD` commit of a pull request against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} +The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on pull requests targeted against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} For more information about the `pull_request` event, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags)." @@ -150,8 +150,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - with: - fetch-depth: 2 - name: Set up Python uses: actions/setup-python@v2 with: @@ -165,8 +163,6 @@ jobs: # Set the `CODEQL-PYTHON` environment variable to the Python executable # that includes the dependencies echo "::set-env name=CODEQL_PYTHON::$(which python)" - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md index f4cabb2462..897fc3a74f 100644 --- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md @@ -42,7 +42,7 @@ You decide how you generate {% data variables.product.prodname_code_scanning %} ![Choose where to commit](/assets/images/help/repository/start-commit-choose-where-to-commit.png) 8. Click **Commit new file** or **Propose new file**. -In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch or any protected branches. As a result, {% data variables.product.prodname_code_scanning %} will now commence. +In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch. As a result, {% data variables.product.prodname_code_scanning %} will now commence. ### Viewing the logging output from {% data variables.product.prodname_code_scanning %} @@ -90,7 +90,7 @@ After {% data variables.product.prodname_code_scanning %} has analyzed the code There are other situations where there may be no analysis for the latest commit to the base branch for a pull request. These include: -* The pull request has been raised against a branch other than the default branch or a protected branch, and this branch hasn't been analyzed. +* The pull request has been raised against a branch other than the default branch, and this branch hasn't been analyzed. To check whether a branch has been scanned, go to the {% data variables.product.prodname_code_scanning_capc %} page, click the **Branch** drop-down and select the relevant branch. diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md index 75179c6a8f..dbbd09cc1c 100644 --- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md @@ -1,5 +1,6 @@ --- title: Finding security vulnerabilities and errors in your code +shortTitle: Finding vulnerabilities and coding errors product: '{% data reusables.gated-features.code-scanning %}' redirect_from: - /github/managing-security-vulnerabilities/finding-security-vulnerabilities-in-your-projects-code @@ -18,6 +19,7 @@ versions: {% link_in_list /configuring-code-scanning %} {% link_in_list /configuring-the-codeql-workflow-for-compiled-languages %} {% link_in_list /troubleshooting-the-codeql-workflow %} + {% link_in_list /running-codeql-code-scanning-in-a-container %} {% topic_link_in_list /managing-results-from-code-scanning %} {% link_in_list /about-integration-with-code-scanning %} {% link_in_list /uploading-a-sarif-file-to-github %} diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md index 1a9ed7c53a..e5f49436a9 100644 --- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md @@ -1,7 +1,7 @@ --- title: Managing code scanning alerts for your repository shortTitle: Warnungen verwalten -intro: 'You can view, fix, and close alerts for potential vulnerabilities or errors in your project''s code.' +intro: 'You can view, fix, {% if currentVersion == "enterprise-server@2.22" %}or close{% else %}dismiss, or delete{% endif %} alerts for potential vulnerabilities or errors in your project''s code.' product: '{% data reusables.gated-features.code-scanning %}' permissions: 'People with write permission to a repository can manage {% data variables.product.prodname_code_scanning %} alerts for the repository.' versions: @@ -37,25 +37,89 @@ Anyone with read permission for a repository can see {% data variables.product.p {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} -{% data reusables.code-scanning.click-alert-in-list %} -5. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. ![Example data-flow alert](/assets/images/help/repository/code-scanning-show-paths.png) +1. Under "{% data variables.product.prodname_code_scanning_capc %}," click the alert you'd like to explore. ![Summary of alerts](/assets/images/help/repository/code-scanning-click-alert.png) +1. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. ![The "Show paths" link on an alert](/assets/images/help/repository/code-scanning-show-paths.png) +1. Alerts from {% data variables.product.prodname_codeql %} analysis include a description of the problem. Click **Show more** for guidance on how to fix your code. ![Details for an alert](/assets/images/help/repository/code-scanning-alert-details.png) ### Fixing an alert Anyone with write permission for a repository can fix an alert by committing a correction to the code. If the repository has {% data variables.product.prodname_code_scanning %} scheduled to run on pull requests, it's best to raise a pull request with your correction. This will trigger {% data variables.product.prodname_code_scanning %} analysis of the changes and test that your fix doesn't introduce any new problems. For more information, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)" and "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)." +If you have write permission for a repository, you can view fixed alerts by viewing the summary of alerts and clicking **Closed**. For more information, see "[Viewing an alert](#viewing-an-alert)." The "Closed" list shows fixed alerts and alerts that users have {% if currentVersion == "enterprise-server@2.22" %}closed{% else %}dismissed{% endif %}. + +Alerts may be fixed in one branch but not in another. You can use the "Branch" drop-down menu, on the summary of alerts, to check whether an alert is fixed in a particular branch. + +![Filtering alerts by branch](/assets/images/help/repository/code-scanning-branch-filter.png) + +{% if currentVersion == "enterprise-server@2.22" %} + ### Closing an alert Closing an alert is a way to resolve an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} +{% else %} + +### Dismissing or deleting alerts + +There are two ways of closing an alert. You can fix the problem in the code, or you can dismiss the alert. Alternatively, if you have admin permissions for the repository, you can delete alerts. Deleting alerts is useful in situations where you have enabled a {% data variables.product.prodname_code_scanning %} tool and then decided to remove it, or where you have enabled {% data variables.product.prodname_codeql %} analysis with a larger set of queries than you want to continue using, and you've then removed some queries from the tool. In both cases, deleting alerts allows you to clean up your {% data variables.product.prodname_code_scanning %} results. You can delete alerts from the summary list within the **Security** tab. + +Dismissing an alert is a way of closing an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} You can dismiss alerts from {% data variables.product.prodname_code_scanning %} annotations in code, or from the summary list within the **Security** tab. + +When you dismiss an alert: + +- It's dismissed in all branches. +- The alert is removed from the number of current alerts for your project. +- The alert is moved to the "Closed" list in the summary of alerts, from where you can reopen it, if required. +- The reason why you closed the alert is recorded. +- Next time {% data variables.product.prodname_code_scanning %} runs, the same code won't generate an alert. + +When you delete an alert: + +- It's deleted in all branches. +- The alert is removed from the number of current alerts for your project. +- It is _not_ added to the "Closed" list in the summary of alerts. +- If the code that generated the alert stays the same, and the same {% data variables.product.prodname_code_scanning %} tool runs again without any configuration changes, the alert will be shown again in your analysis results. + +To dismiss or delete alerts: + +{% endif %} + {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} +{% if currentVersion == "enterprise-server@2.22" %} {% data reusables.code-scanning.click-alert-in-list %} -5. Select the Close drop-down menu and click a reason for closing the alert. ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) +1. Select the **Close** drop-down menu and click a reason for closing the alert. + ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) {% data reusables.code-scanning.false-positive-fix-codeql %} +{% else %} + +1. If you have admin permissions for the repository, and you want to delete alerts for this {% data variables.product.prodname_code_scanning %} tool, select some or all of the check boxes and click **Delete**. + + ![Deleting alerts](/assets/images/help/repository/code-scanning-delete-alerts.png) + + Optionally, you can use the filters to display a subset of alerts and then delete all matching alerts at once. For example, if you have removed a query from {% data variables.product.prodname_codeql %} analysis, you can use the "Rule" filter to list just the alerts for that query and then select and delete all of those alerts. + + ![Filter alerts by rule](/assets/images/help/repository/code-scanning-filter-by-rule.png) + +1. If you want to dismiss an alert, it's important to explore the alert first, so that you can choose the correct dismissal reason. Click the alert you'd like to explore. + + ![Open an alert from the summary list](/assets/images/help/repository/code-scanning-click-alert.png) + +1. Review the alert, then click **Dismiss** and choose a reason for closing the alert. ![Choosing a reason for dismissing an alert](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + + {% data reusables.code-scanning.choose-alert-dismissal-reason %} + + {% data reusables.code-scanning.false-positive-fix-codeql %} + +#### Dismissing multiple alerts at once + +If a project has multiple alerts that you want to dismiss for the same reason, you can bulk dismiss them from the summary of alerts. Typically, you'll want to filter the list and then dismiss all of the matching alerts. For example, you might want to dismiss all of the current alerts in the project that have been tagged for a particular Common Weakness Enumeration (CWE) vulnerability. + +{% endif %} + ### Weiterführende Informationen - "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)" diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md new file mode 100644 index 0000000000..d32e59c2c2 --- /dev/null +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md @@ -0,0 +1,69 @@ +--- +title: Running CodeQL code scanning in a container +shortTitle: '{% data variables.product.prodname_code_scanning_capc %} in a container' +intro: 'You can run {% data variables.product.prodname_code_scanning %} in a container by ensuring that all processes run in the same container.' +product: '{% data reusables.gated-features.code-scanning %}' +versions: + free-pro-team: '*' + enterprise-server: '>=2.22' +--- + +{% data reusables.code-scanning.beta %} + +### About {% data variables.product.prodname_code_scanning %} with a containerized build + +If you're setting up {% data variables.product.prodname_code_scanning %} for a compiled language, and you're building the code in a containerized environment, the analysis may fail with the error message "No source code was seen during the build." This indicates that {% data variables.product.prodname_codeql %} was unable to monitor your code as it was compiled. + +You must run {% data variables.product.prodname_codeql %} in the same container in which you build your code. This applies whether you are using the {% data variables.product.prodname_codeql_runner %}, or {% data variables.product.prodname_actions %}. If you're using the {% data variables.product.prodname_codeql_runner %}, run it in the container where your code builds. For more information about the {% data variables.product.prodname_codeql_runner %}, see "[Running {% data variables.product.prodname_codeql %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-code-scanning-in-your-ci-system)." If you're using {% data variables.product.prodname_actions %}, configure your workflow to run all the actions in the same container. For more information, see "[Example workflow](#example-workflow)." + +### Dependencies + +You may have difficulty running {% data variables.product.prodname_code_scanning %} if the container you're using is missing certain dependencies (for example, Git must be installed and added to the PATH variable). If you encounter dependency issues, review the list of software typically included on {% data variables.product.prodname_dotcom %}'s virtual environments. For more information, see the version-specific `readme` files in these locations: + +* Linux: https://github.com/actions/virtual-environments/tree/main/images/linux +* MacOS: https://github.com/actions/virtual-environments/tree/main/images/macos +* Windows: https://github.com/actions/virtual-environments/tree/main/images/win + +### Example workflow + +This sample workflow uses {% data variables.product.prodname_actions %} to run {% data variables.product.prodname_codeql %} analysis in a containerized environment. The value of `container.image` identifies the container to use. In this example the image is named `codeql-container`, with a tag of `f0f91db`. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)." + +``` yaml +name: "{% data variables.product.prodname_codeql %}" + +on: + push: + branches: [main] + pull_request: + branches: [main] + schedule: + - cron: '0 0 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: [java] + + # Specify the container in which actions will run + container: + image: codeql-container:f0f91db + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Initialize {% data variables.product.prodname_codeql %} + uses: github/codeql-action/init@v1 + with: + languages: {% raw %}${{ matrix.language }}{% endraw %} + - name: Build + run: | + ./configure + make + - name: Perform {% data variables.product.prodname_codeql %} Analysis + uses: github/codeql-action/analyze@v1 +``` diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md index 5b7faf0e62..539d8eca9a 100644 --- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md @@ -10,6 +10,8 @@ versions: enterprise-server: '>=2.22' --- + + {% data reusables.code-scanning.beta-codeql-runner %} {% data reusables.code-scanning.beta %} {% data reusables.code-scanning.enterprise-enable-code-scanning %} @@ -18,7 +20,7 @@ versions: If you use a continuous integration or continuous delivery/deployment (CI/CD) system other than {% data variables.product.prodname_actions %}, you can use your existing system to run {% data variables.product.prodname_dotcom %}'s {% data variables.product.prodname_codeql %} analysis and upload the results to {% data variables.product.prodname_dotcom %}. To do this, use the {% data variables.product.prodname_codeql_runner %}. -### About the {% data variables.product.prodname_codeql_runner %} +### Informationen zu {% data variables.product.prodname_codeql_runner %} {% data reusables.code-scanning.about-code-scanning %} For information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)." @@ -49,7 +51,7 @@ On Windows, the `codeql-runner-win.exe` file usually requires no change to permi ### Adding the {% data variables.product.prodname_codeql_runner %} to your CI system -Once you have downloaded the {% data variables.product.prodname_codeql_runner %} and verified that it can be executed, you should make the runner available to each CI server that you intend to use for {% data variables.product.prodname_code_scanning %}. It is important to notice that each CI server that you intend to use for {% data variables.product.prodname_code_scanning %} needs to have the {% data variables.product.prodname_codeql_runner %}. You might configure each server to copy the runner from a central, internal location, or you could use the REST API to get the runner direct from GitHub, for example: +Once you have downloaded the {% data variables.product.prodname_codeql_runner %} and verified that it can be executed, you should make the runner available to each CI server that you intend to use for {% data variables.product.prodname_code_scanning %}. It is important to notice that each CI server that you intend to use for {% data variables.product.prodname_code_scanning %} needs to have the {% data variables.product.prodname_codeql_runner %}. You might configure each server to copy the runner from a central, internal location, or you could use the REST API to get the runner direct from GitHub, for example: ```shell wget https://github.com/github/codeql-action/releases/download/codeql-bundle-20200826/codeql-runner-linux @@ -64,8 +66,9 @@ In addition to this, each CI server also needs: The options for providing access to the {% data variables.product.prodname_codeql %} bundle are: 1. Allow the CI servers access to {% data variables.product.prodname_dotcom_the_website %} so that the {% data variables.product.prodname_codeql_runner %} can download the bundle automatically. -1. Manually download/extract the bundle, store it with other central resources, and use the `--codeql-path` flag to specify the location of the bundle in calls to initialize the {% data variables.product.prodname_codeql_runner %}. -{% if currentVersion != "free-pro-team@latest" %} +1. Manually download/extract the bundle, store it with other central resources, and use the `--codeql-path` flag to specify the location of the bundle in calls to initialize the +{% data variables.product.prodname_codeql_runner %}. +{% if enterpriseServerVersions contains currentVersion %} 1. You can mirror the `github/codeql-action` repository on {% data variables.product.product_location %}. Unless you specify the `--codeql-path` flag, the runner automatically checks for the bundle in this location and on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} ### Calling the {% data variables.product.prodname_codeql_runner %} @@ -75,7 +78,7 @@ You should call the {% data variables.product.prodname_codeql_runner %} from the 1. `init` required to initialize the runner and create a {% data variables.product.prodname_codeql %} database for each language to be analyzed. These databases are populated and analyzed by subsequent commands. 1. `analyze` required to populate the {% data variables.product.prodname_codeql %} databases, analyze them, and upload results to {% data variables.product.product_location %}. -For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}. +For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if enterpriseServerVersions contains currentVersion %} or mirrored on {% data variables.product.product_location %}{% endif %}. You can configure where the {% data variables.product.prodname_codeql_runner %} stores the CodeQL bundle for future analysis on a server using the `--tools-dir` flag and where it stores temporary files during analysis using `--temp-dir`. @@ -109,7 +112,7 @@ This example runs {% data variables.product.prodname_codeql %} analysis on a Lin > Successfully uploaded results ``` -The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if enterpriseServerVersions contains currentVersion %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." #### Compiled language example @@ -155,7 +158,7 @@ This example is similar to the previous example, however this time the repositor {% endnote %} -### Further reading +### Weiterführende Informationen - "[Configuring {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-codeql-code-scanning-in-your-ci-system)" - "[Troubleshooting {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system)" diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md index 8c1b98ee48..b042803451 100644 --- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md @@ -36,6 +36,8 @@ If you upload a SARIF file without fingerprint data using the `/code-scanning/sa ### Validating your SARIF file + + If your SARIF file doesn't include `partialFingerprints`, the `partialFingerprints` field will be calculated when you upload the SARIF file using {% data variables.product.prodname_actions %}. For more information, visit the [Microsoft SARIF validator](https://sarifweb.azurewebsites.net/). ### Supported SARIF output file properties diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md index 88dcad87f0..e8d8e1298a 100644 --- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md @@ -13,11 +13,11 @@ versions: ### About {% data variables.product.prodname_code_scanning %} results on pull requests -In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch or protected branches, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." -If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch, and the repository owner has configured required status checks, then you must either fix or close any error alerts before the pull request can be merged. Weitere Informationen finden Sie unter „[Informationen zu erforderlichen Statuschecks](/github/administering-a-repository/about-required-status-checks)“. +If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch that has been enabled for {% data variables.product.prodname_code_scanning %}, and the repository owner has configured required status checks, then you must either fix or {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} all error alerts before the pull request can be merged. Weitere Informationen finden Sie unter „[Informationen zu erforderlichen Statuschecks](/github/administering-a-repository/about-required-status-checks)“. -![Example pull request check status with {% data variables.product.prodname_code_scanning %} alert](/assets/images/help/repository/code-scanning-check-failure.png) +![Failed {% data variables.product.prodname_code_scanning %} check on a pull request](/assets/images/help/repository/code-scanning-check-failure.png) ### About {% data variables.product.prodname_code_scanning %} as a pull request check @@ -29,20 +29,38 @@ If the repository uses the {% data variables.product.prodname_codeql_workflow %} When you look at the **Files changed** tab for a pull request, you see annotations for any lines of code that triggered the alert. -![Example {% data variables.product.prodname_code_scanning %} alert shown as an annotation in the "Files changed" view of a pull request](/assets/images/help/repository/code-scanning-pr-annotation.png) +![Alert annotation within a pull request diff](/assets/images/help/repository/code-scanning-pr-annotation.png) Some annotations contain links with extra context for the alert. In the example above, from {% data variables.product.prodname_codeql %} analysis, you can click **user-provided value** to see where the untrusted data enters the data flow (this is referred to as the source). In this case you can view the full path from the source to the code that uses the data (the sink) by clicking **Show paths**. This makes it easy to check whether the data is untrusted or if the analysis failed to recognize a data sanitization step between the source and the sink. For information about analyzing data flow using {% data variables.product.prodname_codeql %}, see "[About data flow analysis](https://help.semmle.com/QL/learn-ql/intro-to-data-flow.html)." For more information about an alert, click **Show more details** on the annotation. This allows you to see all of the context and metadata provided by the tool in an alert view. In the example below, you can see tags showing the severity, type, and relevant common weakness enumerations (CWEs) for the problem. The view also shows which commit introduced the problem. -Alerts from some tools, like {% data variables.product.prodname_codeql %}, also include a description and a **Show more** link for guidance on how to fix the problem in the code. +In the detailed view for an alert, some {% data variables.product.prodname_code_scanning %} tools, like {% data variables.product.prodname_codeql %} analysis, also include a description of the problem and a **Show more** link for guidance on how to fix your code. -![Example of "Show more details" for a {% data variables.product.prodname_code_scanning %} alert in a pull request](/assets/images/help/repository/code-scanning-pr-alert.png) +![Alert description and link to show more information](/assets/images/help/repository/code-scanning-pr-alert.png) -### Resolving an alert on your pull request +### {% if currentVersion == "enterprise-server@2.22" %}Resolving{% else %}Fixing{% endif %} an alert on your pull request -Anyone with write permission for a repository can resolve alerts on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is resolved and the annotation removed. +Anyone with write permission for a repository can fix a {% data variables.product.prodname_code_scanning %} alert that's identified on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is closed and the annotation removed. + +{% if currentVersion == "enterprise-server@2.22" %} If you don't think that an alert needs to be fixed, you can close the alert manually. {% data reusables.code-scanning.close-alert-examples %} The **Close** button is available in annotations and in the alerts view if you have write permission for the repository. {% data reusables.code-scanning.false-positive-fix-codeql %} + +{% else %} + +### Dismissing an alert on your pull request + +An alternative way of closing an alert is to dismiss it. You can dismiss an alert if you don't think it needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} If you have write permission for the repository, the **Dismiss** button is available in code annotations and in the alerts summary. When you click **Dismiss** you will be prompted to choose a reason for closing the alert. + +![Choosing a reason for dismissing an alert](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + +{% data reusables.code-scanning.choose-alert-dismissal-reason %} + +{% data reusables.code-scanning.false-positive-fix-codeql %} + +For more information about dismissing alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#dismissing-or-deleting-alerts)." + +{% endif %} \ No newline at end of file diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md index 317698c3e0..05cc0e7610 100644 --- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md @@ -49,4 +49,4 @@ If the `analyze` command for the {% data variables.product.prodname_codeql_runne {% endnote %} -1. The code is built in a container or on a separate machine. If you use a containerized build or if you outsource the build to another machine, make sure to run the {% data variables.product.prodname_codeql_runner %} in the container or on the machine where your build task takes place. +1. The code is built in a container or on a separate machine. If you use a containerized build or if you outsource the build to another machine, make sure to run the {% data variables.product.prodname_codeql_runner %} in the container or on the machine where your build task takes place. For more information, see "[Running CodeQL code scanning in a container](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)." diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md index f42dbb3db6..fcbe2979c3 100644 --- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md +++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md @@ -18,7 +18,7 @@ If an automatic build of code for a compiled language within your project fails, - Remove the `autobuild` step from your {% data variables.product.prodname_code_scanning %} workflow and add specific build steps. For information about editing the workflow, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#editing-a-code-scanning-workflow)." For more information about replacing the `autobuild` step, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." -- If your workflow doesn't explicitly specify the languages to analyze, {% data variables.product.prodname_codeql %} implicitly detects the supported languages in your code base. In this configuration, out of the compiled languages C/C++, C#, and Java, {% data variables.product.prodname_codeql %} only analyzes the language with the most source files. Edit the workflow and add a build matrix specifying the languages you want to analyze. The default CodeQL analysis workflow uses such a matrix. +- If your workflow doesn't explicitly specify the languages to analyze, {% data variables.product.prodname_codeql %} implicitly detects the supported languages in your code base. In this configuration, out of the compiled languages C/C++, C#, and Java, {% data variables.product.prodname_codeql %} only analyzes the language with the most source files. Edit the workflow and add a build matrix specifying the languages you want to analyze. The default CodeQL analysis workflow uses such a matrix. The following extracts from a workflow show how you can use a matrix within the job strategy to specify languages, and then reference each language within the "Initialize {% data variables.product.prodname_codeql %}" step: @@ -38,7 +38,7 @@ If an automatic build of code for a compiled language within your project fails, with: languages: {% raw %}${{ matrix.language }}{% endraw %} ``` - + For more information about editing the workflow, see "[Configuring code scanning](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)." ### No code found during the build @@ -58,12 +58,16 @@ If your workflow fails with an error `No source code was seen during the build` ``` For more information, see the workflow extract in "[Automatic build for a compiled language fails](#automatic-build-for-a-compiled-language-fails)" above. 1. Your {% data variables.product.prodname_code_scanning %} workflow is analyzing a compiled language (C, C++, C#, or Java), but the code was not compiled. By default, the {% data variables.product.prodname_codeql %} analysis workflow contains an `autobuild` step, however, this step represents a best effort process, and may not succeed in building your code, depending on your specific build environment. Compilation may also fail if you have removed the `autobuild` step and did not include build steps manually. For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." -1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but portions of your build are cached to improve performance (most likely to occur with build systems like Gradle or Bazel). Since {% data variables.product.prodname_codeql %} observes the activity of the compiler to understand the data flows in a repository, {% data variables.product.prodname_codeql %} requires a complete build to take place in order to perform analysis. -1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but compilation does not occur between the `init` and `analyze` steps in the workflow. {% data variables.product.prodname_codeql %} requires that your build happens in between these two steps in order to observe the activity of the compiler and perform analysis. -1. Your compiled code (in C, C++, C#, or Java) was compiled successfully, but {% data variables.product.prodname_codeql %} was unable to detect the compiler invocations. The most common causes are certain configuration options like running your build process in a container, if you're building using a distributed build system external to {% data variables.product.prodname_actions %} using a daemon process, or if {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. +1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but portions of your build are cached to improve performance (most likely to occur with build systems like Gradle or Bazel). Since {% data variables.product.prodname_codeql %} observes the activity of the compiler to understand the data flows in a repository, {% data variables.product.prodname_codeql %} requires a complete build to take place in order to perform analysis. +1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but compilation does not occur between the `init` and `analyze` steps in the workflow. {% data variables.product.prodname_codeql %} requires that your build happens in between these two steps in order to observe the activity of the compiler and perform analysis. +1. Your compiled code (in C, C++, C#, or Java) was compiled successfully, but {% data variables.product.prodname_codeql %} was unable to detect the compiler invocations. The most common causes are: + + * Running your build process in a separate container to {% data variables.product.prodname_codeql %}. For more information, see "[Running CodeQL code scanning in a container](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)." + * Building using a distributed build system external to GitHub Actions, using a daemon process. + * {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. For C# projects using either `dotnet build` or `msbuild` which target .NET Core 2, you should specify `/p:UseSharedCompilation=false` in your workflow's `run` step, when you build your code. The `UseSharedCompilation` flag isn't necessary for .NET Core 3.0 and later. - + For example, the following configuration for C# will pass the flag during the first build step. ``` yaml @@ -73,7 +77,7 @@ For more information, see the workflow extract in "[Automatic build for a compil If you encounter another problem with your specific compiler or configuration, contact {% data variables.contact.contact_support %}. -For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." +For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." ### Portions of my repository were not analyzed using `autobuild` @@ -84,14 +88,15 @@ The {% data variables.product.prodname_codeql %} `autobuild` feature uses heuris If the run of a workflow for {% data variables.product.prodname_code_scanning %} fails due to a server error, try running the workflow again. If the problem persists, contact {% data variables.contact.contact_support %}. ### Error: "Out of disk" or "Out of memory" +On very large projects, -On very large projects, {% data variables.product.prodname_codeql %} may run out of disk or memory on the runner. +{% data variables.product.prodname_codeql %} may run out of disk or memory on the runner. {% if currentVersion == "free-pro-team@latest" %}If you encounter this issue on a hosted {% data variables.product.prodname_actions %} runner, contact {% data variables.contact.contact_support %} so that we can investigate the problem. {% else %}If you encounter this issue, try increasing the memory on the runner.{% endif %} ### The build takes too long -If your build with {% data variables.product.prodname_codeql %} analysis takes too long to run, there are several approaches you can try to reduce the build time. +If your build with {% data variables.product.prodname_codeql %} analysis takes too long to run, there are several approaches you can try to reduce the build time. #### Increase the memory or cores @@ -105,11 +110,11 @@ The default {% data variables.product.prodname_codeql_workflow %} uses a build m Analysis time is typically proportional to the amount of code being analyzed. You can reduce the analysis time by reducing the amount of code being analyzed at once, for example, by excluding test code, or breaking analysis into multiple workflows that analyze only a subset of your code at a time. -For compiled languages like Java, C, C++, and C#, {% data variables.product.prodname_codeql %} analyzes all of the code which was built during the workflow run. To limit the amount of code being analyzed, build only the code which you wish to analyze by specifying your own build steps in a `run` block. You can combine specifying your own build steps with using the `paths` or `paths-ignore` filters on the `pull_request` and `push` events to ensure that your workflow only runs when specific code is changed. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestpaths)." +For compiled languages like Java, C, C++, and C#, {% data variables.product.prodname_codeql %} analyzes all of the code which was built during the workflow run. To limit the amount of code being analyzed, build only the code which you wish to analyze by specifying your own build steps in a `run` block. You can combine specifying your own build steps with using the `paths` or `paths-ignore` filters on the `pull_request` and `push` events to ensure that your workflow only runs when specific code is changed. Weitere Informationen findest Du unter „[Workflow-Syntax für {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestpaths)“. For interpreted languages like Go, JavaScript, Python, and TypeScript, that {% data variables.product.prodname_codeql %} analyzes without a specific build, you can specify additional configuration options to limit the amount of code to analyze. For more information, see "[Specifying directories to scan](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#specifying-directories-to-scan)." -If you split your analysis into multiple workflows as described above, we still recommend that you have at least one workflow which runs on a `schedule` which analyzes all of the code in your repository. Because {% data variables.product.prodname_codeql %} analyzes data flows between components, some complex security behaviors may only be detected on a complete build. +If you split your analysis into multiple workflows as described above, we still recommend that you have at least one workflow which runs on a `schedule` which analyzes all of the code in your repository. Because {% data variables.product.prodname_codeql %} analyzes data flows between components, some complex security behaviors may only be detected on a complete build. #### Run only during a `schedule` event @@ -122,4 +127,4 @@ If you are analyzing code written in Python, you may see different results depen On GitHub-hosted runners that use Linux, the {% data variables.product.prodname_codeql_workflow %} tries to install and analyze Python dependencies, which could lead to more results. To disable the auto-install, add `setup-python-dependencies: false` to the "Initialize CodeQL" step of the workflow. For more information about configuring the analysis of Python dependencies, see "[Analyzing Python dependencies](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#analyzing-python-dependencies)." -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/de-DE/content/github/getting-started-with-github/githubs-products.md b/translations/de-DE/content/github/getting-started-with-github/githubs-products.md index 7a3eda9b05..4d77c8db0c 100644 --- a/translations/de-DE/content/github/getting-started-with-github/githubs-products.md +++ b/translations/de-DE/content/github/getting-started-with-github/githubs-products.md @@ -96,7 +96,7 @@ Um weitere Informationen über das Hosten Deiner eigenen [{% data variables.prod - {% data variables.contact.github_support %} {% data variables.product.premium_plus_support_plan %} - {% data variables.product.prodname_insights %} -- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} +- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} - [{% data variables.product.prodname_learning %} für Organisationen](https://lab.github.com/organizations) Weitere Informationen zur Anmeldung für {% data variables.product.prodname_ghe_one %} erhältst Du beim [{% data variables.product.product_name %}-Vertriebsteam](https://enterprise.github.com/contact). diff --git a/translations/de-DE/content/github/getting-started-with-github/supported-browsers.md b/translations/de-DE/content/github/getting-started-with-github/supported-browsers.md index f83a694077..bc190a2c5d 100644 --- a/translations/de-DE/content/github/getting-started-with-github/supported-browsers.md +++ b/translations/de-DE/content/github/getting-started-with-github/supported-browsers.md @@ -4,7 +4,7 @@ redirect_from: - /articles/why-doesn-t-graphs-work-with-ie-8/ - /articles/why-don-t-graphs-work-with-ie8/ - /articles/supported-browsers -intro: '{% data variables.product.product_name %} wird ständig weiterentwickelt, um auch die neuesten Webbrowser zu unterstützen. We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.16" %}Internet Explorer 11, {% endif %}and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' +intro: '{% data variables.product.product_name %} wird ständig weiterentwickelt, um auch die neuesten Webbrowser zu unterstützen. We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' versions: free-pro-team: '*' enterprise-server: '*' diff --git a/translations/de-DE/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md b/translations/de-DE/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md index ecf02f620b..a0360a2783 100644 --- a/translations/de-DE/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md +++ b/translations/de-DE/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md @@ -29,7 +29,7 @@ versions: 3. Wechsle Dein aktuelles Arbeitsverzeichnis in das lokale Projekt. 4. Initialisiere das lokale Verzeichnis als Git-Repository. ```shell - $ git init + $ git init -b main ``` 5. Fügen Sie die Daten zum neuen lokalen Repository hinzu. Das bereitet sie für den ersten Commit vor. ```shell @@ -67,7 +67,7 @@ versions: 3. Wechsle Dein aktuelles Arbeitsverzeichnis in das lokale Projekt. 4. Initialisiere das lokale Verzeichnis als Git-Repository. ```shell - $ git init + $ git init -b main ``` 5. Fügen Sie die Daten zum neuen lokalen Repository hinzu. Das bereitet sie für den ersten Commit vor. ```shell @@ -105,7 +105,7 @@ versions: 3. Wechsle Dein aktuelles Arbeitsverzeichnis in das lokale Projekt. 4. Initialisiere das lokale Verzeichnis als Git-Repository. ```shell - $ git init + $ git init -b main ``` 5. Fügen Sie die Daten zum neuen lokalen Repository hinzu. Das bereitet sie für den ersten Commit vor. ```shell diff --git a/translations/de-DE/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md b/translations/de-DE/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md index 9cbc184bef..b09ec6161c 100644 --- a/translations/de-DE/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md +++ b/translations/de-DE/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md @@ -19,7 +19,7 @@ Für Dateien, die Sie über einen Browser zu einem Repository hinzufügen, gilt {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. Klicke unter dem Namen des Repositorys auf **Upload files** (Dateien hochladen). ![Schaltfläche „Upload files“ (Dateien hochladen)](/assets/images/help/repository/upload-files-button.png) {% else %} 2. Above the list of files, using the **Add file** drop-down, click **Upload files**. !["Upload files" in the "Add file" dropdown](/assets/images/help/repository/upload-files-button.png) diff --git a/translations/de-DE/content/github/managing-files-in-a-repository/navigating-code-on-github.md b/translations/de-DE/content/github/managing-files-in-a-repository/navigating-code-on-github.md index aa7ff134aa..bede1c05f5 100644 --- a/translations/de-DE/content/github/managing-files-in-a-repository/navigating-code-on-github.md +++ b/translations/de-DE/content/github/managing-files-in-a-repository/navigating-code-on-github.md @@ -10,6 +10,7 @@ versions: ### Über Code-Navigation auf {% data variables.product.prodname_dotcom %} Code-Navigationsfunktionen verwenden die [Semantik](https://github.com/github/semantic) der Open-Source-Bibliothek. Die folgenden Sprachen werden unterstützt: +- C# - CodeQL - Go - Java diff --git a/translations/de-DE/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md b/translations/de-DE/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md index 10e1f375d1..b360669a66 100644 --- a/translations/de-DE/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md +++ b/translations/de-DE/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md @@ -9,9 +9,9 @@ versions: --- -Die interaktiven Features des Notebooks, beispielsweise benutzerdefinierte JavaScript-Plots, funktionieren in Ihrem Repository auf {% data variables.product.product_location %} nicht. Ein Beispiel findest Du unter [*Linking and Interactions.ipynb*](https://github.com/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb). +Die interaktiven Features des Notebooks, beispielsweise benutzerdefinierte JavaScript-Plots, funktionieren in Ihrem Repository auf {% data variables.product.product_location %} nicht. For an example, see [*Linking and Interactions.ipynb*](https://github.com/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb). -Du kannst [nbviewer](https://nbviewer.jupyter.org/) verwenden, um Dein Jupyter Notebook mit dargestelltem JavaScript-Inhalt anzuzeigen oder um Deine Notebook-Dateien mit anderen zu teilen. Ein Beispiel zu auf nbviewer gerenderten Elementen findest Du unter [*Linking and Interactions.ipynb*](https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb). +Du kannst [nbviewer](https://nbviewer.jupyter.org/) verwenden, um Dein Jupyter Notebook mit dargestelltem JavaScript-Inhalt anzuzeigen oder um Deine Notebook-Dateien mit anderen zu teilen. For an example, see [*Linking and Interactions.ipynb*](https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb) rendered on nbviewer. Wenn Du eine vollständig interaktive Version Deines Jupyter Notebook anzeigen möchtest, kannst Du einen Notebook-Server lokal einrichten. Weitere Informationen findest Du in der [offiziellen Dokumentation von Jupyter](http://jupyter.readthedocs.io/en/latest/index.html). diff --git a/translations/de-DE/content/github/managing-large-files/about-git-large-file-storage.md b/translations/de-DE/content/github/managing-large-files/about-git-large-file-storage.md index df0be247d6..d4c3bed787 100644 --- a/translations/de-DE/content/github/managing-large-files/about-git-large-file-storage.md +++ b/translations/de-DE/content/github/managing-large-files/about-git-large-file-storage.md @@ -41,11 +41,13 @@ size 84977953 Sie erfasst die `version` von {% data variables.large_files.product_name_short %}, die Sie verwenden, gefolgt von einem eindeutigen Kennzeichner für die Datei (`oid`). Außerdem speichert sie die Größe (`size`) der endgültigen Datei. -{% tip %} +{% note %} -**Tipp**: {% data variables.large_files.product_name_short %} kann nicht mit {% data variables.product.prodname_pages %}-Websites verwendet werden. +**Hinweise**: +- {% data variables.large_files.product_name_short %} cannot be used with {% data variables.product.prodname_pages %} sites. +- {% data variables.large_files.product_name_short %} cannot be used with template repositories. -{% endtip %} +{% endnote %} ### Weiterführende Informationen diff --git a/translations/de-DE/content/github/managing-large-files/conditions-for-large-files.md b/translations/de-DE/content/github/managing-large-files/conditions-for-large-files.md index 1ec6ea4a96..435318e8f3 100644 --- a/translations/de-DE/content/github/managing-large-files/conditions-for-large-files.md +++ b/translations/de-DE/content/github/managing-large-files/conditions-for-large-files.md @@ -16,4 +16,4 @@ Wenn Du versuchst, eine Datei größer als {% data variables.large_files.warning ### Blockierte Pushs für große Dateien -{% if currentVersion != "free-pro-team@latest" %}By default, {% endif %}{% data variables.product.product_name %} blocks pushes that exceed {% data variables.large_files.max_github_size %}. {% if currentVersion != "free-pro-team@latest" %}However, a site administrator can configure a different limit for your {% data variables.product.prodname_ghe_server %} instance. Weitere Informationen findest Du unter „[Push-Begrenzungen für Git festlegen](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits).“{% endif %} +{% data variables.product.product_name %} blockiert {% if enterpriseServerVersions contains currentVersion %}standardmäßig {% endif %}Übertragungen, welche {% data variables.large_files.max_github_size %} übersteigen. {% if enterpriseServerVersions contains currentVersion %}Ein Website-Administrator kann jedoch für Deine {% data variables.product.prodname_ghe_server %}-Instanz eine andere Limite konfigurieren. Weitere Informationen findest Du unter „[Push-Begrenzungen für Git festlegen](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits).“{% endif %} diff --git a/translations/de-DE/content/github/managing-large-files/configuring-git-large-file-storage.md b/translations/de-DE/content/github/managing-large-files/configuring-git-large-file-storage.md index 282c1bd09b..d43285ead2 100644 --- a/translations/de-DE/content/github/managing-large-files/configuring-git-large-file-storage.md +++ b/translations/de-DE/content/github/managing-large-files/configuring-git-large-file-storage.md @@ -13,7 +13,7 @@ Wenn in Ihrem Repository bereits Dateien vorhanden sind, für die Sie {% data va {% data reusables.large_files.resolving-upload-failures %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} diff --git a/translations/de-DE/content/github/managing-large-files/removing-files-from-git-large-file-storage.md b/translations/de-DE/content/github/managing-large-files/removing-files-from-git-large-file-storage.md index 9290d04394..89806df91e 100644 --- a/translations/de-DE/content/github/managing-large-files/removing-files-from-git-large-file-storage.md +++ b/translations/de-DE/content/github/managing-large-files/removing-files-from-git-large-file-storage.md @@ -1,6 +1,6 @@ --- -title: Removing files from Git Large File Storage -intro: 'If you''ve set up {% data variables.large_files.product_name_short %} for your repository, you can remove all files or a subset of files from {% data variables.large_files.product_name_short %}.' +title: Dateien aus dem Git Large File Storage entfernen +intro: 'Wenn Sie für Ihr Repository {% data variables.large_files.product_name_short %} eingerichtet haben, können Sie alle oder einen Teil der Dateien aus {% data variables.large_files.product_name_short %} entfernen.' redirect_from: - /articles/removing-files-from-git-large-file-storage versions: @@ -8,45 +8,45 @@ versions: enterprise-server: '*' --- -### Removing a single file +### Einzelne Datei entfernen -1. Remove the file from the repository's Git history using either the `filter-branch` command or BFG Repo-Cleaner. For detailed information on using these, see "[Removing sensitive data from a repository](/articles/removing-sensitive-data-from-a-repository)." -2. Navigate to your *.gitattributes* file. +1. Entferne die Datei mit dem Befehl `filter-branch` oder mit BFG Repo-Cleaner aus dem Git-Verlauf des Repositorys. Weitere Informationen zur Verwendung dieser Werkzeuge findest Du unter „[Vertrauliche Daten aus einem Repository entfernen](/articles/removing-sensitive-data-from-a-repository).“ +2. Navigiere zu Deiner *.gitattributes*-Datei. {% note %} - **Note:** Your *.gitattributes* file is generally saved within your local repository. In some cases, you may have created a global *.gitattributes* file that contains all of your {% data variables.large_files.product_name_short %} associations. + **Hinweis:** Die *.gitattributes*-Datei wird im Allgemeinen im lokalen Repository gespeichert. Eventuell hast Du aber auch eine globale *.gitattributes*-Datei mit allen Deinen {% data variables.large_files.product_name_short %}-Zuordnungen erstellt. {% endnote %} -3. Find and remove the associated {% data variables.large_files.product_name_short %} tracking rule within the *.gitattributes* file. -4. Save and exit the *.gitattributes* file. +3. Suche und entferne die zugeordnete {% data variables.large_files.product_name_short %}-Tracking-Regel (Nachverfolgungsregel) in der *.gitattributes*-Datei. +4. Speichere und schließe die *.gitattributes*-Datei. -### Removing all files within a {% data variables.large_files.product_name_short %} repository +### Alle Dateien eines {% data variables.large_files.product_name_short %}-Repositorys entfernen -1. Remove the files from the repository's Git history using either the `filter-branch` command or BFG Repo-Cleaner. For detailed information on using these, see "[Removing sensitive data from a repository](/articles/removing-sensitive-data-from-a-repository)." -2. Optionally, to uninstall {% data variables.large_files.product_name_short %} in the repository, run: +1. Entferne die Dateien mit dem Befehl `filter-branch` oder mit BFG Repo-Cleaner aus dem Git-Verlauf des Repositorys. Weitere Informationen zur Verwendung dieser Werkzeuge findest Du unter „[Vertrauliche Daten aus einem Repository entfernen](/articles/removing-sensitive-data-from-a-repository).“ +2. Führe optional folgenden Befehl aus, um {% data variables.large_files.product_name_short %} im Repository zu deinstallieren: ```shell $ git lfs uninstall ``` - For {% data variables.large_files.product_name_short %} versions below 1.1.0, run: + Führe bei {% data variables.large_files.product_name_short %}-Versionen vor 1.1.0 folgenden Befehl aus: ```shell $ git lfs uninit ``` -### {% data variables.large_files.product_name_short %} objects in your repository +### {% data variables.large_files.product_name_short %}-Objekte in Ihrem Repository After you remove files from {% data variables.large_files.product_name_short %}, the {% data variables.large_files.product_name_short %} objects still exist on the remote storage{% if currentVersion == "free-pro-team@latest" %} and will continue to count toward your {% data variables.large_files.product_name_short %} storage quota{% endif %}. -To remove {% data variables.large_files.product_name_short %} objects from a repository, {% if currentVersion == "free-pro-team@latest" %}delete and recreate the repository. When you delete a repository, any associated issues, stars, and forks are also deleted. For more information, see "[Deleting a repository](/github/administering-a-repository/deleting-a-repository)."{% else %}contact your {% data variables.product.prodname_enterprise %} administrator to archive the objects. Archived objects are purged after three months.{% endif %} +To remove {% data variables.large_files.product_name_short %} objects from a repository, {% if currentVersion == "free-pro-team@latest" %}delete and recreate the repository. Wenn Du ein Repository löschst, werden alle zugehörigen Issues, Sterne und Forks ebenfalls gelöscht. Weitere Informationen findest Du unter "[Löschen eines Repositories](/github/administering-a-repository/deleting-a-repository)."{% else %}kontaktiere Deinen {% data variables.product.prodname_enterprise %}-Administrator, um die Objekte zu archivieren. Archivierte Objekte werden nach drei Monaten gelöscht.{% endif %} {% note %} -**Note:** If you removed a single file and have other {% data variables.large_files.product_name_short %} objects that you'd like to keep in your repository, after deleting and recreating your repository, reconfigure your {% data variables.large_files.product_name_short %}-associated files. For more information, see "[Removing a single file](#removing-a-single-file)" and "[Configuring {% data variables.large_files.product_name_long %}](/github/managing-large-files/configuring-git-large-file-storage)." +**Hinweis:** Wenn Du eine einzelne Datei entfernt hast und andere {% data variables.large_files.product_name_short %}-Objekte hast, die Du in Deinem Repository behalten möchtest, rekonfiguriere Deine {% data variables.large_files.product_name_short %} zugeordneten Dateien,nachdem Du Dein Repository gelöscht und neu erstellt hast. Weitere Informationen findest Du unter "[Entferne eine einzelne Datei](#removing-a-single-file)" und "[Konfiguriere {% data variables.large_files.product_name_long %}](/github/managing-large-files/configuring-git-large-file-storage)." {% endnote %} -### Further reading +### Weiterführende Informationen -- "[About {% data variables.large_files.product_name_long %}](/articles/about-git-large-file-storage)" -- "[Collaboration with {% data variables.large_files.product_name_long %}](/articles/collaboration-with-git-large-file-storage/)" -- "[Installing {% data variables.large_files.product_name_long %}](/articles/installing-git-large-file-storage)" +- „[Informationen zu {% data variables.large_files.product_name_long %}](/articles/about-git-large-file-storage)“ +- „[Mit {% data variables.large_files.product_name_long %} zusammenarbeiten](/articles/collaboration-with-git-large-file-storage/)“ +- „[{% data variables.large_files.product_name_long %} installieren](/articles/installing-git-large-file-storage)“ diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/translations/de-DE/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index 0ce617f2fd..7296918095 100644 --- a/translations/de-DE/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/translations/de-DE/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -21,7 +21,7 @@ When your code depends on a package that has a security vulnerability, this vuln {% if currentVersion == "free-pro-team@latest" %} - A new vulnerability is added to the {% data variables.product.prodname_advisory_database %}. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)." -- New vulnerability data from [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database) is processed.{% else %} +- New vulnerability data from [WhiteSource](https://www.whitesourcesoftware.com/GitHubSecurityAlerts) is processed.{% else %} - New advisory data is synchronized to {% data variables.product.prodname_ghe_server %} each hour from {% data variables.product.prodname_dotcom_the_website %}. For more information about advisory data, see "Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}."{% endif %} - The dependency graph for a repository changes. For example, when a contributor pushes a commit to change the packages or versions it depends on{% if currentVersion == "free-pro-team@latest" %}, or when the code of one of the dependencies changes{% endif %}. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." @@ -36,7 +36,7 @@ For a list of the ecosystems that {% data variables.product.product_name %} can {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" % %} ### {% data variables.product.prodname_dependabot %} alerts for vulnerable dependencies {% else %} -### Security alerts for vulnerable dependencies +### Sicherheitsmeldungen für angreifbare Abhängigkeiten {% endif %} {% data reusables.repositories.enable-security-alerts %} @@ -49,16 +49,18 @@ You can also enable or disable {% data variables.product.prodname_dependabot %} {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert also contains a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."{% endif %} +When +{% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert will also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} -When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a security alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +When +{% data variables.product.product_name %} identifies a vulnerable dependency, we send a security alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% endif %} {% warning %} -**Note**: {% data variables.product.product_name %}'s security features do not claim to catch all vulnerabilities. Though we are always trying to update our vulnerability database and alert you with our most up-to-date information, we will not be able to catch everything or alert you to known vulnerabilities within a guaranteed time frame. These features are not substitutes for human review of each dependency for potential vulnerabilities or any other issues, and we recommend consulting with a security service or conducting a thorough vulnerability review when necessary. +**Note**: {% data variables.product.product_name %}'s security features do not claim to catch all vulnerabilities. Obwohl wir immer versuchen, unsere Datenbank an Sicherheitslücken zu aktualisieren und Ihnen unsere neuesten Informationen zur Verfügung zu stellen, können wir nicht alles erfassen oder Sie innerhalb eines garantierten Zeitrahmens über bekannte Sicherheitslücken informieren. Diese Funktionen ersetzen nicht die menschliche Überprüfung jeder Abhängigkeit auf potenzielle Sicherheitsrisiken oder andere Probleme. Daher empfehlen wir, einen Sicherheitsdienst zu konsultieren oder bei Bedarf eine gründliche Überprüfung der Sicherheitsrisiken durchzuführen. {% endwarning %} @@ -67,45 +69,20 @@ When {% data variables.product.product_name %} identifies a vulnerable dependenc You can see all of the alerts that affect a particular project{% if currentVersion == "free-pro-team@latest" %} on the repository's Security tab or{% endif %} in the repository's dependency graph.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -We send {% data variables.product.prodname_dependabot_short %} alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository.{% if currentVersion == "free-pro-team@latest" %} You can also enable {% data variables.product.prodname_dependabot_short %} alerts for additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."{% endif %} +We send +{% data variables.product.prodname_dependabot_short %} alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository.{% if currentVersion == "free-pro-team@latest" %} You can also enable {% data variables.product.prodname_dependabot_short %} alerts for additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} -We send security alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +Standardmäßig senden wir Sicherheitsmeldungen an Personen mit Administratorrechten in den betroffenen Repositorys. +{% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. {% endif %} -### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} For more information, see "[Choosing the delivery method for your notifications](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)."{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."{% endif %} {% if currentVersion == "free-pro-team@latest" %} -By default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} +### Weiterführende Informationen -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive {% data variables.product.prodname_dependabot_alerts %} by email. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#security-alert-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Choosing the delivery method for your notifications -](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.20" % %} - -{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} - -{% if currentVersion == "free-pro-team@latest" %} -### Further reading - -- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" -- "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)" -- "[Understanding how {% data variables.product.product_name %} uses and protects your data](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %} +- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" +- „[Angreifbare Abhängigkeiten in Deinem Repository anzeigen und aktualisieren](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)“ +- „[Grundlegendes zur Verwendung und zum Schutz Deiner Daten in {% data variables.product.product_name %}](/categories/understanding-how-github-uses-and-protects-your-data)“{% endif %} diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md b/translations/de-DE/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md new file mode 100644 index 0000000000..ce0eb58e82 --- /dev/null +++ b/translations/de-DE/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md @@ -0,0 +1,33 @@ +--- +title: About GitHub Dependabot security updates +intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.' +shortTitle: About Dependabot security updates +versions: + free-pro-team: '*' +--- + +### Informationen zu {% data variables.product.prodname_dependabot_security_updates %} + +{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot_short %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot_short %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + +{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot_short %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." + +{% note %} + +**Hinweis** + +The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. You will see a {% data variables.product.prodname_dependabot_short %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot_short %} is unable to update an indirect or transitive dependency that is not explicitly defined. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)." + +{% endnote %} + +### About pull requests for security updates + +Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. This includes information about the vulnerability like release notes, changelog entries, and commit details. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_short %} alerts for the repository. + +When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot_short %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot_short %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)." + +{% data reusables.dependabot.automated-tests-note %} + +### Informationen zu Kompatibilitätsbewertungen + +{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency. diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md b/translations/de-DE/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md index 0d893908c7..53f4ca138b 100644 --- a/translations/de-DE/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md +++ b/translations/de-DE/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md @@ -1,6 +1,7 @@ --- title: Sicherheitslücken in der GitHub Advisory Database durchsuchen intro: 'Die {% data variables.product.prodname_advisory_database %} erlaubt Dir, nach Schwachstellen zu suchen, die Open-Source-Projekte auf {% data variables.product.company_short %} betreffen.' +shortTitle: Browsing the Advisory Database versions: free-pro-team: '*' --- diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md b/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md index e264b28382..e302c33794 100644 --- a/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md +++ b/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md @@ -5,30 +5,16 @@ redirect_from: - /articles/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-updates +shortTitle: Configuring Dependabot security updates versions: free-pro-team: '*' --- -### Informationen zum {% data variables.product.prodname_dependabot_security_updates %} +### About configuring {% data variables.product.prodname_dependabot_security_updates %} -{% data variables.product.prodname_dependabot_short %} monitors security advisories such as the {% data variables.product.prodname_advisory_database %} and [WhiteSource](https://www.whitesourcesoftware.com/GitHubSecurityAlerts) and automatically triggers a pull request when it detects a new vulnerable dependency in the dependency graph of repositories. For more information about the {% data variables.product.prodname_advisory_database %}, see "[About the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database#about-the-github-advisory-database)." +You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_short %} alerts and the dependency graph. Weitere Informationen findest Du unter „[ Über {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." -{% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} - -{% data variables.product.prodname_dependabot_short %} includes a link to the pull request in the alert for the vulnerable dependency. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." - -Each security update contains everything you need to quickly and safely review and merge a proposed fix into your project. This includes information about the vulnerability like release notes, changelog entries, and commit details. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_short %} alerts for the repository. - -When you merge a pull request that contains a security update, the corresponding alert is marked as resolved for your repository. - -{% note %} - -**Hinweis** -{% data variables.product.prodname_dependabot_security_updates %} only resolve security vulnerabilities in the dependencies tracked by your dependency graph. Security updates are not created to resolve vulnerabilities in private registries or packages hosted in private repositories. However, indirect or transitive dependencies are included if they are explicitly defined in a lock file, or similar. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." Additionally, it's important to highlight that {% data variables.product.prodname_dependabot_security_updates %} automatically create pulls requests with proposed fixes to the lock files, for the dependencies detected as vulnerable. - -{% endnote %} - -You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_short %} alerts and the dependency graph. You can disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository or for all repositories owned by your user account or organization. For more information, see "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-github-dependabot-security-updates-for-your-repositories)" below. +You can disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository or for all repositories owned by your user account or organization. For more information, see "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-github-dependabot-security-updates-for-your-repositories)" below. {% data reusables.dependabot.dependabot-tos %} @@ -53,10 +39,6 @@ You can enable {% data variables.product.prodname_dependabot_security_updates %} If security updates are not enabled for your repository and you don't know why, first try enabling them using the instructions given in the procedural sections below. If security updates are still not working, you can [contact support](https://support.github.com/contact). -### Informationen zu Kompatibilitätsbewertungen - -{% data variables.product.prodname_dependabot_security_updates %} also include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. We look at previously-passing CI tests from public repositories where we've generated a given security update to learn whether the update causes tests to fail. Die Kompatibilitätsbewertung einer Aktualisierung ist der Prozentsatz an CI-Ausführungen, die beim Aktualisieren zwischen relevanten Versionen der Abhängigkeit bestanden wurden. - ### Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories You can enable or disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository. diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md new file mode 100644 index 0000000000..9b855a2cd8 --- /dev/null +++ b/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md @@ -0,0 +1,58 @@ +--- +title: Configuring notifications for vulnerable dependencies +shortTitle: Benachrichtigungen konfigurieren +intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts.' +versions: + free-pro-team: '*' + enterprise-server: '>=2.21' +--- + +### About notifications for vulnerable dependencies + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we send you {% data variables.product.prodname_dependabot_short %} alerts.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. +{% endif %} + +{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)." +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %} +Your site administrator needs to enable security alerts for vulnerable dependencies for +{% data variables.product.product_location_enterprise %} before you can use the feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.20" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive +{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} by email.{% endif %} + +{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} + +You can configure notification settings for yourself or your organization from the Manage notifications drop-down {% octicon "bell" aria-label="The notifications bell" %} shown at the top of each page. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#choosing-your-notification-settings)." + +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} + ![{% data variables.product.prodname_dependabot_short %} alerts options](/assets/images/help/notifications-v2/dependabot-alerts-options.png) +{% else %} + ![Optionen für Sicherheitswarnungen](/assets/images/help/notifications-v2/security-alerts-options.png) +{% endif %} + +{% note %} + +**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)." + +{% endnote %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} + +### How to reduce the noise from notifications for vulnerable dependencies + +If you are concerned about receiving too many notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, we recommend you opt into the weekly email digest, or turn off notifications while keeping {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} enabled. You can still navigate to see your {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} in your repository's Security tab.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %} + +### Weiterführende Informationen + +- „[Benachrichtigungen konfigurieren](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications)" +- "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-is-queries)" diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/index.md b/translations/de-DE/content/github/managing-security-vulnerabilities/index.md index 16fc4dbc4b..48a15eee55 100644 --- a/translations/de-DE/content/github/managing-security-vulnerabilities/index.md +++ b/translations/de-DE/content/github/managing-security-vulnerabilities/index.md @@ -28,8 +28,11 @@ versions: {% link_in_list /browsing-security-vulnerabilities-in-the-github-advisory-database %} {% link_in_list /about-alerts-for-vulnerable-dependencies %} + {% link_in_list /configuring-notifications-for-vulnerable-dependencies %} + {% link_in_list /about-github-dependabot-security-updates %} {% link_in_list /configuring-github-dependabot-security-updates %} {% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %} {% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %} + {% link_in_list /troubleshooting-github-dependabot-errors %} diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md b/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md new file mode 100644 index 0000000000..a376ff1995 --- /dev/null +++ b/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md @@ -0,0 +1,82 @@ +--- +title: Troubleshooting GitHub Dependabot errors +intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot_short %}.' +shortTitle: Troubleshooting errors +versions: + free-pro-team: '*' +--- + +{% data reusables.dependabot.beta-note %} + +### About {% data variables.product.prodname_dependabot %} errors + +{% data reusables.dependabot.pull-request-introduction %} + +If anything prevents {% data variables.product.prodname_dependabot_short %} from raising a pull request, this is reported as an error. + +### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot_short %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_short %} alerts view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_short %} alerts** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request. + +![{% data variables.product.prodname_dependabot_short %} alerts view showing a pull request link](/assets/images/help/dependabot/dependabot-alert-pr-link.png) + +There are three reasons why an alert may have no pull request link: + +1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository. +1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file. +1. An error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request. + +If an error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request, you can display details of the error by clicking the alert. + +![{% data variables.product.prodname_dependabot_short %} alert showing the error that blocked the creation of a pull request](/assets/images/help/dependabot/dependabot-security-update-error.png) + +### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot_short %} are listed on the {% data variables.product.prodname_dependabot_short %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot_short %}** tab. + +![{% data variables.product.prodname_dependabot_short %} view showing an error](/assets/images/help/dependabot/dependabot-tab-view-error-beta.png) + +To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed. + +![{% data variables.product.prodname_dependabot_short %} version update error and log ](/assets/images/help/dependabot/dependabot-version-update-error-beta.png) + +### Understanding {% data variables.product.prodname_dependabot_short %} errors + +Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot_short %} configuration files. Consequently, some errors are specific to one type of update. + +#### {% data variables.product.prodname_dependabot_short %} cannot update DEPENDENCY to a non-vulnerable version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository. + +Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem. + +The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." + +#### {% data variables.product.prodname_dependabot_short %} cannot update to the required version as there is already an open pull request for the latest version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version. + +There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +#### {% data variables.product.prodname_dependabot_short %} timed out during its update + +{% data variables.product.prodname_dependabot_short %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out. + +This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot_short %} to review the version update and generate the pull request in the time available. + +If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." + +#### {% data variables.product.prodname_dependabot_short %} cannot open any more pull requests + +There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot_short %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests. + +There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit)." + +The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +### Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually + +If you unblock {% data variables.product.prodname_dependabot_short %}, you can manually trigger a fresh attempt to create a pull request. + +- **Security updates**—display the {% data variables.product.prodname_dependabot_short %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot_short %} security update**. +- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**. diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md index 60c68cb3bd..bedd827f80 100644 --- a/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md +++ b/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md @@ -1,6 +1,7 @@ --- title: Troubleshooting the detection of vulnerable dependencies intro: 'If the dependency information reported by {% data variables.product.product_name %} is not what you expected, there are a number of points to consider, and various things you can check.' +shortTitle: Troubleshooting detection versions: free-pro-team: '*' --- @@ -14,9 +15,9 @@ The results of dependency detection reported by {% data variables.product.produc * {% data variables.product.prodname_advisory_database %} is one of the data sources that {% data variables.product.prodname_dotcom %} uses to identify vulnerable dependencies. It's a free, curated database of vulnerability information for common package ecosystems on {% data variables.product.prodname_dotcom %}. It includes both data reported directly to {% data variables.product.prodname_dotcom %} from {% data variables.product.prodname_security_advisories %}, as well as official feeds and community sources. This data is reviewed and curated by {% data variables.product.prodname_dotcom %} to ensure that false or unactionable information is not shared with the development community. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)" and "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." * The dependency graph parses all known package manifest files in a user’s repository. For example, for npm it will parse the _package-lock.json_ file. It constructs a graph of all of the repository’s dependencies and public dependents. This happens when you enable the dependency graph and when anyone pushes to the default branch, and it includes commits that makes changes to a supported manifest format. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." * {% data variables.product.prodname_dependabot_short %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_short %} alerts are aggregated at the repository level, rather than creating one alert per vulnerability. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." | -* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive a security alert about a vulnerable dependency in your repository. {% data variables.product.prodname_dotcom %} automatically creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." - {% data variables.product.prodname_dependabot_short %} doesn't scan repositories on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database. + {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database. ### Why don't I get vulnerability alerts for some ecosystems? @@ -97,3 +98,4 @@ When you click to display the alert details, you can see how many vulnerabilitie - "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" - „[Angreifbare Abhängigkeiten in Ihrem Repository anzeigen und aktualisieren](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)“ - "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/de-DE/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index 981659fe19..32771ee7cf 100644 --- a/translations/de-DE/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/translations/de-DE/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -4,17 +4,18 @@ intro: 'If {% data variables.product.product_name %} discovers vulnerable depend redirect_from: - /articles/viewing-and-updating-vulnerable-dependencies-in-your-repository permissions: Repository administrators and organization owners can view and update dependencies. +shortTitle: Viewing and updating vulnerable dependencies versions: free-pro-team: '*' --- Your repository's {% data variables.product.prodname_dependabot %} alerts tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}. Mithilfe des Dropdownmenü kannst Du die Liste der Warnungen sortieren, und Du kannst auf bestimmte Warnungen klicken, um weitere Details anzuzeigen. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." | -You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. Weitere Informationen findest Du unter „[ Über {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." ### About updates for vulnerable dependencies in your repository -{% data variables.product.product_name %} sends {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} creates a pull request to fix it. {% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} +{% data variables.product.product_name %} sends {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} 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. ### Viewing and updating vulnerable dependencies @@ -33,3 +34,4 @@ You can enable automatic security updates for any repository that uses {% data v - "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" - "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" - "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md index 64c110f04e..70d5c65d95 100644 --- a/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md +++ b/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md @@ -163,25 +163,10 @@ If you are a member of more than one organization, you can configure each one to ### Security alert notification options {% endif %} -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}Choose how you want to receive {% data variables.product.prodname_dependabot_alerts %} for repositories that you are watching. You can receive {% if page.version == 'dotcom' %} {% data variables.product.prodname_dependabot_alerts %} {% else %} security alerts {% endif %} in your inbox, as a banner on {% data variables.product.product_name %}, on the command line, through email, or some combination of these options. +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} -If you want to receive {% data variables.product.prodname_dependabot_alerts %} by email, choose whether you want a weekly email summary of vulnerabilities for up 10 repositories or a new email each time a vulnerability is detected. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." |{% endif %} - -{% if currentVersion == "enterprise-server@2.21" %}Choose how you want to receive security alerts for repositories that you are watching. Du kannst Sicherheitswarnungen in Deinem Posteingang erhalten, als Banner auf {% data variables.product.product_name %}, auf der Befehlszeile, per E-Mail oder eine beliebige Kombination dieser Optionen. - -Wenn Du Sicherheitswarnungen per E-Mail erhalten möchtest, wähle, ob Du eine wöchentliche E-Mail-Zusammenfassung von Verwundbarkeiten für bis zu 10 Repositories erhalten möchtest, oder eine neue E-Mail jedes Mal, wenn eine Verwundbarkeit entdeckt wird. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." |{% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} - ![{% data variables.product.prodname_dependabot_short %} alerts options](/assets/images/help/notifications-v2/dependabot-alerts-options.png) -{% else %} - ![Optionen für Sicherheitswarnungen](/assets/images/help/notifications-v2/security-alerts-options.png) -{% endif %} - -{% note %} - -**Note:** You can filter your {% data variables.product.company_short %} inbox notifications by {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. Weitere Informationen findest Du unter „[Benachrichtigungen über Deinen Posteingang verwalten](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)." - -{% endnote %} +For more information about the notification delivery methods available to you, and advice on optimizing your notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} diff --git a/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md index 80387984b5..afc248cea9 100644 --- a/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md +++ b/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md @@ -124,6 +124,8 @@ Um Benachrichtigungen nach bestimmten Aktivitäten auf {% data variables.product - `is:repository-advisory` - `is:team-discussion` +For information about reducing noise from notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." + Du kannst die Abfrage `is:` auch verwenden, um zu beschreiben, wie die Benachrichtigung selektiert wurde. - `is:saved` diff --git a/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md b/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md index 915e8b2a2a..424de456c6 100644 --- a/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md +++ b/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md @@ -38,7 +38,7 @@ Wenn Du Benachrichtigungen in Deinem Posteingang abmeldest, werden diese automat {% data reusables.notifications.access_notifications %} 1. Wähle im Posteingang für Benachrichtigungen diejenige Benachrichtigungen aus, die Du abmelden möchtest. -2. Benutze das Dropdownmenü **selected** {% octicon "triangle-down" aria-label="The down triangle icon" %} (ausgewählt), und klicke auf **Unsubscribe** (Abmelden). ![Option „Unsubscribe" (Abmelden) aus dem Hauptposteingang](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) +2. Use the **selected** {% octicon "triangle-down" aria-label="The down triangle icon" %} drop-down to click **Unsubscribe.** ![Option „Unsubscribe" (Abmelden) aus dem Hauptposteingang](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) ### Abmeldung von Benachrichtigungen auf der Abonnementseite diff --git a/translations/de-DE/content/github/managing-your-work-on-github/about-automation-for-project-boards.md b/translations/de-DE/content/github/managing-your-work-on-github/about-automation-for-project-boards.md index 44c2e02b19..31a1818005 100644 --- a/translations/de-DE/content/github/managing-your-work-on-github/about-automation-for-project-boards.md +++ b/translations/de-DE/content/github/managing-your-work-on-github/about-automation-for-project-boards.md @@ -29,7 +29,10 @@ Durch die Automatisierung von Projektboards können Teams auch ein gemeinsames V | Done (Erledigt) |
  • Alle abgeschlossenen Issues hierhin verschieben
  • Alle zusammengeführten Pull Requests hierhin verschieben
  • Alle abgeschlossenen, nicht zusammengeführten Pull Requests hierhin verschieben
| ### Projektfortschrittsverfolgung -Die Automatisierung des Projektboards ermöglicht standardmäßig die Verfolgung des Fortschritts. Tickets in Spalten mit den Voreinstellungen „Zu Bearbeiten“, „In Bearbeitung“ oder „Abgeschlossen“ zählen zum Gesamtprojektfortschritt. {% data reusables.project-management.project-progress-locations %} + +You can track the progress on your project board. Cards in the "To do", "In progress", or "Done" columns count toward the overall project progress. {% data reusables.project-management.project-progress-locations %} + +For more information, see "[Tracking progress on your project board](/github/managing-your-work-on-github/tracking-progress-on-your-project-board)." ### Weiterführende Informationen - "[Configuring automation for project boards](/articles/configuring-automation-for-project-boards)"{% if currentVersion == "free-pro-team@latest" %} diff --git a/translations/de-DE/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md b/translations/de-DE/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md index 53a67879b0..ff5167f1c1 100644 --- a/translations/de-DE/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md +++ b/translations/de-DE/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md @@ -1,6 +1,6 @@ --- -title: File attachments on issues and pull requests -intro: 'When you open issue or update a pull request, you can use issue attachments to upload images of proposed features or screenshots of bugs.' +title: Dateianhänge für Issues und Pull Requests +intro: 'Wenn Du einen Issue öffnest oder einen Pull Request aktualisierst, kannst Du mithilfe von Issue-Anhängen Bilder von vorgeschlagenen Funktionen oder Screenshots von Fehlern hochladen.' redirect_from: - /articles/issue-attachments/ - /articles/file-attachments-on-issues-and-pull-requests @@ -8,33 +8,34 @@ versions: free-pro-team: '*' enterprise-server: '*' --- + {% warning %} -**Warning:** If you add an image to a pull request or issue comment, anyone can view the anonymized image URL without authentication, even if the pull request is in a private repository{% if currentVersion != "free-pro-team@latest" %}, or if private mode is enabled{% endif %}. To keep sensitive images private, serve them from a private network or server that requires authentication. {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} +**Warnung:** Wenn Du ein Bild zu einem Pull-Request- oder Issue-Kommentar hinzufügst, kann jeder die anonymisierte Bild-URL ohne Authentifizierung anzeigen, selbst wenn sich der Pull Request in einem privaten Repository befindet{% if enterpriseServerVersions contains currentVersion %} oder der private Modus aktiviert ist{% endif %}. Um vertraulicher Bilder zu schützen, stelle sie über ein privates Netzwerk oder einen Server bereit, der eine Authentifizierung vorschreibt. {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} {% endwarning %} -To attach a file to an issue or pull request conversation, drag and drop it into the comment box. Alternatively, you can click the bar at the bottom of the comment box to browse, select, and add a file from your computer. +Um eine Datei an eine Issue- oder eine Pull-Request-Unterhaltung anzuhängen, ziehe sie per Drag-and-Drop in das Kommentarfeld. Alternativ kannst Du die Leiste am unteren Rand des Kommentarfeldes anklicken, um eine Datei von Deinem Computer zu suchen, auszuwählen und hinzuzufügen. -![Select attachments from computer](/assets/images/help/pull_requests/select-bar.png) +![Anhänge vom Computer auswählen](/assets/images/help/pull_requests/select-bar.png) {% tip %} -**Tip:** If you're using Chrome, you can also copy-and-paste images directly into the box. +**Tip:** In many browsers, you can copy-and-paste images directly into the box. {% endtip %} -The maximum size for files is 25MB and the maximum size for images is 10MB. +Die Größe der Anhänge ist bei Dateien auf 25 MB und bei Bildern auf 10 MB beschränkt. -We support these files: +Wir unterstützen die folgenden Dateiformate: * PNG (*.png*) * GIF (*.gif*) * JPEG (*.jpg*) -* Log files (*.log*) -* Microsoft Word (*.docx*), Powerpoint (*.pptx*), and Excel (*.xlsx*) documents -* Text files (*.txt*) -* PDFs (*.pdf*) -* ZIP (*.zip*, *.gz*) +* Protokolldateien (*.log*) +* Microsoft Word-Dokumente (*.docx*), Powerpoint-Dokumente (*.pptx*) und Excel-Dokumente (*.xlsx*) +* Textdateien (*.txt*) +* PDF-Dateien (*.pdf*) +* ZIP-Dateien (*.zip*, *.gz*) -![Attachments animated GIF](/assets/images/help/pull_requests/dragging_images.gif) +![Animiertes GIF zu Anhängen](/assets/images/help/pull_requests/dragging_images.gif) diff --git a/translations/de-DE/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md b/translations/de-DE/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md index f5eb860e3d..19670c3a45 100644 --- a/translations/de-DE/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md +++ b/translations/de-DE/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md @@ -8,9 +8,15 @@ versions: enterprise-server: '*' --- +{% note %} + +**Note:** In order to link a repository to your organization or user owned project board the repository needs to have issues enabled. For information on how to see if issues are disabled for a repository, see "[Disabling issues](/github/managing-your-work-on-github/disabling-issues) ." + +{% endnote %} + Jeder, der Schreibberechtigung auf ein Projektboard hat, kann Repositories im Besitz dieser Organisation oder dieses Benutzerkontos mit dem Projektboard verknüpfen. Weitere Informationen findest Du unter „[Projektboardberechtigungen für eine Organisation](/articles/project-board-permissions-for-an-organization/)" oder „[Berechtigungsebenen für benutzereigene Projektboards](/articles/permission-levels-for-user-owned-project-boards/)." -{% data reusables.project-management.link-repos-to-project-board %} Du kannst Issues und Pull Requests von nicht verknüpften Repositorys hinzufügen, indem Du die URL des Issues oder Pull Requests in ein Ticket eingibst. Weitere Informationen findest Du unter „[Issues und Pull Requests zu einem Projektboard hinzufügen](/articles/adding-issues-and-pull-requests-to-a-project-board).“ +{% data reusables.project-management.link-repos-to-project-board %} Du kannst Issues und Pull Requests von nicht verknüpften Repositorys hinzufügen, indem Du die URL des Issues oder Pull Requests in ein Ticket eingibst. Weitere Informationen finden Sie unter „[Issues und Pull Requests zu einem Projektboard hinzufügen](/articles/adding-issues-and-pull-requests-to-a-project-board)“. 1. Navigiere zu dem Projektboard, zu dem Du ein Repository verknüpfen möchtest. {% data reusables.project-management.click-menu %} diff --git a/translations/de-DE/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md b/translations/de-DE/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md index 2eaf401b5e..d67b1354a4 100644 --- a/translations/de-DE/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md +++ b/translations/de-DE/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md @@ -1,6 +1,6 @@ --- title: Fortschritt in Deinem Projektboard verfolgen -intro: 'Wenn für ein Projektboard die Automatisierung aktiviert ist, wird der Gesamtfortschritt des Projekts in der Fortschrittsanzeige angezeigt.' +intro: 'You can see the overall progress of your project in a progress bar.' redirect_from: - /articles/tracking-progress-on-your-project-board versions: @@ -10,7 +10,7 @@ versions: {% data reusables.project-management.project-progress-locations %} -1. Navigiere zum Projektboard, in dem die Projektfortschrittsverfolgung deaktiviert werden soll. +1. Navigate to the project board where you want to enable or disable project progress tracking. {% data reusables.project-management.click-menu %} -{% data reusables.project-management.access-collaboration-settings %} -4. Deaktiviere **Track project progress** (Projektfortschritt verfolgen). +{% data reusables.project-management.click-edit-sidebar-menu-project-board %} +4. Select or deselect **Track project progress**. diff --git a/translations/de-DE/content/github/searching-for-information-on-github/finding-files-on-github.md b/translations/de-DE/content/github/searching-for-information-on-github/finding-files-on-github.md index 1215bf26cd..97b479dbc5 100644 --- a/translations/de-DE/content/github/searching-for-information-on-github/finding-files-on-github.md +++ b/translations/de-DE/content/github/searching-for-information-on-github/finding-files-on-github.md @@ -18,7 +18,7 @@ versions: {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. Klicke unter dem Namen des Repositorys auf **Find file** (Datei suchen). ![Schaltfläche „Find file“ (Datei finden)](/assets/images/help/search/find-file-button.png) {% else %} 2. Above the list of files, click **Go to file**. ![Schaltfläche „Find file“ (Datei finden)](/assets/images/help/search/find-file-button.png) diff --git a/translations/de-DE/content/github/searching-for-information-on-github/searching-for-packages.md b/translations/de-DE/content/github/searching-for-information-on-github/searching-for-packages.md index e0b586ee30..3fcd80365f 100644 --- a/translations/de-DE/content/github/searching-for-information-on-github/searching-for-packages.md +++ b/translations/de-DE/content/github/searching-for-information-on-github/searching-for-packages.md @@ -14,7 +14,7 @@ versions: Du kannst global über das gesamte {% data variables.product.product_name %} nach Paketen suchen, oder nur innerhalb einer bestimmten Organisation. Weitere Informationen findest Du unter „[Informationen zur Suche auf {% data variables.product.prodname_dotcom %}](/articles/about-searching-on-github).“ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} You can only search for packages on {% data variables.product.product_location_enterprise %}, not {% data variables.product.prodname_dotcom_the_website %}, even if {% data variables.product.prodname_github_connect %} is enabled. {% endif %} diff --git a/translations/de-DE/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md b/translations/de-DE/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md index 4c609b8154..ee1f5d5c34 100644 --- a/translations/de-DE/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md +++ b/translations/de-DE/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md @@ -13,7 +13,7 @@ Sie können Issues und Pull Requests global auf {% data variables.product.produc {% tip %} -**Tips:**{% if currentVersion != "free-pro-team@latest" %} +**Tips:**{% if enterpriseServerVersions contains currentVersion %} - Dieser Artikel enthält Beispielsuchen für die Website {% data variables.product.prodname_dotcom %}.com. Die gleichen Suchfilter kannst Du jedoch auch auf {% data variables.product.product_location_enterprise %} verwenden.{% endif %} - Eine Liste mit Suchsyntax, die Du jedem Qualifizierer hinzufügen kannst, um Deine Ergebnisse zu verbessern, findest Du unter „[Grundlagen der Suchsyntax](/articles/understanding-the-search-syntax)“. - Schließe Suchbegriffe, die aus mehreren Wörtern bestehen, in Anführungszeichen ein. Möchtest Du beispielsweise nach Issues mit der Kennzeichnung „In progress“ suchen, gib `label:"in progress"` ein. Bei der Suche wird die Groß-/Kleinschreibung ignoriert. diff --git a/translations/de-DE/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md b/translations/de-DE/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md index a664903e88..78f7111387 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md +++ b/translations/de-DE/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md @@ -51,7 +51,7 @@ Die Anzahl der Aufträge, die Du gleichzeitig über alle Repositories in Deinem Am Ende des Monats berechnet {% data variables.product.prodname_dotcom %} die Minuten- und Speicherkosten, die über den in Deinem Konto enthaltenen Kontingent liegen. Wenn Deine Organisation beispielsweise {% data variables.product.prodname_team %} verwendet und unbegrenzte Ausgaben zulässt, würde der Verbrauch von 15.000 Minuten die gesamten Speicher- und Minutenkosten um 56 $ überschreiten, abhängig von den Betriebssystemen, die zur Ausführung der Aufträge verwendet werden. - 5.000 (3.000 Linux und 2.000 Windows) Minuten = 56 $ (24 $ + 32 $). - - 3,000 Linux Minuten zu je 0.008 $ = 24 $. + - 3,000 Linux minutes at $0.008 per minute = $24. - 2.000 Windows Minuten zu je 0.016 $ = 32 $. Am Ende jedes Monates wird {% data variables.product.prodname_dotcom %} Deine Datenübertragung auf das nächste GB aufrunden. diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md index 59ae114ead..1bc69bc16b 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md @@ -19,7 +19,7 @@ Weitere Informationen findest Du unter: ![Bild einer Teamerwähnung](/assets/images/help/teams/team-mention.png) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Sie können außerdem mit LDAP Sync {% data variables.product.product_location_enterprise %}-Teammitglieder und -Teamrollen mit Ihren bestehenden LDAP-Gruppen synchronisieren. Dadurch können Sie eine rollenbasierte Zugriffskontrolle für Benutzer von Ihrem LDAP-Server aus statt manuell innerhalb von {% data variables.product.product_location_enterprise %} einrichten. Weitere Informationen finden Sie unter „[LDAP-Synchronisierung aktivieren](/enterprise/{{ page.version }}/admin/guides/user-management/using-ldap#enabling-ldap-sync)“. @@ -55,7 +55,7 @@ Um zu verstehen, wer die Berechtigungen und Erwähnungen eines übergeordneten T Du kannst beim Erstellen des Teams ein übergeordnetes Team auswählen oder ein Team in der Hierarchie Deiner Organisation später verschieben. Weitere Informationen findest Du unter „[Team innerhalb der Hierarchie Deiner Organisation verschieben](/articles/moving-a-team-in-your-organization-s-hierarchy).“ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.enterprise_user_management.ldap-sync-nested-teams %} diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md index 21495154d6..818053aacc 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md @@ -28,7 +28,7 @@ Im Abschnitt „Recent activity" (Neueste Aktivitäten) Deines Newsfeed kannst D Im Bereich "Alle Aktivitäten" Deines Newsfeed kannst Du Aktualisierungen von anderen Teams und Repositorys in Deiner Organisation ansehen. -Der Abschnitt "Alle Aktivitäten" zeigt alle aktuellen Aktivitäten in der Organisation, einschließlich Aktivitäten in Repositorys, die Du nicht abonniert hast, und von Personen, denen Du nicht folgst. For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." +Der Abschnitt "Alle Aktivitäten" zeigt alle aktuellen Aktivitäten in der Organisation, einschließlich Aktivitäten in Repositorys, die Du nicht abonniert hast, und von Personen, denen Du nicht folgst. For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." Beispielsweise werden im Newsfeed der Organisation Aktualisierungen angezeigt, wenn jemand in der Organisation: - einen neuen Branch erstellt, diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md index 6b112565b6..92572a11d2 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md @@ -1,6 +1,6 @@ --- -title: Adding organization members to a team -intro: 'People with owner or team maintainer permissions can add organization members to teams. People with owner permissions can also {% if currentVersion == "free-pro-team@latest" %}invite non-members to join{% else %}add non-members to{% endif %} a team and the organization.' +title: Organisationsmitglieder zu einem Team hinzufügen +intro: 'Benutzer mit Inhaber- oder Team-Betreuer-Berechtigungen können Organisationsmitglieder zu Teams hinzufügen. People with owner permissions can also {% if currentVersion == "free-pro-team@latest" %}invite non-members to join{% else %}add non-members to{% endif %} a team and the organization.' redirect_from: - /articles/adding-organization-members-to-a-team-early-access-program/ - /articles/adding-organization-members-to-a-team @@ -15,14 +15,13 @@ versions: {% data reusables.profile.access_org %} {% data reusables.organizations.specific_team %} {% data reusables.organizations.team_members_tab %} -6. Above the list of team members, click **Add a member**. -![Add member button](/assets/images/help/teams/add-member-button.png) +6. Klicke oberhalb der Liste der Teammitglieder auf **Add a member** (Ein Mitglied hinzufügen). ![Schaltfläche „Add member“ (Mitglied hinzufügen)](/assets/images/help/teams/add-member-button.png) {% data reusables.organizations.invite_to_team %} {% data reusables.organizations.review-team-repository-access %} {% if currentVersion == "free-pro-team@latest" %}{% data reusables.organizations.cancel_org_invite %}{% endif %} -### Further reading +### Weiterführende Informationen -- "[About teams](/articles/about-teams)" -- "[Managing team access to an organization repository](/articles/managing-team-access-to-an-organization-repository)" +- „[Informationen zu Teams](/articles/about-teams)“ +- „[Den Teamzugriff auf ein Repository einer Organisation verwalten](/articles/managing-team-access-to-an-organization-repository)“ diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md index be985f9279..e701ab4948 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md @@ -1,5 +1,5 @@ --- -title: Converting an outside collaborator to an organization member +title: Einen externen Mitarbeiter in ein Organisationsmitglied umwandeln intro: 'If you would like to give an outside collaborator on your organization''s repositories broader permissions within your organization, you can {% if currentVersion == "free-pro-team@latest" %}invite them to become a member of{% else %}make them a member of{% endif %} the organization.' redirect_from: - /articles/converting-an-outside-collaborator-to-an-organization-member @@ -12,7 +12,7 @@ versions: **Tips**: - Only organization owners can {% if currentVersion == "free-pro-team@latest" %}invite users to join{% else %}add users to{% endif %} an organization. For more information, see "[Permission levels for an organization](/articles/permission-levels-for-an-organization)."{% if currentVersion == "free-pro-team@latest" %} -- If your organization is on a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %}{% endif %} +- Wenn Deine Organisation ein benutzerabhängiges Abonnement abgeschlossen hat, muss eine Lizenz verfügbar sein, bevor Du ein neues Mitglied zur Organisation einladen oder ein ehemaliges Organisationsmitglied wieder einsetzen kannst. Weitere Informationen finden Sie unter „[Informationen zur benutzerabhängigen Preisgestaltung](/articles/about-per-user-pricing)“. {% data reusables.organizations.org-invite-expiration %}{% endif %} - If your organization [requires members to use two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization), users {% if currentVersion == "free-pro-team@latest" %}you invite must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before they can accept the invitation.{% else %}must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before you can add them to the organization.{% endif %} {% endtip %} @@ -22,9 +22,10 @@ versions: {% data reusables.organizations.people %} {% data reusables.organizations.people_tab_outside_collaborators %} {% if currentVersion == "free-pro-team@latest" %} -5. To the right of the name of the outside collaborator you want to become a member, use the {% octicon "gear" aria-label="The gear icon" %} drop-down menu and click **Invite to organization**.![Invite outside collaborators to organization](/assets/images/help/organizations/invite_outside_collaborator_to_organization.png) +5. To the right of the name of the outside collaborator you want to become a member, use the +{% octicon "gear" aria-label="The gear icon" %} drop-down menu and click **Invite to organization**.![Externe Mitarbeiter zur Organisation einladen](/assets/images/help/organizations/invite_outside_collaborator_to_organization.png) {% else %} -5. To the right of the name of the outside collaborator you want to become a member, click **Invite to organization**.![Invite outside collaborators to organization](/assets/images/enterprise/orgs-and-teams/invite_outside_collabs_to_org.png) +5. Klicke rechts neben dem Namen des externen Mitarbeiters, der Mitglied werden soll, auf **Invite to organization** (Zur Organisation einladen).![Externe Mitarbeiter zur Organisation einladen](/assets/images/enterprise/orgs-and-teams/invite_outside_collabs_to_org.png) {% endif %} {% data reusables.organizations.choose-to-restore-privileges %} {% data reusables.organizations.choose-user-role-send-invitation %} @@ -32,6 +33,6 @@ versions: {% data reusables.organizations.user_must_accept_invite_email %} {% data reusables.organizations.cancel_org_invite %} {% endif %} -### Further reading +### Weiterführende Informationen -- "[Converting an organization member to an outside collaborator](/articles/converting-an-organization-member-to-an-outside-collaborator)" +- „[Ein Organisationsmitglied in einen externen Mitarbeiter umwandeln](/articles/converting-an-organization-member-to-an-outside-collaborator)“ diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md index 536c0ef659..2900fa4ff9 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md @@ -17,7 +17,7 @@ Du kannst {% data variables.product.prodname_actions %} für alle Repositories i Alternativ kannst Du {% data variables.product.prodname_actions %} für alle Repository in Deiner Organisation aktivieren, aber die Aktionen limitieren, die ein Workflow ausführen kann. {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### {% data variables.product.prodname_actions %}-Berechtigungen für Deine Organisation verwalten diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md index f3231626ad..a8405f2f65 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md @@ -12,7 +12,7 @@ versions: You can control whether members of your organization can publish websites from repositories in your organization using {% data variables.product.prodname_pages %}. For more information about {% data variables.product.prodname_pages %}, see "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages)." -{% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." +{% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. Weitere Informationen findest Du unter{% if enterpriseServerVersions contains currentVersion %} „[Konfigurieren {% data variables.product.prodname_pages %} auf Deiner Appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" und{% endif %} „[Über die Sichtbarkeit des Repositorys](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." ### Disabling publication of {% data variables.product.prodname_pages %} sites @@ -22,7 +22,5 @@ After you disable publication of {% data variables.product.prodname_pages %} sit {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.member-privileges %} -1. Under "Pages creation", unselect **Allow members to publish sites**. - ![Unselected checkbox for "Allow members to publish sites" option](/assets/images/help/organizations/org-settings-pages-disable-publication-checkbox.png) -1. Click **Save**. - !["Save" button for "Allow members to publish sites" option](/assets/images/help/organizations/org-settings-pages-disable-publication-save-button.png) +1. Under "Pages creation", unselect **Allow members to publish sites**. ![Unselected checkbox for "Allow members to publish sites" option](/assets/images/help/organizations/org-settings-pages-disable-publication-checkbox.png) +1. Klicke auf **Save** (Speichern). !["Save" button for "Allow members to publish sites" option](/assets/images/help/organizations/org-settings-pages-disable-publication-save-button.png) diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/index.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/index.md index 054b97ec77..b91c3debe2 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/index.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/index.md @@ -127,7 +127,7 @@ versions: {% link_in_list /disabling-publication-of-github-pages-sites-for-your-organization %} {% link_in_list /deleting-an-organization-account %} {% link_in_list /converting-an-organization-into-a-user %} - + {% link_in_list /integrating-jira-with-your-organization-project-board %} diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md index e3b6c6b4df..bbb8361961 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md @@ -63,7 +63,7 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | {% data variables.product.prodname_marketplace %}-Apps erwerben, installieren, kündigen und ihre Abrechnung verwalten | **X** | | | | Apps auf {% data variables.product.prodname_marketplace %} aufführen | **X** | | | | Receive [{% data variables.product.prodname_dependabot_alerts %} about vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) for all of an organization's repositories | **X** | | | -| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)") | **X** | | | +| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | | | [Die Forking-Richtlinie verwalten](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | | | [Aktivitäten in öffentlichen Repositorys in einer Organisation einschränken](/articles/limiting-interactions-in-your-organization) | **X** | | | | Lesen von (pull), Schreiben zu (push) und Kopieren von (clone) *allen Repositorys* der Organisation | **X** | | | diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md index 90f63f350b..1eed24c9be 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md @@ -1,6 +1,6 @@ --- -title: Reinstating a former outside collaborator's access to your organization -intro: 'If you required two-factor authentication in your organization and an outside collaborator was removed from the organization for not having 2FA enabled, you can reinstate a former outside collaborator''s access permissions for organization repositories, forks, and settings.' +title: Zugriff eines ehemaligen externen Mitarbeiters auf Deine Organisation wieder einsetzen +intro: 'Wenn Du in Deiner Organisation die Zwei-Faktor-Authentifizierung eingeführt hast und ein externer Mitarbeiter aus der Organisation entfernt wurde, weil er die 2FA nicht aktiviert hatte, kannst Du dessen Zugriffsberechtigungen für die Repositorys, Forks und Einstellungen der Organisation wiederherstellen.' redirect_from: - /articles/reinstating-a-former-outside-collaborator-s-access-to-your-organization - /articles/reinstating-a-former-outside-collaborators-access-to-your-organization @@ -9,25 +9,25 @@ versions: enterprise-server: '*' --- -If an outside collaborator's access to your organization's private repositories is removed because you've [required members and outside collaborators to enable two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization), the user's access privileges and settings are saved for three months. You can restore the user's privileges if you {% if currentVersion == "free-pro-team@latest" %}invite{% else %}add{% endif %} them back to the organization within that time frame. +Wenn der Zugriff eines externen Mitarbeiters auf die privaten Repositorys Deiner Organisation entfernt wurde, weil Du von Deinen [Mitgliedern und externen Mitarbeitern die Aktivierung der Zwei-Faktor-Authentifizierung verlangst](/articles/requiring-two-factor-authentication-in-your-organization), bleiben die Zugriffsberechtigungen und Einstellungen des Benutzers drei Monate lang im System gespeichert. You can restore the user's privileges if you {% if currentVersion == "free-pro-team@latest" %}invite{% else %}add{% endif %} them back to the organization within that time frame. {% data reusables.two_fa.send-invite-to-reinstate-user-before-2fa-is-enabled %} -When you reinstate a former outside collaborator, you can restore: - - The user's former access to organization repositories - - Any private forks of repositories owned by the organization - - Membership in the organization's teams - - Previous access and permissions for the organization's repositories - - Stars for organization repositories - - Issue assignments in the organization - - Repository subscriptions (notification settings for watching, not watching, or ignoring a repository's activity) +Bei der Wiedereinsetzung eines ehemaligen externen Mitarbeiters kannst Du Folgendes wiederherstellen: + - Die früheren Zugriffsberechtigungen des Benutzers auf die Organisationsrepositorys + - Alle privaten Forks der Repositorys der Organisation + - Die Mitgliedschaft innerhalb der Organisationsteams + - Die früheren Zugriffsrechte und Berechtigungen für die Repositorys der Organisation + - Sterne für die Repositorys der Organisation + - Issue-Zuweisungen innerhalb der Organisation + - Repository-Abonnements (Benachrichtigungseinstellungen für das Beobachten, Nichtbeobachten oder Ignorieren der Repository-Aktivitäten) {% tip %} **Tips**: - - Only organization owners can reinstate outside collaborators' access to an organization. For more information, see "[Permission levels for an organization](/articles/permission-levels-for-an-organization)." + - Nur der Organisationsinhaber kann den Zugriff eines externen Mitarbeiters auf seine Organisation wieder einsetzen. Weitere Informationen finden Sie unter „[Berechtigungsebenen für eine Organisation](/articles/permission-levels-for-an-organization)". - The reinstating a member flow on {% data variables.product.product_location %} may use the term "member" to describe reinstating an outside collaborator but if you reinstate this person and keep their previous privileges, they will only have their previous [outside collaborator permissions](/articles/permission-levels-for-an-organization/#outside-collaborators).{% if currentVersion == "free-pro-team@latest" %} - - If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)."{% endif %} + - Wenn Deine Organisation ein benutzerabhängiges Abonnement abgeschlossen hat, muss eine Lizenz verfügbar sein, bevor Du ein neues Mitglied zur Organisation einladen oder ein ehemaliges Organisationsmitglied wieder einsetzen kannst. Weitere Informationen findest Du unter „[Informationen zu benutzerbasierten Preisen](/articles/about-per-user-pricing)“.{% endif %} {% endtip %} @@ -37,37 +37,35 @@ When you reinstate a former outside collaborator, you can restore: {% data reusables.organizations.invite_member_from_people_tab %} {% data reusables.organizations.reinstate-user-type-username %} {% if currentVersion == "free-pro-team@latest" %} -6. Choose to restore the outside collaborator's previous privileges in the organization by clicking **Invite and reinstate** or choose to clear their previous privileges and set new access permissions by clicking **Invite and start fresh**. +6. Klicke auf **Invite and reinstate** (Einladen und wieder einsetzen) oder auf **Invite and start fresh** (Einladen und neu beginnen), um festzulegen, ob Du den externen Mitarbeiter mit seinen früheren Zugriffsberechtigungen innerhalb der Organisation wieder einsetzen möchtest oder ob Du die früheren Berechtigungen löschen und neu festlegen möchtest. {% warning %} - **Warning:** If you want to upgrade the outside collaborator to a member of your organization, then choose **Invite and start fresh** and choose a new role for this person. Note, however, that this person's private forks of your organization's repositories will be lost if you choose to start fresh. To make the former outside collaborator a member of your organization *and* keep their private forks, choose **Invite and reinstate** instead. Once this person accepts the invitation, you can convert them to an organization member by [inviting them to join the organization as a member](/articles/converting-an-outside-collaborator-to-an-organization-member). + **Warnung:** Wenn Du einen externen Mitarbeiter in ein Mitglied Deiner Organisation umwandeln möchtest, klicke auf **Invite and start fresh** (Einladen und neu starten), und wähle eine neue Rolle für diese Person aus. Wenn Du jedoch seine Rolle und Berechtigungen neu festlegst, gehen seine privaten Forks der Repositorys der Organisation verloren. Sollen bei der Umwandlung des externen Mitarbeiters zu einem Mitglied Deiner Organisation dessen privaten Forks *erhalten bleiben*, wähle stattdessen **Invite and reinstate** (Einladen und wieder einsetzen) aus. Sobald diese Person die Einladung annimmt, kannst Du sie anschließend durch [Einladung zum Organisationsbeitritt als Mitglied](/articles/converting-an-outside-collaborator-to-an-organization-member) in ein Organisationsmitglied umwandeln. {% endwarning %} - ![Choose to restore settings or not](/assets/images/help/organizations/choose_whether_to_restore_org_member_info.png) + ![Auswählen, ob Einstellungen wiederhergestellt werden sollen](/assets/images/help/organizations/choose_whether_to_restore_org_member_info.png) {% else %} -6. Choose to restore the outside collaborator's previous privileges in the organization by clicking **Add and reinstate** or choose to clear their previous privileges and set new access permissions by clicking **Add and start fresh**. +6. Klicke auf **Add and reinstate** (Hinzufügen und wieder einsetzen) oder auf **Add and start fresh** (Hinzufügen und neu beginnen), um festzulegen, ob Du den externen Mitarbeiter mit seinen früheren Zugriffsberechtigungen innerhalb der Organisation wieder einsetzen möchtest oder ob Du die früheren Berechtigungen löschen und neu festlegen möchtest. {% warning %} - **Warning:** If you want to upgrade the outside collaborator to a member of your organization, then choose **Add and start fresh** and choose a new role for this person. Note, however, that this person's private forks of your organization's repositories will be lost if you choose to start fresh. To make the former outside collaborator a member of your organization *and* keep their private forks, choose **Add and reinstate** instead. Then, you can convert them to an organization member by [adding them to the organization as a member](/articles/converting-an-outside-collaborator-to-an-organization-member). + **Warnung:** Wenn Du einen externen Mitarbeiter in ein Mitglied Deiner Organisation umwandeln möchtest, klicke auf **Add and start fresh** (Hinzufügen und neu beginnen), und wähle eine neue Rolle für diese Person aus. Wenn Du jedoch seine Rolle und Berechtigungen neu festlegst, gehen seine privaten Forks der Repositorys der Organisation verloren. Sollen bei der Umwandlung des externen Mitarbeiters zu einem Mitglied Deiner Organisation dessen privaten Forks *erhalten bleiben*, wähle stattdessen **Add and reinstate** (Hinzufügen und wieder einsetzen) aus. Danach kannst Du diese Person durch [Hinzufügen zur Organisation als Mitglied](/articles/converting-an-outside-collaborator-to-an-organization-member) in ein Organisationsmitglied umwandeln. {% endwarning %} - ![Choose to restore settings or not](/assets/images/help/organizations/choose_whether_to_restore_org_member_info_ghe.png) + ![Auswählen, ob Einstellungen wiederhergestellt werden sollen](/assets/images/help/organizations/choose_whether_to_restore_org_member_info_ghe.png) {% endif %} {% if currentVersion == "free-pro-team@latest" %} -7. If you cleared the previous privileges for a former outside collaborator, choose a role for the user and optionally add them to some teams, then click **Send invitation**. - ![Role and team options and send invitation button](/assets/images/help/organizations/add-role-send-invitation.png) +7. Wenn Du die früheren Berechtigungen eines ehemaligen externen Mitarbeiters gelöscht hast, wähle eine neue Rolle für den Benutzer aus, und füge ihn optional zu einem oder mehreren Teams hinzu. Klicke dann auf **Send invitation** (Einladung senden). ![Rollen- und Teamoptionen und Schaltfläche „Send invitation“ (Einladung senden)](/assets/images/help/organizations/add-role-send-invitation.png) {% else %} -7. If you cleared the previous privileges for a former outside collaborator, choose a role for the user and optionally add them to some teams, then click **Add member**. - ![Role and team options and add member button](/assets/images/help/organizations/add-role-add-member.png) +7. Wenn Du die früheren Berechtigungen eines ehemaligen externen Mitarbeiters gelöscht hast, wähle eine neue Rolle für den Benutzer aus, und füge ihn optional zu einem oder mehreren Teams hinzu. Klicke dann auf **Add member** (Mitglied hinzufügen). ![Rollen- und Teamoptionen und Schaltfläche „Add member“ (Mitglied hinzufügen)](/assets/images/help/organizations/add-role-add-member.png) {% endif %} {% if currentVersion == "free-pro-team@latest" %} -8. The invited person will receive an email inviting them to the organization. They will need to accept the invitation before becoming an outside collaborator in the organization. {% data reusables.organizations.cancel_org_invite %} +8. Die eingeladene Person erhält per E-Mail eine Einladung zur Organisation. Um externer Mitarbeiter der Organisation zu werden, muss die eingeladene Person die Einladung annehmen. {% data reusables.organizations.cancel_org_invite %} {% endif %} -### Further Reading +### Weiterführende Informationen -- "[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)" +- „[Berechtigungsebenen für die Repositorys einer Organisation](/articles/repository-permission-levels-for-an-organization)“ diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md index b0029b8eea..66375ea090 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md @@ -47,7 +47,7 @@ To search for specific events, use the `action` qualifier in your query. Actions | `repository_content_analysis` | Contains all activities related to [enabling or disabling data use for a private repository](/articles/about-github-s-use-of-your-data). | `repository_dependency_graph` | Contains all activities related to [enabling or disabling the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository).{% endif %} | `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} +| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion %} | `team` | Contains all activities related to teams in your organization.{% endif %} | `team_discussions` | Contains activities related to managing team discussions for an organization. @@ -85,7 +85,7 @@ This list describes the available categories and associated events: - [The `repository_content_analysis` category](#the-repository_content_analysis-category) - [The `repository_dependency_graph` category](#the-repository_dependency_graph-category){% endif %} - [The `repository_vulnerability_alert` category](#the-repository_vulnerability_alert-category){% if currentVersion == "free-pro-team@latest" %} -- [The `sponsors` category](#the-sponsors-category){% endif %}{% if currentVersion != "free-pro-team@latest" %} +- [The `sponsors` category](#the-sponsors-category){% endif %}{% if enterpriseServerVersions contains currentVersion %} - [The `team` category](#the-team-category){% endif %} - [The `team_discussions` category](#the-team_discussions-category) @@ -184,7 +184,8 @@ For more information, see "[Restricting publication of {% data variables.product |------------------|-------------------{% if currentVersion == "free-pro-team@latest"%} | `audit_log_export` | Triggered when an organization admin [creates an export of the organization audit log](#exporting-the-audit-log). If the export included a query, the log will list the query used and the number of audit log entries matching that query. | `block_user` | Triggered when an organization owner [blocks a user from accessing the organization's repositories](/articles/blocking-a-user-from-your-organization). -| `cancel_invitation` | Triggered when an organization invitation has been revoked. +| `cancel_invitation` | Triggered when an organization invitation has been revoked. {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization).{% endif %} {% if currentVersion == "free-pro-team@latest"%} | `disable_oauth_app_restrictions` | Triggered when an owner [disables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/disabling-oauth-app-access-restrictions-for-your-organization) for your organization. | `disable_saml` | Triggered when an organization admin disables SAML single sign-on for an organization.{% endif %} | `disable_member_team_creation_permission` | Triggered when an organization owner limits team creation to owners. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | @@ -196,13 +197,22 @@ For more information, see "[Restricting publication of {% data variables.product | `invite_member` | Triggered when [a new user was invited to join your organization](/articles/adding-organization-members-to-a-team).{% if currentVersion == "free-pro-team@latest" %} | `oauth_app_access_approved` | Triggered when an owner [grants organization access to an {% data variables.product.prodname_oauth_app %}](/articles/approving-oauth-apps-for-your-organization/). | `oauth_app_access_denied` | Triggered when an owner [disables a previously approved {% data variables.product.prodname_oauth_app %}'s access](/articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization) to your organization. -| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). +| `remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest"%} | `remove_billing_manager` | Triggered when an [owner removes a billing manager from an organization](/articles/removing-a-billing-manager-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and a billing manager doesn't use 2FA or disables 2FA. |{% endif %} | `remove_member` | Triggered when an [owner removes a member from an organization](/articles/removing-a-member-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an organization member doesn't use 2FA or disables 2FA. Also triggered when an [organization member removes themselves](/articles/removing-yourself-from-an-organization/) from an organization.| -| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" %} +| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). {% endif %}{% if currentVersion == "free-pro-team@latest" %} | `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." -| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." -| `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/articles/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). +| `runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. +| `runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. +| `runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). +| `runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. {% endif %}{% if currentVersion == "free-pro-team@latest"%} +| `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/articles/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} | `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} | `update_default_repository_permission` | Triggered when an owner changes the default repository permission level for organization members. | `update_member` | Triggered when an owner changes a person's role from owner to member or member to owner. @@ -300,21 +310,26 @@ For more information, see "[Restricting publication of {% data variables.product | `access` | Triggered when a repository owned by an organization is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). | `add_member` | Triggered when a user accepts an [invitation to have collaboration access to a repository](/articles/inviting-collaborators-to-a-personal-repository). | `add_topic` | Triggered when a repository admin [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. -| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} +| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if enterpriseServerVersions contains currentVersion %} | `config.disable_anonymous_git_access` | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | `config.enable_anonymous_git_access` | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | `config.lock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). | `config.unlock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is unlocked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access).{% endif %} -| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository). +| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository).{% endif %} | `destroy` | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} | `disable` | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %} -| `enable` | Triggered when a repository is reenabled. -| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository). +| `enable` | Triggered when a repository is reenabled.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret.{% endif %} +| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). +| `remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). {% endif %} | `remove_topic` | Triggered when a repository admin removes a topic from a repository. | `rename` | Triggered when [a repository is renamed](/articles/renaming-a-repository). | `transfer` | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). | `transfer_start` | Triggered when a repository transfer is about to occur. -| `unarchived` | Triggered when a repository admin unarchives a repository. +| `unarchived` | Triggered when a repository admin unarchives a repository.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret.{% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -351,7 +366,7 @@ For more information, see "[Restricting publication of {% data variables.product | repo_funding_links_file_action | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### The `team` category | Action | Description diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md index 83bcbe3dd4..515c4749f0 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md @@ -1,6 +1,6 @@ --- -title: Reviewing your organization's installed integrations -intro: You can review the permission levels for your organization's installed integrations and configure each integration's access to organization repositories. +title: Installierte Integrationen Deiner Organisation überprüfen +intro: Du kannst die Berechtigungsebenen für die installierten Integrationen Deiner Organisation überprüfen und den Zugriff jeder Integration auf die Repositorys Deiner Organisation konfigurieren. redirect_from: - /articles/reviewing-your-organization-s-installed-integrations - /articles/reviewing-your-organizations-installed-integrations @@ -12,12 +12,9 @@ versions: {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} -4. In the left sidebar, click **Installed {% data variables.product.prodname_github_app %}s**. - ![Installed {% data variables.product.prodname_github_app %}s tab in the organization settings sidebar](/assets/images/help/organizations/org-settings-installed-github-apps.png) -5. Next to the {% data variables.product.prodname_github_app %} you'd like to review, click **Configure**. - ![Configure button](/assets/images/help/organizations/configure-installed-integration-button.png) -6. Review the {% data variables.product.prodname_github_app %}'s permissions and repository access. - ![Option to give the {% data variables.product.prodname_github_app %} access to all repositories or specific repositories](/assets/images/help/organizations/toggle-integration-repo-access.png) - - To give the {% data variables.product.prodname_github_app %} access to all of your organization's repositories, select **All repositories**. - - To choose specific repositories to give the application access to, select **Only select repositories**, then type a repository name. -7. Click **Save**. +4. Klicke in der linken Seitenleiste auf **Installed {% data variables.product.prodname_github_app %}s** (Installierte Apps). ![Registerkarte „Installed {% data variables.product.prodname_github_app %}s“ (Installierte Apps) in der Seitenleiste mit den Organisationseinstellungen](/assets/images/help/organizations/org-settings-installed-github-apps.png) +5. Klicke neben der {% data variables.product.prodname_github_app %}, die Du überprüfen möchtest, auf **Configure** (Konfigurieren). ![Schaltfläche „Configure“ (Konfigurieren)](/assets/images/help/organizations/configure-installed-integration-button.png) +6. Überprüfe die Berechtigungen und den Repository-Zugriff der {% data variables.product.prodname_github_app %}s. ![Option zur Festlegung des Zugriffs der {% data variables.product.prodname_github_app %} auf alle oder ausgewählte Repositorys](/assets/images/help/organizations/toggle-integration-repo-access.png) + - Soll die {% data variables.product.prodname_github_app %} Zugriff auf alle Repositorys Deiner Organisation haben, klicke auf **All repositories** (Alle Repositorys). + - Soll die Anwendung nur auf bestimmte Repositorys Zugriff haben, wähle **Only select repositories** (Nur ausgewählte Repositorys) aus, und gib einen Repositorynamen ein. +7. Klicke auf **Save** (Speichern). diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md index 9f038f84ec..56e1de5c7a 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md +++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md @@ -1,6 +1,6 @@ --- -title: Setting permissions for adding outside collaborators -intro: 'To protect your organization''s data and the number of paid licenses used in your organization, you can allow only owners to invite outside collaborators to organization repositories.' +title: Berechtigungen für das Hinzufügen von externen Mitarbeitern festlegen +intro: 'Zum Schutz Deiner Organisationsdaten und der Anzahl der bezahlten Lizenzen in Deiner Organisation kannst Du es ausschließlich Inhabern erlauben, externe Mitarbeiter zu Organisations-Repositorys einzuladen.' product: '{% data reusables.gated-features.restict-add-collaborator %}' redirect_from: - /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories/ @@ -10,7 +10,7 @@ versions: enterprise-server: '*' --- -Organization owners, and members with admin privileges for a repository, can invite outside collaborators to work on the repository. You can also restrict outside collaborator invite permissions to only organization owners. +Organisationsinhaber und Mitglieder mit Administratorberechtigungen für ein Repository können externe Mitarbeiter einladen, an dem Repository zu arbeiten. Du kannst das Recht, externe Mitarbeiter einzuladen, auf ausschließlich Organisationsinhaber einschränken. {% data reusables.organizations.outside-collaborators-use-seats %} @@ -18,7 +18,6 @@ Organization owners, and members with admin privileges for a repository, can inv {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.member-privileges %} -5. Under "Repository invitations", select **Allow members to invite outside collaborators to repositories for this organization**.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} - ![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox-updated.png){% else %} - ![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox.png){% endif %} -6. Click **Save**. +5. Under "Repository invitations", select **Allow members to invite outside collaborators to repositories for this organization**.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} ![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox-updated.png){% else %} +![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox.png){% endif %} +6. Klicke auf **Save** (Speichern). diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md index 73f649b3d3..a56a1a8476 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md @@ -27,6 +27,8 @@ Weitere Informationen zu Mitgliederzugang und -verwaltung findest Du unter „[B For more information about managing enterprise accounts using the GraphQL API, see "[Enterprise accounts](/v4/guides/managing-enterprise-accounts)." +{% if currentVersion == "free-pro-team@latest" %} + ### Mit Deinem Enterprise-Konto verknüpfte Organisationen verwalten Organisationen sind gemeinsame Konten, in denen Personengruppen projektübergreifend zusammenarbeiten können. Inhaber können den Mitgliederzugang zu den Daten und Projekten der Organisation mit komplexen Sicherheits- und Administrationsfunktionen verwalten. Weitere Informationen finden Sie unter „[Informationen zu Organisationen](/articles/about-organizations)“. @@ -35,6 +37,8 @@ Enterprise-Inhaber können Organisationen erstellen und mit dem Enterprise-Konto Weitere Informationen finden Sie unter „[Organisationen in Ihrem Enterprise-Konto verwalten](/articles/managing-organizations-in-your-enterprise-account)“ und „[Richtlinien für Organisationen in Ihrem Enterprise-Konto festlegen](/articles/setting-policies-for-organizations-in-your-enterprise-account)“. +{% endif %} + ### {% data variables.product.prodname_ghe_server %}-Lizenzen verwalten, die mit Deinem Unternehmens-Konto verknüpft sind {% data reusables.enterprise-accounts.admin-managing-licenses %} diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/index.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/index.md index acc040e335..03663c15e3 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/index.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/index.md @@ -6,6 +6,7 @@ redirect_from: - /categories/setting-up-and-managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md index 223dedf3a1..80afe795f4 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/managing-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md index d44bbb2935..f29b3d52ab 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md @@ -6,5 +6,6 @@ redirect_from: - /articles/managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md index d52e6ca99d..af0dc1a4b2 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/setting-policies-for-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md index cf02cab864..629cfcc264 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md @@ -18,6 +18,9 @@ Enterprise-Konten sind derzeit für {% data variables.product.prodname_enterpris {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} -4. Zeige unter „User licenses“ (Benutzerlizenzen) Deine Gesamtlizenzen, die Anzahl der genutzten Lizenzen und das Ablaufdatum Deines Abonnements an. ![Lizenz- und Abonnementinformationen in Enterprise-Abrechnungseinstellungen](/assets/images/help/business-accounts/billing-license-info.png) -5. Um Details zu den derzeit verwendeten Benutzerlizenzen zu sehen, klicke auf **View details** (Details anzeigen). +{% data reusables.enterprise-accounts.license-tab %} +4. Under "User +{% if currentVersion == "free-pro-team@latest" %}Licenses{% else %}licenses{% endif %}", view your total licenses, number of consumed licenses, and your subscription expiration date. + {% if currentVersion == "free-pro-team@latest" %}![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png){% else %} + ![Lizenz- und Abonnementinformationen in Enterprise-Abrechnungseinstellungen](/assets/images/enterprise/enterprises/enterprise-server-billing-license-info.png){% endif %} +5. To view details of the user licenses currently in use, click **View {% if currentVersion == "free-pro-team@latest" %}details{% else %}users{% endif %}**. diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md b/translations/de-DE/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md index f5a90ef0d9..0ad0ed0285 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md @@ -25,7 +25,7 @@ Bestimmte Aktionen zählen auf Deiner Profilseite als Beiträge: - Commits zum Standardbranch eines Repositorys oder zum Branch `gh-pages` - das Öffnen eines Issues - das Vorschlagen eines Pull Requests -- Submitting a pull request review{% if currentVersion != "free-pro-team@latest" %} +- das Absenden eines Pull-Request-Reviews{% if enterpriseServerVersions contains currentVersion %} - Commits mit Co-Autor im Standardbranch eines Repositorys oder im Branch `gh-pages`{% endif %} {% data reusables.pull_requests.pull_request_merges_and_contributions %} diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md b/translations/de-DE/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md index e0e75feccc..801b9de8aa 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md @@ -28,11 +28,11 @@ Außerdem muss **mindestens eine** der folgenden Voraussetzung erfüllt sein: - Du bist ein Repository-Mitarbeiter oder ein Mitglied der Organisation, welcher das Repository gehört. - Du hast das Repository geforkt. - Du hast einen Pull Request oder Issue im Repository geöffnet. -- Du hast das Repository mit Sternen versehen. -{% if currentVersion != "free-pro-team@latest" %} +- Sie haben das Repository mit Sternen versehen. + ### Allgemeine Ursachen für nicht gezählte Beiträge -{% data reusables.pull_requests.pull_request_merges_and_contributions %}{% endif %} +{% data reusables.pull_requests.pull_request_merges_and_contributions %} #### Die Commit-Erstellung liegt weniger als 24 Stunden zurück diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md b/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md index 8140f49101..ad98565160 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md @@ -1,6 +1,6 @@ --- -title: Changing your GitHub username -intro: 'You can change your {% data variables.product.product_name %} username at any time.' +title: Deinen GitHub-Benutzernamen ändern +intro: 'Sie können Ihren {% data variables.product.product_name %}-Benutzernamen jederzeit ändern.' redirect_from: - /articles/how-to-change-your-username/ - /articles/changing-your-github-user-name/ @@ -12,50 +12,46 @@ versions: enterprise-server: '*' --- -### About username changes +### Informationen zu Änderungen des Benutzernamens You can change your username to another username that is not currently in use.{% if currentVersion == "free-pro-team@latest" %} If the username you want is not available, you'll see information about whether you can request the username to be released when you type in the desired username. -If the username is not eligible for release and you don't hold a trademark for the username, you can choose another username or keep your current username. {% data variables.contact.github_support %} cannot release the unavailable username for you. For more information, see "[Changing your username](#changing-your-username)."{% endif %} +Falls der Benutzername nicht freigegeben werden kann und Du für den Benutzernamen keine Handelsmarke führst, kannst Du einen anderen Benutzernamen auswählen oder Deinen aktuellen Benutzernamen beibehalten. {% data variables.contact.github_support %} kann den für Sie nicht verfügbaren Benutzernamen nicht freigeben. Weitere Informationen findest Du unter „[Benutzernamen ändern](#changing-your-username)“.{% endif %} -After changing your username, your old username becomes available for anyone else to claim. Most references to your repositories under the old username automatically change to the new username. However, some links to your profile won't automatically redirect. +Wenn Du Deinen Benutzernamen geändert hast, steht Dein alter Benutzername wieder der Allgemeinheit zur Verfügung. Die meisten Verweise auf Deine Repositorys unter dem alten Benutzernamen werden automatisch in den neuen Benutzernamen geändert. Einige Links auf Dein Profil werden jedoch nicht automatisch weitergeleitet. -{% data variables.product.product_name %} cannot set up redirects for: -- [@mentions](/articles/basic-writing-and-formatting-syntax/#mentioning-people-and-teams) using your old username -- Links to [gists](/articles/creating-gists) that include your old username +Für Folgendes kann {% data variables.product.product_name %} keine Weiterleitungen einrichten: +- [@Erwähnungen](/articles/basic-writing-and-formatting-syntax/#mentioning-people-and-teams) des alten Benutzernamens +- Links zu [Gists](/articles/creating-gists), die Deinen alten Benutzernamen enthalten -### Repository references +### Repository-Verweise -After you change your username, {% data variables.product.product_name %} will automatically redirect references to your repositories. -- Web links to your existing repositories will continue to work. This can take a few minutes to complete after you make the change. -- Command line pushes from your local repository clones to the old remote tracking URLs will continue to work. +Wenn Du Deinen Benutzernamen geändert hast, leitet {% data variables.product.product_name %} Verweise auf Deine Repositorys automatisch weiter. +- Weblinks zu Deinen vorhandenen Repositorys funktionieren auch weiterhin. Dieser Vorgang kann einige Minuten dauern, nachdem Du die Änderung vorgenommen hast. +- Befehlszeilen-Pushes von Deinen lokalen Repository-Klonen zu den alten Remote-Tracking-URLs funktionieren auch weiterhin. -If the new owner of your old username creates a repository with the same name as your repository, that will override the redirect entry and your redirect will stop working. Because of this possibility, we recommend you update all existing remote repository URLs after changing your username. For more information, see "[Changing a remote's URL](/articles/changing-a-remote-s-url)." +Wenn der neue Inhaber Deines alten Benutzernamens ein Repository mit demselben Namen wie Dein Repository erstellt, wird der Weiterleitungseintrag überschrieben und Deine Weiterleitung wird nicht mehr funktionieren. Angesichts dieser Möglichkeit empfehlen wir Dir, alle vorhandenen Remote-Repository-URLs nach dem Ändern Deines Benutzernamens zu aktualisieren. Weitere Informationen findest Du unter „[URL eines Remote-Repositorys ändern](/articles/changing-a-remote-s-url).“ -### Links to your previous profile page +### Links zu früheren Profilseiten -After changing your username, links to your previous profile page, such as `https://{% data variables.command_line.backticks %}/previoususername`, will return a 404 error. We recommend updating any links to your {% data variables.product.product_name %} account from elsewhere{% if currentVersion == "free-pro-team@latest" %}, such as your LinkedIn or Twitter profile{% endif %}. +Nach dem Ändern Deines Benutzernamens lösen Links zu Deinen früheren Profilseiten, z. B. `https://{% data variables.command_line.backticks %}/previoususername`, eine 404-Fehlermeldung aus. We recommend updating any links to your {% data variables.product.product_name %} account from elsewhere{% if currentVersion == "free-pro-team@latest" %}, such as your LinkedIn or Twitter profile{% endif %}. -### Your Git commits +### Deine Git-Commits -{% if currentVersion == "free-pro-team@latest"%}Git commits that were associated with your {% data variables.product.product_name %}-provided `noreply` email address won't be attributed to your new username and won't appear in your contributions graph.{% endif %} If your Git commits are associated with another email address you've [added to your GitHub account](/articles/adding-an-email-address-to-your-github-account), {% if currentVersion == "free-pro-team@latest"%}including the ID-based {% data variables.product.product_name %}-provided `noreply` email address, {% endif %}they'll continue to be attributed to you and appear in your contributions graph after you've changed your username. For more information on setting your email address, see "[Setting your commit email address](/articles/setting-your-commit-email-address)." +{% if currentVersion == "free-pro-team@latest"%}Git commits that were associated with your {% data variables.product.product_name %}-provided `noreply` email address won't be attributed to your new username and won't appear in your contributions graph.{% endif %} If your Git commits are associated with another email address you've [added to your GitHub account](/articles/adding-an-email-address-to-your-github-account), {% if currentVersion == "free-pro-team@latest"%}including the ID-based {% data variables.product.product_name %}-provided `noreply` email address, {% endif %}they'll continue to be attributed to you and appear in your contributions graph after you've changed your username. Weitere Informationen zum Einrichten Deiner E-Mail-Adresse findest Du unter „[Commit-E-Mail-Adresse festlegen](/articles/setting-your-commit-email-address).“ -### Changing your username +### Deinen Benutzernamen ändern {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.account_settings %} -3. In the "Change username" section, click **Change username**. - ![Change Username button](/assets/images/help/settings/settings-change-username.png){% if currentVersion == "free-pro-team@latest" %} -4. Read the warnings about changing your username. If you still want to change your username, click **I understand, let's change my username**. - ![Change Username warning button](/assets/images/help/settings/settings-change-username-warning-button.png) -5. Type a new username. - ![New username field](/assets/images/help/settings/settings-change-username-enter-new-username.png) -6. If the username you've chosen is available, click **Change my username**. If the username you've chosen is unavailable, you can try a different username or one of the suggestions you see. - ![Change Username warning button](/assets/images/help/settings/settings-change-my-username-button.png) +3. Klicke im Abschnitt „Change username“ (Benutzername ändern) auf **Change username** (Benutzername ändern). ![Change Username button](/assets/images/help/settings/settings-change-username.png){% if currentVersion == "free-pro-team@latest" %} +4. Lies die Warnungen in Bezug auf das Ändern Deines Benutzernamens. Falls Du Deinen Benutzernamen dennoch ändern möchtest, klicke auf **I understand, let's change my username** (Ich habe verstanden, meinen Benutzernamen ändern). ![Schaltfläche mit Warnung zur Änderung des Benutzernamens](/assets/images/help/settings/settings-change-username-warning-button.png) +5. Gib einen neuen Benutzernamen ein. ![Feld für neuen Benutzernamen](/assets/images/help/settings/settings-change-username-enter-new-username.png) +6. Falls der gewünschte Benutzername verfügbar ist, klicke auf **Change my username** (Meinen Benutzernamen ändern). Falls der gewünschte Benutzername nicht verfügbar ist, kannst Du versuchen, einen anderen Benutzernamen oder einen der angezeigten Vorschläge zu verwenden. ![Schaltfläche mit Warnung zur Änderung des Benutzernamens](/assets/images/help/settings/settings-change-my-username-button.png) {% endif %} -### Further reading +### Weiterführende Informationen -- "[Changing a remote's URL](/articles/changing-a-remote-s-url)" +- „[URL eines Remote-Repositorys ändern](/articles/changing-a-remote-s-url)“ - "[Why are my commits linked to the wrong user?](/articles/why-are-my-commits-linked-to-the-wrong-user)"{% if currentVersion == "free-pro-team@latest" %} -- "[{% data variables.product.prodname_dotcom %} Username Policy](/articles/github-username-policy)"{% endif %} +- „[{% data variables.product.prodname_dotcom %}-Richtlinie zu Benutzernamen](/articles/github-username-policy)“{% endif %} diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/index.md b/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/index.md index bea5bcd8f8..278dda333d 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/index.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/index.md @@ -24,7 +24,7 @@ versions: {% link_in_list /managing-the-default-branch-name-for-your-repositories %} {% link_in_list /managing-security-and-analysis-settings-for-your-user-account %} {% link_in_list /managing-access-to-your-user-accounts-project-boards %} - + {% link_in_list /integrating-jira-with-your-personal-projects %} diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md b/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md index c6ebc8a604..74866ede44 100644 --- a/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md +++ b/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md @@ -1,6 +1,6 @@ --- -title: Permission levels for a user account repository -intro: 'A repository owned by a user account has two permission levels: the *repository owner* and *collaborators*.' +title: Berechtigungsebenen für ein Repository eines Benutzerkontos +intro: 'Ein Repository, das einem Benutzerkonto gehört, hat zwei Berechtigungsebenen: den *Repository-Inhaber* und die *Mitarbeiter*.' redirect_from: - /articles/permission-levels-for-a-user-account-repository versions: @@ -10,64 +10,64 @@ versions: {% tip %} -**Tip:** If you require more granular read/write access to a repository owned by your user account, consider transferring the repository to an organization. For more information, see "[Transferring a repository](/articles/transferring-a-repository)." +**Tipp:** Wenn Du einen feiner abgestuften Lese-/Schreibzugriff auf ein Repository benötigst, das Deinem Benutzerkonto gehört, kannst Du das Repository an eine Organisation übertragen. Weitere Informationen findest Du unter „[Ein Repository übertragen](/articles/transferring-a-repository).“ {% endtip %} -#### Owner access on a repository owned by a user account +#### Inhaberzugriff auf ein Repository eines Benutzerkontos -The repository owner has full control of the repository. In addition to all the permissions allowed by repository collaborators, the repository owner can: +Der Repository-Inhaber besitzt die vollständige Kontrolle über das Repository. Neben den Berechtigungen, die auch Repository-Mitarbeitern erteilt werden, stehen dem Repository-Inhaber zusätzlich folgende Möglichkeiten zur Verfügung: - {% if currentVersion == "free-pro-team@latest" %}[Invite collaborators](/articles/inviting-collaborators-to-a-personal-repository){% else %}[Add collaborators](/articles/inviting-collaborators-to-a-personal-repository){% endif %} - Change the visibility of the repository (from [public to private](/articles/making-a-public-repository-private), or from [private to public](/articles/making-a-private-repository-public)){% if currentVersion == "free-pro-team@latest" %} -- [Limit interactions with a repository](/articles/limiting-interactions-with-your-repository){% endif %} -- Merge a pull request on a protected branch, even if there are no approving reviews -- [Delete the repository](/articles/deleting-a-repository) +- [Interaktionen mit einem Repository einschränken](/articles/limiting-interactions-with-your-repository){% endif %} +- Einen Pull Request auf einem geschützten Branch zusammenführen, selbst ohne genehmigende Reviews +- [Das Repository löschen](/articles/deleting-a-repository) - [Manage a repository's topics](/articles/classifying-your-repository-with-topics){% if currentVersion == "free-pro-team@latest" %} - Manage security and analysis settings. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)."{% endif %}{% if currentVersion == "free-pro-team@latest" %} - [Enable the dependency graph](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository) for a private repository{% endif %}{% if currentVersion == "free-pro-team@latest" %} -- Delete packages. For more information, see "[Deleting a package](/github/managing-packages-with-github-packages/deleting-a-package)."{% endif %} -- Create and edit repository social cards. For more information, see "[Customizing your repository's social media preview](/articles/customizing-your-repositorys-social-media-preview)." -- Make the repository a template. For more information, see "[Creating a template repository](/articles/creating-a-template-repository)." +- Pakete löschen. Weitere Informationen findest Du unter „[Ein Paket löschen](/github/managing-packages-with-github-packages/deleting-a-package)."{% endif %} +- soziale Tickets für Repositorys erstellen und bearbeiten (siehe „[Social-Media-Vorschau Ihres Repositorys anpassen](/articles/customizing-your-repositorys-social-media-preview)“) +- das Repository in eine Vorlage umwandeln Weitere Informationen findest Du unter „[Repository-Vorlage erstellen](/articles/creating-a-template-repository).“ - Receive [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a repository.{% if currentVersion == "free-pro-team@latest" %} -- Dismiss {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)." +- Dismiss {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)." - [Manage data usage for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository){% endif %} -- [Define code owners for the repository](/articles/about-code-owners) +- [Codeinhaber für das Repository definieren](/articles/about-code-owners) - [Archive repositories](/articles/about-archiving-repositories){% if currentVersion == "free-pro-team@latest" %} -- Create security advisories. For more information, see "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." -- Display a sponsor button. For more information, see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)."{% endif %} +- Sicherheitshinweise erstellen. Weitere Informationen findest Du unter „[ Über {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." +- eine Sponsorenschaltfläche anzeigen Weitere Informationen findest Du unter „[Sponsorenschaltfläche in Deinem Repository anzeigen](/articles/displaying-a-sponsor-button-in-your-repository)“{% endif %} -There is only **one owner** of a repository owned by a user account; this permission cannot be shared with another user account. To transfer ownership of a repository to another user, see "[How to transfer a repository](/articles/how-to-transfer-a-repository)." +Bei einem Repository, das einem Benutzerkonto gehört, gibt es nur **einen Inhaber**. Diese Berechtigung kann nicht mit einem anderem Benutzerkonto geteilt werden. Informationen zur Übertragung der Repository-Inhaberschaft auf einen anderen Benutzer findest Du unter „[Ein Repository übertragen](/articles/how-to-transfer-a-repository).“ -#### Collaborator access on a repository owned by a user account +#### Mitarbeiterzugriff auf ein Repository eines Benutzerkontos {% note %} -**Note:** In a private repository, repository owners can only grant write access to collaborators. Collaborators can't have read-only access to repositories owned by a user account. +**Hinweis:** In einem privaten Repository können Repository-Inhaber Mitarbeitern nur Schreibzugriff gewähren. Mitarbeiter können nicht Nur-Lese-Zugriff auf Repositorys haben, die einem Benutzerkonto gehören. {% endnote %} -Collaborators on a personal repository can: +Mitarbeiter haben folgende Möglichkeiten in persönlichen Repositorys: -- Push to (write), pull from (read), and fork (copy) the repository -- Create, apply, and delete labels and milestones -- Open, close, re-open, and assign issues -- Edit and delete comments on commits, pull requests, and issues -- Mark an issue or pull request as a duplicate. For more information, see "[About duplicate issues and pull requests](/articles/about-duplicate-issues-and-pull-requests)." -- Open, merge and close pull requests -- Apply suggested changes to pull requests. For more information, see "[Incorporating feedback in your pull request](/articles/incorporating-feedback-in-your-pull-request)." +- Etwas zum Repository pushen (schreiben), etwas vom Repository abrufen (lesen) und das Repository forken (kopieren) +- Kennzeichnungen und Meilensteine erstellen, anwenden und löschen +- Issues öffnen, schließen, erneut öffnen und zuweisen +- Kommentare zu Commits, Pull Requests und Issues bearbeiten und löschen +- Issues und Pull Requests als Duplikate markieren Weitere Informationen findest Du unter „[Informationen zu Duplikaten von Issues und Pull Requests](/articles/about-duplicate-issues-and-pull-requests)“ +- Pull Requests öffnen, zusammenführen und schließen +- Vorgeschlagene Änderungen auf Pull Requests anwenden. Weitere Informationen findest Du unter „[Feedback in Deinen Pull Request aufnehmen](/articles/incorporating-feedback-in-your-pull-request).“ - Send pull requests from forks of the repository{% if currentVersion == "free-pro-team@latest" %} -- Publish, view, and install packages. For more information, see "[Publishing and managing packages](/github/managing-packages-with-github-packages/publishing-and-managing-packages)."{% endif %} -- Create and edit Wikis -- Create and edit releases. For more information, see "[Managing releases in a repository](/github/administering-a-repository/managing-releases-in-a-repository). -- Remove themselves as collaborators on the repository -- Submit a review on a pull request that will affect its mergeability -- Act as a designated code owner for the repository. For more information, see "[About code owners](/articles/about-code-owners)." -- Lock a conversation. For more information, see "[Locking conversations](/articles/locking-conversations)."{% if currentVersion == "free-pro-team@latest" %} -- Report abusive content to {% data variables.contact.contact_support %}. For more information, see "[Reporting abuse or spam](/articles/reporting-abuse-or-spam)."{% endif %} -- Transfer an issue to a different repository. For more information, see "[Transferring an issue to another repository](/articles/transferring-an-issue-to-another-repository)." +- Pakete veröffentlichen, ansehen und installieren. Weitere Informationen findest Du unter „[Pakete veröffentlichen und verwalten](/github/managing-packages-with-github-packages/publishing-and-managing-packages)."{% endif %} +- Wikis erstellen und bearbeiten +- Erstellen und Bearbeiten von Releases. Weitere Informationen findest Du unter „[Releases in einem Repository verwalten](/github/administering-a-repository/managing-releases-in-a-repository). +- Sich selbst als Mitarbeiter aus dem Repository entfernen +- Einen Review zu einem Pull Request absenden, der seine Merge-Fähigkeit beeinflusst +- Als designierter Codeinhaber des Repositorys agieren. Weitere Informationen findest Du unter „[Informationen zu Codeinhabern](/articles/about-code-owners).“ +- Eine Unterhaltung sperren. For more information, see "[Locking conversations](/articles/locking-conversations)."{% if currentVersion == "free-pro-team@latest" %} +- missbräuchliche Inhalte an den {% data variables.contact.contact_support %} melden Weitere Informationen findest Du unter „[Missbrauch oder Spam melden](/articles/reporting-abuse-or-spam)“.{% endif %} +- einen Issue in ein anderes Repository übertragen Weitere Informationen finden Sie unter „[Einen Issue in ein anderes Repository übertragen](/articles/transferring-an-issue-to-another-repository)“. -### Further reading +### Weiterführende Informationen -- "[Inviting collaborators to a personal repository](/articles/inviting-collaborators-to-a-personal-repository)" -- "[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)" +- „[Mitarbeiter in ein persönliches Repository einladen](/articles/inviting-collaborators-to-a-personal-repository)“ +- „[Berechtigungsebenen für die Repositorys einer Organisation](/articles/repository-permission-levels-for-an-organization)“ diff --git a/translations/de-DE/content/github/site-policy/github-enterprise-subscription-agreement.md b/translations/de-DE/content/github/site-policy/github-enterprise-subscription-agreement.md index 1accd904db..8f096ce814 100644 --- a/translations/de-DE/content/github/site-policy/github-enterprise-subscription-agreement.md +++ b/translations/de-DE/content/github/site-policy/github-enterprise-subscription-agreement.md @@ -330,7 +330,7 @@ Das Erscheinungsbild des Dienstes ist wie folgt urheberrechtlich geschützt: „ #### 3.5.2 Urheberrechtsverletzungen und DMCA-Richtlinie -Wenn der Kunde Urheberrechtsinhaber ist und der Ansicht ist, dass Inhalte im Dienst gegen die Urheberrechte des Kunden verstoßen, kann er sich nach der [Digital Millenium Copyright Act-Richtlinie](https://github.com/contact/dmca) von GitHub an GitHub wenden, indem er GitHub über das [DMCA-Formular](https://github.com/contact/dmca-notice) oder per E-Mail an copyright@github.com entsprechend informiert. +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 3.5.3 Marken und Logos von GitHub diff --git a/translations/de-DE/content/github/site-policy/github-sensitive-data-removal-policy.md b/translations/de-DE/content/github/site-policy/github-sensitive-data-removal-policy.md index 0a05fc23a1..79d879765d 100644 --- a/translations/de-DE/content/github/site-policy/github-sensitive-data-removal-policy.md +++ b/translations/de-DE/content/github/site-policy/github-sensitive-data-removal-policy.md @@ -76,7 +76,7 @@ Diese Richtlinien sollen die Bearbeitung von Anfragen zum Entfernen sensibler Da ### So senden Sie Ihre Anfrage -Sie können Ihre Anfrage zur Entfernung sensibler Daten über unser [-Kontaktformular](https://support.github.com/contact) senden. Bitte fügen Sie eine Textversion Ihrer Anfrage in den Text Ihrer Nachricht ein. Das Senden Ihrer Anfrage in einem Anhang kann zu Verzögerungen bei der Bearbeitung führen. +Sie können Ihre Anfrage zur Entfernung sensibler Daten über unser [-Kontaktformular](https://support.github.com/contact?tags=docs-sensitive-data) senden. Bitte fügen Sie eine Textversion Ihrer Anfrage in den Text Ihrer Nachricht ein. Das Senden Ihrer Anfrage in einem Anhang kann zu Verzögerungen bei der Bearbeitung führen. ### Streitfall diff --git a/translations/de-DE/content/github/site-policy/github-subprocessors-and-cookies.md b/translations/de-DE/content/github/site-policy/github-subprocessors-and-cookies.md index d06bb4878b..76412bb633 100644 --- a/translations/de-DE/content/github/site-policy/github-subprocessors-and-cookies.md +++ b/translations/de-DE/content/github/site-policy/github-subprocessors-and-cookies.md @@ -53,34 +53,34 @@ GitHub uses cookies and similar technologies (collectively, “cookies”) to pr Since the number and names of cookies may change,the table below may be updated from time to time. -| Service Provider | Cookie Name | Beschreibung | Expiration* | -|:------------------ |:------------------------------------ |:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:------------------------------------------------------------- | -| GitHub | `app_manifest_token` | This cookie is used during the App Manifest flow to maintain the state of the flow during the redirect to fetch a user session. | five minutes | -| GitHub | `cookie-preferences` | This cookie is used to track user cookie preferences. | one year | -| GitHub | `_device_id` | This cookie is used to track recognized devices. | one year | -| GitHub | `dotcom_user` | Dieses Cookie wird verwendet, um uns zu signalisieren, dass der Benutzer bereits angemeldet ist. | one year | -| GitHub | `_gh_ent` | This cookie is used for temporary application and framework state between pages like what step the customer is on in a multiple step form. | two weeks | -| GitHub | `_gh_sess` | Dieses Cookie wird für temporäre Anwendungen und Framework-Status zwischen Seiten verwendet, z. B. in welchem Schritt sich der Benutzer in einem mehrstufigen Formular befindet. | Session, Sitzung | -| GitHub | `gist_oauth_csrf` | Dieses Cookie wird von Gist gesetzt, um sicherzustellen, dass der Benutzer, der den auth-Flow gestartet hat, derselbe Benutzer ist, der ihn abschließt. | deleted when oauth state is validated | -| GitHub | `gist_user_session` | Dieses Cookie wird von Gist verwendet, wenn es auf einem separaten Host ausgeführt wird. | two weeks | -| GitHub | `has_recent_activity` | This cookie is used to prevent showing the security interstitial to users that have visited the app recently. | one hour | -| GitHub | `__Host-gist_user_session_same_site` | Dieses Cookie wird so gesetzt, dass Browser, die SameSite-Cookies unterstützen, überprüfen können, ob eine Anfrage von GitHub stammt. | two weeks | -| GitHub | `__Host-user_session_same_site` | Dieses Cookie wird so gesetzt, dass Browser, die SameSite-Cookies unterstützen, überprüfen können, ob eine Anfrage von GitHub stammt. | two weeks | -| GitHub | `logged_in` | Dieses Cookie wird verwendet, um uns zu signalisieren, dass der Benutzer bereits angemeldet ist. | one year | -| GitHub | `marketplace_repository_ids` | This cookie is used for the marketplace installation flow. | one hour | -| GitHub | `marketplace_suggested_target_id` | This cookie is used for the marketplace installation flow. | one hour | -| GitHub | `_octo` | This cookie is used by our internal analytics service to distinguish unique users and clients. | one year | -| GitHub | `org_transform_notice` | This cookie is used to provide notice during organization transforms. | one hour | -| GitHub | `private_mode_user_session` | This cookie is used for Enterprise authentication requests. | two weeks | -| GitHub | `saml_csrf_token` | Dieses Cookie wird von der SAML auth path-Methode gesetzt, um dem Client ein Token zuzuordnen. | until user closes browser or completes authentication request | -| GitHub | `saml_csrf_token_legacy` | Dieses Cookie wird von der SAML auth path-Methode gesetzt, um dem Client ein Token zuzuordnen. | until user closes browser or completes authentication request | -| GitHub | `saml_return_to` | Dieses Cookie wird von der SAML auth path-Methode gesetzt, um den Status während der SAML-Authentifizierungsschleife beizubehalten. | until user closes browser or completes authentication request | -| GitHub | `saml_return_to_legacy` | Dieses Cookie wird von der SAML auth path-Methode gesetzt, um den Status während der SAML-Authentifizierungsschleife beizubehalten. | until user closes browser or completes authentication request | -| GitHub | `tz` | Mit diesem Cookie kann Ihr Browser uns mitteilen, in welcher Zeitzone Sie sich befinden. | Session, Sitzung | -| GitHub | `user_session` | Dieses Cookie wird verwendet, um Sie anzumelden. | two weeks | -| Google Analytics** | `_ga` | Dieses Cookie wird von Google Analytics verwendet. | two years | -| Google Analytics** | `_gat` | Dieses Cookie wird von Google Analytics verwendet. | one minute | -| Google Analytics** | `_gid` | Dieses Cookie wird von Google Analytics verwendet. | one day | +| Service Provider | Cookie Name | Beschreibung | Expiration* | +|:------------------ |:------------------------------------ |:------------------------------------------------------------------------------------------------------------------------------------------ |:------------------------------------------------------------- | +| GitHub | `app_manifest_token` | This cookie is used during the App Manifest flow to maintain the state of the flow during the redirect to fetch a user session. | five minutes | +| GitHub | `cookie-preferences` | This cookie is used to track user cookie preferences. | one year | +| GitHub | `_device_id` | This cookie is used to track recognized devices. | one year | +| GitHub | `dotcom_user` | This cookie is used to signal to us that the user is already logged in. | one year | +| GitHub | `_gh_ent` | This cookie is used for temporary application and framework state between pages like what step the customer is on in a multiple step form. | two weeks | +| GitHub | `_gh_sess` | This cookie is used for temporary application and framework state between pages like what step the user is on in a multiple step form. | Session, Sitzung | +| GitHub | `gist_oauth_csrf` | This cookie is set by Gist to ensure the user that started the oauth flow is the same user that completes it. | deleted when oauth state is validated | +| GitHub | `gist_user_session` | This cookie is used by Gist when running on a separate host. | two weeks | +| GitHub | `has_recent_activity` | This cookie is used to prevent showing the security interstitial to users that have visited the app recently. | one hour | +| GitHub | `__Host-gist_user_session_same_site` | This cookie is set to ensure that browsers that support SameSite cookies can check to see if a request originates from GitHub. | two weeks | +| GitHub | `__Host-user_session_same_site` | This cookie is set to ensure that browsers that support SameSite cookies can check to see if a request originates from GitHub. | two weeks | +| GitHub | `logged_in` | This cookie is used to signal to us that the user is already logged in. | one year | +| GitHub | `marketplace_repository_ids` | This cookie is used for the marketplace installation flow. | one hour | +| GitHub | `marketplace_suggested_target_id` | This cookie is used for the marketplace installation flow. | one hour | +| GitHub | `_octo` | This cookie is used by our internal analytics service to distinguish unique users and clients. | one year | +| GitHub | `org_transform_notice` | This cookie is used to provide notice during organization transforms. | one hour | +| GitHub | `private_mode_user_session` | This cookie is used for Enterprise authentication requests. | two weeks | +| GitHub | `saml_csrf_token` | This cookie is set by SAML auth path method to associate a token with the client. | until user closes browser or completes authentication request | +| GitHub | `saml_csrf_token_legacy` | This cookie is set by SAML auth path method to associate a token with the client. | until user closes browser or completes authentication request | +| GitHub | `saml_return_to` | This cookie is set by the SAML auth path method to maintain state during the SAML authentication loop. | until user closes browser or completes authentication request | +| GitHub | `saml_return_to_legacy` | This cookie is set by the SAML auth path method to maintain state during the SAML authentication loop. | until user closes browser or completes authentication request | +| GitHub | `tz` | This cookie allows your browser to tell us what time zone you're in. | Session, Sitzung | +| GitHub | `user_session` | This cookie is used to log you in. | two weeks | +| Google Analytics** | `_ga` | This cookie is used by Google Analytics. | two years | +| Google Analytics** | `_gat` | This cookie is used by Google Analytics. | one minute | +| Google Analytics** | `_gid` | This cookie is used by Google Analytics. | one day | _*_ The **expiration** dates for the cookies listed below generally apply on a rolling basis. @@ -88,10 +88,10 @@ _**_ We use **Google Analytics** as a third party analytics service to collect i You can control your Google Analytics cookie preferences through our cookie preference link located at the footer of our website. In addition, Google provides further information about its own privacy practices and [offers a browser add-on to opt out of Google Analytics tracking](https://tools.google.com/dlpage/gaoptout). -(!) Please note certain pages on our website may set other third party cookies. Beispielsweise können wir Inhalte, z. B. Videos, von einer anderen Website, die ein Cookie setzt, einbetten. Während wir versuchen, diese Cookies von Drittanbietern zu minimieren, können wir nicht immer kontrollieren, welche Cookies diese Inhalte von Drittanbietern setzen. +(!) Please note certain pages on our website may set other third party cookies. For example, we may embed content, such as videos, from another site that sets a cookie. While we try to minimize these third party cookies, we can’t always control what cookies this third party content sets. ### Tracking on GitHub -"[Do Not Track](https://www.eff.org/issues/do-not-track)" (DNT) is a privacy preference you can set in your browser if you do not want online services to collect and share certain kinds of information about your online activity from third party tracking services. GitHub reagiert auf Browser-DNT-Signale und folgt dem [W3C-Standard für das Reagieren auf DNT-Signale](https://www.w3.org/TR/tracking-dnt/). Wenn Sie diese Einstellung in Ihrem Browser setzen wollen, schauen Sie sich die Dokumentation Ihres Browsers an. Es gibt auch gute Anwendungen, die die Online-Verfolgung verhindern. Ein gutes Beispiel dafür ist [Privacy Badger](https://www.eff.org/privacybadger). +"[Do Not Track](https://www.eff.org/issues/do-not-track)" (DNT) is a privacy preference you can set in your browser if you do not want online services to collect and share certain kinds of information about your online activity from third party tracking services. GitHub reagiert auf Browser-DNT-Signale und folgt dem [W3C-Standard für das Reagieren auf DNT-Signale](https://www.w3.org/TR/tracking-dnt/). If you would like to set your browser to signal that you would not like to be tracked, please check your browser's documentation for how to enable that signal. There are also good applications that block online tracking, such as [Privacy Badger](https://www.eff.org/privacybadger). -Wenn Sie DNT auf einem Browser, der DNT unterstützt, nicht aktiviert haben, können Cookies an bestimmten Stellen unserer Website Ihre Online-Surfaktivitäten auf anderen Online-Diensten nachverfolgen, aber wir gestatten es keinen Dritten, außer unseren Analyse- und Dienstanbietern, die Aktivitäten von GitHub-Benutzern auf GitHub zu verfolgen. We have agreements with certain vendors, such as analytics providers, who help us track visitors' movements on certain pages on our website. Nur unsere Anbieter, die in unserem Namen personenbezogene Daten sammeln, dürfen Daten auf unseren Seiten sammeln, und wir haben Datenschutzvereinbarungen mit jedem Anbieter unterzeichnet, der diese Daten in unserem Namen erhebt. Wir verwenden die Daten, die wir von diesen Anbietern erhalten, um die Interessen unserer Besucher besser nachvollziehen zu können, um die Leistung unserer Website zu erfassen und um unsere Inhalte zu verbessern. Any analytics vendor will be listed in our [subprocessor list](#github-subprocessors), and you may see a list of every page where we collect this kind of data below. +If you have not enabled DNT on a browser that supports it, cookies on some parts of our website will track your online browsing activity on other online services over time, though we do not permit third parties other than our analytics and service providers to track GitHub users' activity over time on GitHub. We have agreements with certain vendors, such as analytics providers, who help us track visitors' movements on certain pages on our website. Only our vendors, who are collecting personal information on our behalf, may collect data on our pages, and we have signed data protection agreements with every vendor who collects this data on our behalf. We use the data we receive from these vendors to better understand our visitors' interests, to understand our website's performance, and to improve our content. Any analytics vendor will be listed in our [subprocessor list](#github-subprocessors), and you may see a list of every page where we collect this kind of data below. diff --git a/translations/de-DE/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md b/translations/de-DE/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md index 981e0d3e87..c1f0014a79 100644 --- a/translations/de-DE/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md +++ b/translations/de-DE/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md @@ -175,7 +175,7 @@ Das Erscheinungsbild des Dienstes ist wie folgt urheberrechtlich geschützt: „ #### 2.5.2 Copyright Infringement and DMCA Policy. -Wenn der Kunde Urheberrechtsinhaber ist und der Ansicht ist, dass Inhalte im Dienst gegen die Urheberrechte des Kunden verstoßen, kann er sich nach der [Digital Millenium Copyright Act-Richtlinie](https://github.com/contact/dmca) von GitHub an GitHub wenden, indem er GitHub über das [DMCA-Formular](https://github.com/contact/dmca-notice) oder per E-Mail an copyright@github.com entsprechend informiert. +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 2.5.3 GitHub Trademarks and Logos. diff --git a/translations/de-DE/content/github/site-policy/github-trademark-policy.md b/translations/de-DE/content/github/site-policy/github-trademark-policy.md index e1ebe743b8..c9813c48fe 100644 --- a/translations/de-DE/content/github/site-policy/github-trademark-policy.md +++ b/translations/de-DE/content/github/site-policy/github-trademark-policy.md @@ -23,7 +23,7 @@ Wenn wir Berichte über Verstöße gegen die Markenrichtlinien von Inhabern staa ### Wie melde ich einen Verstoß gegen die Markenrichtlinie? -Inhaber eingetragener Marken können mögliche Markenrechtsverletzungen über unser [Kontaktformular](https://support.github.com/contact) an GitHub melden. Bitte senden Sie markenbezogene Anfragen unter Verwendung Ihrer Firmen-E-Mail-Adresse und fügen Sie alle unten angeforderten Informationen ein, um unsere Antwort zu beschleunigen. Achten Sie auch darauf, uns klar zu beschreiben, warum das Konto Verwirrung mit Ihrer Marke verursachen kann oder wie das Konto Ihre Marke schädigen oder beeinträchtigen kann. +Inhaber eingetragener Marken können mögliche Markenrechtsverletzungen über unser [Kontaktformular](https://support.github.com/contact?tags=docs-trademark) an GitHub melden. Bitte senden Sie markenbezogene Anfragen unter Verwendung Ihrer Firmen-E-Mail-Adresse und fügen Sie alle unten angeforderten Informationen ein, um unsere Antwort zu beschleunigen. Achten Sie auch darauf, uns klar zu beschreiben, warum das Konto Verwirrung mit Ihrer Marke verursachen kann oder wie das Konto Ihre Marke schädigen oder beeinträchtigen kann. ### Welche Informationen sind erforderlich, wenn Markenrichtlinienverstöße gemeldet werden? diff --git a/translations/de-DE/content/github/using-git/changing-a-remotes-url.md b/translations/de-DE/content/github/using-git/changing-a-remotes-url.md index 028fa76946..5d0570dbc2 100644 --- a/translations/de-DE/content/github/using-git/changing-a-remotes-url.md +++ b/translations/de-DE/content/github/using-git/changing-a-remotes-url.md @@ -50,7 +50,7 @@ git@{% data variables.command_line.codeblock %}:USERNAME/REPOSITORY > origin https://{% data variables.command_line.codeblock %}/USERNAME/REPOSITORY.git (push) ``` -Wenn Du das nächste Mal den Befehl `git fetch`, `git pull` oder `git push` für das Remote-Repository ausführst, musst Du Deinen GitHub-Benutzernamen und Dein Passwort eingeben. +Wenn Du das nächste Mal den Befehl `git fetch`, `git pull` oder `git push` für das Remote-Repository ausführst, musst Du Deinen GitHub-Benutzernamen und Dein Passwort eingeben. {% data reusables.user_settings.password-authentication-deprecation %} - Wenn Du die [Zwei-Faktor-Authentifizierung](/articles/securing-your-account-with-two-factor-authentication-2fa) aktiviert hast, musst Du [ein persönliches Zugriffstoken erstellen](/github/authenticating-to-github/creating-a-personal-access-token), das Du anstelle Deines GitHub-Passworts verwendest. - Sie können einen [Credential-Helper](/github/using-git/caching-your-github-credentials-in-git) verwenden, damit Git Ihren GitHub-Benutzernamen und Ihr -Passwort für die Kommunikation mit GitHub speichert. diff --git a/translations/de-DE/content/github/using-git/pushing-commits-to-a-remote-repository.md b/translations/de-DE/content/github/using-git/pushing-commits-to-a-remote-repository.md index 7f167d0f3a..20a7ad860c 100644 --- a/translations/de-DE/content/github/using-git/pushing-commits-to-a-remote-repository.md +++ b/translations/de-DE/content/github/using-git/pushing-commits-to-a-remote-repository.md @@ -97,3 +97,4 @@ Weitere Informationen zur Arbeit mit Forks findest Du unter „[Fork synchronisi - [„`git remote`"-Handbuch-Seiten](https://git-scm.com/docs/git-remote.html) - „[Git-Merkzettel](/articles/git-cheatsheet)“ - „[Git-Workflows](/articles/git-workflows)“ +- "[Git Handbook](https://guides.github.com/introduction/git-handbook/)" diff --git a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md index 069c3b38ed..e674add356 100644 --- a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md +++ b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md @@ -47,9 +47,9 @@ You can use the dependency graph to: {% if currentVersion == "free-pro-team@latest" %}To generate a dependency graph, {% data variables.product.product_name %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private repositories. For information about enabling or disabling it for private repositories, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md index d14239d94f..7ab0d25e9f 100644 --- a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md +++ b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md @@ -35,7 +35,7 @@ If vulnerabilities have been detected in the repository, these are shown at the {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to {% data variables.product.prodname_dependabot_short %} alerts. @@ -55,7 +55,7 @@ Any direct and indirect dependencies that are specified in the repository's mani {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to security alerts. {% note %} diff --git a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md index 8a5e0bbb8d..8d52ea7def 100644 --- a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md +++ b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md @@ -13,7 +13,7 @@ versions: ### Informationen zu Mitarbeitern -You can view the top 100 contributors to a repository{% if currentVersion != "free-pro-team@latest" %}, including commit co-authors,{% endif %} in the contributors graph. Merge- und leere Commits werden für dieses Diagramm nicht als Beiträge gezählt. +Im Mitarbeiterdiagramm kannst Du die Top 100 der Mitarbeiter an einem Repository anzeigen{% if enterpriseServerVersions contains currentVersion %}, darunter auch die Commit-Co-Autoren{% endif %}. Merge- und leere Commits werden für dieses Diagramm nicht als Beiträge gezählt. {% if currentVersion == "free-pro-team@latest" %} Darüber hinaus kannst Du eine Liste der Personen anzeigen, die Beiträge zu den Python-Abhängigkeiten des Projekts geliefert haben. Rufe `https://github.com/REPO-OWNER/REPO-NAME/community_contributors` auf, um auf diese Liste der Community-Mitarbeiter zuzugreifen. diff --git a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md index 5597ba9682..8d312cfc08 100644 --- a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md +++ b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md @@ -1,6 +1,6 @@ --- -title: Viewing traffic to a repository -intro: 'Anyone with push access to a repository can view its traffic, including full clones (not fetches), visitors from the past 14 days, referring sites, and popular content in the traffic graph.' +title: Traffic zu einem Repository anzeigen +intro: 'Personen mit Push-Zugriff auf ein Repository können den zugehörigen Traffic anzeigen, darunter die vollständigen Klone (keine Abrufe), die Besucher der letzten 14 Tage, die verweisenden Websites und die beliebten Inhalte im Traffic-Diagramm.' product: '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 %}, and {% data variables.product.prodname_ghe_cloud %}.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[About repository graphs](/articles/about-repository-graphs)" and "[{% data variables.product.prodname_dotcom %}''s products](/articles/github-s-products)."{% endif %}' redirect_from: - /articles/viewing-traffic-to-a-repository @@ -8,21 +8,20 @@ versions: free-pro-team: '*' --- -You can navigate to referring sites, excluding search engines and {% data variables.product.product_name %} itself, from the links the specific paths were referred from. The popular content links to the specific content that generated traffic. +Sie können zu den verweisenden Websites, mit Ausnahme der Suchmaschinen und {% data variables.product.product_name %} selbst, über die Links navigieren, von denen aus auf die spezifischen Pfade verwiesen wurde. Der beliebte Inhalt wird mit dem spezifischen Inhalt verknüpft, der Traffic generiert hat. -Referring sites and popular content are ordered by views and unique visitors. Full clones and visitor information update hourly, while referring sites and popular content sections update daily. All data in the traffic graph uses the UTC+0 timezone, regardless of your location. +Verweisende Websites und beliebte Inhalte sind nach Ansichten und eindeutigen Besuchern sortiert. Informationen zu vollständigen Klonen und Besuchern werden stündlich aktualisiert. Demgegenüber werden die Abschnitte zu verweisenden Websites und beliebten Inhalten täglich aktualisiert. Alle Daten im Traffic-Diagramm verwenden unabhängig von Deinem Standort die Zeitzone UTC+0. {% tip %} -**Tip:** You can hover over a specific day in the traffic graph to view the exact data for that day. +**Tipp:** Du kannst den Mauszeiger über einen bestimmten Tag im Traffic-Diagramm bewegen, um die exakten Daten für den jeweiligen Tag anzuzeigen. {% endtip %} -![Repository traffic graphs with tooltip](/assets/images/help/graphs/repo_traffic_graphs_tooltip_dotcom.png) +![Repository-Traffic-Diagramm mit QuickInfo](/assets/images/help/graphs/repo_traffic_graphs_tooltip_dotcom.png) -### Accessing the traffic graph +### Auf das Traffic-Diagramm zugreifen {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.accessing-repository-graphs %} -3. In the left sidebar, click **Traffic**. -![Traffic tab](/assets/images/help/graphs/traffic_tab.png) +3. Klicke auf der linken Seitenleiste auf **Traffic**. ![Registerkarte „Traffic“](/assets/images/help/graphs/traffic_tab.png) diff --git a/translations/de-DE/content/github/working-with-github-pages/about-github-pages-and-jekyll.md b/translations/de-DE/content/github/working-with-github-pages/about-github-pages-and-jekyll.md index 61fecdea97..9e224d99a2 100644 --- a/translations/de-DE/content/github/working-with-github-pages/about-github-pages-and-jekyll.md +++ b/translations/de-DE/content/github/working-with-github-pages/about-github-pages-and-jekyll.md @@ -27,7 +27,7 @@ versions: Jekyll ist ein Generator für statische Websites mit integrierter Unterstützung von {% data variables.product.prodname_pages %} und einem vereinfachten Build-Prozess. Jekyll erstellt aus Markdown- und HTML-Dateien eine statische Website und nutzt dabei die von Dir ausgewählten Layouts. Jekyll unterstützt Markdown und Liquid, eine Vorlagensprache, die dynamische Inhalte auf Deiner Website lädt. Weitere Informationen findest Du auf der Website zu [Jekyll](https://jekyllrb.com/). -Jekyll wird von Windows nicht offiziell unterstützt. Weitere Informationen findest Du unter „[Jekyll on Windows](http://jekyllrb.com/docs/windows/#installation)“ (Jekyll unter Windows) in der Jekyll-Dokumentation. +Jekyll wird von Windows nicht offiziell unterstützt. For more information, see "[Jekyll on Windows](http://jekyllrb.com/docs/windows/#installation)" in the Jekyll documentation. Wir empfehlen, Jekyll mit {% data variables.product.prodname_pages %} zu verwenden. Wenn Du möchtest, kannst Du aber auch andere Generatoren für statische Websites verwenden oder Deinen eigenen Build-Prozess lokal oder auf einem anderen Server anpassen. Weitere Informationen findest Du unter „[Informationen zu {% data variables.product.prodname_pages %}](/articles/about-github-pages#static-site-generators).“ diff --git a/translations/de-DE/content/github/working-with-github-pages/about-github-pages.md b/translations/de-DE/content/github/working-with-github-pages/about-github-pages.md index bbd5628279..85c6a3f08f 100644 --- a/translations/de-DE/content/github/working-with-github-pages/about-github-pages.md +++ b/translations/de-DE/content/github/working-with-github-pages/about-github-pages.md @@ -45,7 +45,7 @@ Weitere Informationen dazu, wie sich die URL Ihrer Website bei benutzerdefiniert Sie können für jedes {% data variables.product.product_name %}-Konto nur eine Benutzer- oder Organisations-Website erstellen. Für Projekt-Websites gibt es keine Beschränkung, egal, ob sie einer Organisation oder einem Benutzerkonto gehören. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} The URL where your site is available depends on whether subdomain isolation is enabled for {% data variables.product.product_location %}. diff --git a/translations/de-DE/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md b/translations/de-DE/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md index 86907ab801..29e1fbd28e 100644 --- a/translations/de-DE/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md +++ b/translations/de-DE/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md @@ -1,24 +1,24 @@ --- -title: Creating a GitHub Pages site with Jekyll -intro: 'You can use Jekyll to create a {% data variables.product.prodname_pages %} site in a new or existing repository.' +title: GitHub Pages-Website mit Jekyll erstellen +intro: 'Sie können mit Jekyll eine {% data variables.product.prodname_pages %}-Website in einem neuen oder vorhandenen Repository erstellen.' product: '{% data reusables.gated-features.pages %}' redirect_from: - /articles/creating-a-github-pages-site-with-jekyll -permissions: 'People with admin permissions for a repository can create a {% data variables.product.prodname_pages %} site with Jekyll.' +permissions: 'Personen mit Administratorberechtigungen für ein Repository können mit Jekyll eine {% data variables.product.prodname_pages %}-Website erstellen.' versions: free-pro-team: '*' enterprise-server: '*' --- -### Prerequisites +### Vorrausetzungen -Before you can use Jekyll to create a {% data variables.product.prodname_pages %} site, you must install Jekyll and Git. For more information, see [Installation](https://jekyllrb.com/docs/installation/) in the Jekyll documentation and "[Set up Git](/articles/set-up-git)." +Bevor Du mit Jekyll eine {% data variables.product.prodname_pages %}-Website erstellen kannst, musst Du Jekyll und Git installieren. Weitere Informationen finden Sie unter „[Installation](https://jekyllrb.com/docs/installation/)“ in der Jekyll-Dokumentation und unter „[Git einrichten](/articles/set-up-git)“. {% data reusables.pages.recommend-bundler %} {% data reusables.pages.jekyll-install-troubleshooting %} -### Creating a repository for your site +### Ein Repository für eine Website erstellen {% data reusables.pages.new-or-existing-repo %} @@ -29,59 +29,58 @@ Before you can use Jekyll to create a {% data variables.product.prodname_pages % {% data reusables.pages.create-repo-name %} {% data reusables.repositories.choose-repo-visibility %} -### Creating your site +### Eine Website erstellen {% data reusables.pages.must-have-repo-first %} {% data reusables.command_line.open_the_multi_os_terminal %} -2. If you don't already have a local copy of your repository, navigate to the location where you want to store your site's source files, replacing _PARENT-FOLDER_ with the folder you want to contain the folder for your repository. +2. Wenn Du noch keine lokale Kopie Deines Repositorys besitzt, navigiere zu dem Speicherort, an dem Du die Quelldateien Deiner Website speichern möchtest, und ersetze dabei _PARENT-FOLDER_ durch den Ordner, der den Ordner für Dein Repository enthalten soll. ```shell $ cd PARENT-FOLDER ``` -3. If you haven't already, initialize a local Git repository, replacing _REPOSITORY-NAME_ with the name of your repository. +3. Wenn Du dies noch nicht getan hast, initialisiere ein lokales Git-Repository, und ersetzen dabei _REPOSITORY-NAME_ durch den Namen Deines Repositorys. ```shell $ git init REPOSITORY-NAME > Initialized empty Git repository in /Users/octocat/my-site/.git/ - # Creates a new folder on your computer, initialized as a Git repository - ``` - 4. Change directories to the repository. + # Erstellt einen neuen Ordner auf Deinem Computer, der als Git-Repository initialisiert wird + ``` + 4. Wechsle in das Verzeichnis des Repositorys. ```shell $ cd REPOSITORY-NAME - # Changes the working directory + # Ändert das Arbeitsverzeichnis ``` {% data reusables.pages.decide-publishing-source %} {% data reusables.pages.navigate-publishing-source %} For example, if you chose to publish your site from the `docs` folder on the default branch, create and change directories to the `docs` folder. ```shell $ mkdir docs - # Creates a new folder called docs + # Erstellt einen neuen Ordner mit dem Namen docs $ cd docs ``` - If you chose to publish your site from the `gh-pages` branch, create and checkout the `gh-pages` branch. + Wenn Du Deine Website aus dem `gh-pages`-Branch veröffentlichen möchtest, erstelle den `gh-pages`-Branch und checke ihn aus. ```shell $ git checkout --orphan gh-pages - # Creates a new branch, with no history or contents, called gh-pages and switches to the gh-pages branch + # Erstellt einen neuen Branch, ohne Verlauf und Inhalte, mit dem namen gh-pages und wechselt zum gh-pages-Branch ``` - 7. To create a new Jekyll site, use the `jekyll new` command, replacing _VERSION_ with the current dependency version for Jekyll. For more information, see "[Dependency versions](https://pages.github.com/versions/)" on the {% data variables.product.prodname_pages %} site. - - If you installed Bundler: + 7. Um eine neue Jekyll-Website zu erstellen, führe den Befehl `jekyll new` aus. Ersetze dabei _VERSION_ durch die aktuelle Abhängigkeitsversion für Jekyll. Weitere Informationen findest Du unter „[Abhängigkeitsversionen](https://pages.github.com/versions/)“ auf der {% data variables.product.prodname_pages %}-Website. + - Wenn Du Bundler installiert hast: ```shell $ bundle exec jekyll VERSION new . - # Creates a Jekyll site in the current directory + # Erstellt eine Jekyll-Website im aktuellen Verzeichnis ``` - - If you don't have Bundler installed: + - Wenn Du Bundler nicht installiert hast: ```shell $ jekyll VERSION new . - # Creates a Jekyll site in the current directory + # Erstellt eine Jekyll-Website im aktuellen Verzeichnis ``` -8. Open the Gemfile that was created and follow the instructions in the Gemfile's comments to use {% data variables.product.prodname_pages %}. - ![Instructions for updating Gemfile](/assets/images/help/pages/gemfile-instructions.png) -9. Update the `gem "github-pages"` line so that the line looks like this, replacing _VERSION_ with the current dependency version for `github-pages`. For more information, see "[Dependency versions](https://pages.github.com/versions/)" on the {% data variables.product.prodname_pages %} site. +8. Öffne das gerade erstellte Gemfile, und befolge die Anweisungen in den Gemfile-Kommentaren, um {% data variables.product.prodname_pages %} zu verwenden. ![Anleitung zum Aktualisieren der Gemfile](/assets/images/help/pages/gemfile-instructions.png) +9. Aktualisiere die Zeile `gem "github-pages"` so, dass sie wie folgt aussieht. Ersetze dabei _VERSION_ durch die aktuelle Abhängigkeitsversion für `github-pages`. Weitere Informationen findest Du unter „[Abhängigkeitsversionen](https://pages.github.com/versions/)“ auf der {% data variables.product.prodname_pages %}-Website. ```shell gem "github-pages", "~> VERSION", group: :jekyll_plugins ``` -10. Save and close the Gemfile. -11. Optionally, test your site locally. For more information, see "[Testing your {% data variables.product.prodname_pages %} site locally with Jekyll](/articles/testing-your-github-pages-site-locally-with-jekyll)." -12. Add your {% data variables.product.product_name %} repository as a remote, replacing {% if currentVersion != "free-pro-team@latest" %}_HOSTNAME_ with your appliance's hostname,{% endif %} _USER_ with the account that owns the repository{% if currentVersion != "free-pro-team@latest" %},{% endif %} and _REPOSITORY_ with the name of the repository. +10. Speichere und schließe das Gemfile. +11. Teste Deine Website optional lokal. Weitere Informationen findest Du unter „[Deine {% data variables.product.prodname_pages %}-Website lokal mit Jekyll testen](/articles/testing-your-github-pages-site-locally-with-jekyll).“ +12. Fügen Sie Ihr {% data variables.product.product_name %}-Repository als Remote-Repository hinzu. Ersetzen Sie dabei {% if enterpriseServerVersions contains currentVersion %}_HOSTNAME_ durch den Hostnamen Ihrer Appliance,{% endif %} _USER_ durch das Konto, das das Repository besitzt{% if enterpriseServerVersions contains currentVersion %},{% endif %} und _REPOSITORY_ durch den Namen des Repositorys. ```shell {% if currentVersion == "free-pro-team@latest" %} $ git remote add origin https://github.com/USER/REPOSITORY.git @@ -89,7 +88,7 @@ $ git remote add origin https://github.com/USER/REPOSITORY.git $ git remote add origin https://HOSTNAME/USER/REPOSITORY.git {% endif %} ``` -13. Push the repository to {% data variables.product.product_name %}, replacing _BRANCH_ with the name of the branch you're working on. +13. Übertrage das Repository zu {% data variables.product.product_name %}, und ersetze dabei _BRANCH_ durch den Namen des Branches, auf dem Du gerade arbeitest. ```shell $ git push -u origin BRANCH ``` @@ -100,8 +99,8 @@ $ git remote add origin https://HOSTNAME/USER/REPOSITORY ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ``` @@ -119,11 +119,11 @@ If your instance has subdomain isolation disabled: ``` {% endif %} -#### Authenticating with the `GITHUB_TOKEN` +#### #### Authenticating with the `GITHUB_TOKEN` {% data reusables.package_registry.package-registry-with-github-tokens %} -### Publishing a package +### Ein Paket veröffentlichen {% data reusables.package_registry.default-name %} For example, {% data variables.product.prodname_dotcom %} will publish a package named `com.example:test` in a repository called `OWNER/test`. @@ -131,8 +131,10 @@ If you would like to publish multiple packages to the same repository, you can i For more information on creating a package, see the [maven.apache.org documentation](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html). -1. Edit the `distributionManagement` element of the *pom.xml* file located in your package directory, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. - {% if currentVersion != "free-pro-team@latest" %} +1. Edit the `distributionManagement` element of the *pom.xml* file located in your package directory, replacing `OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. + +{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} ``` @@ -144,7 +146,7 @@ For more information on creating a package, see the [maven.apache.org documentat ``` - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ``` @@ -164,7 +166,7 @@ For more information on creating a package, see the [maven.apache.org documentat {% data reusables.package_registry.viewing-packages %} -### Installing a package +### Ein Paket installieren To install an Apache Maven package from {% data variables.product.prodname_registry %}, edit the *pom.xml* file to include the package as a dependency. If you want to install packages from more than one repository, add a `repository` tag for each. For more information on using a *pom.xml* file in your project, see "[Introduction to the POM](https://maven.apache.org/guides/introduction/introduction-to-the-pom.html)" in the Apache Maven documentation. @@ -180,13 +182,13 @@ To install an Apache Maven package from {% data variables.product.prodname_regis ``` -3. Install the package. +3. Installieren Sie das Paket. ```shell $ mvn install ``` -### Further reading +### Weiterführende Informationen - "[Configuring Gradle for use with {% data variables.product.prodname_registry %}](/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages)" - "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md index 59c0d2c8b8..920cc9b836 100644 --- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md +++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md @@ -1,6 +1,6 @@ --- title: Configuring Docker for use with GitHub Packages -intro: 'You can configure the Docker client to use {% data variables.product.prodname_registry %} to publish and retrieve docker images.' +intro: 'Sie können den Docker-Client für die Nutzung von {% data variables.product.prodname_registry %} zum Veröffentlichen und Abrufen von Docker-Images konfigurieren.' product: '{% data reusables.gated-features.packages %}' redirect_from: - /articles/configuring-docker-for-use-with-github-package-registry @@ -13,21 +13,21 @@ versions: {% data reusables.package_registry.packages-ghes-release-stage %} -{% data reusables.package_registry.admins-can-configure-package-types %} +**Note:** When installing or publishing a docker image, {% data variables.product.prodname_registry %} does not currently support foreign layers, such as Windows images. -### About Docker and {% data variables.product.prodname_registry %} +### Bei {% data variables.product.prodname_registry %} authentifizieren {% data reusables.package_registry.docker_registry_deprecation_status %} When installing or publishing a docker image, {% data variables.product.prodname_registry %} does not currently support foreign layers, such as Windows images. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Before you can use the Docker registry on {% data variables.product.prodname_registry %}, the site administrator for {% data variables.product.product_location_enterprise %} must enable Docker support and subdomain isolation for your instance. For more information, see "[Managing GitHub Packages for your enterprise](/enterprise/admin/packages)." {% endif %} -### Authenticating to {% data variables.product.prodname_registry %} +### Bei {% data variables.product.prodname_registry %} authentifizieren {% data reusables.package_registry.docker_registry_deprecation_status %} @@ -49,7 +49,7 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% raw %} ```shell $ cat ~/TOKEN.txt | docker login docker.HOSTNAME -u USERNAME --password-stdin @@ -57,19 +57,19 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if currentVersion != "free-pro-team@latest" %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. +To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if enterpriseServerVersions contains currentVersion %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. For more information, see "[Docker login](https://docs.docker.com/engine/reference/commandline/login/#provide-a-password-using-stdin)." -#### Authenticating with the `GITHUB_TOKEN` +#### #### Authenticating with the `GITHUB_TOKEN` {% data reusables.package_registry.package-registry-with-github-tokens %} -### Publishing a package +### Ein Paket veröffentlichen {% data reusables.package_registry.docker_registry_deprecation_status %} -{% data variables.product.prodname_registry %} supports multiple top-level Docker images per repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation. +{% data variables.product.prodname_registry %} unterstützt mehrere Top-Level-Docker-Images pro Repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation. {% data reusables.package_registry.lowercase-name-field %} @@ -82,17 +82,19 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen > REPOSITORY TAG IMAGE ID CREATED SIZE > IMAGE_NAME VERSION IMAGE_ID 4 weeks ago 1.11MB ``` -2. Using the Docker image ID, tag the docker image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. +2. Using the Docker image ID, tag the docker image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, and *VERSION* with package version at build time. +{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker tag IMAGE_ID docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION ``` {% else %} ```shell - $ docker tag IMAGE_ID docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION + If you haven't already built a docker image for the package, build the image, replacing OWNER with the name of the user or organization account that owns the repository, REPOSITORY with the name of the repository containing your project, IMAGE_NAME with name of the package or image, VERSION with package version at build time, and PATH to the image if it isn't in the current working directory. ``` {% endif %} -3. If you haven't already built a docker image for the package, build the image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, *VERSION* with package version at build time,{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s +3. If you haven't already built a docker image for the package, build the image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, *VERSION* with package version at build time, +{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker build -t docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH @@ -102,7 +104,8 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen $ docker build -t docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH ``` {% endif %} -4. Publish the image to {% data variables.product.prodname_registry %}. +4. Publish the image to +{% data variables.product.prodname_registry %}. {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker push docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION @@ -163,7 +166,7 @@ You can publish a new Docker image for the first time and name it `monalisa`. # Assumes Dockerfile resides in the current working directory (.) $ docker build -t docker.pkg.github.com/octocat/octo-app/monalisa:1.0 . -# Push the image to {% data variables.product.prodname_registry %} +# Pusht das Image zu {% data variables.product.prodname_registry %} $ docker push docker.pkg.github.com/octocat/octo-app/monalisa:1.0 ``` @@ -178,11 +181,11 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0 ``` {% endif %} -### Installing a package +### Ein Paket installieren {% data reusables.package_registry.docker_registry_deprecation_status %} -You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} +You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} {% if currentVersion == "free-pro-team@latest" %} ```shell @@ -200,6 +203,6 @@ $ docker pull docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:TAG_NAME {% endnote %} -### Further reading +### Weiterführende Informationen - "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md index 86804a187c..b2e0c5cf27 100644 --- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md +++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md @@ -29,7 +29,7 @@ To authenticate to {% data variables.product.prodname_registry %} with the `dotn You must replace: - `USERNAME` with the name of your user account on {% data variables.product.prodname_dotcom %}. - `TOKEN` with your personal access token. -- `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} +- `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} - `HOSTNAME` with the host name for your {% data variables.product.prodname_ghe_server %} instance. If your instance has subdomain isolation enabled: @@ -51,7 +51,7 @@ If your instance has subdomain isolation enabled: ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```xml @@ -90,7 +90,7 @@ You can publish a package to {% data variables.product.prodname_registry %} by a 3. Add your project's specific information to your project's file, which ends in *.csproj*. You must replace: - `OWNER` with the name of the user or organization account that owns the repository containing your project. - `REPOSITORY` with the name of the repository containing the package you want to publish. - - `1.0.0` with the version number of the package.{% if currentVersion != "free-pro-team@latest" %} + - `1.0.0` with the version number of the package.{% if enterpriseServerVersions contains currentVersion %} - `HOSTNAME` with the host name for your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` xml diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md index 3a2e361548..f9c89adc44 100644 --- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md +++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md @@ -25,7 +25,7 @@ versions: You can authenticate to {% data variables.product.prodname_registry %} with Gradle using either Gradle Groovy or Kotlin DSL by editing your *build.gradle* file (Gradle Groovy) or *build.gradle.kts* file (Kotlin DSL) file to include your personal access token. You can also configure Gradle Groovy and Kotlin DSL to recognize a single package or multiple packages in a repository. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Replace *REGISTRY-URL* with the URL for your instance's Maven registry. If your instance has subdomain isolation enabled, use `maven.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/maven`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance. {% endif %} diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md index efc0e2d450..866741929a 100644 --- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md +++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md @@ -1,6 +1,6 @@ --- title: Configuring npm for use with GitHub Packages -intro: 'You can configure npm to publish packages to {% data variables.product.prodname_registry %} and to use packages stored on {% data variables.product.prodname_registry %} as dependencies in an npm project.' +intro: 'Sie können NPM für die Veröffentlichung von Paketen auf {% data variables.product.prodname_registry %} und für die Nutzung von auf {% data variables.product.prodname_registry %} gespeicherten Paketen als Abhängigkeiten in einem NPM-Projekt konfigurieren.' product: '{% data reusables.gated-features.packages %}' redirect_from: - /articles/configuring-npm-for-use-with-github-package-registry @@ -13,9 +13,9 @@ versions: {% data reusables.package_registry.packages-ghes-release-stage %} -{% data reusables.package_registry.admins-can-configure-package-types %} +**Note:** When installing or publishing a docker image, {% data variables.product.prodname_registry %} does not currently support foreign layers, such as Windows images. -### Authenticating to {% data variables.product.prodname_registry %} +### Bei {% data variables.product.prodname_registry %} authentifizieren {% data reusables.package_registry.authenticate-packages %} @@ -25,9 +25,9 @@ versions: You can authenticate to {% data variables.product.prodname_registry %} with npm by either editing your per-user *~/.npmrc* file to include your personal access token or by logging in to npm on the command line using your username and personal access token. -To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. Create a new *~/.npmrc* file if one doesn't exist. +To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. Create a new *~/.npmrc* file if one doesn't exist. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -35,17 +35,20 @@ If your instance has subdomain isolation enabled: //{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}/:_authToken=TOKEN ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell -//HOSTNAME/_registry/npm/:_authToken=TOKEN +$ npm login --registry=https://npm.pkg.github.com +> Username: USERNAME +> Password: TOKEN +> Email: PUBLIC-EMAIL-ADDRESS ``` {% endif %} To authenticate by logging in to npm, use the `npm login` command, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *PUBLIC-EMAIL-ADDRESS* with your email address. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -56,28 +59,27 @@ $ npm login --registry=https://{% if currentVersion == "free-pro-team@latest" %} > Email: PUBLIC-EMAIL-ADDRESS ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell -$ npm login --registry=https://HOSTNAME/_registry/npm/ -> Username: USERNAME -> Password: TOKEN -> Email: PUBLIC-EMAIL-ADDRESS +registry=https://npm.pkg.github.com/OWNER +@OWNER:registry=https://npm.pkg.github.com +@OWNER:registry=https://npm.pkg.github.com ``` {% endif %} -#### Authenticating with the `GITHUB_TOKEN` +#### #### Authenticating with the `GITHUB_TOKEN` {% data reusables.package_registry.package-registry-with-github-tokens %} -### Publishing a package +### Ein Paket veröffentlichen -By default, {% data variables.product.prodname_registry %} publishes a package in the {% data variables.product.prodname_dotcom %} repository you specify in the name field of the *package.json* file. For example, you would publish a package named `@my-org/test` to the `my-org/test` {% data variables.product.prodname_dotcom %} repository. You can add a summary for the package listing page by including a *README.md* file in your package directory. For more information, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" and "[How to create Node.js Modules](https://docs.npmjs.com/getting-started/creating-node-modules)" in the npm documentation. +By default, {% data variables.product.prodname_registry %} publishes a package in the {% data variables.product.prodname_dotcom %} repository you specify in the name field of the *package.json* file. Ein Paket namens `@my-org/test` würde beispielsweise im Repository `my-org/test` auf {% data variables.product.prodname_dotcom %} veröffentlicht. You can add a summary for the package listing page by including a *README.md* file in your package directory. For more information, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" and "[How to create Node.js Modules](https://docs.npmjs.com/getting-started/creating-node-modules)" in the npm documentation. You can publish multiple packages to the same {% data variables.product.prodname_dotcom %} repository by including a `URL` field in the *package.json* file. For more information, see "[Publishing multiple packages to the same repository](#publishing-multiple-packages-to-the-same-repository)." -You can set up the scope mapping for your project using either a local *.npmrc* file in the project or using the `publishConfig` option in the *package.json*. {% data variables.product.prodname_registry %} only supports scoped npm packages. Scoped packages have names with the format of `@owner/name`. Scoped packages always begin with an `@` symbol. You may need to update the name in your *package.json* to use the scoped name. For example, `"name": "@codertocat/hello-world-npm"`. +Die Scope-Zuordnung für Ihr Projekt können Sie entweder über die lokale *.npmrc*-Datei im Projekt oder die Option `publishConfig` in der Datei *package.json* festlegen. {% data variables.product.prodname_registry %} only supports scoped npm packages. Pakete mit Scopes weisen Namen im Format `@owner/name` auf. Pakete mit Scopes beginnen immer mit dem Symbol `@`. Eventuell müssen Sie den Namen in der Datei *package.json* aktualisieren, um den Namen mit Scope zu verwenden. Beispiel: `"name": "@codertocat/hello-world-npm"`. {% data reusables.package_registry.viewing-packages %} @@ -88,16 +90,17 @@ You can use an *.npmrc* file to configure the scope mapping for your project. In {% data reusables.package_registry.authenticate-step %} {% data reusables.package_registry.create-npmrc-owner-step %} {% data reusables.package_registry.add-npmrc-to-repo-step %} -4. Verify the name of your package in your project's *package.json*. The `name` field must contain the scope and the name of the package. For example, if your package is called "test", and you are publishing to the "My-org" {% data variables.product.prodname_dotcom %} organization, the `name` field in your *package.json* should be `@my-org/test`. +4. Überprüfen Sie den Namen Ihres Pakets in der Datei *package.json* Ihres Projekts. Das Feld `name` (Name) muss den Scope und den Namen des Pakets enthalten. For example, if your package is called "test", and you are publishing to the "My-org" +{% data variables.product.prodname_dotcom %} organization, the `name` field in your *package.json* should be `@my-org/test`. {% data reusables.package_registry.verify_repository_field %} {% data reusables.package_registry.publish_package %} #### Publishing a package using `publishConfig` in the *package.json* file -You can use `publishConfig` element in the *package.json* file to specify the registry where you want the package published. For more information, see "[publishConfig](https://docs.npmjs.com/files/package.json#publishconfig)" in the npm documentation. +You can use `publishConfig` element in the *package.json* file to specify the registry where you want the package published. Weitere Informationen finden Sie unter „[publishConfig](https://docs.npmjs.com/files/package.json#publishconfig)“ in der NPM-Dokumentation. -1. Edit the *package.json* file for your package and include a `publishConfig` entry. - {% if currentVersion != "free-pro-team@latest" %} +1. Bearbeiten Sie die Datei *package.json* für Ihr Paket, und fügen Sie den Eintrag `publishConfig` hinzu. + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} ```shell @@ -105,7 +108,7 @@ You can use `publishConfig` element in the *package.json* file to specify the re "registry":"https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}" }, ``` - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell "publishConfig": { @@ -132,13 +135,13 @@ To ensure the repository's URL is correct, replace REPOSITORY with the name of t }, ``` -### Installing a package +### Ein Paket installieren -You can install packages from {% data variables.product.prodname_registry %} by adding the packages as dependencies in the *package.json* file for your project. For more information on using a *package.json* in your project, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" in the npm documentation. +You can install packages from {% data variables.product.prodname_registry %} by adding the packages as dependencies in the *package.json* file for your project. Weitere Informationen zum Verwenden einer *package.json*-Datei in Ihrem Projekt finden Sie unter „[Mit package.json arbeiten](https://docs.npmjs.com/getting-started/using-a-package.json)“ in der npm-Dokumentation. By default, you can add packages from one organization. For more information, see "[Installing packages from other organizations](#installing-packages-from-other-organizations)." -You also need to add the *.npmrc* file to your project so all requests to install packages will go through {% data variables.product.prodname_registry %}. When you route all package requests through {% data variables.product.prodname_registry %}, you can use both scoped and unscoped packages from *npmjs.com*. For more information, see "[npm-scope](https://docs.npmjs.com/misc/scope)" in the npm documentation. +You also need to add the *.npmrc* file to your project so all requests to install packages will go through {% data variables.product.prodname_registry %}. When you route all package requests through {% data variables.product.prodname_registry %}, you can use both scoped and unscoped packages from *npmjs.com*. Weitere Informationen finden Sie unter „[npm-scope](https://docs.npmjs.com/misc/scope) in der npm-Dokumentation. {% data reusables.package_registry.authenticate-step %} {% data reusables.package_registry.create-npmrc-owner-step %} @@ -158,17 +161,17 @@ You also need to add the *.npmrc* file to your project so all requests to instal } } ``` -5. Install the package. +5. Installieren Sie das Paket. ```shell $ npm install ``` -#### Installing packages from other organizations +#### Pakete von anderen Organisationen installieren -By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} +Standardmäßig können Sie nur {% data variables.product.prodname_registry %}-Pakete von einer Organisation verwenden. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -178,7 +181,7 @@ registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github @OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %} ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell @@ -188,6 +191,6 @@ registry=https://HOSTNAME/_registry/npm/OWNER ``` {% endif %} -### Further reading +### Weiterführende Informationen - "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md index 35f32a1ae3..807e7e75ab 100644 --- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md +++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md @@ -13,55 +13,54 @@ versions: {% data reusables.package_registry.packages-ghes-release-stage %} -{% data reusables.package_registry.admins-can-configure-package-types %} +**Note:** When installing or publishing a docker image, {% data variables.product.prodname_registry %} does not currently support foreign layers, such as Windows images. -### Prerequisites +### Vorrausetzungen - You must have rubygems 2.4.1 or higher. To find your rubygems version: ```shell $ gem --version ``` - + - You must have bundler 1.6.4 or higher. To find your Bundler version: ```shell $ bundle --version Bundler version 1.13.7 ``` - + - Install keycutter to manage multiple credentials. To install keycutter: ```shell $ gem install keycutter ``` - -### Authenticating to {% data variables.product.prodname_registry %} - + +### Bei {% data variables.product.prodname_registry %} authentifizieren + {% data reusables.package_registry.authenticate-packages %} - + #### Authenticating with a personal access token - + {% data reusables.package_registry.required-scopes %} - + You can authenticate to {% data variables.product.prodname_registry %} with RubyGems by editing the *~/.gem/credentials* file for publishing gems, editing the *~/.gemrc* file for installing a single gem, or using Bundler for tracking and installing one or more gems. - + To publish new gems, you need to authenticate to {% data variables.product.prodname_registry %} with RubyGems by editing your *~/.gem/credentials* file to include your personal access token. Create a new *~/.gem/credentials* file if this file doesn't exist. - + For example, you would create or edit a *~/.gem/credentials* to include the following, replacing *TOKEN* with your personal access token. - + ```shell ---- -:github: Bearer TOKEN +gem.metadata = { "github_repo" => "ssh://github.com/OWNER/REPOSITORY" } ``` - + To install gems, you need to authenticate to {% data variables.product.prodname_registry %} by editing the *~/.gemrc* file for your project to include `https://USERNAME:TOKEN@{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER/`. You must replace: - `USERNAME` with your {% data variables.product.prodname_dotcom %} username. - `TOKEN` with your personal access token. - - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} + - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} - `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance. -{% endif %} - +{% endif %} + If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this example. - + ```shell --- :backtrace: false @@ -73,31 +72,31 @@ If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this exa :verbose: true ``` - -To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} - + +To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} + {% data reusables.package_registry.lowercase-name-field %} - + ```shell $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER USERNAME:TOKEN ``` - -#### Authenticating with the `GITHUB_TOKEN` - -{% data reusables.package_registry.package-registry-with-github-tokens %} - -### Publishing a package -{% data reusables.package_registry.default-name %} For example, when you publish `octo-gem` to the `octo-org` organization, {% data variables.product.prodname_registry %} publishes the gem to the `octo-org/octo-gem` repository. For more information on creating your gem, see "[Make your own gem](http://guides.rubygems.org/make-your-own-gem/)" in the RubyGems documentation. - +#### #### Authenticating with the `GITHUB_TOKEN` + +{% data reusables.package_registry.package-registry-with-github-tokens %} + +### Ein Paket veröffentlichen + +{% data reusables.package_registry.default-name %} For example, when you publish `octo-gem` to the `octo-org` organization, {% data variables.product.prodname_registry %} publishes the gem to the `octo-org/octo-gem` repository. Weitere Informationen zum Erstellen einer Gem finden Sie unter „[Eine eigene Gem erstellen](http://guides.rubygems.org/make-your-own-gem/)“ in der RubyGems-Dokumentation. + {% data reusables.package_registry.viewing-packages %} - + {% data reusables.package_registry.authenticate-step %} 2. Build the package from the *gemspec* to create the *.gem* package. ```shell gem build OCTO-GEM.gemspec ``` -3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ```shell $ gem push --key github \ @@ -107,18 +106,18 @@ $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygem ### Publishing multiple packages to the same repository -To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if currentVersion != "free-pro-team@latest" %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if enterpriseServerVersions contains currentVersion %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` gem.metadata = { "github_repo" => "ssh://{% if currentVersion == "free-pro-team@latest" %}github.com{% else %}HOSTNAME{% endif %}/OWNER/REPOSITORY" } ``` -### Installing a package +### Ein Paket installieren You can use gems from {% data variables.product.prodname_registry %} much like you use gems from *rubygems.org*. You need to authenticate to {% data variables.product.prodname_registry %} by adding your {% data variables.product.prodname_dotcom %} user or organization as a source in the *~/.gemrc* file or by using Bundler and editing you *Gemfile*. {% data reusables.package_registry.authenticate-step %} -2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` source "https://rubygems.org" @@ -140,11 +139,11 @@ You can use gems from {% data variables.product.prodname_registry %} much like y gem "GEM NAME" ``` -4. Install the package: +4. Installieren Sie das Paket: ```shell $ gem install octo-gem --version "0.1.1" ``` -### Further reading +### Weiterführende Informationen - "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" diff --git a/translations/de-DE/content/rest/overview/api-previews.md b/translations/de-DE/content/rest/overview/api-previews.md index 26f7fc14f4..e602d47db1 100644 --- a/translations/de-DE/content/rest/overview/api-previews.md +++ b/translations/de-DE/content/rest/overview/api-previews.md @@ -42,7 +42,7 @@ Get a [list of events](/v3/issues/timeline/) for an issue or pull request. **Custom media type:** `mockingbird-preview` **Announced:** [2016-05-23](https://developer.github.com/changes/2016-05-23-timeline-preview-api/) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Pre-receive environments Create, list, update, and delete environments for pre-receive hooks. @@ -50,7 +50,7 @@ Create, list, update, and delete environments for pre-receive hooks. **Custom media type:** `eye-scream-preview` **Announced:** [2015-07-29](/rest/reference/enterprise-admin#pre-receive-environments) {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### Integrations Manage [integrations](/early-access/integrations/) through the API. @@ -98,7 +98,7 @@ View all [codes of conduct](/v3/codes_of_conduct) or get which code of conduct a **Custom media type:** `scarlet-witch-preview` -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### Verschachtelte Teams Include nested team content in [team](/v3/teams/) payloads. @@ -107,7 +107,7 @@ Include nested team content in [team](/v3/teams/) payloads. {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Global webhooks @@ -117,7 +117,7 @@ Enables [global webhooks](/rest/reference/enterprise-admin#global-webhooks/) for {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### Repository transfer Transfer a [repository](/v3/repos/) to an organization or user. @@ -125,7 +125,7 @@ Transfer a [repository](/v3/repos/) to an organization or user. **Custom media type:** `nightshade-preview` **Announced:** [2017-11-09](https://developer.github.com/changes/2017-11-09-repository-transfer-api-preview) {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### Add lock reason You can now add a reason when you [lock an issue](/v3/issues/#lock-an-issue). @@ -145,7 +145,7 @@ You can now [require multiple approving reviews](/v3/repos/branches) for a pull **Custom media type:** `luke-cage-preview` **Announced:** [2018-03-16](https://developer.github.com/changes/2018-03-16-protected-branches-required-approving-reviews) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.19" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.19" %} ### Retrieve hovercard information Retrieve information from [someone's hovercard](/v3/users/#get-contextual-information-for-a-user). @@ -162,7 +162,7 @@ Allows a GitHub App to run external checks on a repository's code. See the [Chec **Custom media type:** `antiope-preview` **Announced:** [2018-05-07](https://developer.github.com/changes/2018-05-07-new-checks-api-public-beta/) {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Anonymous Git access to repositories @@ -216,7 +216,7 @@ Allows you to temporarily restrict interactions, such as commenting, opening iss {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### Entwürfe für Pull Requests You can use the Draft Pull Requests API and its [pull request](/v3/pulls/) endpoints to see whether a pull request is in draft state. To learn more about draft pull requests, see "[About pull requests](/articles/about-pull-requests/)". @@ -237,7 +237,7 @@ You can use two new endpoints in the [Commits API](/v3/repos/commits/) to list b **Custom media types:** `groot-preview` **Announced:** [2019-04-11](https://developer.github.com/changes/2019-04-11-pulls-branches-for-commit/) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### Uninstall a GitHub App Owners of GitHub Apps can now uninstall an app using the [Apps API](/v3/apps/#delete-an-installation-for-the-authenticated-app). diff --git a/translations/de-DE/content/rest/overview/resources-in-the-rest-api.md b/translations/de-DE/content/rest/overview/resources-in-the-rest-api.md index 8aa9e2a0ba..74c0efe14b 100644 --- a/translations/de-DE/content/rest/overview/resources-in-the-rest-api.md +++ b/translations/de-DE/content/rest/overview/resources-in-the-rest-api.md @@ -40,7 +40,7 @@ $ curl -i {% data variables.product.api_url_pre %}/users/octocat/orgs > X-GitHub-Media-Type: github.v3 > X-RateLimit-Limit: 5000 > X-RateLimit-Remaining: 4987 -> X-RateLimit-Reset: 1350085394{% if currentVersion != "free-pro-team@latest" %} +> X-RateLimit-Reset: 1350085394{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: {{ currentVersion }}.0{% endif %} > Content-Length: 5 > Cache-Control: max-age=0, private, must-revalidate @@ -107,7 +107,7 @@ curl -u my_client_id:my_client_secret '{% data variables.product.api_url_pre %}/ Using your `client_id` and `client_secret` does _not_ authenticate as a user, it will only identify your OAuth application to increase your rate limit. Permissions are only granted to users, not applications, and you will only get back data that an unauthenticated user would see. For this reason, you should only use the OAuth2 key/secret in server-to-server scenarios. Don't leak your OAuth application's client secret to your users. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} You will be unable to authenticate using your OAuth2 key and secret while in private mode, and trying to authenticate will return `401 Unauthorized`. For more information, see "[Enabling private mode](/enterprise/admin/installation/enabling-private-mode)". {% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -163,10 +163,10 @@ $ curl -i -u username -d '{"scopes":["public_repo"]}' {% data variables.product. You can issue a `GET` request to the root endpoint to get all the endpoint categories that the REST API supports: ```shell -$ curl {% if currentVersion != "free-pro-team@latest" %}-u username:password {% endif %}{% data variables.product.api_url_pre %} +$ curl {% if enterpriseServerVersions contains currentVersion %}-u username:password {% endif %}{% data variables.product.api_url_pre %} ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/de-DE/content/rest/reference/apps.md b/translations/de-DE/content/rest/reference/apps.md index 191557815b..f84a5dc93f 100644 --- a/translations/de-DE/content/rest/reference/apps.md +++ b/translations/de-DE/content/rest/reference/apps.md @@ -61,3 +61,12 @@ Be sure to replace stubbed endpoints with production endpoints before deploying {% endfor %} {% endif %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +## Webhooks + +{% for operation in currentRestOperations %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} +{% endfor %} + +{% endif %} \ No newline at end of file diff --git a/translations/de-DE/content/rest/reference/enterprise-admin.md b/translations/de-DE/content/rest/reference/enterprise-admin.md index 6c1045bb89..5183827b35 100644 --- a/translations/de-DE/content/rest/reference/enterprise-admin.md +++ b/translations/de-DE/content/rest/reference/enterprise-admin.md @@ -21,7 +21,7 @@ You can use these {{ site.data.variables.product.prodname_ghe_cloud }} endpoints {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Endpoint URLs @@ -39,7 +39,7 @@ http(s)://hostname/ ### Authentifizierung -Your {% data variables.product.product_name %} installation's API endpoints accept [the same authentication methods](/rest/overview/resources-in-the-rest-api#authentication) as the GitHub.com API. You can authenticate yourself with **[OAuth tokens](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** (which can be created using the [Authorizations API](/rest/reference/oauth-authorizations#create-a-new-authorization)) or **[basic authentication](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if currentVersion != "free-pro-team@latest" %} OAuth tokens must have the `site_admin` [OAuth scope](/developers/apps/scopes-for-oauth-apps#available-scopes) when used with Enterprise-specific endpoints.{% endif %} +Your {% data variables.product.product_name %} installation's API endpoints accept [the same authentication methods](/rest/overview/resources-in-the-rest-api#authentication) as the GitHub.com API. You can authenticate yourself with **[OAuth tokens](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** (which can be created using the [Authorizations API](/rest/reference/oauth-authorizations#create-a-new-authorization)) or **[basic authentication](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if enterpriseServerVersions contains currentVersion %} OAuth tokens must have the `site_admin` [OAuth scope](/developers/apps/scopes-for-oauth-apps#available-scopes) when used with Enterprise-specific endpoints.{% endif %} Enterprise administration API endpoints are only accessible to authenticated {% data variables.product.product_name %} site administrators, except for the [Management Console](#management-console) API, which requires the [Management Console password](/enterprise/admin/articles/accessing-the-management-console/). @@ -135,7 +135,7 @@ GET /scim/v2/enterprises/{enterprise}/Users/{scim_user_id} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ## Admin stats diff --git a/translations/de-DE/content/rest/reference/gists.md b/translations/de-DE/content/rest/reference/gists.md index 92b7d9d964..2e6fe3ccd6 100644 --- a/translations/de-DE/content/rest/reference/gists.md +++ b/translations/de-DE/content/rest/reference/gists.md @@ -9,7 +9,7 @@ versions: ### Authentifizierung -You can read public gists {% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "2.9" %}and create them for anonymous users without a token.{% else %} anonymously, but you must be signed into GitHub to create gists.{% endif %} To read or write gists on a user's behalf, you need the gist OAuth scope and a token. For more information, see "[Scopes for OAuth Apps](/developers/apps/scopes-for-oauth-apps)." +You can read public gists {% if enterpriseServerVersions contains currentVersion %}and create them for anonymous users without a token.{% else %} anonymously, but you must be signed into GitHub to create gists.{% endif %} To read or write gists on a user's behalf, you need the gist OAuth scope and a token. For more information, see "[Scopes for OAuth Apps](/developers/apps/scopes-for-oauth-apps)." diff --git a/translations/de-DE/content/rest/reference/orgs.md b/translations/de-DE/content/rest/reference/orgs.md index 9389a03b8d..506438cb69 100644 --- a/translations/de-DE/content/rest/reference/orgs.md +++ b/translations/de-DE/content/rest/reference/orgs.md @@ -56,5 +56,5 @@ For more best practices, [see our guide](/guides/best-practices-for-integrators/ {% data variables.product.product_name %} will send along several HTTP headers to differentiate between event types and payload identifiers. See [webhook headers](/webhooks/event-payloads/#delivery-headers) for details. {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} diff --git a/translations/de-DE/content/rest/reference/permissions-required-for-github-apps.md b/translations/de-DE/content/rest/reference/permissions-required-for-github-apps.md index 6533185089..84b0dd3b00 100644 --- a/translations/de-DE/content/rest/reference/permissions-required-for-github-apps.md +++ b/translations/de-DE/content/rest/reference/permissions-required-for-github-apps.md @@ -577,7 +577,7 @@ _Teams_ - [`GET /orgs/:org/teams`](/v3/teams/#list-teams) (:read) - [`POST /orgs/:org/teams`](/v3/teams/#create-a-team) (:write) - [`GET /orgs/:org/teams/:team_slug`](/v3/teams/#get-a-team-by-name) (:read) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} - [`GET /teams/:team_id`](/v3/teams/#get-a-team) (:read) {% endif %} - [`PATCH /teams/:team_id`](/v3/teams/#update-a-team) (:write) @@ -619,7 +619,7 @@ _Teams_ _Teams_ - [`DELETE /teams/:team_id/projects/:project_id`](/v3/teams/#remove-a-project-from-a-team) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Permission on "organization pre receive hooks" - [`GET /orgs/:org/pre-receive-hooks`](/v3/enterprise-admin/org_pre_receive_hooks/#list-pre-receive-hooks-for-an-organization) (:read) @@ -766,7 +766,7 @@ _Reviews_ - [`POST /repos/:owner/:repo/hooks/:hook_id/pings`](/v3/repos/hooks/#ping-a-repository-webhook) (:read) - [`POST /repos/:owner/:repo/hooks/:hook_id/tests`](/v3/repos/hooks/#test-the-push-repository-webhook) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Permission on "repository pre receive hooks" - [`GET /repos/:owner/:repo/pre-receive-hooks`](/v3/enterprise-admin/repo_pre_receive_hooks/#list-pre-receive-hooks-for-a-repository) (:read) diff --git a/translations/de-DE/content/rest/reference/repos.md b/translations/de-DE/content/rest/reference/repos.md index 6d7ca1e37d..083cecf0dc 100644 --- a/translations/de-DE/content/rest/reference/repos.md +++ b/translations/de-DE/content/rest/reference/repos.md @@ -263,7 +263,7 @@ The Repository Webhooks API allows repository admins to manage the post-receive If you would like to set up a single webhook to receive events from all of your organization's repositories, see our API documentation for [Organization Webhooks](/rest/reference/orgs#webhooks). {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} ### Receiving Webhooks @@ -292,14 +292,14 @@ The default format is what [existing post-receive hooks should expect](/post-rec #### Callback URLs Callback URLs can use the `http://` protocol. -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %}You can also `github://` callbacks to specify a GitHub service. +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %}You can also `github://` callbacks to specify a GitHub service. {% data reusables.apps.deprecating_github_services_ghe %} {% endif %} # Send updates to postbin.org http://postbin.org/123 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} # Send updates to Campfire github://campfire?subdomain=github&room=Commits&token=abc123 {% endif %} diff --git a/translations/de-DE/data/reusables/actions/actions-not-verified.md b/translations/de-DE/data/reusables/actions/actions-not-verified.md index cb26fa9d61..2ab85ce6c1 100644 --- a/translations/de-DE/data/reusables/actions/actions-not-verified.md +++ b/translations/de-DE/data/reusables/actions/actions-not-verified.md @@ -1 +1 @@ -Anyone can publish an action in {% data variables.product.prodname_marketplace %} as long as they meet the terms of service. Unlike apps, {% data variables.product.prodname_actions %} listed in {% data variables.product.prodname_marketplace %} are not verified by {% data variables.product.prodname_dotcom %}. +Anyone can publish an action in {% data variables.product.prodname_marketplace %}. {% data variables.product.prodname_dotcom %} verifies some partner organizations, but unlike verified apps, {% data variables.product.prodname_dotcom %} does not review or verify individual actions listed in {% data variables.product.prodname_marketplace %}. diff --git a/translations/de-DE/data/reusables/actions/enterprise-beta.md b/translations/de-DE/data/reusables/actions/enterprise-beta.md index 30eac75a91..5c456da70d 100644 --- a/translations/de-DE/data/reusables/actions/enterprise-beta.md +++ b/translations/de-DE/data/reusables/actions/enterprise-beta.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.22" %} {% note %} **Note:** {% data variables.product.prodname_actions %} support on {% data variables.product.prodname_ghe_server %} 2.22 is a limited public beta. To review the external storage requirements and request access to the beta, see "[Enabling {% data variables.product.prodname_actions %} and configuring storage](/enterprise/admin/github-actions/enabling-github-actions-and-configuring-storage)." diff --git a/translations/de-DE/data/reusables/actions/enterprise-github-hosted-runners.md b/translations/de-DE/data/reusables/actions/enterprise-github-hosted-runners.md index 178bf09abe..948121d881 100644 --- a/translations/de-DE/data/reusables/actions/enterprise-github-hosted-runners.md +++ b/translations/de-DE/data/reusables/actions/enterprise-github-hosted-runners.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} {% note %} **Note:** {% data variables.product.prodname_dotcom %}-hosted runners are not currently supported on {% data variables.product.prodname_ghe_server %}. You can see more information about planned future support on the [{% data variables.product.prodname_roadmap %}](https://github.com/github/roadmap/issues/72). diff --git a/translations/de-DE/data/reusables/actions/enterprise-marketplace-actions.md b/translations/de-DE/data/reusables/actions/enterprise-marketplace-actions.md index 3f63d16698..4794c03cfb 100644 --- a/translations/de-DE/data/reusables/actions/enterprise-marketplace-actions.md +++ b/translations/de-DE/data/reusables/actions/enterprise-marketplace-actions.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/de-DE/data/reusables/actions/enterprise-setup-prereq.md b/translations/de-DE/data/reusables/actions/enterprise-setup-prereq.md index 3ead3e20f9..6646511192 100644 --- a/translations/de-DE/data/reusables/actions/enterprise-setup-prereq.md +++ b/translations/de-DE/data/reusables/actions/enterprise-setup-prereq.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} #### Using self-hosted runners on {% data variables.product.prodname_ghe_server %} diff --git a/translations/de-DE/data/reusables/apps/deprecating_auth_with_query_parameters.md b/translations/de-DE/data/reusables/apps/deprecating_auth_with_query_parameters.md index c7642634c7..68d632051f 100644 --- a/translations/de-DE/data/reusables/apps/deprecating_auth_with_query_parameters.md +++ b/translations/de-DE/data/reusables/apps/deprecating_auth_with_query_parameters.md @@ -3,7 +3,7 @@ **Deprecation Notice:** {% data variables.product.prodname_dotcom %} will discontinue authentication to the API using query parameters. Authenticating to the API should be done with [HTTP basic authentication](/v3/auth/#via-oauth-and-personal-access-tokens).{% if currentVersion == "free-pro-team@latest" %} Using query parameters to authenticate to the API will no longer work on May 5, 2021. {% endif %} For more information, including scheduled brownouts, see the [blog post](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/). -{% if currentVersion != "free-pro-team@latest" %} Authentication to the API using query parameters while available is no longer supported due to security concerns. Instead we recommend integrators move their access token, `client_id`, or `client_secret` in the header. {% data variables.product.prodname_dotcom %} will announce the removal of authentication by query parameters with advanced notice. {% endif %} +{% if enterpriseServerVersions contains currentVersion %} Authentication to the API using query parameters while available is no longer supported due to security concerns. Instead we recommend integrators move their access token, `client_id`, or `client_secret` in the header. {% data variables.product.prodname_dotcom %} will announce the removal of authentication by query parameters with advanced notice. {% endif %} {% endwarning %} {% endif %} diff --git a/translations/de-DE/data/reusables/apps/deprecating_github_services_ghe.md b/translations/de-DE/data/reusables/apps/deprecating_github_services_ghe.md index ebdcd4af06..72e5d399fb 100644 --- a/translations/de-DE/data/reusables/apps/deprecating_github_services_ghe.md +++ b/translations/de-DE/data/reusables/apps/deprecating_github_services_ghe.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% note %} **Note:** GitHub Enterprise release 2.17 and higher no longer allows admins to install new GitHub Services, and existing services will stop working in GitHub Enterprise release 2.20 and higher. You can use the [Replacing GitHub Services guide](/v3/guides/replacing-github-services) to help you update your services to webhooks. diff --git a/translations/de-DE/data/reusables/apps/deprecating_password_auth.md b/translations/de-DE/data/reusables/apps/deprecating_password_auth.md index d10ba259e1..9fd86310d3 100644 --- a/translations/de-DE/data/reusables/apps/deprecating_password_auth.md +++ b/translations/de-DE/data/reusables/apps/deprecating_password_auth.md @@ -3,7 +3,7 @@ **Deprecation Notice:** {% data variables.product.prodname_dotcom %} will discontinue password authentication to the API. You must now authenticate to the {% data variables.product.prodname_dotcom %} API with an API token, such as an OAuth access token, GitHub App installation access token, or personal access token, depending on what you need to do with the token.{% if currentVersion == "free-pro-team@latest" %} Password authentication to the API will be removed on November 13, 2020.{% endif %} For more information,{% if currentVersion == "free-pro-team@latest" %} including scheduled brownouts,{% endif %} see the [blog post](https://developer.github.com/changes/2020-02-14-deprecating-password-auth/). -{% if currentVersion != "free-pro-team@latest" %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %} will announce the deprecation and provide advanced notice before removing support for this feature.{% endif %} +{% if enterpriseServerVersions contains currentVersion %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %} will announce the deprecation and provide advanced notice before removing support for this feature.{% endif %} {% endwarning %} {% endif %} diff --git a/translations/de-DE/data/reusables/apps/deprecating_token_oauth_authorizations.md b/translations/de-DE/data/reusables/apps/deprecating_token_oauth_authorizations.md index 7bd0d49516..333f7b3f53 100644 --- a/translations/de-DE/data/reusables/apps/deprecating_token_oauth_authorizations.md +++ b/translations/de-DE/data/reusables/apps/deprecating_token_oauth_authorizations.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% warning %} **Deprecation Notice:** The `token` attribute is deprecated in some OAuth Authorizations API responses: diff --git a/translations/de-DE/data/reusables/code-scanning/choose-alert-dismissal-reason.md b/translations/de-DE/data/reusables/code-scanning/choose-alert-dismissal-reason.md new file mode 100644 index 0000000000..e7abf5ece7 --- /dev/null +++ b/translations/de-DE/data/reusables/code-scanning/choose-alert-dismissal-reason.md @@ -0,0 +1 @@ +It's important to choose the appropriate reason from the drop-down menu as this may affect whether a query continues to be included in future analysis. \ No newline at end of file diff --git a/translations/de-DE/data/reusables/code-scanning/false-positive-fix-codeql.md b/translations/de-DE/data/reusables/code-scanning/false-positive-fix-codeql.md index db3da9c9d5..011f129f12 100644 --- a/translations/de-DE/data/reusables/code-scanning/false-positive-fix-codeql.md +++ b/translations/de-DE/data/reusables/code-scanning/false-positive-fix-codeql.md @@ -1 +1 @@ -If you close a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." +If you {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." diff --git a/translations/de-DE/data/reusables/dependabot/automated-tests-note.md b/translations/de-DE/data/reusables/dependabot/automated-tests-note.md new file mode 100644 index 0000000000..1f15a27f8e --- /dev/null +++ b/translations/de-DE/data/reusables/dependabot/automated-tests-note.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** It's good practice to have automated tests and acceptance processes in place so that checks are carried out before the pull request is merged. This is particularly important if the suggested version to upgrade to contains additional functionality, or a change that breaks your project's code. For more information about continuous integration, see "[About continuous integration](/actions/building-and-testing-code-with-continuous-integration/about-continuous-integration)." + +{% endnote %} diff --git a/translations/de-DE/data/reusables/dependabot/pull-request-introduction.md b/translations/de-DE/data/reusables/dependabot/pull-request-introduction.md new file mode 100644 index 0000000000..7494d21059 --- /dev/null +++ b/translations/de-DE/data/reusables/dependabot/pull-request-introduction.md @@ -0,0 +1 @@ +{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot_short %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." \ No newline at end of file diff --git a/translations/de-DE/data/reusables/dependabot/supported-package-managers.md b/translations/de-DE/data/reusables/dependabot/supported-package-managers.md index 48c5b661f2..2f01ce66bb 100644 --- a/translations/de-DE/data/reusables/dependabot/supported-package-managers.md +++ b/translations/de-DE/data/reusables/dependabot/supported-package-managers.md @@ -7,7 +7,7 @@ | Elm: `elm` | | | git submodule: `gitsubmodule` | | | GitHub Actions: `github-actions` | | -| Go modules: `gomod` | | +| Go modules: `gomod` | **X** | | Gradle: `gradle` | | | Maven: `maven` | | | Mix: `mix` | | diff --git a/translations/de-DE/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md b/translations/de-DE/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md new file mode 100644 index 0000000000..0a4573b062 --- /dev/null +++ b/translations/de-DE/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md @@ -0,0 +1,5 @@ +1. Navigieren Sie zu {% data variables.product.prodname_dotcom_the_website %} + +1. In the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) + +1. In the list of enterprises, click the enterprise you want to view. ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png) diff --git a/translations/de-DE/data/reusables/enterprise-accounts/access-enterprise.md b/translations/de-DE/data/reusables/enterprise-accounts/access-enterprise.md index 2a7bee222c..66edf20433 100644 --- a/translations/de-DE/data/reusables/enterprise-accounts/access-enterprise.md +++ b/translations/de-DE/data/reusables/enterprise-accounts/access-enterprise.md @@ -1,3 +1,17 @@ -1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on GitHub](/assets/images/help/enterprises/your-enterprises.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) 1. In the list of enterprises, click the enterprise you want to view. ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png) + +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %} + +1. Navigate to your enterprise account by visiting {% raw %}https://HOSTNAME/enterprises/ENTERPRISE-NAME{% endraw %}, replacing `HOSTNAME` with your instance's hostname and `ENTERPRISE-NAME` with your enterprise account's name. + +{% elsif enterpriseServerVersions contains currentVersion %} + +1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Enterprise settings**. !["Enterprise settings" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/enterprise/settings/enterprise-settings.png) + +{% endif %} diff --git a/translations/de-DE/data/reusables/enterprise-accounts/license-tab.md b/translations/de-DE/data/reusables/enterprise-accounts/license-tab.md index 363b2e5cd4..8c417ca37b 100644 --- a/translations/de-DE/data/reusables/enterprise-accounts/license-tab.md +++ b/translations/de-DE/data/reusables/enterprise-accounts/license-tab.md @@ -1 +1,9 @@ -1. Klicke auf der linken Seitenleiste auf **License** (Lizenz). ![Registerkarte „License" (Lizenz) auf der Seitenleiste der Einstellungen von 'Enterprise Server'](/assets/images/enterprise/business-accounts/license-tab.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. Klicke in der linken Seitenleiste auf **Enterprise licensing** (Enterprise-Lizenzierung). !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) + +{% else %} + +1. Klicke auf der linken Seitenleiste auf **License** (Lizenz). !["License" tab in the enterprise account settings sidebar](/assets/images/enterprise/enterprises/license.png) + +{% endif %} diff --git a/translations/de-DE/data/reusables/enterprise/rate_limit.md b/translations/de-DE/data/reusables/enterprise/rate_limit.md index ddf01e8d88..7412078c13 100644 --- a/translations/de-DE/data/reusables/enterprise/rate_limit.md +++ b/translations/de-DE/data/reusables/enterprise/rate_limit.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Note that the limits mentioned above are the default rate limits for a {% data variables.product.prodname_ghe_server %} instance. Contact your site administrator to confirm if rate limits are enabled and how they are configured. {% endif %} diff --git a/translations/de-DE/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md b/translations/de-DE/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md index 0c54f101da..9c6f220569 100644 --- a/translations/de-DE/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md +++ b/translations/de-DE/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md @@ -9,7 +9,7 @@ - Choose **{% data variables.product.support_ticket_priority_urgent %}** to report {% if currentVersion == "free-pro-team@latest" %}critical system failure{% else %}fatal system failures, outages impacting critical system operations, security incidents, and expired licenses{% endif %}. - Choose **{% data variables.product.support_ticket_priority_high %}** to report issues impacting business operations, including {% if currentVersion == "free-pro-team@latest" %}removing sensitive data (commits, issues, pull requests, uploaded attachments) from your own accounts and organization restorations{% else %}system performance issues{% endif %}, or to report critical bugs. - Choose **{% data variables.product.support_ticket_priority_normal %}** to {% if currentVersion == "free-pro-team@latest" %}request account recovery or spam unflagging, report user login issues{% else %}make technical requests like configuration changes and third-party integrations{% endif %}, and to report non-critical bugs. - - Choose **{% data variables.product.support_ticket_priority_low %}** to ask general questions and submit requests for new features, purchases, training, or health checks.{% if currentVersion != "free-pro-team@latest" %} + - Wähle **{% data variables.product.support_ticket_priority_low %}** um allgemeine Fragen zu stellen und um Anfragen für neue Funktionen, Käufe, Ausbildung oder Systemdiagnosen einzureichen.{% if enterpriseServerVersions contains currentVersion %} 1. From the " {% data variables.product.prodname_enterprise %} Series" drop-down menu, select the version of {% data variables.product.prodname_ghe_server %} you're using. ![Dropdownmenü „{% data variables.product.prodname_enterprise %} Series“ ({% data variables.product.prodname_enterprise %}-Serie)](/assets/images/enterprise/support/support-ticket-ghes-series.png) diff --git a/translations/de-DE/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md b/translations/de-DE/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md index 81f2575d81..6c8ca1d7fa 100644 --- a/translations/de-DE/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md +++ b/translations/de-DE/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md @@ -1,5 +1,5 @@ 1. Klicke auf **Submit** (Einreichen). -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If you chose not to include diagnostics with your support ticket, you can share diagnostic information with {% data variables.product.prodname_enterprise %} Support after submitting your support request. Weitere Informationen findest Du unter „[Daten für den {% data variables.product.prodname_dotcom %}-Support bereitstellen](/enterprise/admin/guides/enterprise-support/providing-data-to-github-support)“.{% endif %} diff --git a/translations/de-DE/data/reusables/enterprise_installation/aws-recommended-instance-types.md b/translations/de-DE/data/reusables/enterprise_installation/aws-recommended-instance-types.md index fca1b6bc49..7944554a9d 100644 --- a/translations/de-DE/data/reusables/enterprise_installation/aws-recommended-instance-types.md +++ b/translations/de-DE/data/reusables/enterprise_installation/aws-recommended-instance-types.md @@ -1,5 +1,5 @@ Basierend auf der Anzahl Deiner Benutzerlizenzen empfehlen wir die folgenden Instanztypen. | -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} | Benutzerlizenzen | Empfohlener Typ | |:---------------------------------------------------------- | ---------------:| | Test, Demo oder 10 Benutzer mit eingeschränkten Funktionen | r4.large | diff --git a/translations/de-DE/data/reusables/enterprise_installation/aws-supported-instance-types.md b/translations/de-DE/data/reusables/enterprise_installation/aws-supported-instance-types.md index 465a9f2940..d5877937e6 100644 --- a/translations/de-DE/data/reusables/enterprise_installation/aws-supported-instance-types.md +++ b/translations/de-DE/data/reusables/enterprise_installation/aws-supported-instance-types.md @@ -28,9 +28,9 @@ | ---------------- | -------------------------------------------------------------------- | | R4 | r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge | -| EC2-Instance-Typ | Modell | -| ---------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} +| EC2-Instance-Typ | Modell | +| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} | EC2-Instance-Typ | Modell | | ---------------- | ------------------------ | diff --git a/translations/de-DE/data/reusables/files/add-file.md b/translations/de-DE/data/reusables/files/add-file.md index daf8d37dba..9eaecc80e4 100644 --- a/translations/de-DE/data/reusables/files/add-file.md +++ b/translations/de-DE/data/reusables/files/add-file.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Above the list of files, click **Create new file**. !["Create new file" button](/assets/images/help/repository/create_new_file.png) {% else %} 1. Above the list of files, using the **Add file** drop-down, click **Create new file**. !["Create new file" in the "Add file" dropdown](/assets/images/help/repository/create_new_file.png) diff --git a/translations/de-DE/data/reusables/gated-features/code-scanning.md b/translations/de-DE/data/reusables/gated-features/code-scanning.md index a1aca3e675..2bcd80c1d4 100644 --- a/translations/de-DE/data/reusables/gated-features/code-scanning.md +++ b/translations/de-DE/data/reusables/gated-features/code-scanning.md @@ -1 +1 @@ -{% data variables.product.prodname_code_scanning_capc %} is available in public repositories, and in public and private repositories owned by organizations with a license for {% data variables.product.prodname_advanced_security %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +{% data variables.product.prodname_code_scanning_capc %} is available {% if currentVersion == "free-pro-team@latest" %}in public repositories, and in private repositories owned by organizations with {% else %}if you have {% endif %}an {% data variables.product.prodname_advanced_security %} license. {% data reusables.gated-features.more-info %} diff --git a/translations/de-DE/data/reusables/gated-features/draft-prs.md b/translations/de-DE/data/reusables/gated-features/draft-prs.md index 0379025602..52b7344ec8 100644 --- a/translations/de-DE/data/reusables/gated-features/draft-prs.md +++ b/translations/de-DE/data/reusables/gated-features/draft-prs.md @@ -1 +1 @@ -Draft pull requests are 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 %}{% if currentVersion != "free-pro-team@latest" %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +Draft pull requests are 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 %}{% if enterpriseServerVersions contains currentVersion %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} diff --git a/translations/de-DE/data/reusables/gist/anonymous-gists-cannot-be-deleted.md b/translations/de-DE/data/reusables/gist/anonymous-gists-cannot-be-deleted.md index c0797a38e9..a3d7967ceb 100644 --- a/translations/de-DE/data/reusables/gist/anonymous-gists-cannot-be-deleted.md +++ b/translations/de-DE/data/reusables/gist/anonymous-gists-cannot-be-deleted.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% warning %} **Warnung:** Anonyme Gists können nicht aus dem Webbrowser gelöscht werden. Um einen anonymen Gist löschen zu lassen, wende Dich an {% data variables.contact.contact_support %}. Bitte gib die URL des Gist an, den Du löschen möchtest. diff --git a/translations/de-DE/data/reusables/github-actions/macos-runner-preview.md b/translations/de-DE/data/reusables/github-actions/macos-runner-preview.md new file mode 100644 index 0000000000..88a2d482c4 --- /dev/null +++ b/translations/de-DE/data/reusables/github-actions/macos-runner-preview.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** The MacOS 11.0 virtual environment is currently provided as a preview only. The `macos-latest` YAML workflow label still uses the MacOS 10.15 virtual environment. + +{% endnote %} diff --git a/translations/de-DE/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md b/translations/de-DE/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md index 3c69be1b97..07b7463b64 100644 --- a/translations/de-DE/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md +++ b/translations/de-DE/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md @@ -1,9 +1,9 @@ -A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. Um einen selbst-gehosteten Läufer zu verwalten, musst Du über die folgenden Berechtigungen verfügen, abhängig davon, wo der selbst-gehostete Läufer hinzugefügt wurde: +A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. Um einen selbst-gehosteten Läufer zu verwalten, musst Du über die folgenden Berechtigungen verfügen, abhängig davon, wo der selbst-gehostete Läufer hinzugefügt wurde: - **User repository**: You must be the repository owner. - **Organization**: You must be an organization owner. - **Organization repository**: You must be an organization owner, or have admin access to the repository. {% if currentVersion == "free-pro-team@latest" %} - **Enterprise account**: You must be an enterprise owner. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} - **Enterprise**: You must be a {% data variables.product.prodname_enterprise %} site administrator. {% endif %} diff --git a/translations/de-DE/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md b/translations/de-DE/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md index 7e1fa03773..b55b0354ff 100644 --- a/translations/de-DE/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md +++ b/translations/de-DE/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md @@ -1,6 +1,6 @@ 1. Navigate to where your self-hosted runner is registered: * **In an organization or repository**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. - * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: 1. Klicke in der oberen rechten Ecke einer beliebigen Seite auf {% octicon "rocket" aria-label="The rocket ship" %}. 1. In the left sidebar, click **Enterprise overview**. @@ -9,4 +9,4 @@ * **In an organization or repository**: click **Actions** in the left sidebar. ![Aktionseinstellungen](/assets/images/help/settings/settings-sidebar-actions.png) - * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". diff --git a/translations/de-DE/data/reusables/github-actions/supported-github-runners.md b/translations/de-DE/data/reusables/github-actions/supported-github-runners.md index fe9d9e0bf5..ea9376ffde 100644 --- a/translations/de-DE/data/reusables/github-actions/supported-github-runners.md +++ b/translations/de-DE/data/reusables/github-actions/supported-github-runners.md @@ -4,4 +4,5 @@ | Ubuntu 20.04 | `ubuntu-20.04` | | Ubuntu 18.04 | `ubuntu-latest` oder `ubuntu-18.04` | | Ubuntu 16.04 | `ubuntu-16.04` | +| macOS Big Sur 11.0 | `macos-11.0` | | macOS Catalina 10.15 | `macos-latest` or `macos-10.15` | diff --git a/translations/de-DE/data/reusables/github-actions/usage-matrix-limits.md b/translations/de-DE/data/reusables/github-actions/usage-matrix-limits.md index 73eaef2f9c..6d10e805fb 100644 --- a/translations/de-DE/data/reusables/github-actions/usage-matrix-limits.md +++ b/translations/de-DE/data/reusables/github-actions/usage-matrix-limits.md @@ -1 +1 @@ -- **Job matrix** - A job matrix can generate a maximum of 256 jobs per workflow run. Dieses Limit gilt auch für selbst-gehostete Läufer. +Eine Auftragsmatrix kann maximal 256 Aufträge pro Workflow-Ausführung generieren. Dieses Limit gilt auch für selbst-gehostete Läufer. diff --git a/translations/de-DE/data/reusables/notifications/outbound_email_tip.md b/translations/de-DE/data/reusables/notifications/outbound_email_tip.md index cb4068938e..c720ce09bb 100644 --- a/translations/de-DE/data/reusables/notifications/outbound_email_tip.md +++ b/translations/de-DE/data/reusables/notifications/outbound_email_tip.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} Du wirst nur dann E-Mail-Benachrichtigungen erhalten, wenn der ausgehende E-Mail-Support auf {% data variables.product.product_location_enterprise %} aktiviert ist. Für weitere Informationen kontaktiere Deinen Websiteadministrator. diff --git a/translations/de-DE/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md b/translations/de-DE/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md new file mode 100644 index 0000000000..6b3de47d4c --- /dev/null +++ b/translations/de-DE/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md @@ -0,0 +1,3 @@ +You can choose the delivery method for notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} on repositories that you are watching, as well as the frequency at which the notifications are sent to you. + + diff --git a/translations/de-DE/data/reusables/notifications/vulnerable-dependency-notification-options.md b/translations/de-DE/data/reusables/notifications/vulnerable-dependency-notification-options.md new file mode 100644 index 0000000000..29e67dd447 --- /dev/null +++ b/translations/de-DE/data/reusables/notifications/vulnerable-dependency-notification-options.md @@ -0,0 +1,33 @@ +{% if currentVersion == "free-pro-team@latest" %} +By default, you will receive +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) + +You can customize the way you are notified about security alerts. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} diff --git a/translations/de-DE/data/reusables/package_registry/admins-can-configure-package-types.md b/translations/de-DE/data/reusables/package_registry/admins-can-configure-package-types.md index efe344932d..23e237356b 100644 --- a/translations/de-DE/data/reusables/package_registry/admins-can-configure-package-types.md +++ b/translations/de-DE/data/reusables/package_registry/admins-can-configure-package-types.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **Note:** This package type may not be available for your instance, because site administrators can enable or disable each supported package type. For more information, see "[Configuring packages support for your enterprise](/enterprise/admin/packages/configuring-packages-support-for-your-enterprise)." diff --git a/translations/de-DE/data/reusables/package_registry/docker_registry_deprecation_status.md b/translations/de-DE/data/reusables/package_registry/docker_registry_deprecation_status.md index 79e9650f34..2df9364c31 100644 --- a/translations/de-DE/data/reusables/package_registry/docker_registry_deprecation_status.md +++ b/translations/de-DE/data/reusables/package_registry/docker_registry_deprecation_status.md @@ -1,5 +1,5 @@ {% warning %} -**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if currentVersion != "free-pro-team@latest" %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} +**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if enterpriseServerVersions contains currentVersion %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} {% endwarning %} diff --git a/translations/de-DE/data/reusables/package_registry/packages-ghes-release-stage.md b/translations/de-DE/data/reusables/package_registry/packages-ghes-release-stage.md index 66d73926c6..03d9b25f84 100644 --- a/translations/de-DE/data/reusables/package_registry/packages-ghes-release-stage.md +++ b/translations/de-DE/data/reusables/package_registry/packages-ghes-release-stage.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **Note:** {% data variables.product.prodname_registry %} is currently in beta for {% data variables.product.prodname_ghe_server %} 2.22. To join the beta for your instance, use the [sign-up form](https://resources.github.com/beta-signup/). diff --git a/translations/de-DE/data/reusables/pages/build-failure-email-server.md b/translations/de-DE/data/reusables/pages/build-failure-email-server.md index dd553157a6..78ca9666ef 100644 --- a/translations/de-DE/data/reusables/pages/build-failure-email-server.md +++ b/translations/de-DE/data/reusables/pages/build-failure-email-server.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} Du erhältst nur dann eine E-Mail, wenn der Support für ausgehende E-Mails auf {% data variables.product.product_location_enterprise %} aktiviert ist. Für weitere Informationen kontaktiere Deinen Websiteadministrator. diff --git a/translations/de-DE/data/reusables/pages/private_pages_are_public_warning.md b/translations/de-DE/data/reusables/pages/private_pages_are_public_warning.md index 2579c5d10f..2ddfcb97a9 100644 --- a/translations/de-DE/data/reusables/pages/private_pages_are_public_warning.md +++ b/translations/de-DE/data/reusables/pages/private_pages_are_public_warning.md @@ -1,5 +1,5 @@ {% warning %} - **Warning**: {% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. If you have sensitive data in your site's repository, you may want to remove it before publishing. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." + **Warning**: {% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. Wenn Du sensitive Daten im Repository Deiner Website hast, solltest Du diese vor der Veröffentlichung entfernen. Weitere Informationen findest Du unter{% if enterpriseServerVersions contains currentVersion %} „[Konfigurieren {% data variables.product.prodname_pages %} auf Deiner Appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" und{% endif %} „[Über die Sichtbarkeit des Repositorys](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." {% endwarning %} diff --git a/translations/de-DE/data/reusables/pre-release-program/fury-pre-release.md b/translations/de-DE/data/reusables/pre-release-program/fury-pre-release.md index 5e63be7160..25b74a97ea 100644 --- a/translations/de-DE/data/reusables/pre-release-program/fury-pre-release.md +++ b/translations/de-DE/data/reusables/pre-release-program/fury-pre-release.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% note %} **Note:** {% data variables.product.prodname_github_app %} Manifests are currently available for developers to preview. To access this API during the preview period, you must provide a custom [media type](/v3/media) in the `Accept` header: diff --git a/translations/de-DE/data/reusables/pre-release-program/machine-man-preview.md b/translations/de-DE/data/reusables/pre-release-program/machine-man-preview.md index bdcee03dec..d18399b663 100644 --- a/translations/de-DE/data/reusables/pre-release-program/machine-man-preview.md +++ b/translations/de-DE/data/reusables/pre-release-program/machine-man-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **Note:** To access the API with your GitHub App, you must provide a custom [media type](/v3/media) in the `Accept` Header for your requests. diff --git a/translations/de-DE/data/reusables/pre-release-program/sailor-v-preview.md b/translations/de-DE/data/reusables/pre-release-program/sailor-v-preview.md index 271ed23002..fcf2e98e68 100644 --- a/translations/de-DE/data/reusables/pre-release-program/sailor-v-preview.md +++ b/translations/de-DE/data/reusables/pre-release-program/sailor-v-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **Note:** You can now use the REST API to add a reason when you lock an issue, and you will see lock reasons in responses that include issues or pull requests. You will also see lock reasons in `locked` events. This feature is currently available for developers to preview. See the [blog post](https://developer.github.com/changes/2018-01-10-lock-reason-api-preview) for full details. To access this feature, you must provide a custom [media type](/v3/media) in the `Accept` header: diff --git a/translations/de-DE/data/reusables/profile/user_profile_page_block_or_report.md b/translations/de-DE/data/reusables/profile/user_profile_page_block_or_report.md index e13872b65d..1455b80d18 100644 --- a/translations/de-DE/data/reusables/profile/user_profile_page_block_or_report.md +++ b/translations/de-DE/data/reusables/profile/user_profile_page_block_or_report.md @@ -1 +1 @@ -1. Klicke in der linken Seitenleiste unter dem Benutzer-Profilbild auf **Block or report user** (Blockiere oder melde Benutzer). ![Link „Block or report user" (Blockiere oder melde einen Benutzer)](/assets/images/help/profile/profile-block-or-report-button.png) +1. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Block or report user**. ![Link „Block or report user" (Blockiere oder melde einen Benutzer)](/assets/images/help/profile/profile-block-or-report-button.png) diff --git a/translations/de-DE/data/reusables/project-management/project-progress-locations.md b/translations/de-DE/data/reusables/project-management/project-progress-locations.md index c5e3e8604e..9ac6c41be9 100644 --- a/translations/de-DE/data/reusables/project-management/project-progress-locations.md +++ b/translations/de-DE/data/reusables/project-management/project-progress-locations.md @@ -1 +1 @@ -Bei aktivierter Projektboard-Automatisierung wird oberhalb des Projektboards, auf der Seite mit der Projektauflistung, auf der Issue-Seitenleiste und in den Verweisen auf das Projekt in anderen Projektboards eine Fortschrittsanzeige angezeigt. +If progress tracking is enabled, a progress bar appears above the project board, on the project listing page, in the issue sidebar, and in references to the project on other project boards. diff --git a/translations/de-DE/data/reusables/pull_requests/pull_request_merges_and_contributions.md b/translations/de-DE/data/reusables/pull_requests/pull_request_merges_and_contributions.md index 60c2dc8da0..52eeec91a4 100644 --- a/translations/de-DE/data/reusables/pull_requests/pull_request_merges_and_contributions.md +++ b/translations/de-DE/data/reusables/pull_requests/pull_request_merges_and_contributions.md @@ -1,6 +1,6 @@ {% note %} -**Notes:**{% if currentVersion != "free-pro-team@latest" %} +**Notes:**{% if enterpriseServerVersions contains currentVersion %} - Damit Commits mit Co-Autor auf Profil-Beteiligungsdiagrammen angezeigt werden, müssen sie dieselben Kriterien wie Commits mit einem Autor erfüllen.{% endif %} - Beim Rebasing von Commits erhalten die ursprünglichen Autoren des Commits und die Person, welche die Commits rebaset hat, den Beitragscredit, unabhängig davon, ob sie die Commits an der Befehlszeile oder auf {% data variables.product.product_location %} rebaset haben. diff --git a/translations/de-DE/data/reusables/repositories/about-internal-repos.md b/translations/de-DE/data/reusables/repositories/about-internal-repos.md index d921cfd133..cfa9b36198 100644 --- a/translations/de-DE/data/reusables/repositories/about-internal-repos.md +++ b/translations/de-DE/data/reusables/repositories/about-internal-repos.md @@ -1 +1 @@ -You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if currentVersion != "free-pro-team@latest" %}, even with private mode disabled{% endif %}. +You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if enterpriseServerVersions contains currentVersion %}, even with private mode disabled{% endif %}. diff --git a/translations/de-DE/data/reusables/repositories/copy-clone-url.md b/translations/de-DE/data/reusables/repositories/copy-clone-url.md index a4d353a814..66960d3115 100644 --- a/translations/de-DE/data/reusables/repositories/copy-clone-url.md +++ b/translations/de-DE/data/reusables/repositories/copy-clone-url.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Klicke unter dem Repository-Namen auf **Clone or download** (Klonen oder herunterladen). ![Schaltfläche „Clone or download“ (Klonen oder herunterladen)](/assets/images/help/repository/clone-repo-clone-url-button.png) 2. To clone the repository using HTTPS, under "Clone with HTTPS", click {% octicon "clippy" aria-label="The clipboard icon" %}. diff --git a/translations/de-DE/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md b/translations/de-DE/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md index 14ae8e36cf..2d9773680f 100644 --- a/translations/de-DE/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md +++ b/translations/de-DE/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md @@ -2,7 +2,7 @@ **Warnung:** -- Wenn Du den Zugriff einer Person auf ein privates Repository entfernst, werden all ihre Forks in diesem privaten Repositorys gelöscht. Lokale Klone des privaten Repositorys werden beibehalten. If a team's access to a private repository is revoked or a team with access to a private repository is deleted, and team members do not have access to the repository through another team, private forks of the repository will be deleted.{% if currentVersion != "free-pro-team@latest" %} +- Wenn Du den Zugriff einer Person auf ein privates Repository entfernst, werden all ihre Forks in diesem privaten Repositorys gelöscht. Lokale Klone des privaten Repositorys werden beibehalten. Wenn der Zugriff eines Teams auf ein privates Repository widerrufen wird oder ein Team mit Zugriff auf ein privates Repository gelöscht wird und die Teammitglieder nicht über ein anderes Team auf das Repository zugreifen können, werden die privaten Forks des Repositorys gelöscht.{% if enterpriseServerVersions contains currentVersion %} - Wenn Du [bei aktivierter LDAP-Synchronisation](/enterprise/{{ page.version }}/admin/guides/user-management/using-ldap/#enabling-ldap-sync) eine Person aus einem Repository entfernst, verliert diese den Zugriff, aber ihre Forks werden nicht gelöscht. Wenn die Person innerhalb von drei Monaten einem Team mit Zugriff auf das ursprüngliche Organisations-Repository hinzugefügt wird, wird ihr Zugriff auf die Forks bei der nächsten Synchronisierung automatisch wiederhergestellt.{% endif %} - Sie sind dafür verantwortlich, dass die Personen, denen Sie den Zugriff auf ein Repository entziehen, vertrauliche Informationen oder geistiges Eigentum von ihren Systemen löschen. diff --git a/translations/de-DE/data/reusables/repositories/enable-security-alerts.md b/translations/de-DE/data/reusables/repositories/enable-security-alerts.md index 4ab63edcb3..d47e84d4f6 100644 --- a/translations/de-DE/data/reusables/repositories/enable-security-alerts.md +++ b/translations/de-DE/data/reusables/repositories/enable-security-alerts.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Your site administrator must enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location_enterprise %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/de-DE/data/reusables/repositories/new-pull-request.md b/translations/de-DE/data/reusables/repositories/new-pull-request.md index a04487b755..0a1407ee12 100644 --- a/translations/de-DE/data/reusables/repositories/new-pull-request.md +++ b/translations/de-DE/data/reusables/repositories/new-pull-request.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Klicke auf der rechten Seite des Branch-Menü auf **New pull request** (Neuer Pull Request). !["Pull request" link above list of files](/assets/images/help/pull_requests/pull-request-start-review-button.png) {% else %} 1. Above the list of files, click diff --git a/translations/de-DE/data/reusables/repositories/open-with-github-desktop.md b/translations/de-DE/data/reusables/repositories/open-with-github-desktop.md index fe235be960..cc7265e26e 100644 --- a/translations/de-DE/data/reusables/repositories/open-with-github-desktop.md +++ b/translations/de-DE/data/reusables/repositories/open-with-github-desktop.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Klicke unter dem Namen Deines Repositorys auf **Clone or download** (Klonen oder herunterladen). ![Schaltfläche „Clone or download“ (Klonen oder herunterladen)](/assets/images/help/repository/clone-repo-clone-url-button.png) 1. Click **Open in Desktop** to clone the repository and open it in über {% data variables.product.prodname_desktop %}. diff --git a/translations/de-DE/data/reusables/repositories/releases.md b/translations/de-DE/data/reusables/repositories/releases.md index 988ec84d92..ebc71fc29d 100644 --- a/translations/de-DE/data/reusables/repositories/releases.md +++ b/translations/de-DE/data/reusables/repositories/releases.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Klicke unter Deinem Repository-Namen auf **Releases**. ![Registerkarte „Releases"](/assets/images/help/releases/release-link.png) diff --git a/translations/de-DE/data/reusables/repositories/tracks-vulnerabilities.md b/translations/de-DE/data/reusables/repositories/tracks-vulnerabilities.md index 0f672566e5..34da36c59e 100644 --- a/translations/de-DE/data/reusables/repositories/tracks-vulnerabilities.md +++ b/translations/de-DE/data/reusables/repositories/tracks-vulnerabilities.md @@ -3,4 +3,3 @@ We add vulnerabilities to the {% data variables.product.prodname_advisory_databa - Eine Kombination aus maschinellem Lernen und menschlichem Review zum Erkennen von Sicherheitsrisiken in öffentlichen Commits auf {% data variables.product.prodname_dotcom %} - Security advisories reported on {% data variables.product.prodname_dotcom %} - The [npm Security advisories](https://www.npmjs.com/advisories) database -- [FriendsOfPHP](https://github.com/FriendsOfPHP/security-advisories) diff --git a/translations/de-DE/data/reusables/repositories/you-can-fork.md b/translations/de-DE/data/reusables/repositories/you-can-fork.md index 2d290ce6cd..c2de2edf8f 100644 --- a/translations/de-DE/data/reusables/repositories/you-can-fork.md +++ b/translations/de-DE/data/reusables/repositories/you-can-fork.md @@ -1,3 +1,3 @@ -You can fork any public repository to your user account or any organization where you have repository creation permissions. For more information, see "[Permission levels for an organization](/articles/permission-levels-for-an-organization)." +Du kannst jedes öffentliche Repository zu Deinem Benutzerkonto oder zu jeder Organisation forken, in der Du die Berechtigung zum Erstellen von Repositorys hast. Weitere Informationen finden Sie unter „[Berechtigungsebenen für eine Organisation](/articles/permission-levels-for-an-organization)". -You can fork any private repository you can access to your user account and any organization on {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} where you have repository creation permissions. You cannot fork a private repository to an organization using {% data variables.product.prodname_free_team %}.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[GitHub's products](/articles/githubs-products)."{% endif %} +Du kannst jedes private Repository, auf das Du Zugriff hast, zu Deinem Benutzerkonto oder zu jeder Organisation auf {% data variables.product.prodname_team %} oder {% data variables.product.prodname_enterprise %} forken, in denen Du die Berechtigung zum Erstellen von Repositorys hast. You cannot fork a private repository to an organization using {% data variables.product.prodname_free_team %}.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[GitHub's products](/articles/githubs-products)."{% endif %} diff --git a/translations/de-DE/data/reusables/search/syntax_tips.md b/translations/de-DE/data/reusables/search/syntax_tips.md index 83266f1938..619c005c4c 100644 --- a/translations/de-DE/data/reusables/search/syntax_tips.md +++ b/translations/de-DE/data/reusables/search/syntax_tips.md @@ -1,6 +1,6 @@ {% tip %} -**Tips:**{% if currentVersion != "free-pro-team@latest" %} +**Tips:**{% if enterpriseServerVersions contains currentVersion %} - Dieser Artikel enthält Beispielsuchen für die Website {% data variables.product.prodname_dotcom %}.com. Die gleichen Suchfilter kannst Du jedoch auch auf {% data variables.product.product_location_enterprise %} verwenden.{% endif %} - Eine Liste mit Suchsyntax, die Du jedem Qualifizierer hinzufügen kannst, um Deine Ergebnisse zu verbessern, findest Du unter „[Grundlagen der Suchsyntax](/articles/understanding-the-search-syntax)“. - Schließe Suchbegriffe, die aus mehreren Wörtern bestehen, in Anführungszeichen ein. Möchtest Du beispielsweise nach Issues mit der Kennzeichnung „In progress“ suchen, gib `label:"in progress"` ein. Bei der Suche wird die Groß-/Kleinschreibung ignoriert. diff --git a/translations/de-DE/data/reusables/two_fa/auth_methods_2fa.md b/translations/de-DE/data/reusables/two_fa/auth_methods_2fa.md index 60697f9581..51ffaa9c3c 100644 --- a/translations/de-DE/data/reusables/two_fa/auth_methods_2fa.md +++ b/translations/de-DE/data/reusables/two_fa/auth_methods_2fa.md @@ -1,10 +1,10 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Authentifizierungsmethoden, die 2FA unterstützen -| Authentifizierungsmethode | Beschreibung | Unterstützung der Zwei-Faktor-Authentifizierung | -| ---------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Integriert | Die Authentifizierung erfolgt über Benutzerkonten, die in der {% data variables.product.prodname_ghe_server %}-Appliance gespeichert sind. | Wird in der {% data variables.product.prodname_ghe_server %}-Appliance unterstützt und verwaltet. Organisationsadministratoren können vorschreiben, dass die Zwei-Faktor-Authentifizierung für Mitglieder der Organisation aktiviert werden muss. |{% if currentVersion != "free-pro-team@latest" %} +| Authentifizierungsmethode | Beschreibung | Unterstützung der Zwei-Faktor-Authentifizierung | +| ---------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Integriert | Die Authentifizierung erfolgt über Benutzerkonten, die in der {% data variables.product.prodname_ghe_server %}-Appliance gespeichert sind. | Wird in der {% data variables.product.prodname_ghe_server %}-Appliance unterstützt und verwaltet. Organisationsadministratoren können vorschreiben, dass die Zwei-Faktor-Authentifizierung für Mitglieder der Organisation aktiviert werden muss. |{% if enterpriseServerVersions contains currentVersion %} | Integrierte Authentifizierung mit einem Identitätsanbieter | Die Authentifizierung erfolgt über Benutzerkonten, die beim Identitätsanbieter gespeichert sind. | Ist vom Identitätsanbieter abhängig.{% endif %} -| LDAP | Erlaubt die Integration in Deinen Unternehmens-Verzeichnisdienst für Authentifizierung. | Wird in der {% data variables.product.prodname_ghe_server %}-Appliance unterstützt und verwaltet. Organisationsadministratoren können vorschreiben, dass die Zwei-Faktor-Authentifizierung für Mitglieder der Organisation aktiviert werden muss. | +| LDAP | Erlaubt die Integration in Deinen Unternehmens-Verzeichnisdienst für Authentifizierung. | Wird in der {% data variables.product.prodname_ghe_server %}-Appliance unterstützt und verwaltet. Organisationsadministratoren können vorschreiben, dass die Zwei-Faktor-Authentifizierung für Mitglieder der Organisation aktiviert werden muss. | | SAML | Die Authentifizierung erfolgt über einen externen Identitätsanbieter. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %} | CAS | Der Single Sign-On-Dienst wird von einem externen Server bereitgestellt. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %}{% endif %} diff --git a/translations/de-DE/data/reusables/webhooks/webhooks-rest-api-links.md b/translations/de-DE/data/reusables/webhooks/webhooks-rest-api-links.md new file mode 100644 index 0000000000..3882222b05 --- /dev/null +++ b/translations/de-DE/data/reusables/webhooks/webhooks-rest-api-links.md @@ -0,0 +1,4 @@ +You can use the repository, organization, and app webhook REST APIs to create, update, delete, and ping webhooks. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}You can also use the REST API to change the configuration of the webhook. For example, you can modify the payload URL, content type, SSL verification, and secret. {% endif %}For more information, see: +- [Repository Webhooks REST API](/rest/reference/repos#webhooks) +- [Organization Webhooks REST API](/rest/reference/orgs#webhooks){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +- [GitHub App Webhooks REST API](/rest/reference/apps#webhooks){% endif %} diff --git a/translations/ja-JP/content/actions/creating-actions/creating-a-composite-run-steps-action.md b/translations/ja-JP/content/actions/creating-actions/creating-a-composite-run-steps-action.md index 1db1450e57..6f608341b2 100644 --- a/translations/ja-JP/content/actions/creating-actions/creating-a-composite-run-steps-action.md +++ b/translations/ja-JP/content/actions/creating-actions/creating-a-composite-run-steps-action.md @@ -32,7 +32,7 @@ versions: エコー"さようなら" ``` -3. 端末から、`goodbye.sh` を実行可能にします。 +3. ターミナルから、`goodbye.sh` を実行可能にします。 ```shell chmod +x goodbye.sh @@ -82,7 +82,7 @@ versions:

github.action_path`の使用方法の詳細については、「github コンテキスト](/actions/creating-actions/metadata-syntax-for-github-actions#outputs-for-composite-run-steps-actions)の `」を参照してください。

-

  • 端末から、action.yml` ファイルを確認します。 +

  • ターミナルから、action.yml` ファイルをチェックインします。 @@ -93,7 +93,7 @@ versions: ```

    • -1 端末から、タグを追加します。 この例では、`v1` というタグを使用しています。 詳細については、「[アクションについて](/actions/creating-actions/about-actions#using-release-management-for-actions)」を参照してください。 +1 ターミナルから、タグを追加します。 この例では、`v1` というタグを使用しています。 詳しい情報については、「[アクションについて](/actions/creating-actions/about-actions#using-release-management-for-actions)」を参照してください。 diff --git a/translations/ja-JP/content/actions/creating-actions/creating-a-javascript-action.md b/translations/ja-JP/content/actions/creating-actions/creating-a-javascript-action.md index 6799ccc713..8267e77f3e 100644 --- a/translations/ja-JP/content/actions/creating-actions/creating-a-javascript-action.md +++ b/translations/ja-JP/content/actions/creating-actions/creating-a-javascript-action.md @@ -77,9 +77,9 @@ runs: アクションのツールキットは、Node.js パッケージのコレクションで、より一貫性を保ちつつ、JavaScript を素早く作成するためのものです。 -ツールキットの [`@actions/core`](https://github.com/actions/toolkit/tree/main/packages/core)パッケージは、ワークフローのコマンド、入力および出力変数、終了ステータス、ならびにデバッグメッセージに対してインターフェースを提供します。 +ツールキットの [`@actions/core`](https://github.com/actions/toolkit/tree/main/packages/core) パッケージは、ワークフローコマンド、入力変数と出力変数、終了ステータス、およびデバッグメッセージへのインターフェースを提供します。 -このツールキットはまた、認証を受けたOctokit RESTクライアント及びGitHub Actionsコンテキストへのアクセスを返す[`@actions/github`](https://github.com/actions/toolkit/tree/main/packages/github)パッケージも提供します。 +このツールキットは、認証された Octokit REST クライアントと GitHub Actions コンテキストへのアクセスを返す [`@actions/github`](https://github.com/actions/toolkit/tree/main/packages/github) パッケージも提供します。 ツールキットは、`core` や `github` パッケージ以外のものも提供しています。 詳しい情報については、[actions/toolkit](https://github.com/actions/toolkit) リポジトリ以下を参照してください。 @@ -119,7 +119,7 @@ try { } ``` -上記のサンプルの`index.js`でエラーが投げられた場合、`core.setFailed(error.message);`はアクションツールキットの[`@actions/core`](https://github.com/actions/toolkit/tree/main/packages/core)パッケージを使ってメッセージをログに記録し、失敗の終了コードを設定します。 詳しい情報については「[アクションの終了コードの設定](/actions/creating-actions/setting-exit-codes-for-actions)」を参照してください。 +上記の `index.js` の例でエラーがスローされた場合、`core.setFailed(error.message);` はアクションツールキット [`@actions/core`](https://github.com/actions/toolkit/tree/main/packages/core) パッケージを使用してメッセージをログに記録し、失敗の終了コードを設定します。 詳しい情報については「[アクションの終了コードの設定](/actions/creating-actions/setting-exit-codes-for-actions)」を参照してください。 ### READMEの作成 @@ -262,4 +262,4 @@ jobs: ![ワークフローでアクションを使用しているスクリーンショット](/assets/images/help/repository/javascript-action-workflow-run-updated.png) {% else %} ![ワークフローでアクションを使用しているスクリーンショット](/assets/images/help/repository/javascript-action-workflow-run.png) -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/ja-JP/content/actions/guides/building-and-testing-java-with-maven.md b/translations/ja-JP/content/actions/guides/building-and-testing-java-with-maven.md index 0d8eb6c2ea..e79f37fcd6 100644 --- a/translations/ja-JP/content/actions/guides/building-and-testing-java-with-maven.md +++ b/translations/ja-JP/content/actions/guides/building-and-testing-java-with-maven.md @@ -30,7 +30,7 @@ Java及びMavenフレームワークの基本的な理解をしておくこと ### Mavenワークフローテンプレートで始める -{% data variables.product.prodname_dotcom %}は、ほとんどのMavenベースのJavaプロジェクトで使えるMavenワークフローテンプレートを提供しています。 詳しい情報については[Mavenワークフローテンプレート](https://github.com/actions/starter-workflows/blob/main/ci/maven.yml)を参照してください。 +{% data variables.product.prodname_dotcom %}は、ほとんどのMavenベースのJavaプロジェクトで使えるMavenワークフローテンプレートを提供しています。 詳しい情報については、[Maven ワークフローテンプレート](https://github.com/actions/starter-workflows/blob/main/ci/maven.yml)を参照してください。 素早く始めるには、新しいワークフローを作成する際に事前設定されたMavenテンプレートを選択できます。 詳しい情報については、「[{% data variables.product.prodname_actions %} のクイックスタート](/actions/quickstart)」を参照してください。 diff --git a/translations/ja-JP/content/actions/guides/building-and-testing-nodejs.md b/translations/ja-JP/content/actions/guides/building-and-testing-nodejs.md index d49aba3fa5..4b55c1a9e3 100644 --- a/translations/ja-JP/content/actions/guides/building-and-testing-nodejs.md +++ b/translations/ja-JP/content/actions/guides/building-and-testing-nodejs.md @@ -33,7 +33,7 @@ Node.js、YAML、ワークフローの設定オプションと、ワークフロ 手早く始めるために、テンプレートをリポジトリの`.github/workflows`ディレクトリに追加してください。 {% raw %} -```yaml +```yaml{:copy} name: Node.js CI on: [push] diff --git a/translations/ja-JP/content/actions/guides/publishing-docker-images.md b/translations/ja-JP/content/actions/guides/publishing-docker-images.md index 366b0a8823..0c92831b99 100644 --- a/translations/ja-JP/content/actions/guides/publishing-docker-images.md +++ b/translations/ja-JP/content/actions/guides/publishing-docker-images.md @@ -50,7 +50,7 @@ Docker Hubにプッシュするためには、Docker Hubのアカウントを持 Docker Hubに必要な`build-push-action`のオプションは以下のとおりです。 -* `username`及び`password`: Docker Hubのユーザ名とパスワードです。 Docker Hubのユーザ名とパスワードは、{% data variables.product.prodname_dotcom %}リポジトリに暗号化されたシークレットとして保存し、ワークフローファイルで公開しないことをおすすめします。 詳しい情報については、「[暗号化されたシークレットの作成と利用](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)」を参照してください。 +* `username`及び`password`: Docker Hubのユーザ名とパスワードです。 We recommend storing your Docker Hub username and password as encrypted secrets in your {% data variables.product.prodname_dotcom %} repository so they aren't exposed in your workflow file. 詳しい情報については、「[暗号化されたシークレットの作成と利用](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)」を参照してください。 * `repository`: `DOCKER-HUB-NAMESPACE/DOCKER-HUB-REPOSITORY`フォーマットでのDocker Hubのリポジトリ。 {% raw %} diff --git a/translations/ja-JP/content/actions/guides/storing-workflow-data-as-artifacts.md b/translations/ja-JP/content/actions/guides/storing-workflow-data-as-artifacts.md index 39a95d745a..a8b4862141 100644 --- a/translations/ja-JP/content/actions/guides/storing-workflow-data-as-artifacts.md +++ b/translations/ja-JP/content/actions/guides/storing-workflow-data-as-artifacts.md @@ -41,7 +41,7 @@ versions: 成果物はワークフローの実行中にアップロードされ、成果物の名前とサイズはUIで見ることができます。 {% data variables.product.product_name %}のUIを使って成果物がダウンロードされる場合、成果物の一部として個別にアップロードされたすべてのファイルはzipして1つのファイルにまとめられます。 これはすなわち、支払いはこのzipファイルのサイズではなく、アップロードされた成果物のサイズを元に計算されるということです。 -{% data variables.product.product_name %}には、ビルドアーティファクトのアップロードとダウンロードに使用できるアクションが2つあります。 詳しい情報については、 {% data variables.product.product_location %} 上の {% if currentVersion == "free-pro-team@latest" %}[actions/upload-artifact](https://github.com/actions/upload-artifact) および [download-artifact](https://github.com/actions/download-artifact) アクション{% else %} `actions/upload-artifact` および `download-artifact` アクション{% endif %}を参照してください。 +{% data variables.product.product_name %}には、ビルドの成果物のアップロードとダウンロードに使用できるアクションが2つあります。 詳しい情報については、 {% data variables.product.product_location %} 上の {% if currentVersion == "free-pro-team@latest" %}[actions/upload-artifact](https://github.com/actions/upload-artifact) および [download-artifact](https://github.com/actions/download-artifact) アクション{% else %} `actions/upload-artifact` および `download-artifact` アクション{% endif %}を参照してください。 ジョブ間でデータを共有するには: @@ -74,7 +74,7 @@ versions: | ``` -この例では、`src`ディレクトリにコードを`builds`して、`tests`ディレクトリでテストを実行するNode.jsプロジェクトのワークフローを作成しています。 実行中の`npm test`が、`code-coverage.html`という名前で、`output/test/`ディレクトリに保存されるコード網羅率レポートを生成すると想定できます。 +この例では、srcディレクトリにコードを`builds`して、`tests`ディレクトリでテストを実行するNode.jsプロジェクトのワークフローを作成しています。 実行中の`npm test`が、`code-coverage.html`という名前で、`output/test/`ディレクトリに保存されるコード網羅率レポートを生成すると想定できます。 ワークフローは、 `dist` ディレクトリにプロダクション アーティファクトをアップロードしますが、マークダウン ファイルは除きます。 また、 `の code-coverage.html` レポートを別のアーティファクトとしてアップロードします。 diff --git a/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index cbae31fa8b..2b1f058b87 100644 --- a/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -91,7 +91,7 @@ versions: - macOS 10.13 (High Sierra)以降 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### セルフホストランナーと{% data variables.product.prodname_dotcom %}との通信 diff --git a/translations/ja-JP/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md b/translations/ja-JP/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md index d5dd92e580..f20213f389 100644 --- a/translations/ja-JP/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md +++ b/translations/ja-JP/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md @@ -50,14 +50,14 @@ versions: {% if currentVersion == "free-pro-team@latest" %} セルフホストランナーを Enterprise アカウントに追加するには、Enterprise のオーナーである必要があります。 -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} セルフホストランナーを {% data variables.product.product_location %} の Enterprise レベルでを追加するには、サイト管理者である必要があります。 {% endif %} {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/ja-JP/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/translations/ja-JP/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index e971f16f21..001e086db1 100644 --- a/translations/ja-JP/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/translations/ja-JP/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -56,7 +56,7 @@ Enterprise は、セルフホストランナーをグループに追加して、 {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/ja-JP/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md b/translations/ja-JP/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md index 8f1f09c03e..a1931e1324 100644 --- a/translations/ja-JP/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md +++ b/translations/ja-JP/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md @@ -62,7 +62,7 @@ Organizationからセルフホストランナーを削除するには、Organiza {% if currentVersion == "free-pro-team@latest" %} セルフホストランナーを Enterprise アカウントから削除するには、Enterprise のオーナーである必要があります。 セルフホストランナーのマシンへもアクセスできるようにしておくことをおすすめします。 -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} 次の Enterprise レベルでセルフホストランナーを削除するには、 {% data variables.product.product_location %} の Enterprise レベルでを追加するには、サイト管理者である必要があります。 セルフホストランナーのマシンへもアクセスできるようにしておくことをおすすめします。 {% endif %} @@ -71,7 +71,7 @@ Organizationからセルフホストランナーを削除するには、Organiza {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/ja-JP/content/actions/index.md b/translations/ja-JP/content/actions/index.md index 5bf3bb6184..433fd30322 100644 --- a/translations/ja-JP/content/actions/index.md +++ b/translations/ja-JP/content/actions/index.md @@ -37,7 +37,7 @@ versions:
    -

    {% data ui.toc.getting_started %}

    +

    {% data ui.toc.guides %}

      {% for link in featuredLinks.gettingStarted %} @@ -59,7 +59,7 @@ versions:
      -

      Manage workflows

      +

      ワークフローの管理

        {% for link in featuredLinks.guide %} @@ -68,34 +68,10 @@ versions:
    - -
    -
    - -
    {% octicon "bookmark" width="24" %}
    -

    Create actions

    -

    A complete guide to creating and sharing actions with the community.

    -     -
    -
    - -
    {% octicon "rocket" width="24" %}
    -

    Starter workflows

    -

    A collection of workflow files to help you get started with GitHub Actions.

    -     -
    -
    - -
    {% octicon "light-bulb" width="24" %}
    -

    GitHub Actions Marketplace

    -

    Explore community actions and supercharge your workflow.

    -     -
    -
    -

    ガイド

    +

    その他のガイド

    @@ -184,7 +160,7 @@ versions:

    Publishing Node.js packages

    Use GitHub Actions to push your Node.js package to GitHub Packages or npm.

    - Java + JavaScript/TypeScript CI
    @@ -196,5 +172,5 @@ versions:
    - More guides {% octicon "arrow-right" %} + すべてのガイド表示 {% octicon "arrow-right" %}
    diff --git a/translations/ja-JP/content/actions/learn-github-actions/finding-and-customizing-actions.md b/translations/ja-JP/content/actions/learn-github-actions/finding-and-customizing-actions.md index 4ae6970322..6f977ea354 100644 --- a/translations/ja-JP/content/actions/learn-github-actions/finding-and-customizing-actions.md +++ b/translations/ja-JP/content/actions/learn-github-actions/finding-and-customizing-actions.md @@ -149,7 +149,7 @@ outputs: 私の最初のステップ: docker://alpine:3.8 ``` -Dockerアクションの例については、[Docker-image.ymlのワークフロー](https://github.com/actions/starter-workflows/blob/main/ci/docker-image.yml)及び「[Dockerコンテナのアクションの作成](/articles/creating-a-docker-container-action)」を参照してください。 +Docker アクションの例については、[Docker-image.yml のワークフロー](https://github.com/actions/starter-workflows/blob/main/ci/docker-image.yml) および「[Docker コンテナのアクションを作成する](/articles/creating-a-docker-container-action)」を参照してください。 ### 次のステップ diff --git a/translations/ja-JP/content/actions/learn-github-actions/introduction-to-github-actions.md b/translations/ja-JP/content/actions/learn-github-actions/introduction-to-github-actions.md index 1bac7acb62..2dc0bcf3d0 100644 --- a/translations/ja-JP/content/actions/learn-github-actions/introduction-to-github-actions.md +++ b/translations/ja-JP/content/actions/learn-github-actions/introduction-to-github-actions.md @@ -20,13 +20,13 @@ versions: この図は、{% data variables.product.prodname_actions %} を使用してソフトウェアテストスクリプトを自動的に実行する方法を示しています。 イベントは、_ジョブ_を含む_ワークフロー_を自動的にトリガーします。 次に、ジョブは_ステップ_を使用して、_アクション_が実行される順序を制御します。 これらのアクションは、ソフトウェアテストを自動化するコマンドです。 -![Workflow overview](/assets/images/help/images/overview-actions-simple.png) +![ワークフローの概要](/assets/images/help/images/overview-actions-simple.png) ### {% data variables.product.prodname_actions %} のコンポーネント 以下は、ジョブを実行するために連動する複数の {% data variables.product.prodname_actions %} コンポーネントのリストです。 これらのコンポーネントがどのように相互作用するかを確認できます。 -![Component and service overview](/assets/images/help/images/overview-actions-design.png) +![コンポーネントとサービスの概要](/assets/images/help/images/overview-actions-design.png) #### ワークフロー @@ -197,28 +197,28 @@ YAML 構文を使用してワークフローファイルを作成する方法を #### ワークフローファイルの視覚化 -In this diagram, you can see the workflow file you just created and how the {% data variables.product.prodname_actions %} components are organized in a hierarchy. Each step executes a single action. Steps 1 and 2 use prebuilt community actions. To find more prebuilt actions for your workflows, see "[Finding and customizing actions](/actions/learn-github-actions/finding-and-customizing-actions)." +この図では、作成したワークフローファイルと、{% data variables.product.prodname_actions %} コンポーネントが階層にどのように整理されているかを確認できます。 各ステップでは、単一のアクションが実行されます。 ステップ 1 と 2 は、ビルド済みのコミュニティアクションを使用します。 ワークフローのビルド済みアクションの詳細については、「[アクションの検索とカスタマイズ](/actions/learn-github-actions/finding-and-customizing-actions)」を参照してください。 -![Workflow overview](/assets/images/help/images/overview-actions-event.png) +![ワークフローの概要](/assets/images/help/images/overview-actions-event.png) -### Viewing the job's activity +### ジョブのアクティビティを表示する -Once your job has started running, you can view each step's activity on {% data variables.product.prodname_dotcom %}. +ジョブの実行が開始されると、{% data variables.product.prodname_dotcom %} で各ステップのアクティビティを表示できます。 {% data reusables.repositories.navigate-to-repo %} -1. リポジトリ名の下で**Actions（アクション）**をクリックしてください。 ![Navigate to repository](/assets/images/help/images/learn-github-actions-repository.png) -1. In the left sidebar, click the workflow you want to see. ![Screenshot of workflow results](/assets/images/help/images/learn-github-actions-workflow.png) -1. Under "Workflow runs", click the name of the run you want to see. ![Screenshot of workflow runs](/assets/images/help/images/learn-github-actions-run.png) +1. リポジトリ名の下で**Actions（アクション）**をクリックしてください。 ![リポジトリに移動](/assets/images/help/images/learn-github-actions-repository.png) +1. 左サイドバーで、表示するワークフローをクリックします。 ![ワークフロー結果のスクリーンショット](/assets/images/help/images/learn-github-actions-workflow.png) +1. [Workflow runs] で、表示する実行の名前をクリックします。 ![ワークフロー実行のスクリーンショット](/assets/images/help/images/learn-github-actions-run.png) {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -1. Click on the job name to see the results of each step. ![Screenshot of workflow run details](/assets/images/help/images/overview-actions-result-updated.png) +1. ジョブ名をクリックして、各ステップの結果を確認します。 ![ワークフロー実行の詳細のスクリーンショット](/assets/images/help/images/overview-actions-result-updated.png) {% else %} -1. Click on the job name to see the results of each step. ![Screenshot of workflow run details](/assets/images/help/images/overview-actions-result.png) +1. ジョブ名をクリックして、各ステップの結果を確認します。 ![ワークフロー実行の詳細のスクリーンショット](/assets/images/help/images/overview-actions-result.png) {% endif %} ### 次のステップ -To continue learning about {% data variables.product.prodname_actions %}, see "[Finding and customizing actions](/actions/learn-github-actions/finding-and-customizing-actions)." +{% data variables.product.prodname_actions %} について詳しくは、「[アクションの検索とカスタマイズ](/actions/learn-github-actions/finding-and-customizing-actions)」を参照してください。 ### サポートへの連絡 diff --git a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md index c279889926..4225be96c4 100644 --- a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md +++ b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md @@ -1,6 +1,6 @@ --- -title: Migrating from Azure Pipelines to GitHub Actions -intro: '{% data variables.product.prodname_actions %} and Azure Pipelines share several configuration similarities, which makes migrating to {% data variables.product.prodname_actions %} relatively straightforward.' +title: Azure PipelinesからGitHub Actionsへの移行 +intro: '{% data variables.product.prodname_actions %}とAzure Pipelinesは、いくつかの点で設定が似ており、そのため{% data variables.product.prodname_actions %}への移行は比較的単純です。' redirect_from: - /actions/migrating-to-github-actions/migrating-from-azure-pipelines-to-github-actions versions: @@ -8,44 +8,44 @@ versions: enterprise-server: '>=2.22' --- -{% data reusables.actions.enterprise-beta %} -{% data reusables.actions.enterprise-github-hosted-runners %} +{% data variables.product.prodname_actions %} の支払いを管理する +{% data variables.product.prodname_dotcom %}は、macOSランナーのホストに[MacStadium](https://www.macstadium.com/)を使用しています。 -### Introduction +### はじめに -Azure Pipelines and {% data variables.product.prodname_actions %} both allow you to create workflows that automatically build, test, publish, release, and deploy code. Azure Pipelines and {% data variables.product.prodname_actions %} share some similarities in workflow configuration: +Azure Pipelinesと{% data variables.product.prodname_actions %}は、どちらも自動的にコードのビルド、テスト、公開、リリース、デプロイを行うワークフローを作成できます。 Azure Pipelinesと{% data variables.product.prodname_actions %}は、ワークフローの設定において似ているところがあります。 -- Workflow configuration files are written in YAML and are stored in the code's repository. -- Workflows include one or more jobs. -- Jobs include one or more steps or individual commands. -- Steps or tasks can be reused and shared with the community. +- ワークフローの設定ファイルはYAMLで書かれ、コードのリポジトリに保存されます。 +- ワークフローには1つ以上のジョブが含まれます。 +- ジョブには1つ以上のステップもしくは個別のコマンドが含まれます。 +- ステップもしくはタスクは、再利用とコミュニティとの共有が可能です。 -For more information, see "[Core concepts for {% data variables.product.prodname_actions %}](/actions/getting-started-with-github-actions/core-concepts-for-github-actions)." +詳しい情報については、「[{% data variables.product.prodname_actions %}の中核的概念](/actions/getting-started-with-github-actions/core-concepts-for-github-actions)」を参照してください。 -### Key differences +### 主要な差異 -When migrating from Azure Pipelines, consider the following differences: +Azure Pipelinesから移行する際には、以下の差異を考慮してください。 -- Azure Pipelines supports a legacy _classic editor_, which lets you define your CI configuration in a GUI editor instead of creating the pipeline definition in a YAML file. {% data variables.product.prodname_actions %} uses YAML files to define workflows and does not support a graphical editor. -- Azure Pipelines allows you to omit some structure in job definitions. For example, if you only have a single job, you don't need to define the job and only need to define its steps. {% data variables.product.prodname_actions %} requires explicit configuration, and YAML structure cannot be omitted. -- Azure Pipelines supports _stages_ defined in the YAML file, which can be used to create deployment workflows. {% data variables.product.prodname_actions %} requires you to separate stages into separate YAML workflow files. -- On-premises Azure Pipelines build agents can be selected with capabilities. {% data variables.product.prodname_actions %} self-hosted runners can be selected with labels. +- Azure Pipelineはレガシーの_クラシックエディタ_をサポートしています。これはCIの設定を、YAMLファイルでパイプラインの定義を作成する代わりに、GUIのエディタで定義できるようにするものです。 {% data variables.product.prodname_actions %}はワークフローの定義にYAMLファイルを使い、グラフィカルなエディタはサポートしていません。 +- Azure Pipelinesでは、ジョブの定義中の一部の構造を省略できます。 たとえば、ジョブが1つだけしかないなら、ジョブを定義する必要はなく、ステップだけを定義すれば済みます。 {% data variables.product.prodname_actions %}は明示的な設定が必要であり、YAMLの構造は省略できません。 +- Azure PipelinesはYAMLファイル中で定義される_ステージ_をサポートしています。ステージは、デプロイメントのワークフローの作成に利用できます。 {% data variables.product.prodname_actions %}では、ステージは個別のYAMLワークフローファイルに分割しなければなりません。 +- オンプレミスのAzure Pipelinesビルドエージェントは、機能で選択できます。 {% data variables.product.prodname_actions %}のセルフホストランナーは、ラベルで選択できます。 -### Migrating jobs and steps +### ジョブとステップの移行 -Jobs and steps in Azure Pipelines are very similar to jobs and steps in {% data variables.product.prodname_actions %}. In both systems, jobs have the following characteristics: +Azure Pipelinesのジョブとステップは、{% data variables.product.prodname_actions %}のジョブとステップによく似ています。 どちらのシステムでも、ジョブは以下の特徴を持ちます。 -* Jobs contain a series of steps that run sequentially. -* Jobs run on separate virtual machines or in separate containers. -* Jobs run in parallel by default, but can be configured to run sequentially. +* ジョブは、順番に実行される一連のステップを持ちます。 +* ジョブは、個別の仮想マシンまたは個別のコンテナで実行されます。 +* ジョブは、デフォルトでは並列に実行されますが、順次実行するように設定することもできます。 -### Migrating script steps +### スクリプトのステップの移行 -You can run a script or a shell command as a step in a workflow. In Azure Pipelines, script steps can be specified using the `script` key, or with the `bash`, `powershell`, or `pwsh` keys. Scripts can also be specified as an input to the [Bash task](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/bash?view=azure-devops) or the [PowerShell task](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/powershell?view=azure-devops). +スクリプトやシェルのコマンドを、ワークフロー中のステップとして実行できます。 Azure Pipelinesでは、スクリプトのステップは`script`キー、あるいは`bash`、`powershell`、`pwsh`といったキーで指定できます。 スクリプトはまた、[Bashタスク](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/bash?view=azure-devops)あるいは[PowerShellタスク](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/powershell?view=azure-devops)への入力としても指定できます。 -In {% data variables.product.prodname_actions %}, all scripts are specified using the `run` key. To select a particular shell, you can specify the `shell` key when providing the script. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun)." +{% data variables.product.prodname_actions %}では、すべてのスクリプトは`run`キーを使って指定されます。 特定のシェルを選択するには、スクリプトを提供する際に`shell`キーを指定します。 詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun)」を参照してください。 -Below is an example of the syntax for each system: +以下が、それぞれのシステムの構文の例です。 @@ -94,19 +94,19 @@ jobs:
    -### Differences in script error handling +### スクリプトのエラー処理の差異 -In Azure Pipelines, scripts can be configured to error if any output is sent to `stderr`. {% data variables.product.prodname_actions %} does not support this configuration. +Azure Pipelinesでは、`stderr`への出力があればスクリプトがエラーとなるように設定できます。 {% data variables.product.prodname_actions %}はこの設定をサポートしていません。 -{% data variables.product.prodname_actions %} configures shells to "fail fast" whenever possible, which stops the script immediately if one of the commands in a script exits with an error code. In contrast, Azure Pipelines requires explicit configuration to exit immediately on an error. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference)." +{% data variables.product.prodname_actions %}は、可能な場合にはシェルを"fail fast"に設定します。これは、スクリプト中のコマンドの1つがエラーコードで終了した場合に即座にスクリプトを停止させるものです。 これに対し、Azure Pipelinesではエラーの際に即座に終了させるためには、明示的に設定しなければなりません。 詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference)」を参照してください。 -### Differences in the default shell on Windows +### Windows上でのデフォルトシェルの差異 -In Azure Pipelines, the default shell for scripts on Windows platforms is the Command shell (_cmd.exe_). In {% data variables.product.prodname_actions %}, the default shell for scripts on Windows platforms is PowerShell. PowerShell has several differences in built-in commands, variable expansion, and flow control. +Azure Pipelinesでは、Windowsプラットフォーム上のスクリプトのためのデフォルトシェルはコマンドシェル(_cmd.exe_)です。 {% data variables.product.prodname_actions %}では、Windowsプラットフォーム上のスクリプトのためのデフォルトシェルはPowerShellです。 PowerShellは、組み込みコマンド、変数の展開、フロー制御で多少の差異があります。 -If you're running a simple command, you might be able to run a Command shell script in PowerShell without any changes. But in most cases, you will either need to update your script with PowerShell syntax or instruct {% data variables.product.prodname_actions %} to run the script with the Command shell instead of PowerShell. You can do this by specifying `shell` as `cmd`. +シンプルなコマンドを実行するなら、コマンドシェルのスクリプトを変更なしにPowerShellで実行できるかもしれません。 しかしほとんどの場合は、PowerShellの構文でスクリプトをアップデートするか、{% data variables.product.prodname_actions %}に対してスクリプトをPowerShellではなくコマンドシェルで実行するように指定することになります。 それには、`shell`を`cmd`と指定します。 -Below is an example of the syntax for each system: +以下が、それぞれのシステムの構文の例です。 @@ -146,15 +146,15 @@ jobs:
    -For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#using-a-specific-shell)." +詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#using-a-specific-shell)」を参照してください。 -### Migrating conditionals and expression syntax +### 条件と式の構文の移行 -Azure Pipelines and {% data variables.product.prodname_actions %} can both run steps conditionally. In Azure Pipelines, conditional expressions are specified using the `condition` key. In {% data variables.product.prodname_actions %}, conditional expressions are specified using the `if` key. +Azure Pipelinesと{% data variables.product.prodname_actions %}は、どちらもステップを条件付きで実行できます。 Azure Pipelinesでは、条件式は`condition`キーを使って指定します。 {% data variables.product.prodname_actions %}では、条件式は`if`キーを使って指定します。 -Azure Pipelines uses functions within expressions to execute steps conditionally. In contrast, {% data variables.product.prodname_actions %} uses an infix notation. For example, you must replace the `eq` function in Azure Pipelines with the `==` operator in {% data variables.product.prodname_actions %}. +Azure Pipelinesは、ステップを条件付きで実行するために、式の中で関数を使います。 それに対し、{% data variables.product.prodname_actions %}はinfix表記を使います。 たとえば、Azure Pipelinesにおける`eq`関数は、{% data variables.product.prodname_actions %}では`==`演算子に置き換えなければなりません。 -Below is an example of the syntax for each system: +以下が、それぞれのシステムの構文の例です。 @@ -194,13 +194,13 @@ jobs:
    -For more information, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)." +詳しい情報については、「[{% data variables.product.prodname_actions %} のコンテキストと式構文](/actions/reference/context-and-expression-syntax-for-github-actions)」を参照してください。 -### Dependencies between jobs +### ジョブ間の依存関係 -Both Azure Pipelines and {% data variables.product.prodname_actions %} allow you to set dependencies for a job. In both systems, jobs run in parallel by default, but job dependencies can be specified explicitly. In Azure Pipelines, this is done with the `dependsOn` key. In {% data variables.product.prodname_actions %}, this is done with the `needs` key. +Azure Pipelinesと{% data variables.product.prodname_actions %}は、どちらもジョブの依存関係を設定できます。 どちらのシステムでも、デフォルトではジョブは並行に実行されますが、ジョブの依存関係を明示的に指定できます。 Azure Pipelinesでは、これは`dependsOn`キーで行います。 {% data variables.product.prodname_actions %}では、`needs`キーを使って行います。 -Below is an example of the syntax for each system. The workflows start a first job named `initial`, and when that job completes, two jobs named `fanout1` and `fanout2` will run. Finally, when those jobs complete, the job `fanin` will run. +以下は、それぞれのシステムにおける構文の例です。 このワークフローは、`initial`という名前の最初のジョブを開始し、そのジョブが終わると`fanout1`と`fanout2`という名前の2つのジョブが実行されます。 最後に、それらのジョブが完了すると、`fanin`というジョブが実行されます。 @@ -246,38 +246,42 @@ jobs: {% raw %} ```yaml jobs: - initial: - runs-on: ubuntu-latest - steps: - - run: echo "This job will be run first." - fanout1: - runs-on: ubuntu-latest - needs: initial - steps: - - run: echo "This job will run after the initial job, in parallel with fanout2." - fanout2: - runs-on: ubuntu-latest - needs: initial - steps: - - run: echo "This job will run after the initial job, in parallel with fanout1." - fanin: - runs-on: ubuntu-latest - needs: [fanout1, fanout2] - steps: - - run: echo "This job will run after fanout1 and fanout2 have finished." +- job: initial + pool: + vmImage: 'ubuntu-latest' + steps: + - script: echo "This job will be run first." + - job: fanout1 + pool: + vmImage: 'ubuntu-latest' + dependsOn: initial + steps: + - script: echo "This job will run after the initial job, in parallel with fanout2." + - job: fanout2 + pool: + vmImage: 'ubuntu-latest' + dependsOn: initial + steps: + - script: echo "This job will run after the initial job, in parallel with fanout1." + - job: fanin: + pool: + vmImage: 'ubuntu-latest' + dependsOn: [fanout1, fanout2] + steps: + - script: echo "This job will run after fanout1 and fanout2 have finished." ``` {% endraw %}
    -For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idneeds)." +詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idneeds)」を参照してください。 -### Migrating tasks to actions +### タスクのアクションへの移行 -Azure Pipelines uses _tasks_, which are application components that can be re-used in multiple workflows. {% data variables.product.prodname_actions %} uses _actions_, which can be used to perform tasks and customize your workflow. In both systems, you can specify the name of the task or action to run, along with any required inputs as key/value pairs. +Azure Pipelinesは_タスク_を使います。これは、複数のワークフローで再利用できるアプリケーションのコンポーネントです。 {% data variables.product.prodname_actions %}は_アクション_を使います。これは、タスクの実行とワークフローのカスタマイズに利用できます。 どちらのシステムでも、実行するタスクやアクションの名前を、必要な入力のキー/値のペアとともに指定できます。 -Below is an example of the syntax for each system: +以下が、それぞれのシステムの構文の例です。 @@ -323,5 +327,5 @@ jobs:
    -You can find actions that you can use in your workflow in [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions), or you can create your own actions. For more information, see "[Creating actions](/actions/creating-actions)." +ワークフロー中で利用できるアクションは、[{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions)で見つけることも、独自のactionsを作成することもできます。 詳細については、「[アクションを作成する](/actions/creating-actions)」を参照してください。 diff --git a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md index aad477296a..ffcc860a69 100644 --- a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md +++ b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md @@ -1,6 +1,6 @@ --- -title: Migrating from GitLab CI/CD to GitHub Actions -intro: '{% data variables.product.prodname_actions %} and GitLab CI/CD share several configuration similarities, which makes migrating to {% data variables.product.prodname_actions %} relatively straightforward.' +title: GitLab CI/CD から GitHub Actions への移行 +intro: '{% data variables.product.prodname_actions %} と GitLab CI/CDはいくつかの点で設定が似ているため、{% data variables.product.prodname_actions %} への移行は比較的簡単です。' versions: free-pro-team: '*' enterprise-server: '>=2.22' @@ -11,24 +11,24 @@ versions: ### はじめに -GitLab CI/CD and {% data variables.product.prodname_actions %} both allow you to create workflows that automatically build, test, publish, release, and deploy code. GitLab CI/CD and {% data variables.product.prodname_actions %} share some similarities in workflow configuration: +GitLab CI/CD と {% data variables.product.prodname_actions %} は、どちらも自動的にコードのビルド、テスト、公開、リリース、デプロイを行うワークフローを作成できます。 GitLab CI/CD と {% data variables.product.prodname_actions %} は、ワークフローの設定において似ているところがあります。 - ワークフローの設定ファイルはYAMLで書かれ、コードのリポジトリに保存されます。 - ワークフローには1つ以上のジョブが含まれます。 - ジョブには1つ以上のステップもしくは個別のコマンドが含まれます。 -- Jobs can run on either managed or self-hosted machines. +- ジョブは、マネージドマシンまたはセルフホストマシンのいずれかで実行できます。 -There are a few differences, and this guide will show you the important differences so that you can migrate your workflow to {% data variables.product.prodname_actions %}. +いくつかの違いがありますので、このガイドでは、ワークフローを {% data variables.product.prodname_actions %} に移行できるようにする際の重要な違いを説明します。 ### Jobs -Jobs in GitLab CI/CD are very similar to jobs in {% data variables.product.prodname_actions %}. どちらのシステムでも、ジョブは以下の特徴を持ちます。 +GitLab CI/CD のジョブは、{% data variables.product.prodname_actions %} のジョブと非常によく似ています。 どちらのシステムでも、ジョブは以下の特徴を持ちます。 -* Jobs contain a series of steps or scripts that run sequentially. -* Jobs can run on separate machines or in separate containers. +* ジョブには、順番に実行される一連のステップまたはスクリプトが含まれています。 +* ジョブは、個別のマシンまたは個別のコンテナで実行できます。 * ジョブは、デフォルトでは並列に実行されますが、順次実行するように設定することもできます。 -You can run a script or a shell command in a job. In GitLab CI/CD, script steps are specified using the `script` key. {% data variables.product.prodname_actions %}では、すべてのスクリプトは`run`キーを使って指定されます。 +ジョブ内でスクリプトまたはシェルコマンドを実行できます。 GitLab CI/CD では、`script` キーを使用してスクリプトステップを指定します。 {% data variables.product.prodname_actions %}では、すべてのスクリプトは`run`キーを使って指定されます。 以下が、それぞれのシステムの構文の例です。 @@ -69,7 +69,7 @@ jobs: ### ランナー -Runners are machines on which the jobs run. Both GitLab CI/CD and {% data variables.product.prodname_actions %} offer managed and self-hosted variants of runners. In GitLab CI/CD, `tags` are used to run jobs on different platforms, while in {% data variables.product.prodname_actions %} it is done with the `runs-on` key. +ランナーは、ジョブが実行されるマシンです。 GitLab CI/CD と {% data variables.product.prodname_actions %} はどちらも、マネージドおよびセルフホストのランナーのバリエーションを提供しています。 GitLab CI/CD では、さまざまなプラットフォームでジョブを実行するために `tags` を使用しますが、{% data variables.product.prodname_actions %} では `runs-on` を使用します。 以下が、それぞれのシステムの構文の例です。 @@ -118,11 +118,11 @@ linux_job: -For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on)." +詳しい情報については、「[{% data variables.product.prodname_actions %} のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on)」を参照してください。 -### Docker images +### Docker イメージ -Both GitLab CI/CD and {% data variables.product.prodname_actions %} support running jobs in a Docker image. In GitLab CI/CD, Docker images are defined with a `image` key, while in {% data variables.product.prodname_actions %} it is done with the `container` key. +GitLab CI/CD と {% data variables.product.prodname_actions %} はどちらも、Docker イメージ内でのジョブの実行をサポートしています。 GitLab CI/CD では、Docker イメージは `image` キーで定義しますが、{% data variables.product.prodname_actions %} では `container` キーで定義します。 以下が、それぞれのシステムの構文の例です。 @@ -156,11 +156,11 @@ jobs: -For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)." +詳しい情報については、「[{% data variables.product.prodname_actions %} のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)」を参照してください。 -### Condition and expression syntax +### 条件と式の構文 -GitLab CI/CD uses `rules` to determine if a job will run for a specific condition. {% data variables.product.prodname_actions %} uses the `if` keyword to prevent a job from running unless a condition is met. +GitLab CI/CD は、特定の条件でジョブを実行するかどうかを決定するために `rules` を使用します。 {% data variables.product.prodname_actions %} は、`if` キーワードを使用して、条件が満たされない限りジョブが実行されないようにします。 以下が、それぞれのシステムの構文の例です。 @@ -203,11 +203,11 @@ jobs: 詳しい情報については、「[{% data variables.product.prodname_actions %} のコンテキストと式構文](/actions/reference/context-and-expression-syntax-for-github-actions)」を参照してください。 -### Dependencies between Jobs +### ジョブ間の依存関係 -Both GitLab CI/CD and {% data variables.product.prodname_actions %} allow you to set dependencies for a job. In both systems, jobs run in parallel by default, but job dependencies in {% data variables.product.prodname_actions %} can be specified explicitly with the `needs` key. GitLab CI/CD also has a concept of `stages`, where jobs in a stage run concurrently, but the next stage will start when all the jobs in the previous stage have completed. You can recreate this scenario in {% data variables.product.prodname_actions %} with the `needs` key. +GitLab CI/CD と {% data variables.product.prodname_actions %} の両方で、ジョブの依存関係を設定できます。 どちらのシステムでも、ジョブはデフォルトで並行して実行されますが、{% data variables.product.prodname_actions %} のジョブの依存関係は `needs` キーで明示的に指定できます。 GitLab CI/CD には、`stages` の概念もあります。ステージ内のジョブは同時に実行されますが、次のステージは、前のステージのすべてのジョブが完了すると開始されます。 このシナリオは、`needs` キーを使用して {% data variables.product.prodname_actions %} で再作成できます。 -以下は、それぞれのシステムにおける構文の例です。 The workflows start with two jobs named `build_a` and `build_b` running in parallel, and when those jobs complete, another job called `test_ab` will run. Finally, when `test_ab` completes, the `deploy_ab` job will run. +以下は、それぞれのシステムにおける構文の例です。 ワークフローは、`build_a` と `build_b` という名前の 2 つのジョブを並行して実行することから始まり、これらのジョブが完了すると、`test_ab` という別のジョブが実行されます。 最後に、`test_ab` が完了すると、`deploy_ab` ジョブが実行されます。 @@ -282,21 +282,21 @@ jobs: 詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idneeds)」を参照してください。 -### Scheduling workflows +### ワークフローのスケジューリング -Both GitLab CI/CD and {% data variables.product.prodname_actions %} allow you to run workflows at a specific interval. In GitLab CI/CD, pipeline schedules are configured with the UI, while in {% data variables.product.prodname_actions %} you can trigger a workflow on a scheduled interval with the "on" key. +GitLab CI/CD と {% data variables.product.prodname_actions %} の両方を使用すると、特定の間隔でワークフローを実行できます。 GitLab CI/CD では、パイプラインスケジュールは UI で設定されますが、{% data variables.product.prodname_actions %} では、「on」キーを使用してスケジュールされた間隔でワークフローをトリガーできます。 -For more information, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows#scheduled-events)." +詳しい情報については、「[ワークフローをトリガーするイベント](/actions/reference/events-that-trigger-workflows#scheduled-events)」を参照してください。 -### Variables and secrets +### 変数とシークレット -GitLab CI/CD and {% data variables.product.prodname_actions %} support setting environment variables in the pipeline or workflow configuration file, and creating secrets using the GitLab or {% data variables.product.product_name %} UI. +GitLab CI/CD および {% data variables.product.prodname_actions %} は、パイプラインまたはワークフロー設定ファイルでの環境変数の設定、および GitLab または {% data variables.product.product_name %} UI を使用したシークレットの作成をサポートしています。 -For more information, see "[Environment variables](/actions/reference/environment-variables)" and "[Encrypted secrets](/actions/reference/encrypted-secrets)." +詳しい情報については、「[環境変数](/actions/reference/environment-variables)」および「[暗号化されたシークレット](/actions/reference/encrypted-secrets)」を参照してください。 ### キャッシング -GitLab CI/CD and {% data variables.product.prodname_actions %} provide a method in the configuration file to manually cache workflow files. +GitLab CI/CD と {% data variables.product.prodname_actions %} では、設定ファイルにワークフローファイルを手動でキャッシュするためのメソッドがあります。 以下が、それぞれのシステムの構文の例です。 @@ -346,11 +346,11 @@ jobs:
    -For more information, see "[Caching dependencies to speed up workflows](/actions/guides/caching-dependencies-to-speed-up-workflows)." +詳しい情報については、「[ワークフローを高速化するための依存関係のキャッシュ](/actions/guides/caching-dependencies-to-speed-up-workflows)」を参照してください。 ### 成果物 -Both GitLab CI/CD and {% data variables.product.prodname_actions %} can upload files and directories created by a job as artifacts. In {% data variables.product.prodname_actions %}, artifacts can be used to persist data across multiple jobs. +GitLab CI/CD と {% data variables.product.prodname_actions %} はどちらも、ジョブによって作成されたファイルとディレクトリをアーティファクトとしてアップロードできます。 {% data variables.product.prodname_actions %} では、アーティファクトを使用して、複数のジョブ間でデータを永続化できます。 以下が、それぞれのシステムの構文の例です。 @@ -388,13 +388,13 @@ artifacts: -For more information, see "[Storing workflow data as artifacts](/actions/guides/storing-workflow-data-as-artifacts)." +詳しい情報については、「[ワークフローデータをアーティファクトとして保存する](/actions/guides/storing-workflow-data-as-artifacts)」を参照してください。 -### Databases and service containers +### データベースとサービスコンテナ どちらのシステムでも、データベース、キャッシング、あるいはその他の依存関係のための追加コンテナを含めることができます。 -In GitLab CI/CD, a container for the job is specified with the `image` key, while {% data variables.product.prodname_actions %} uses the `container` key. In both systems, additional service containers are specified with the `services` key. +GitLab CI/CD では、ジョブのコンテナは `image` キーで指定しますが、{% data variables.product.prodname_actions %} は `container` キーを使用します。 どちらのシステムでも、追加のサービスコンテナは `services` キーで指定します。 以下が、それぞれのシステムの構文の例です。 @@ -414,20 +414,20 @@ GitLab CI/CD container-job: variables: POSTGRES_PASSWORD: postgres - # The hostname used to communicate with the - # PostgreSQL service container + # PostgreSQL サービスコンテナとの通信に + # 使用されるホスト名 POSTGRES_HOST: postgres - # The default PostgreSQL port + # デフォルトの PostgreSQL ポート POSTGRES_PORT: 5432 image: node:10.18-jessie services: - postgres script: - # Performs a clean installation of all dependencies - # in the `package.json` file + # 「package.json」ファイル内のすべての依存関係の + # クリーンインストールを実行する - npm ci - # Runs a script that creates a PostgreSQL client, - # populates the client with data, and retrieves data + # PostgreSQL クライアントを作成してクライアントにデータを入力し + # データを取得するスクリプトを実行する - node client.js tags: - docker @@ -452,20 +452,20 @@ jobs: - name: Check out repository code uses: actions/checkout@v2 - # Performs a clean installation of all dependencies - # in the `package.json` file + # 「package.json」ファイル内のすべての依存関係の + # クリーンインストールを実行する - name: Install dependencies run: npm ci - name: Connect to PostgreSQL - # Runs a script that creates a PostgreSQL client, - # populates the client with data, and retrieves data + # PostgreSQL クライアントを作成してクライアントにデータを入力し + # データを取得するスクリプトを実行する run: node client.js env: - # The hostname used to communicate with the - # PostgreSQL service container + # PostgreSQL サービスコンテナとの通信に + # 使用されるホスト名 POSTGRES_HOST: postgres - # The default PostgreSQL port + # デフォルトの PostgreSQL ポート POSTGRES_PORT: 5432 ``` {% endraw %} @@ -473,4 +473,4 @@ jobs: -For more information, see "[About service containers](/actions/guides/about-service-containers)." +詳しい情報については、「[サービスコンテナについて](/actions/guides/about-service-containers)」を参照してください。 diff --git a/translations/ja-JP/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/translations/ja-JP/content/actions/learn-github-actions/security-hardening-for-github-actions.md index a1291e6574..18a61c3b8a 100644 --- a/translations/ja-JP/content/actions/learn-github-actions/security-hardening-for-github-actions.md +++ b/translations/ja-JP/content/actions/learn-github-actions/security-hardening-for-github-actions.md @@ -95,3 +95,40 @@ versions: 次のように、セルフホストランナーマシンの環境も考慮する必要があります。 - セルフホストランナーとして設定されたマシンにはどのような機密情報が存在するか。 たとえば、SSH 秘密鍵、API アクセストークンなどです。 - マシンが機密性の高いサービスにネットワークアクセス可能か。 たとえば、Azure または AWS メタデータサービスなどです。 この環境での機密情報量は最小限に抑える必要があります。ワークフローを呼び出すことができるすべてのユーザがこの環境にアクセスできることを常に意識しておいてください。 + +### Auditing {% data variables.product.prodname_actions %} events + +You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account perfomed the action. + +For example, you can use the audit log to track the `action:org.update_actions_secret` event, which tracks changes to organization secrets: ![Audit log entries](/assets/images/help/repository/audit-log-entries.png) + +The following tables describe the {% data variables.product.prodname_actions %} events that you can find in the audit log. For more information on using the audit log, see "[Reviewing the audit log for your organization](/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization#searching-the-audit-log)." + +#### Events for secret management +| アクション | 説明 | +| ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `action:org.create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization). | +| `action:org.remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret. | +| `action:org.update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret. | +| `action:repo.create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository). | +| `action:repo.remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret. | +| `action:repo.update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret. | + +#### Events for self-hosted runners +| アクション | 説明 | +| ----------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). | +| `action:org.remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). | +| `action:repo.register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). | +| `action:repo.remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). | + +#### Events for self-hosted runner groups +| アクション | 説明 | +| ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). | +| `action:org.runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. | +| `action:org.runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. | +| `action:org.runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). | +| `action:org.runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. | + + diff --git a/translations/ja-JP/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md b/translations/ja-JP/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md index 84b72b4d0b..a0576bc491 100644 --- a/translations/ja-JP/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md +++ b/translations/ja-JP/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md @@ -1,7 +1,7 @@ --- -title: Sharing workflows with your organization -shortTitle: Sharing workflows with your organization -intro: 'Learn how you can use organization features to collaborate with your team, by sharing workflow templates, secrets, and self-hosted runners.' +title: ワークフローを Organization と共有する +shortTitle: ワークフローを Organization と共有する +intro: 'ワークフローテンプレート、シークレット、およびセルフホストランナーを共有することで、Organization 機能を使用して Team とコラボレーションする方法を学びます。' redirect_from: - /actions/configuring-and-managing-workflows/sharing-workflow-templates-within-your-organization versions: @@ -14,7 +14,7 @@ versions: ### 概要 -If you need to share workflows and other {% data variables.product.prodname_actions %} features with your team, then consider collaborating within a {% data variables.product.prodname_dotcom %} organization. An organization allows you to centrally store and and manage secrets, artifacts, and self-hosted runners. You can also create workflow templates in the `.github` repository and share them with other users in your organization. +ワークフローやその他の {% data variables.product.prodname_actions %} 機能を Team と共有する必要がある場合は、{% data variables.product.prodname_dotcom %} Organization 内でのコラボレーションを検討します。 Organization を使用すると、シークレット、アーティファクト、およびセルフホストランナーを一元的に保存および管理できます。 `.github` リポジトリにワークフローテンプレートを作成して、Organization 内の他のユーザと共有することもできます。 ### ワークフロー テンプレートの作成 @@ -83,9 +83,9 @@ If you need to share workflows and other {% data variables.product.prodname_acti 組織のワークフロー テンプレートは、組織名で作成されたワークフロー    "というタイトルの独自 _セクションにあります。 使いたいテンプレート名の下で、**Set up this workflow（このワークフローをセットアップする）**をクリックしてください。 ![このワークフローを設定します](/assets/images/help/settings/actions-create-starter-workflow.png)

    -### Sharing secrets within an organization +### Organization 内でシークレットを共有する -You can centrally manage your secrets within an organization, and then make them available to selected repositories. This also means that you can update a secret in one location, and have the change apply to all repository workflows that use the secret. +Organization 内でシークレットを一元管理し、選択したリポジトリで使用できるようにすることができます。 これは、1 つの場所でシークレットを更新し、その変更をシークレットを使用するすべてのリポジトリワークフローに適用できるということを示します。 組織でシークレットを作成する場合、ポリシーを使用して、そのシークレットにアクセスできるリポジトリを制限できます。 たとえば、すべてのリポジトリにアクセスを許可したり、プライベート リポジトリまたは指定したリポジトリ のリストのみにアクセスを制限したりできます。 @@ -100,13 +100,13 @@ You can centrally manage your secrets within an organization, and then make them 1 [ **リポジトリアクセス** ドロップダウン リストから、アクセス ポリシーを選択します。 1 [**Add secret**] をクリックします。 -### Share self-hosted runners within an organization +### Organization 内でセルフホストランナーを共有する -Organization admins can add their self-hosted runners to groups, and then create policies that control which repositories can access the group. +Organization の管理者は、セルフホストランナーをグループに追加してから、グループにアクセスできるリポジトリを制御するポリシーを作成できます。 詳しい情報については、「[グループを使用したセルフホストランナーへのアクセスを管理する](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)」を参照してください。 ### 次のステップ -To continue learning about {% data variables.product.prodname_actions %}, see "[Security hardening for {% data variables.product.prodname_actions %}](/actions/learn-github-actions/security-hardening-for-github-actions)." +{% data variables.product.prodname_actions %} の詳細については、「[{% data variables.product.prodname_actions %} のセキュリティ強化](/actions/learn-github-actions/security-hardening-for-github-actions)」を参照してください。 diff --git a/translations/ja-JP/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md b/translations/ja-JP/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md index afcf834749..5cc85172ef 100644 --- a/translations/ja-JP/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md +++ b/translations/ja-JP/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md @@ -1,5 +1,5 @@ --- -title: Disabling and enabling a workflow +title: ワークフローの無効化と有効化 intro: '{% data variables.product.prodname_dotcom %} または REST API を使用して、ワークフローを無効化したり、再度有効化したりすることができます。' product: '{% data reusables.gated-features.actions %}' versions: @@ -10,14 +10,14 @@ versions: {% data variables.product.prodname_actions %} の支払いを管理する {% data variables.product.prodname_dotcom %}は、macOSランナーのホストに[MacStadium](https://www.macstadium.com/)を使用しています。 -Disabling a workflow allows you to stop a workflow from being triggered without having to delete the file from the repo. You can easily re-enable the workflow again on {% data variables.product.prodname_dotcom %}. REST API を使用して、ワークフローを無効化または有効化することもできます。 詳しい情報については、「[アクション REST API](/rest/reference/actions#workflows)」を参照してください。 +ワークフローを無効にすると、リポジトリからファイルを削除することなく、ワークフローがトリガーされないようにすることができます。 {% data variables.product.prodname_dotcom %} でワークフローを簡単に再度有効にすることができます。 REST API を使用して、ワークフローを無効化または有効化することもできます。 詳しい情報については、「[アクション REST API](/rest/reference/actions#workflows)」を参照してください。 -Temporarily disabling a workflow can be useful in many scenarios. These are a few examples where disabling a workflow might be helpful: +ワークフローを一時的に無効にすると、多くのシナリオで便利です。 以下は、ワークフローを無効すると便利な場合の例の一部です。 -- A workflow error that produces too many or wrong requests, impacting external services negatively. -- A workflow that is not critical and is consuming too many minutes on your account. -- A workflow that sends requests to a service that is down. -- Workflows on a forked repository that aren't needed (for example, scheduled workflows). +- リクエストが多すぎるまたは間違っていて、外部サービスに悪影響を与えるワークフローエラー。 +- 重要ではないが、アカウントで時間がかかりすぎるワークフロー。 +- ダウンしているサービスにリクエストを送信するワークフロー。 +- フォークされたリポジトリ上の不要なワークフロー（スケジュールされたワークフローなど）。 {% warning %} @@ -25,21 +25,21 @@ Temporarily disabling a workflow can be useful in many scenarios. These are a fe {% endwarning %} -### Disabling a workflow +### ワークフローの無効化 -You can manually disable a workflow so that it won't execute any workflow runs. A disabled workflow is not deleted, and can be re-enabled. +ワークフローを手動で無効にして、ワークフロー実行が行われないようにすることができます。 無効にしたワークフローは削除されず、再度有効にすることができます。 {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.actions-tab %} -1. In the left sidebar, click the workflow you want to disable. ![アクション選択ワークフロー](/assets/images/actions-select-workflow.png) -1. Click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}. ![actions kebab menu](/assets/images/help/repository/actions-workflow-menu-kebab.png) -1. Click **Disable workflow**. ![actions disable workflow](/assets/images/help/repository/actions-disable-workflow.png) The disabled workflow is marked {% octicon "stop" aria-label="The stop icon" %} to indicate its status. ![actions list disabled workflow](/assets/images/help/repository/actions-find-disabled-workflow.png) +1. 左サイドバーで、無効にするワークフローをクリックします。 ![アクション選択ワークフロー](/assets/images/actions-select-workflow.png) +1. {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} をクリックします。 ![アクションケバブメニュー](/assets/images/help/repository/actions-workflow-menu-kebab.png) +1. [**Disable workflow**] をクリックします。 ![actions disable workflow](/assets/images/help/repository/actions-disable-workflow.png)無効化されたワークフローには、そのステータスを示すために {% octicon "stop" aria-label="The stop icon" %} のマークが付けられます。 ![無効なワークフローをリストするアクション](/assets/images/help/repository/actions-find-disabled-workflow.png) -### Enabling a workflow +### ワークフローの有効化 -You can re-enable a workflow that was previously disabled. +以前、無効化したワークフローを再度有効化することができます。 {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.actions-tab %} -1. In the left sidebar, click the workflow you want to enable. ![actions select disabled workflow](/assets/images/help/repository/actions-select-disabled-workflow.png) -1. Click **Enable workflow**. ![actions enable workflow](/assets/images/help/repository/actions-enable-workflow.png) +1. 左サイドバーで、有効にするワークフローをクリックします。 ![無効なワークフローを選択するアクション](/assets/images/help/repository/actions-select-disabled-workflow.png) +1. [**Enable workflow**] をクリックします。 ![ワークフローを有効にするアクション](/assets/images/help/repository/actions-enable-workflow.png) diff --git a/translations/ja-JP/content/actions/managing-workflow-runs/downloading-workflow-artifacts.md b/translations/ja-JP/content/actions/managing-workflow-runs/downloading-workflow-artifacts.md index ddfd6150e1..59f6eb8e7d 100644 --- a/translations/ja-JP/content/actions/managing-workflow-runs/downloading-workflow-artifacts.md +++ b/translations/ja-JP/content/actions/managing-workflow-runs/downloading-workflow-artifacts.md @@ -1,5 +1,5 @@ --- -title: Downloading workflow artifacts +title: ワークフロー アーティファクトをダウンロードする intro: アーカイブされたアーティファクトは、自動的に有効期限切れになる前にダウンロードできます。 product: '{% data reusables.gated-features.actions %}' versions: @@ -19,4 +19,4 @@ versions: {% data reusables.repositories.actions-tab %} {% data reusables.repositories.navigate-to-workflow %} {% data reusables.repositories.view-run %} -1. Under **Artifacts**, click the artifact you want to download. ![成果物のダウンロードのドロップダウンメニュー](/assets/images/help/repository/artifact-drop-down.png) +1. [**Artifacts**] の下で、ダウンロードするアーティファクトをクリックします。 ![成果物のダウンロードのドロップダウンメニュー](/assets/images/help/repository/artifact-drop-down.png) diff --git a/translations/ja-JP/content/actions/managing-workflow-runs/index.md b/translations/ja-JP/content/actions/managing-workflow-runs/index.md index c7011ffc4e..cac7f39a3f 100644 --- a/translations/ja-JP/content/actions/managing-workflow-runs/index.md +++ b/translations/ja-JP/content/actions/managing-workflow-runs/index.md @@ -1,6 +1,6 @@ --- -title: Managing workflow runs -shortTitle: Managing workflow runs +title: ワークフロー実行を管理する +shortTitle: ワークフロー実行を管理する intro: 'ワークフローの各ステップのステータスと結果の表示、保留中のワークフローのキャンセル、請求可能なジョブ実行時間の表示、失敗したワークフローのデバッグと再実行、ログの検索とダウンロード、アーティファクトのダウンロードを行うことができます。' redirect_from: - /actions/configuring-and-managing-workflows/managing-a-workflow-run diff --git a/translations/ja-JP/content/actions/managing-workflow-runs/manually-running-a-workflow.md b/translations/ja-JP/content/actions/managing-workflow-runs/manually-running-a-workflow.md index c5265ebf53..6529e43adb 100644 --- a/translations/ja-JP/content/actions/managing-workflow-runs/manually-running-a-workflow.md +++ b/translations/ja-JP/content/actions/managing-workflow-runs/manually-running-a-workflow.md @@ -1,6 +1,6 @@ --- title: ワークフローの手動実行 -intro: 'When a workflow is configured to run on the `workflow_dispatch` event, you can run the workflow using the REST API or from the Actions tab on {% data variables.product.prodname_dotcom %}.' +intro: 'ワークフローが「workflow_dispatch」イベントで実行されるように設定されている場合、REST API を使用するか、{% data variables.product.prodname_dotcom %} の [Actions] タブからワークフローを実行できます。' product: '{% data reusables.gated-features.actions %}' versions: free-pro-team: '*' @@ -10,9 +10,9 @@ versions: {% data variables.product.prodname_actions %} の支払いを管理する {% data variables.product.prodname_dotcom %}は、macOSランナーのホストに[MacStadium](https://www.macstadium.com/)を使用しています。 -To run a workflow manually, the workflow must be configured to run on the `workflow_dispatch` event. 詳しい情報については、「[ワークフローをトリガーするイベント](/actions/reference/events-that-trigger-workflows)」を参照してください。 +ワークフローを手動で実行するには、`workflow_dispatch` イベントで実行するようにワークフローを設定する必要があります。 詳しい情報については、「[ワークフローをトリガーするイベント](/actions/reference/events-that-trigger-workflows)」を参照してください。 -### Running a workflow on {% data variables.product.prodname_dotcom %} +### {% data variables.product.prodname_dotcom %} でワークフローを実行する {% data variables.product.prodname_dotcom %} で `workflow_dispatch` イベントをトリガーするには、ワークフローがデフォルトブランチに含まれている必要があります。 ワークフローの実行を手動でトリガーするには、次の手順に従います。 @@ -24,7 +24,7 @@ To run a workflow manually, the workflow must be configured to run on the `workf 1. ワークフロー実行の一覧の上にある [ワークフローの実行 ****を実行する] を選択します。 ![アクション ワークフローのディスパッチ](/assets/images/actions-workflow-dispatch.png) 1. ワークフローを実行する分岐を選択し、ワークフローで使用される入力パラメータを入力します。 [ ワークフロー**実行 ] をクリックします。 ![アクションはワークフローを手動で実行します](/assets/images/actions-manually-run-workflow.png)

    -### Running a workflow using the REST API +### REST API を使用してワークフローを実行する REST API を使用する場合は、 `入力` を構成し、要求本文パラメーターとして ref     します。 入力を省略すると、ワークフロー ファイルで定義されている既定値が使用されます。

    diff --git a/translations/ja-JP/content/actions/managing-workflow-runs/re-running-a-workflow.md b/translations/ja-JP/content/actions/managing-workflow-runs/re-running-a-workflow.md index c33fb90729..e4794d650a 100644 --- a/translations/ja-JP/content/actions/managing-workflow-runs/re-running-a-workflow.md +++ b/translations/ja-JP/content/actions/managing-workflow-runs/re-running-a-workflow.md @@ -1,6 +1,6 @@ --- -title: Re-running a workflow -intro: You can re-run an instance of a workflow. Re-running a workflow uses the same `GITHUB_SHA` (commit SHA) and `GITHUB_REF` (Git ref) of the original event that triggered the workflow run. +title: ワークフローを再実行する +intro: ワークフローのインスタンスを再実行できます。 ワークフローの再実行では、ワークフローの実行をトリガーした元のイベントと同じ 「GITHUB_SHA」（コミット SHA）と「GITHUB_REF」（Git ref）が使用されます。 product: '{% data reusables.gated-features.actions %}' versions: free-pro-team: '*' @@ -16,4 +16,4 @@ versions: {% data reusables.repositories.actions-tab %} {% data reusables.repositories.navigate-to-workflow %} {% data reusables.repositories.view-run %} -1. In the upper-right corner of the workflow, use the **Re-run jobs** drop-down menu, and select **Re-run all jobs**. ![[Re-run checks] ドロップダウンメニュー](/assets/images/help/repository/rerun-checks-drop-down.png) +1. ワークフローの右上隅にある [**Re-run jobs**] ドロップダウンメニューを使用して、[**Re-run all jobs**] を選択します。 ![[Re-run checks] ドロップダウンメニュー](/assets/images/help/repository/rerun-checks-drop-down.png) diff --git a/translations/ja-JP/content/actions/managing-workflow-runs/removing-workflow-artifacts.md b/translations/ja-JP/content/actions/managing-workflow-runs/removing-workflow-artifacts.md index fc1449ed6b..955cdc6b49 100644 --- a/translations/ja-JP/content/actions/managing-workflow-runs/removing-workflow-artifacts.md +++ b/translations/ja-JP/content/actions/managing-workflow-runs/removing-workflow-artifacts.md @@ -1,5 +1,5 @@ --- -title: Removing workflow artifacts +title: ワークフロー アーティファクトを削除する intro: '{% data variables.product.product_name %} で期限切れになる前にアーティファクトを削除することで、使用済みの {% data variables.product.prodname_actions %} ストレージを再利用できます。' product: '{% data reusables.gated-features.actions %}' versions: @@ -26,7 +26,7 @@ versions: {% data reusables.repositories.actions-tab %} {% data reusables.repositories.navigate-to-workflow %} {% data reusables.repositories.view-run %} -1. Under **Artifacts**, click {% octicon "trashcan" aria-label="The trashcan icon" %} next to the artifact you want to remove. ![成果物の削除のドロップダウンメニュー](/assets/images/help/repository/actions-delete-artifact.png) +1. [**Artifacts**] で、削除するアーティファクトの横にある {% octicon "trashcan" aria-label="The trashcan icon" %} をクリックします。 ![成果物の削除のドロップダウンメニュー](/assets/images/help/repository/actions-delete-artifact.png) {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} ### アーティファクトの保持期間を設定する @@ -38,4 +38,4 @@ versions: ### アーティファクトの有効期限を探す API を使用して、アーティファクトの削除がスケジュールされている日付を確認できます。 詳しい情報については、「[リポジトリのアーティファクトの一覧表示](/rest/reference/actions#artifacts)」によって返される `expires_at` 値を参照してください。 -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/ja-JP/content/actions/managing-workflow-runs/using-workflow-run-logs.md b/translations/ja-JP/content/actions/managing-workflow-runs/using-workflow-run-logs.md index 15ece802c5..7663b434be 100644 --- a/translations/ja-JP/content/actions/managing-workflow-runs/using-workflow-run-logs.md +++ b/translations/ja-JP/content/actions/managing-workflow-runs/using-workflow-run-logs.md @@ -1,6 +1,6 @@ --- -title: Using workflow run logs -intro: 'You can view, search, and download the logs for each job in a workflow run.' +title: ワークフロー実行ログを使用する +intro: 'ワークフロー実行の各ジョブのログを表示、検索、およびダウンロードできます。' product: '{% data reusables.gated-features.actions %}' versions: free-pro-team: '*' @@ -22,7 +22,7 @@ versions: ワークフローの実行を失敗した場合には、どのステップが失敗の原因になったかを確認し、失敗したステップのビルドログを確かめてトラブルシューティングすることができます。 各ステップの実行にかかった時間もわかります。 ログファイルの特定の行のパーマリンクをコピーして、チームで共有することもできます。 {% data reusables.repositories.permissions-statement-read %} -In addition to the steps configured in the workflow file, {% data variables.product.prodname_dotcom %} adds two additional steps to each job to set up and complete the job's execution. These steps are logged in the workflow run with the names "Set up job" and "Complete job". +ワークフローファイルで設定されたステップに加えて、{% data variables.product.prodname_dotcom %} はジョブの実行をセットアップして完了するために、各ジョブに 2 つの追加ステップを追加します。 これらのステップは、「Set up job」および「Complete job」として実行されるワークフローに記録されます。 {% data variables.product.prodname_dotcom %}ホストランナー上のジョブの実行では、"Set up job"はランナーの仮想環境の詳細を記録し、ランナーマシン上にあったプリインストールされたツールのリストへのリンクを含みます。 @@ -60,12 +60,12 @@ In addition to the steps configured in the workflow file, {% data variables.prod {% data reusables.repositories.view-run-superlinter %} {% data reusables.repositories.navigate-to-job-superlinter %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -1. In the upper right corner, click -{% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} and select **Download log archive**. +1. 右上隅にある +{% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} をクリックし、[**Download log archive**] を選択します。 ![[Download logs] ドロップダウンメニュー](/assets/images/help/repository/download-logs-drop-down-updated.png) {% else %} -1. In the upper right corner, click -{% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} and select **Download log archive**. +1. 右上隅にある +{% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} をクリックし、[**Download log archive**] を選択します。 ![[Download logs] ドロップダウンメニュー](/assets/images/help/repository/download-logs-drop-down.png) {% endif %} @@ -78,9 +78,9 @@ In addition to the steps configured in the workflow file, {% data variables.prod {% data reusables.repositories.navigate-to-workflow-superlinter %} {% data reusables.repositories.view-run-superlinter %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -1. In the upper right corner, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}. ![Kebab-horizontal icon](/assets/images/help/repository/workflow-run-kebab-horizontal-icon-updated.png) +1. 右上隅にある {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} をクリックします。 ![水平ケバブアイコン](/assets/images/help/repository/workflow-run-kebab-horizontal-icon-updated.png) 2. ログファイルを削除するには、**Delete all logs（すべてのログを削除）**ボタンをクリックして、確認の要求を見てください 。 ![Delete all logs](/assets/images/help/repository/delete-all-logs-updated.png) ログを削除すると、**Delete all logs（すべてのログを削除）**ボタンはなくなり、ワークフローの実行中にログファイルが残っていないことを示します。 {% else %} -1. In the upper right corner, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}. ![Kebab-horizontal icon](/assets/images/help/repository/workflow-run-kebab-horizontal-icon.png) -2. ログファイルを削除するには、**Delete all logs（すべてのログを削除）**ボタンをクリックして、確認の要求を見てください 。 ![Delete all logs](/assets/images/help/repository/delete-all-logs.png) After the logs have been deleted, the **Delete all logs** button is removed to indicate that no log files remain in the workflow run. +1. 右上隅にある {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} をクリックします。 ![水平ケバブアイコン](/assets/images/help/repository/workflow-run-kebab-horizontal-icon.png) +2. ログファイルを削除するには、**Delete all logs（すべてのログを削除）**ボタンをクリックして、確認の要求を見てください 。 ![Delete all logs](/assets/images/help/repository/delete-all-logs.png)ログが削除されると、[**Delete all logs**] ボタンが削除され、ワークフローの実行にログファイルが残っていないことを示します。 {% endif %} diff --git a/translations/ja-JP/content/actions/managing-workflow-runs/viewing-job-execution-time.md b/translations/ja-JP/content/actions/managing-workflow-runs/viewing-job-execution-time.md index b17372dc54..cdedcc2c06 100644 --- a/translations/ja-JP/content/actions/managing-workflow-runs/viewing-job-execution-time.md +++ b/translations/ja-JP/content/actions/managing-workflow-runs/viewing-job-execution-time.md @@ -1,5 +1,5 @@ --- -title: Viewing job execution time +title: ジョブの実行時間を表示する intro: 'ジョブの実行時間 (ジョブの発生した支払対象の分を含む) を表示できます。' product: '{% data reusables.gated-features.actions %}' versions: @@ -9,16 +9,16 @@ versions: {% data variables.product.prodname_actions %} の支払いを管理する {% data variables.product.prodname_dotcom %}は、macOSランナーのホストに[MacStadium](https://www.macstadium.com/)を使用しています。 -Billable job execution minutes are only shown for jobs run on private repositories that use {% data variables.product.prodname_dotcom %}-hosted runners. There are no billable minutes when using {% data variables.product.prodname_actions %} in public repositories or for jobs run on self-hosted runners. +請求可能なジョブ実行時間（分）は、{% data variables.product.prodname_dotcom %} ホストランナーを使用するプライベートリポジトリで実行されるジョブに対してのみ表示されます。 パブリックリポジトリで {% data variables.product.prodname_actions %} を使用する場合、またはセルフホストランナーで実行されるジョブの場合、請求対象となる実行時間はありません。 {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.actions-tab %} {% data reusables.repositories.navigate-to-workflow %} {% data reusables.repositories.view-run %} -1. Under the job summary, you can view the job's execution time. To view the billable job execution time, click **Run and billable time details**. ![実行および支払請求可能な時間の詳細リンク](/assets/images/help/repository/view-run-billable-time.png) +1. ジョブの概要の下で、ジョブの実行時間を表示できます。 請求対象となるジョブの実行時間を表示するには、[**Run and billable time details**] をクリックします。 ![実行および支払請求可能な時間の詳細リンク](/assets/images/help/repository/view-run-billable-time.png) {% note %} - **注:** 表示される請求可能な時間には、丸めや分数の乗数は含まれません。 To view your total {% data variables.product.prodname_actions %} usage, including rounding and minute multipliers, see "[Viewing your {% data variables.product.prodname_actions %} usage](/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage)." + **注:** 表示される請求可能な時間には、丸めや分数の乗数は含まれません。 四捨五入や分乗数を含む {% data variables.product.prodname_actions %} の使用状況の合計を表示するには、「[{% data variables.product.prodname_actions %} の使用状況を表示する](/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage)」を参照してください。 {% endnote %} diff --git a/translations/ja-JP/content/actions/managing-workflow-runs/viewing-workflow-run-history.md b/translations/ja-JP/content/actions/managing-workflow-runs/viewing-workflow-run-history.md index 4d75478ddc..43aabb1d9c 100644 --- a/translations/ja-JP/content/actions/managing-workflow-runs/viewing-workflow-run-history.md +++ b/translations/ja-JP/content/actions/managing-workflow-runs/viewing-workflow-run-history.md @@ -1,6 +1,6 @@ --- -title: Viewing workflow run history -intro: You can view logs for each run of a workflow. Logs include the status for each job and step in a workflow. +title: ワークフロー実行の履歴を表示する +intro: ワークフロー実行ごとにログを表示できます。 ログには、ワークフローの各ジョブとステップのステータスが含まれます。 product: '{% data reusables.gated-features.actions %}' versions: free-pro-team: '*' diff --git a/translations/ja-JP/content/actions/quickstart.md b/translations/ja-JP/content/actions/quickstart.md index f22ebf0391..e62b5c5542 100644 --- a/translations/ja-JP/content/actions/quickstart.md +++ b/translations/ja-JP/content/actions/quickstart.md @@ -1,6 +1,6 @@ --- -title: Quickstart for GitHub Actions -intro: 'Add a {% data variables.product.prodname_actions %} workflow to an existing repository in 5 minutes or less.' +title: GitHub Actions のクイックスタート +intro: '{% data variables.product.prodname_actions %} ワークフローを 5 分以内に既存のリポジトリに追加します。' allowTitleToDifferFromFilename: true redirect_from: - /actions/getting-started-with-github-actions/starting-with-preconfigured-workflow-templates @@ -14,34 +14,34 @@ versions: ### はじめに -You only need an existing {% data variables.product.prodname_dotcom %} repository to create and run a {% data variables.product.prodname_actions %} workflow. In this guide, you'll add a workflow that lints multiple coding languages using the [{% data variables.product.prodname_dotcom %} Super-Linter action](https://github.com/github/super-linter). The workflow uses Super-Linter to validate your source code every time a new commit is pushed to your repository. +{% data variables.product.prodname_actions %} ワークフローを作成して実行するには、既存の {% data variables.product.prodname_dotcom %} リポジトリのみが必要です。 このガイドでは、[{% data variables.product.prodname_dotcom %}Super-Linter アクション](https://github.com/github/super-linter)を使用して複数のコーディング言語の文法チェックを行うワークフローを追加します。 ワークフローは Super-Linter を使用して、新しいコミットがリポジトリにプッシュされるたびにソースコードを検証します。 -### Creating your first workflow +### 最初のワークフローを作成する -1. From your repository on {% data variables.product.prodname_dotcom %}, create a new file in the `.github/workflows` directory named `superlinter.yml`. 詳細は「[新しいファイルを作成する](/github/managing-files-in-a-repository/creating-new-files)」を参照してください。 -2. Copy the following YAML contents into the `superlinter.yml` file. **Note:** If your default branch is not `main`, update the value of `DEFAULT_BRANCH` to match your repository's default branch name. +1. {% data variables.product.prodname_dotcom %} のリポジトリから、`superlinter.yml` という名前の新しいファイルを `.github/workflows` ディレクトリに作成します。 詳細は「[新しいファイルを作成する](/github/managing-files-in-a-repository/creating-new-files)」を参照してください。 +2. 次の YAML コンテンツを `superlinter.yml` ファイルにコピーします。 **注釈:** デフォルトブランチが `main` でない場合は、リポジトリのデフォルトブランチ名と一致するように `DEFAULT_BRANCH` の値を更新してください。 {% raw %} - ```yaml + ```yaml{:copy} name: Super-Linter - # Run this workflow every time a new commit pushed to your repository + # 新しいコミットがリポジトリにプッシュされるたびにこのワークフローを実行する on: push jobs: - # Set the job key. The key is displayed as the job name - # when a job name is not provided + # ジョブキーを設定する。 ジョブ名が指定されていない場合、 + # キーはジョブ名として表示される super-lint: - # Name the Job + # ジョブ名を付ける name: Lint code base - # Set the type of machine to run on + # 実行するマシンのタイプを設定する runs-on: ubuntu-latest steps: - # Checks out a copy of your repository on the ubuntu-latest machine + # ubuntu-latest マシンでリポジトリのコピーをチェックアウトする - name: Checkout code uses: actions/checkout@v2 - # Runs the Super-Linter action + # Super-Linter アクションを実行する - name: Run Super-Linter uses: github/super-linter@v3 env: @@ -49,27 +49,27 @@ You only need an existing {% data variables.product.prodname_dotcom %} repositor GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ``` {% endraw %} -3. To run your workflow, scroll to the bottom of the page and select **Create a new branch for this commit and start a pull request**. Then, to create a pull request, click **Propose new file**. ![Commit workflow file](/assets/images/commit-workflow-file.png) +3. ワークフローを実行するには、ページの一番下までスクロールし、[**Create a new branch for this commit and start a pull request**] を選択します。 次に、[**Propose new file**] をクリックしてプルリクエストを作成します。 ![ワークフローファイルのコミット](/assets/images/commit-workflow-file.png) -Committing the workflow file in your repository triggers the `push` event and runs your workflow. +リポジトリ内のワークフローファイルをコミットすると、`push` イベントがトリガーされ、ワークフローが実行されます。 -### Viewing your workflow results +### ワークフローの結果を表示する {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.actions-tab %} {% data reusables.repositories.navigate-to-workflow-superlinter %} {% data reusables.repositories.view-run-superlinter %} -1. In the left sidebar, click the **Lint code base** job. ![Lint code base job](/assets/images/help/repository/superlinter-lint-code-base-job.png) +1. 左サイドバーで、[**Lint code base**] をクリックします。 ![Lint コードベースジョブ](/assets/images/help/repository/superlinter-lint-code-base-job.png) {% data reusables.repositories.view-failed-job-results-superlinter %} -### More starter workflows +### その他のスターターワークフロー -{% data variables.product.prodname_dotcom %} provides preconfigured workflow templates that you can start from to automate or create a continuous integration workflows. You can browse the full list of workflow templates in the {% if currentVersion == "free-pro-team@latest" %}[actions/starter-workflows](https://github.com/actions/starter-workflows) repository{% else %} `actions/starter-workflows` repository on {% data variables.product.product_location %}{% endif %}. +{% data variables.product.prodname_dotcom %} では、事前設定されたワークフローテンプレートが用意されており、継続的インテグレーションワークフローの自動化や作成が可能です。 {% if currentVersion == "free-pro-team@latest" %}[actions/starter-workflows](https://github.com/actions/starter-workflows) リポジトリ{% else %} {% data variables.product.product_location %} の `actions/starter-workflows` リポジトリで、ワークフローテンプレートの完全なリストを閲覧できます{% endif %}。 ### 次のステップ -The super-linter workflow you just added runs any time code is pushed to your repository to help you spot errors and inconsistencies in your code. But, this is only the beginning of what you can do with {% data variables.product.prodname_actions %}. Your repository can contain multiple workflows that trigger different jobs based on different events. {% data variables.product.prodname_actions %} can help you automate nearly every aspect of your application development processes. Ready to get started? Here are some helpful resources for taking your next steps with {% data variables.product.prodname_actions %}: +追加した super-linter ワークフローは、コードがリポジトリにプッシュされるたびに実行され、コードのエラーや不整合を見つけます。 ただし、これは {% data variables.product.prodname_actions %} でできることの一部にすぎません。 リポジトリには、さまざまなイベントに基づいてさまざまなジョブをトリガーする複数のワークフローを含めることができます。 {% data variables.product.prodname_actions %} は、アプリケーション開発プロセスのほぼすべての要素を自動化するのに役立ちます。 開始する場合、 {% data variables.product.prodname_actions %} で次のステップに進む際に役立つ、以下のようなリソースを参照してください。 -- "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)" for an in-depth tutorial -- "[Guides](/actions/guides)" for specific uses cases and examples -- [github/super-linter](https://github.com/github/super-linter) for more details about configuring the Super-Linter action +- 詳細なチュートリアルは、「[{% data variables.product.prodname_actions %}を学ぶ](/actions/learn-github-actions)」 +- 特定の使用例とサンプルについては、「[ガイド](/actions/guides)」 +- Super-Linter アクションの設定の詳細については、[github/super-linter](https://github.com/github/super-linter) diff --git a/translations/ja-JP/content/actions/reference/authentication-in-a-workflow.md b/translations/ja-JP/content/actions/reference/authentication-in-a-workflow.md index e8cb006fa9..3d44f57e2c 100644 --- a/translations/ja-JP/content/actions/reference/authentication-in-a-workflow.md +++ b/translations/ja-JP/content/actions/reference/authentication-in-a-workflow.md @@ -1,5 +1,5 @@ --- -title: Authentication in a workflow +title: ワークフローで認証する intro: '{% data variables.product.prodname_dotcom %}は、{% data variables.product.prodname_actions %}の代理で認証を受けるために利用できるトークンを提供します。' product: '{% data reusables.gated-features.actions %}' redirect_from: diff --git a/translations/ja-JP/content/actions/reference/context-and-expression-syntax-for-github-actions.md b/translations/ja-JP/content/actions/reference/context-and-expression-syntax-for-github-actions.md index 74f5ea370c..04696f10e6 100644 --- a/translations/ja-JP/content/actions/reference/context-and-expression-syntax-for-github-actions.md +++ b/translations/ja-JP/content/actions/reference/context-and-expression-syntax-for-github-actions.md @@ -93,7 +93,7 @@ env: | `github.event_path` | `string` | ランナー上の完全なイベントwebhookペイロードへのパス。 | | `github.head_ref` | `string` | ワークフローの実行における `head_ref` またはプルリクエストのソースブランチ。 このプロパティは、ワークフローの実行をトリガーしたイベントが `pull_request` の場合のみ使用できます。 | | `github.job` | `string` | 現在のジョブの[`job_id`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_id)。 | -| `github.ref` | `string` | ワークフローの実行をトリガーしたブランチまたはタグ ref。 | +| `github.ref` | `string` | ワークフローの実行をトリガーしたブランチまたはタグ ref。 ブランチの場合、これは `refs/heads/` の形式で、タグの場合は `refs/tags/` です。 | | `github.repository` | `string` | 所有者およびリポジトリの名前。 `Codertocat/Hello-World`などです。 | | `github.repository_owner` | `string` | リポジトリのオーナーの名前。 たとえば`Codertocat`。 | | `github.run_id` | `string` | {% data reusables.github-actions.run_id_description %} diff --git a/translations/ja-JP/content/actions/reference/encrypted-secrets.md b/translations/ja-JP/content/actions/reference/encrypted-secrets.md index 6c202cb6f3..e51c0f200a 100644 --- a/translations/ja-JP/content/actions/reference/encrypted-secrets.md +++ b/translations/ja-JP/content/actions/reference/encrypted-secrets.md @@ -1,5 +1,5 @@ --- -title: Encrypted secrets +title: 暗号化されたシークレット intro: 暗号化されたシークレットを使用すると、機密情報をリポジトリまたは Organization に保存できます。 product: '{% data reusables.gated-features.actions %}' redirect_from: diff --git a/translations/ja-JP/content/actions/reference/environment-variables.md b/translations/ja-JP/content/actions/reference/environment-variables.md index db63723a65..1dbdacb513 100644 --- a/translations/ja-JP/content/actions/reference/environment-variables.md +++ b/translations/ja-JP/content/actions/reference/environment-variables.md @@ -54,7 +54,7 @@ steps: | `GITHUB_REF` | ワークフローをトリガーしたブランチまたはタグref。 たとえば、`refs/heads/feature-branch-1`です。 イベントタイプのブランチもタグも利用できない場合、変数は存在しません。 | | `GITHUB_HEAD_REF` | フォークしたリポジトリのみに設定。 headリポジトリのブランチです。 | | `GITHUB_BASE_REF` | フォークしたリポジトリのみに設定。 ベースリポジトリのブランチです。 | -| `GITHUB_SERVER_URL` | Returns the URL of the {% data variables.product.product_name %} server. For example: `https://github.com`. | +| `GITHUB_SERVER_URL` | {% data variables.product.product_name %} サーバーの URL を返します。 For example: `https://github.com`. | | `GITHUB_API_URL` | API URL を返します。 For example: `https://api.github.com`. | | `GITHUB_GRAPHQL_URL` | グラフ QL API の URL を返します。 For example: `https://api.github.com/graphql`. | diff --git a/translations/ja-JP/content/actions/reference/events-that-trigger-workflows.md b/translations/ja-JP/content/actions/reference/events-that-trigger-workflows.md index 247df2c9db..7ab4eee37b 100644 --- a/translations/ja-JP/content/actions/reference/events-that-trigger-workflows.md +++ b/translations/ja-JP/content/actions/reference/events-that-trigger-workflows.md @@ -15,9 +15,9 @@ versions: {% data variables.product.prodname_actions %} の支払いを管理する {% data variables.product.prodname_dotcom %}は、macOSランナーのホストに[MacStadium](https://www.macstadium.com/)を使用しています。 -### Configuring workflow events +### ワークフローイベントを設定する -You can configure workflows to run for one or more events using the `on` workflow syntax. 詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/articles/workflow-syntax-for-github-actions#on)」を参照してください。 +`on` ワークフロー構文を使用して、1 つ以上のイベントに対して実行するようにワークフローを設定できます。 詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/articles/workflow-syntax-for-github-actions#on)」を参照してください。 {% data reusables.github-actions.actions-on-examples %} @@ -29,7 +29,7 @@ You can configure workflows to run for one or more events using the `on` workflo ワークフローの実行がトリガーされるには、以下のステップが生じます。 -1. An event occurs on your repository, and the resulting event has an associated commit SHA and Git ref. +1. リポジトリでイベントが発生し、結果のイベントにはコミット SHA と Git ref が関連付けられます。 2. リポジトリ内の関連づけられたコミットSHAもしくはGit refにおける `.github/workflows`ディレクトリ内でワークフローファイルが検索される。 ワークフローファイルは、コミットSHAあるいはGit refを考慮した上で存在していなければなりません。 たとえば、イベントが特定のリポジトリブランチで発生したなら、ワークフローファイルはそのブランチ上でリポジトリ内に存在しなければなりません。 @@ -90,15 +90,15 @@ You can configure workflows to run for one or more events using the `on` workflo | ---------------------------------------------------------------- | ---------- | -------------------------- | --------------- | | [workflow_dispatch](/webhooks/event-payloads/#workflow_dispatch) | n/a | `GITHUB_REF` ブランチ上の直近のコミット | ディスパッチを受信したブランチ | -You can configure custom-defined input properties, default input values, and required inputs for the event directly in your workflow. ワークフローが実行されると、 `github.event.inputs` コンテキスト内の入力値にアクセスできます。 詳しい情報については、「[{% data variables.product.prodname_actions %} のコンテキストと式構文](/actions/reference/context-and-expression-syntax-for-github-actions#github-context)」を参照してください。 +カスタム定義の入力プロパティ、デフォルトの入力値、イベントに必要な入力をワークフローで直接設定できます。 ワークフローが実行されると、 `github.event.inputs` コンテキスト内の入力値にアクセスできます。 詳しい情報については、「[{% data variables.product.prodname_actions %} のコンテキストと式構文](/actions/reference/context-and-expression-syntax-for-github-actions#github-context)」を参照してください。 -You can manually trigger a workflow run using the {% data variables.product.prodname_dotcom %} API and from {% data variables.product.prodname_dotcom %}. For more information, see "[Manually running a workflow](/actions/managing-workflow-runs/manually-running-a-workflow)." +You can manually trigger a workflow run using the {% data variables.product.prodname_dotcom %} API and from {% data variables.product.prodname_dotcom %}. 詳しい情報については、「[ワークフローを手動で実行する](/actions/managing-workflow-runs/manually-running-a-workflow)」を参照してください。 - {% data variables.product.prodname_dotcom %} でイベントをトリガーすると、{% data variables.product.prodname_dotcom %} で `ref` と `inputs` を直接入力できます。 For more information, see "[Using inputs and outputs with an action](/actions/learn-github-actions/finding-and-customizing-actions#using-inputs-and-outputs-with-an-action)." + {% data variables.product.prodname_dotcom %} でイベントをトリガーすると、{% data variables.product.prodname_dotcom %} で `ref` と `inputs` を直接入力できます。 詳しい情報については、「[アクションで入力と出力を使用する](/actions/learn-github-actions/finding-and-customizing-actions#using-inputs-and-outputs-with-an-action)」を参照してください。 REST API を使用してカスタム `workflow_dispatch` webhook イベントをトリガーするには、`POST` リクエストを {% data variables.product.prodname_dotcom %} API エンドポイントに送信し、`ref` および必要な `inputs` を入力する必要があります。 詳細については、「[ワークフローディスパッチイベントの作成](/rest/reference/actions/#create-a-workflow-dispatch-event)」REST API エンドポイントを参照してください。 -##### Example workflow configuration +##### ワークフロー設定の例 この例では、 `名` 定義し、入力     ` github.event.inputs.name` を使用してそれらを出力し、github.event.inputs.home コンテキスト `します。 ` `名が指定されていない場合は、既定値の 「Mona the Octocat」 が表示されます。

    @@ -244,7 +244,7 @@ on: #### `delete` -誰かがブランチまたはタグを作成し、それによって `create` イベントがトリガーされるときにワークフローを実行します。 REST API の詳細については、「[リファレンスの削除](/v3/git/refs/#delete-a-reference)」を参照してください。 +誰かがブランチまたはタグを作成し、それによって `delete` イベントがトリガーされるときにワークフローを実行します。 REST API の詳細については、「[リファレンスの削除](/v3/git/refs/#delete-a-reference)」を参照してください。 {% data reusables.github-actions.branch-requirement %} @@ -307,7 +307,7 @@ on: -#### `フォーク` +#### `fork` 誰かがリポジトリをフォークし、それによって `deployment_status` イベントがトリガーされるときにワークフローを実行します。 REST API の詳細については、「[フォークの作成](/v3/repos/forks/#create-a-fork)」を参照してください。 @@ -315,7 +315,7 @@ on: | webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | | ---------------------------------------- | ---------- | ----------------- | ------------ | -| [`フォーク`](/webhooks/event-payloads/#fork) | n/a | デフォルトブランチの直近のコミット | デフォルトブランチ | +| [`fork`](/webhooks/event-payloads/#fork) | n/a | デフォルトブランチの直近のコミット | デフォルトブランチ | たとえば、`fork` イベントが発生したときにワークフローを実行する例は、次のとおりです。 @@ -405,15 +405,15 @@ on: -#### `ラベル` +#### `label` `label` イベントが発生したときにワークフローを実行します。 {% data reusables.developer-site.multiple_activity_types %} REST API の詳細については、「[ラベル](/v3/issues/labels/)」を参照してください。 {% data reusables.github-actions.branch-requirement %} -| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | -| ---------------------------------------- | ----------------------------------------------------------------- | ----------------- | ------------ | -| [`ラベル`](/webhooks/event-payloads/#label) | - `created`
    - `edited`
    - `deleted`
    | デフォルトブランチの直近のコミット | デフォルトブランチ | +| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | +| ------------------------------------------ | ----------------------------------------------------------------- | ----------------- | ------------ | +| [`label`](/webhooks/event-payloads/#label) | - `created`
    - `edited`
    - `deleted`
    | デフォルトブランチの直近のコミット | デフォルトブランチ | {% data reusables.developer-site.limit_workflow_to_activity_types %} @@ -431,15 +431,15 @@ on: -#### `マイルストーン` +#### `milestone` `milestone` イベントが発生したときにワークフローを実行します。 {% data reusables.developer-site.multiple_activity_types %} REST API の詳細については、「[マイルストーン](/v3/issues/milestones/)」を参照してください。 {% data reusables.github-actions.branch-requirement %} -| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | -| ------------------------------------------------ | ----------------------------------------------------------------------------------------------------------- | ----------------- | ------------ | -| [`マイルストーン`](/webhooks/event-payloads/#milestone) | - `created`
    - `closed`
    - `opened`
    - `edited`
    - `deleted`
    | デフォルトブランチの直近のコミット | デフォルトブランチ | +| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | +| -------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------- | ------------ | +| [`milestone`](/webhooks/event-payloads/#milestone) | - `created`
    - `closed`
    - `opened`
    - `edited`
    - `deleted`
    | デフォルトブランチの直近のコミット | デフォルトブランチ | {% data reusables.developer-site.limit_workflow_to_activity_types %} @@ -688,7 +688,7 @@ on: pull_request_target -#### `プッシュ` +#### `push` {% note %} @@ -700,7 +700,7 @@ on: pull_request_target | webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | | ---------------------------------------- | ---------- | --------------------------------------------- | ------------ | -| [`プッシュ`](/webhooks/event-payloads/#push) | n/a | プッシュされたコミット、ただし (デフォルトブランチの際に) ブランチを削除する場合を除く | 更新された ref | +| [`push`](/webhooks/event-payloads/#push) | n/a | プッシュされたコミット、ただし (デフォルトブランチの際に) ブランチを削除する場合を除く | 更新された ref | たとえば、`push` イベントが発生したときにワークフローを実行する例は、次のとおりです。 @@ -739,7 +739,7 @@ on: -#### `リリース` +#### `release` {% note %} @@ -749,9 +749,9 @@ on: `release` イベントが発生したときにワークフローを実行します。 {% data reusables.developer-site.multiple_activity_types %} REST API の詳細については、「[リリース](/v3/repos/releases/)」を参照してください。 -| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | -| ------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ | ------------ | -| [`リリース`](/webhooks/event-payloads/#release) | - `published`
    - `unpublished`
    - `created`
    - `edited`
    - `deleted`
    - `prereleased`
    - `released` | リリースのタグが付いた直近のコミット | リリースのタグ | +| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | +| ---------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ | ------------ | +| [`release`](/webhooks/event-payloads/#release) | - `published`
    - `unpublished`
    - `created`
    - `edited`
    - `deleted`
    - `prereleased`
    - `released` | リリースのタグが付いた直近のコミット | リリースのタグ | {% data reusables.developer-site.limit_workflow_to_activity_types %} @@ -769,15 +769,15 @@ on: -#### `ステータス` +#### `status` Git コミットのステータスが変更された、それによって `status` イベントがトリガーされるときにワークフローを実行します。 REST API の詳細については、「[ステータス](/v3/repos/statuses/)」を参照してください。 {% data reusables.github-actions.branch-requirement %} -| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | -| ------------------------------------------- | ---------- | ----------------- | ------------ | -| [`ステータス`](/webhooks/event-payloads/#status) | n/a | デフォルトブランチの直近のコミット | n/a | +| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | +| -------------------------------------------- | ---------- | ----------------- | ------------ | +| [`status`](/webhooks/event-payloads/#status) | n/a | デフォルトブランチの直近のコミット | n/a | たとえば、`status` イベントが発生したときにワークフローを実行する例は、次のとおりです。 diff --git a/translations/ja-JP/content/actions/reference/index.md b/translations/ja-JP/content/actions/reference/index.md index 58c27a44bb..45a4375628 100644 --- a/translations/ja-JP/content/actions/reference/index.md +++ b/translations/ja-JP/content/actions/reference/index.md @@ -1,6 +1,6 @@ --- title: リファレンス -intro: 'Reference documentation for creating workflows, using GitHub-hosted runners, and authentication.' +intro: 'ワークフローの作成、GitHub ホストランナーの使用、および認証に関するリファレンスドキュメント。' redirect_from: - /actions/configuring-and-managing-workflows/using-variables-and-secrets-in-a-workflow versions: @@ -13,7 +13,7 @@ versions: ### ワークフロー構文 -The workflow file is written in YAML. In the YAML workflow file, you can use expression syntax to evaluate contextual information, literals, operators, and functions. Contextual information includes workflow, environment variables, secrets, and the events that triggered the workflow. When you use [`run`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun) in a workflow step to run shell commands, you can use specific workflow command syntax to set environment variables, set output parameters for subsequent steps, and set error or debug messages. +ワークフローファイルは YAML で記述されています。 YAML ワークフローファイルでは、式の構文を使用して、コンテキスト情報、リテラル、演算子、および関数を評価できます。 コンテキスト情報には、ワークフロー、環境変数、シークレット、およびワークフローをトリガーしたイベントが含まれます。 ワークフローステップで [`run`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun) を使用してシェルコマンドを実行する場合、特定のワークフローコマンド構文を使用して環境変数を設定し、後続のステップの出力パラメーターを設定して、エラーメッセージまたはデバッグメッセージを設定できます。 {% link_in_list /workflow-syntax-for-github-actions %} {% link_in_list /context-and-expression-syntax-for-github-actions %} @@ -21,20 +21,20 @@ The workflow file is written in YAML. In the YAML workflow file, you can use exp ### イベント -You can configure workflows to run when specific GitHub events occur, at a scheduled time, manually, or when events outside of GitHub occur. +特定の GitHub イベントが発生したとき、スケジュールされた時間で実行、手動で実行、または GitHub 外のイベントが発生したときに実行するようにワークフローを設定できます。 {% link_in_list /events-that-trigger-workflows %} -### Authentication and secrets +### 認証とシークレット -{% data variables.product.prodname_dotcom %}は、{% data variables.product.prodname_actions %}の代理で認証を受けるために利用できるトークンを提供します。 You can also store sensitive information as a secret in your organization or repository. {% data variables.product.prodname_dotcom %} encrypts all secrets. +{% data variables.product.prodname_dotcom %}は、{% data variables.product.prodname_actions %}の代理で認証を受けるために利用できるトークンを提供します。 機密情報をシークレットとして Organization またはリポジトリに保存することもできます。 {% data variables.product.prodname_dotcom %} はすべてのシークレットを暗号化します。 {% link_in_list /authentication-in-a-workflow %} {% link_in_list /encrypted-secrets %} ### {% data variables.product.prodname_dotcom %}ホストランナー -GitHub offers hosted virtual machines to run workflows. The virtual machine contains an environment with tools, packages, and environment variables for GitHub Actions to use. +GitHub は、ワークフローを実行するホストされた仮想マシンを提供します。 仮想マシンには、GitHub Actions が使用するツール、パッケージ、および環境変数を備えた環境が含まれます。 {% link_in_list /environment-variables %} {% link_in_list /specifications-for-github-hosted-runners %} @@ -42,7 +42,7 @@ GitHub offers hosted virtual machines to run workflows. The virtual machine cont {% if currentVersion == "free-pro-team@latest" %} ### 管理 -When you run workflows on {% data variables.product.prodname_dotcom %}-hosted runners, there are usage limits and potential usage charges. You can also disable or restrict the usage of {% data variables.product.prodname_actions %} in a repository and organization. +{% data variables.product.prodname_dotcom %} ホストランナーでワークフローを実行する場合、使用制限が適用されたり使用料がかかったりする場合があります。 リポジトリおよび Organization での {% data variables.product.prodname_actions %} の使用を無効化または制限することもできます。 {% link_in_list /usage-limits-billing-and-administration %} diff --git a/translations/ja-JP/content/actions/reference/specifications-for-github-hosted-runners.md b/translations/ja-JP/content/actions/reference/specifications-for-github-hosted-runners.md index a480f22e01..32030cf3f3 100644 --- a/translations/ja-JP/content/actions/reference/specifications-for-github-hosted-runners.md +++ b/translations/ja-JP/content/actions/reference/specifications-for-github-hosted-runners.md @@ -1,5 +1,5 @@ --- -title: Specifications for GitHub-hosted runners +title: GitHub ホストランナーの仕様 intro: '{% data variables.product.prodname_dotcom %}は、ワークフローを実行するためのホストされた仮想マシンを提供します。 仮想マシンには、{% data variables.product.prodname_actions %}で使用できるツール、パッケージ、および設定の環境が含まれています。' product: '{% data reusables.gated-features.actions %}' redirect_from: @@ -50,12 +50,13 @@ Windowsの仮想マシンは、ユーザアカウント制御（UAC）が無効 {% data reusables.github-actions.supported-github-runners %} {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} -Workflow logs list the runner used to run a job. For more information, see "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history)." +ワークフローログには、ジョブの実行に使用されたランナーが一覧表示されます。 詳しい情報については、「[ワークフロー実行の履歴を表示する](/actions/managing-workflow-runs/viewing-workflow-run-history)」を参照してください。 -### Supported software +### サポートされているソフトウェア -The software tools included in {% data variables.product.prodname_dotcom %}-hosted runners are updated weekly. 各ランナーオペレーティングシステム用に含まれるツールの最新のリストについては、以下のリンクを参照してください。 +{% data variables.product.prodname_dotcom %} ホストランナーに含まれているソフトウェアツールは毎週更新されます。 各ランナーオペレーティングシステム用に含まれるツールの最新のリストについては、以下のリンクを参照してください。 * [Ubuntu 20.04 LTS](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md) * [Ubuntu 18.04 LTS](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md) @@ -63,16 +64,18 @@ The software tools included in {% data variables.product.prodname_dotcom %}-host * [Windows Server 2019](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md) * [Windows Server 2016](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md) * [MacOS 10.15](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md) +* [MacOS 11.0](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md) {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} {% data variables.product.prodname_dotcom %}ホストランナーには、オペレーティングシステムのデフォルトの組み込みツールに加え、上のリファレンスのリスト内のパッケージにが含まれています。 たとえば、Ubuntu及びmacOSのランナーには、`grep`、`find`、`which`やその他のデフォルトのツールが含まれています。 -Workflow logs include a link to the preinstalled tools on the runner. For more information, see "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history)." +ワークフローログには、ランナーにプリインストールされているツールへのリンクが含まれています。 詳しい情報については、「[ワークフロー実行の履歴を表示する](/actions/managing-workflow-runs/viewing-workflow-run-history)」を参照してください。 リクエストしたいツールがある場合、[actions/virtual-environments](https://github.com/actions/virtual-environments) で Issue を開いてください。 -### IP addresses +### IP アドレス {% note %} @@ -119,7 +122,7 @@ JSONファイルには、`values`という配列があります。 この配列 } ``` -### File systems +### ファイルシステム {% data variables.product.prodname_dotcom %}は、仮想マシン上の特定のディレクトリでアクションとシェルコマンドを実行します。 仮想マシン上のファイルパスは静的なものではありません。 `home`、`workspace`、`workflow` ディレクトリのファイルパスを構築するには、{% data variables.product.prodname_dotcom %}が提供している環境変数を使用してください。 diff --git a/translations/ja-JP/content/actions/reference/usage-limits-billing-and-administration.md b/translations/ja-JP/content/actions/reference/usage-limits-billing-and-administration.md index a23e696092..18c324aa38 100644 --- a/translations/ja-JP/content/actions/reference/usage-limits-billing-and-administration.md +++ b/translations/ja-JP/content/actions/reference/usage-limits-billing-and-administration.md @@ -1,6 +1,6 @@ --- -title: 'Usage limits, billing, and administration' -intro: 'There are usage limits for {% data variables.product.prodname_actions %} workflows. Usage charges apply to repositories that go beyond the amount of free minutes and storage for a repository.' +title: '使用制限、支払い、管理' +intro: '{% data variables.product.prodname_actions %} ワークフローには使用制限があります。 使用料は、リポジトリの空き時間とストレージの量を超えるリポジトリに適用されます。' product: '{% data reusables.gated-features.actions %}' redirect_from: - /actions/getting-started-with-github-actions/usage-and-billing-information-for-github-actions @@ -17,19 +17,19 @@ versions: {% if currentVersion == "free-pro-team@latest" %} {% data reusables.github-actions.actions-billing %} 詳細は「[{% data variables.product.prodname_actions %} の支払いについて](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions)」を参照してください。 {% else %} -GitHub Actions usage is free for -{% data variables.product.prodname_ghe_server %} that use self-hosted runners. +GitHub アクションの使用は、 +セルフホストランナーを使用する {% data variables.product.prodname_ghe_server %} では無料です。 {% endif %} ### 使用制限 {% if currentVersion == "free-pro-team@latest" %} -There are some limits on -{% data variables.product.prodname_actions %} usage when using {% data variables.product.prodname_dotcom %}-hosted runners. これらの制限は変更されることがあります。 +ー +{% data variables.product.prodname_dotcom %} ホストランナーを使用する場合、{% data variables.product.prodname_actions %} の使用にはいくつかの制限があります。 これらの制限は変更されることがあります。 {% note %} -**Note:** For self-hosted runners, different usage limits apply. 詳しい情報については「[セルフホストランナーについて](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)」を参照してください。 +**注釈:** セルフホストランナーの場合、さまざまな使用制限が適用されます。 詳しい情報については「[セルフホストランナーについて](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)」を参照してください。 {% endnote %} @@ -46,20 +46,20 @@ There are some limits on | Enterprise | 180 | 50 | - **ジョブマトリックス** - {% data reusables.github-actions.usage-matrix-limits %} {% else %} -Usage limits apply to self-hosted runners. 詳しい情報については「[セルフホストランナーについて](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)」を参照してください。 +使用制限は、セルフホストランナーに適用されます。 詳しい情報については「[セルフホストランナーについて](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)」を参照してください。 {% endif %} {% if currentVersion == "free-pro-team@latest" %} ### 利用のポリシー -In addition to the usage limits, you must ensure that you use +使用制限に加えて、 -{% data variables.product.prodname_actions %} within the [GitHub Terms of Service](/articles/github-terms-of-service/). {% data variables.product.prodname_actions %}の固有の規約に関する詳しい情報については、[GitHubの追加製品規約](/github/site-policy/github-additional-product-terms#a-actions-usage)を参照してください。 +[GitHub 利用規約](/articles/github-terms-of-service/)で {% data variables.product.prodname_actions %} を使用していることを確認する必要があります。 {% data variables.product.prodname_actions %}の固有の規約に関する詳しい情報については、[GitHubの追加製品規約](/github/site-policy/github-additional-product-terms#a-actions-usage)を参照してください。 {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} ### アーティファクトとログの保持ポリシー -リポジトリ、Organization、または Enterprise アカウントのアーティファクトとログの保持期間を構成できます。 +リポジトリ、Organization、または Enterprise アカウントのアーティファクトとログの保持期間を設定できます。 {% data reusables.actions.about-artifact-log-retention %} @@ -70,19 +70,19 @@ In addition to the usage limits, you must ensure that you use - [Enterprise 内のアーティファクトとログの {% data variables.product.prodname_actions %} の保持期間を設定する](/github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account) {% endif %} -### リポジトリあるいはOrganizationでの{% data variables.product.prodname_actions %}の無効化もしくは制限 +### リポジトリまたは Organization の {% data variables.product.prodname_actions %} を無効化または制限する {% data reusables.github-actions.disabling-github-actions %} 詳しい情報については、以下を参照してください。 -- "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository)" -- "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization)"{% if currentVersion == "free-pro-team@latest" %} -- "[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account)" for {% data variables.product.prodname_ghe_cloud %}{% endif %} +- 「[リポジトリの {% data variables.product.prodname_actions %} を無効化または制限する](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository)」 +- 「[Organization の {% data variables.product.prodname_actions %} を無効化または制限する](/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization)」{% if currentVersion == "free-pro-team@latest" %} +- {% data variables.product.prodname_ghe_cloud %}{% endif %} の「[Enterprise アカウントで {% data variables.product.prodname_actions %} ポリシーを適用する](/github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account)」 -### Disabling and enabling workflows +### ワークフローの無効化と有効化 -You can enable and disable individual workflows in your repository on {% data variables.product.prodname_dotcom %}. +{% data variables.product.prodname_dotcom %} のリポジトリで個々のワークフローを有効化または無効化できます。 {% data reusables.actions.scheduled-workflows-disabled %} -For more information, see "[Disabling and enabling a workflow](/actions/managing-workflow-runs/disabling-and-enabling-a-workflow)." +詳しい情報については、「[ワークフローの無効化と有効化](/actions/managing-workflow-runs/disabling-and-enabling-a-workflow)」を参照してください。 diff --git a/translations/ja-JP/content/actions/reference/workflow-commands-for-github-actions.md b/translations/ja-JP/content/actions/reference/workflow-commands-for-github-actions.md index 90dcca0454..3c73319d79 100644 --- a/translations/ja-JP/content/actions/reference/workflow-commands-for-github-actions.md +++ b/translations/ja-JP/content/actions/reference/workflow-commands-for-github-actions.md @@ -22,7 +22,7 @@ versions: アクションは、 環境変数を設定する、他のアクションに利用される値を出力する、デバッグメッセージを出力ログに追加するなどのタスクを行うため、ランナーマシンとやりとりできます。 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -Most workflow commands use the `echo` command in a specific format, while others are invoked by writing to a file. For more information, see ["Environment files".](#environment-files) +ほとんどのワークフローコマンドは特定の形式で `echo` コマンドを使用しますが、他のワークフローコマンドはファイルへの書き込みによって呼び出されます。 詳しい情報については、「[環境ファイル](#environment-files)」を参照してください。 {% else %} ワークフローコマンドは、特定のフォーマットで `echo` コマンドを使います。 {% endif %} @@ -45,44 +45,46 @@ echo "::workflow-command parameter1={data},parameter2={data}::{command value}" ### ワークフローコマンドを使ったツールキット関数へのアクセス -[actions/toolkit](https://github.com/actions/toolkit)には、ワークフローコマンドとして実行できる多くの関数があります。 `::`構文を使って、YAMLファイル内でワークフローコマンドを実行してください。それらのコマンドは`stdout`を通じてランナーに送信されます。 For example, instead of using code to set an output, as below: +[actions/toolkit](https://github.com/actions/toolkit)には、ワークフローコマンドとして実行できる多くの関数があります。 `::`構文を使って、YAMLファイル内でワークフローコマンドを実行してください。それらのコマンドは`stdout`を通じてランナーに送信されます。 たとえば、コードを使用して出力を設定する代わりに、以下のようにします。 ```javascript core.setOutput('SELECTED_COLOR', 'green'); ``` -You can use the `set-output` command in your workflow to set the same value: +ワークフローで `set-output` コマンドを使用して、同じ値を設定できます。 +{% raw %} ``` yaml - name: Set selected color run: echo '::set-output name=SELECTED_COLOR::green' id: random-color-generator - name: Get color - run: echo 'The selected color is' ${steps.random-color-generator.outputs.SELECTED_COLOR} + run: echo "The selected color is ${{ steps.random-color-generator.outputs.SELECTED_COLOR }}" ``` +{% endraw %} 以下の表は、ワークフロー内で使えるツールキット関数を示しています。 -| ツールキット関数 | 等価なワークフローのコマンド | -| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- | -| `core.addPath` | | -| {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}Accessible using environment file `GITHUB_PATH`{% else %} `add-path` {% endif %} | | -| | | -| `core.debug` | `debug` | -| `core.error` | `エラー` | -| `core.endGroup` | `endgroup` | -| `core.exportVariable` | | -| {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}Accessible using environment file `GITHUB_ENV`{% else %} `set-env` {% endif %} | | -| | | -| `core.getInput` | 環境変数の`INPUT_{NAME}`を使ってアクセス可能 | -| `core.getState` | 環境変数の`STATE_{NAME}`を使ってアクセス可能 | -| `core.isDebug` | 環境変数の`RUNNER_DEBUG`を使ってアクセス可能 | -| `core.saveState` | `save-state` | -| `core.setFailed` | `::error`及び`exit 1`のショートカットとして使われる | -| `core.setOutput` | `set-output` | -| `core.setSecret` | `add-mask` | -| `core.startGroup` | `group` | -| `core.warning` | `warning file` | +| ツールキット関数 | 等価なワークフローのコマンド | +| -------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- | +| `core.addPath` | | +| {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}環境ファイル `GITHUB_PATH` を使用してアクセス可能{% else %} `add-path` {% endif %} | | +| | | +| `core.debug` | `debug` | +| `core.error` | `エラー` | +| `core.endGroup` | `endgroup` | +| `core.exportVariable` | | +| {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}環境ファイル `GITHUB_ENV` を使用してアクセス可能{% else %} `set-env` {% endif %} | | +| | | +| `core.getInput` | 環境変数の`INPUT_{NAME}`を使ってアクセス可能 | +| `core.getState` | 環境変数の`STATE_{NAME}`を使ってアクセス可能 | +| `core.isDebug` | 環境変数の`RUNNER_DEBUG`を使ってアクセス可能 | +| `core.saveState` | `save-state` | +| `core.setFailed` | `::error`及び`exit 1`のショートカットとして使われる | +| `core.setOutput` | `set-output` | +| `core.setSecret` | `add-mask` | +| `core.startGroup` | `group` | +| `core.warning` | `warning file` | {% if currentVersion ver_lt "enterprise-server@2.23" %} ### 環境変数の設定 @@ -130,7 +132,7 @@ echo "::add-path::/path/to/dir" `::debug::{message}` -デバッグメッセージをログに出力します。 ログでこのコマンドにより設定されたデバッグメッセージを表示するには、`ACTIONS_STEP_DEBUG` という名前のシークレットを作成し、値を `true` に設定する必要があります。 For more information, see "[Enabling debug logging](/actions/managing-workflow-runs/enabling-debug-logging)." +デバッグメッセージをログに出力します。 ログでこのコマンドにより設定されたデバッグメッセージを表示するには、`ACTIONS_STEP_DEBUG` という名前のシークレットを作成し、値を `true` に設定する必要があります。 詳しい情報については、「[デバッグログの有効化](/actions/managing-workflow-runs/enabling-debug-logging)」を参照してください。 #### サンプル @@ -228,13 +230,13 @@ console.log("The running PID from the main action is: " + process.env.STATE_pro ``` {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -## Environment Files +## 環境ファイル -During the execution of a workflow, the runner generates temporary files that can be used to perform certain actions. The path to these files are exposed via environment variables. You will need to use UTF-8 encoding when writing to these files to ensure proper processing of the commands. Multiple commands can be written to the same file, separated by newlines. +ワークフローの実行中に、ランナーは特定のアクションを実行する際に使用できる一時ファイルを生成します。 これらのファイルへのパスは、環境変数を介して公開されます。 コマンドを適切に処理するには、これらのファイルに書き込むときに UTF-8 エンコーディングを使用する必要があります。 複数のコマンドを、改行で区切って同じファイルに書き込むことができます。 {% warning %} -**Warning:** Powershell does not use UTF-8 by default. Make sure you write files using the correct encoding. For example, you need to set UTF-8 encoding when you set the path: +**警告:** Powershell はデフォルト設定で UTF-8 を使用しません。 正しいエンコーディングを使用してファイルを書き込むようにしてください。 たとえば、パスを設定するときに UTF-8 エンコーディングを設定する必要があります。 ``` steps: @@ -255,9 +257,9 @@ steps: echo "action_state=yellow" >> $GITHUB_ENV ``` -Running `$action_state` in a future step will now return `yellow` +将来のステップで `$action_state` を実行すると `yellow` が返されるようになりました -#### Multline strings +#### 複数行の文字列 複数行の文字列の場合、次の構文で区切り文字を使用できます。 ``` @@ -267,7 +269,7 @@ Running `$action_state` in a future step will now return `yellow` ``` #### サンプル -In this example, we use `EOF` as a delimiter and set the `JSON_RESPONSE` environment variable to the value of the curl response. +この例では、区切り文字として `EOF` を使用し、`JSON_RESPONSE` 環境変数を cURL レスポンスの値に設定します。 ``` steps: - name: Set the value diff --git a/translations/ja-JP/content/actions/reference/workflow-syntax-for-github-actions.md b/translations/ja-JP/content/actions/reference/workflow-syntax-for-github-actions.md index 500c35b335..151efca572 100644 --- a/translations/ja-JP/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/translations/ja-JP/content/actions/reference/workflow-syntax-for-github-actions.md @@ -225,7 +225,7 @@ defaults: それぞれのジョブは、`runs-on`で指定された環境で実行されます。 -ワークフローの利用限度内であれば、実行するジョブ数に限度はありません。 For more information, see "[Usage limits and billing](/actions/reference/usage-limits-billing-and-administration)" for {% data variables.product.prodname_dotcom %}-hosted runners and "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)" for self-hosted runner usage limits. +ワークフローの利用限度内であれば、実行するジョブ数に限度はありません。 詳細については、{% data variables.product.prodname_dotcom %} ホストランナーの「[使用制限と支払い](/actions/reference/usage-limits-billing-and-administration)」、およびセルフホストランナーの使用制限については「[セルフホストランナーについて](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)」を参照してください。 ワークフローの実行中で動作しているジョブのユニークな識別子が必要な場合は、{% data variables.product.prodname_dotcom %} APIが利用できます。 詳しい情報については、「[ワークフロージョブ](/v3/actions/workflow-jobs)」を参照してください。 @@ -289,7 +289,7 @@ jobs: ##### **サンプル** ```yaml -ランオン:Ubuntu-最新 +runs-on: ubuntu-latest ``` 詳しい情報については「[{% data variables.product.prodname_dotcom %}ホストランナーの仮想環境](/github/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners)」を参照してください。 @@ -389,7 +389,7 @@ jobs: 1つのジョブには、`steps` (ステップ) と呼ばれる一連のタスクがあります。 ステップでは、コマンドを実行する、設定タスクを実行する、あるいはリポジトリやパブリックリポジトリ、Dockerレジストリで公開されたアクションを実行することができます。 すべてのステップでアクションを実行するとは限りませんが、すべてのアクションはステップとして実行されます。 各ステップは、ランナー環境のそれ自体のプロセスで実行され、ワークスペースとファイルシステムにアクセスします。 ステップはそれ自体のプロセスで実行されるため、環境変数を変更しても、ステップ間では反映されません。 {% data variables.product.prodname_dotcom %}には、ジョブを設定して完了するステップが組み込まれています。 -ワークフローの利用限度内であれば、実行するステップ数に限度はありません。 For more information, see "[Usage limits and billing](/actions/reference/usage-limits-billing-and-administration)" for {% data variables.product.prodname_dotcom %}-hosted runners and "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)" for self-hosted runner usage limits. +ワークフローの利用限度内であれば、実行するステップ数に限度はありません。 詳細については、{% data variables.product.prodname_dotcom %} ホストランナーの「[使用制限と支払い](/actions/reference/usage-limits-billing-and-administration)」、およびセルフホストランナーの使用制限については「[セルフホストランナーについて](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)」を参照してください。 #### サンプル @@ -946,7 +946,7 @@ jobs: #### **`jobs..container.image`** -アクションを実行するコンテナとして使用するDockerイメージ。 The value can be the Docker Hub image name or a {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. +アクションを実行するコンテナとして使用するDockerイメージ。 The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..container.credentials`** @@ -1029,7 +1029,7 @@ services: #### **`jobs..services..image`** -アクションを実行するサービスコンテナとして使用するDockerイメージ。 The value can be the Docker Hub image name or a {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. +アクションを実行するサービスコンテナとして使用するDockerイメージ。 The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..services..credentials`** diff --git a/translations/ja-JP/content/admin/authentication/using-cas.md b/translations/ja-JP/content/admin/authentication/using-cas.md index 4219a41b84..cd35c47517 100644 --- a/translations/ja-JP/content/admin/authentication/using-cas.md +++ b/translations/ja-JP/content/admin/authentication/using-cas.md @@ -5,7 +5,7 @@ redirect_from: - /enterprise/admin/articles/about-cas-authentication/ - /enterprise/admin/user-management/using-cas - /enterprise/admin/authentication/using-cas -intro: 'CAS は、複数の Web アプリケーションのためのシングルサインオン (SSO) プロトコルです。 A CAS user account does not take up a {% if currentVersion ver_gt "enterprise-server@2.16" %}user license{% else %}seat{% endif %} until the user signs in.' +intro: 'CAS は、複数の Web アプリケーションのためのシングルサインオン (SSO) プロトコルです。 CAS ユーザアカウントは、ユーザがサインインするまで、{% if currentVersion ver_gt "enterprise-server@2.16" %}ユーザライセンス{% else %}シート{% endif %}を消費しません。' versions: enterprise-server: '*' --- diff --git a/translations/ja-JP/content/admin/authentication/using-saml.md b/translations/ja-JP/content/admin/authentication/using-saml.md index 928555742b..c810ccd47a 100644 --- a/translations/ja-JP/content/admin/authentication/using-saml.md +++ b/translations/ja-JP/content/admin/authentication/using-saml.md @@ -33,7 +33,7 @@ versions: {% note %} -**注釈**: ユーザの `NameID` が IdP で変更された場合、ユーザが {% data variables.product.prodname_ghe_server %} インスタンスにサインインしようとすると、エラーメッセージが表示されます。 {% if currentVersion ver_gt "enterprise-server@2.21" %}To restore the user's access, you'll need to update the user account's `NameID` mapping. 詳しい情報については、「[ユーザの SAML `NameID` を更新する](#updating-a-users-saml-nameid)」を参照してください。{% else %} 詳しい情報については、「[エラー: '別のユーザーがすでにアカウントを所有しています'](#error-another-user-already-owns-the-account)」を参照してください。{% endif %} +**注釈**: ユーザの `NameID` が IdP で変更された場合、ユーザが {% data variables.product.prodname_ghe_server %} インスタンスにサインインしようとすると、エラーメッセージが表示されます。 {% if currentVersion ver_gt "enterprise-server@2.21" %} ユーザのアクセスを復元するには、ユーザアカウントの `NameID` マッピングを更新する必要があります。 詳しい情報については、「[ユーザの SAML `NameID` を更新する](#updating-a-users-saml-nameid)」を参照してください。{% else %} 詳しい情報については、「[エラー: '別のユーザーがすでにアカウントを所有しています'](#error-another-user-already-owns-the-account)」を参照してください。{% endif %} {% endnote %} @@ -144,7 +144,7 @@ versions: > 別のユーザが既にアカウントを所有しています。 管理者に認証ログを確認するようご依頼ください。 -このメッセージは通常、その人のユーザ名またはメールアドレスが IdP で変更されたということを示します。 {% if currentVersion ver_gt "enterprise-server@2.21" %}Ensure that the `NameID` mapping for the user account on {% data variables.product.prodname_ghe_server %} matches the user's `NameID` on your IdP. 詳しい情報については、「[ユーザの SAML `NameID` の更新](#updating-a-users-saml-nameid)」を参照してください。{% else %} `NameID` マッピングの更新については、{% data variables.contact.contact_ent_support %} にお問い合わせください。{% endif %} +このメッセージは通常、その人のユーザ名またはメールアドレスが IdP で変更されたということを示します。 {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_ghe_server %} のユーザアカウントの `NameID` マッピングが IdP のユーザの `NameID` とマッチすることを確認します。 詳しい情報については、「[ユーザの SAML `NameID` の更新](#updating-a-users-saml-nameid)」を参照してください。{% else %} `NameID` マッピングの更新については、{% data variables.contact.contact_ent_support %} にお問い合わせください。{% endif %} #### SAMLレスポンスが署名されていなかった場合、あるいは署名が内容とマッチしなかった場合、authログに以下のエラーメッセージが残されます。 diff --git a/translations/ja-JP/content/admin/configuration/command-line-utilities.md b/translations/ja-JP/content/admin/configuration/command-line-utilities.md index b8616ed087..98a04169a2 100644 --- a/translations/ja-JP/content/admin/configuration/command-line-utilities.md +++ b/translations/ja-JP/content/admin/configuration/command-line-utilities.md @@ -20,8 +20,8 @@ SSH 管理ユーザとしてサインインした後では、VM 上のどこか このユーティリティは、あらゆる {% data variables.product.prodname_enterprise %} ページの上部にバナーを設定します。 これを使用すればユーザにメッセージを配信することができます。 {% if currentVersion ver_gt "enterprise-server@2.21" %} -You can also set an announcement banner using the enterprise settings on -{% data variables.product.product_name %}. 詳しい情報については「[インスタンス上でのユーザメッセージをカスタマイズする](/enterprise/admin/user-management/customizing-user-messages-on-your-instance#creating-a-global-announcement-banner)」を参照してください。 +また、 +{% data variables.product.product_name %} の Enterprise 設定を使用してアナウンスバナーを設定することもできます。 詳しい情報については「[インスタンス上でのユーザメッセージをカスタマイズする](/enterprise/admin/user-management/customizing-user-messages-on-your-instance#creating-a-global-announcement-banner)」を参照してください。 {% endif %} ```shell diff --git a/translations/ja-JP/content/admin/configuration/configuring-applications.md b/translations/ja-JP/content/admin/configuration/configuring-applications.md index eb02f83939..b00ed254e9 100644 --- a/translations/ja-JP/content/admin/configuration/configuring-applications.md +++ b/translations/ja-JP/content/admin/configuration/configuring-applications.md @@ -15,7 +15,7 @@ versions: {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.management-console %} 3. 左のサイドバーで、**Applications（アプリケーション）** をクリックしてください。 ![[Settings] サイドバーでの [Applications] タブ](/assets/images/enterprise/management-console/sidebar-applications.png) -4. Under "Avatar image cache time (seconds)", type the number of seconds that you would like -{% data variables.product.product_location_enterprise %} to cache avatar images. +4. [Avatar image cache time (seconds)] で、 +{% data variables.product.product_location_enterprise %} がアバター画像をキャッシュする秒数を入力します。 ![アバター画像キャッシュのフォームフィールド](/assets/images/enterprise/management-console/add-image-caching-value-field.png) {% data reusables.enterprise_management_console.save-settings %} diff --git a/translations/ja-JP/content/admin/configuration/configuring-code-scanning-for-your-appliance.md b/translations/ja-JP/content/admin/configuration/configuring-code-scanning-for-your-appliance.md index bd377a043f..7a61d66b33 100644 --- a/translations/ja-JP/content/admin/configuration/configuring-code-scanning-for-your-appliance.md +++ b/translations/ja-JP/content/admin/configuration/configuring-code-scanning-for-your-appliance.md @@ -37,8 +37,8 @@ versions: {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.management-console %} {% data reusables.enterprise_management_console.advanced-security-tab %} -1. Under " -{% data variables.product.prodname_advanced_security %}," click **{% data variables.product.prodname_code_scanning_capc %}**. +1. [ +{% data variables.product.prodname_advanced_security %}] の下にある [**{% data variables.product.prodname_code_scanning_capc %}**] をクリックします。 ![{% data variables.product.prodname_code_scanning %} を有効化または無効化するチェックボックス](/assets/images/enterprise/management-console/enable-code-scanning-checkbox.png) {% data reusables.enterprise_management_console.save-settings %} @@ -49,7 +49,7 @@ versions: {% data variables.product.prodname_actions %} ベータに登録している場合、{% data variables.product.prodname_ghe_server %} は {% data variables.product.prodname_actions %} ワークフローを使用して {% data variables.product.prodname_code_scanning %} を実行できます。 まず、環境内に 1 つ以上のセルフホスト {% data variables.product.prodname_actions %} ランナーをプロビジョニングする必要があります。 セルフホストランナーは、リポジトリ、Organization、または Enterprise アカウントレベルでプロビジョニングできます。 詳しい情報については、「[セルフホストランナーについて](/actions/hosting-your-own-runners/about-self-hosted-runners)」および「[セルフホストランナーを追加する](/actions/hosting-your-own-runners/adding-self-hosted-runners)」を参照してください。 -You must ensure that Git is in the PATH variable on any self-hosted runners you use to run {% data variables.product.prodname_codeql %} actions. +{% data variables.product.prodname_codeql %} アクションを実行するために使用するセルフホストランナーの PATH 変数に Git が含まれていることを確認する必要があります。 #### アクションをプロビジョニングする {% data variables.product.prodname_ghe_server %} で {% data variables.product.prodname_actions %} を使用して {% data variables.product.prodname_code_scanning %} を実行するには、適切なアクションがローカルで使用可能である必要があります。 アクションを 3 つの方法で利用可能にすることができます。 @@ -80,7 +80,7 @@ Organization が {% data variables.product.prodname_actions %} のベータに {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.management-console %} {% data reusables.enterprise_management_console.advanced-security-tab %} -1. Under " -{% data variables.product.prodname_advanced_security %}", unselect **{% data variables.product.prodname_code_scanning_capc %}**. +1. [ +[{% data variables.product.prodname_advanced_security %}] の下にある [**{% data variables.product.prodname_code_scanning_capc %}**] を選択解除します。 ![{% data variables.product.prodname_code_scanning %} を有効化または無効化するチェックボックス](/assets/images/enterprise/management-console/code-scanning-disable.png) {% data reusables.enterprise_management_console.save-settings %} diff --git a/translations/ja-JP/content/admin/configuration/connecting-github-enterprise-server-to-github-enterprise-cloud.md b/translations/ja-JP/content/admin/configuration/connecting-github-enterprise-server-to-github-enterprise-cloud.md index d76fe5bd64..51685dd851 100644 --- a/translations/ja-JP/content/admin/configuration/connecting-github-enterprise-server-to-github-enterprise-cloud.md +++ b/translations/ja-JP/content/admin/configuration/connecting-github-enterprise-server-to-github-enterprise-cloud.md @@ -40,9 +40,9 @@ versions: GraphQL APIを利用したEnterpriseアカウントの管理に関する詳しい情報については、「[Enterprise アカウント](/v4/guides/managing-enterprise-accounts)」を参照してください。 ### {% data variables.product.prodname_github_connect %} の有効化 -1. Sign in to +1. まず、 -{% data variables.product.product_location_enterprise %} and {% data variables.product.prodname_dotcom_the_website %}. +{% data variables.product.product_location_enterprise %} および {% data variables.product.prodname_dotcom_the_website %} にサインインします。 {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% data reusables.enterprise-accounts.settings-tab %} diff --git a/translations/ja-JP/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/translations/ja-JP/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md index 0685f36002..61bbd12783 100644 --- a/translations/ja-JP/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md +++ b/translations/ja-JP/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md @@ -1,11 +1,11 @@ --- title: GitHub Enterprise Serverで脆弱性のある依存関係に対するアラートを有効化する -intro: 'You can connect {% data variables.product.product_location_enterprise %} to {% data variables.product.prodname_ghe_cloud %} and enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies in repositories in your instance.' +intro: '{% data variables.product.product_location_enterprise %} を {% data variables.product.prodname_ghe_cloud %} に接続し、インスタンス内のリポジトリの脆弱な依存関係に対して{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートを有効にすることができます。' redirect_from: - /enterprise/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server - /enterprise/admin/configuration/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server - /enterprise/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server -permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}.' +permissions: '接続された {% data variables.product.prodname_ghe_cloud %} Organization または Enterprise アカウントの所有者でもある {% data variables.product.prodname_ghe_server %} のサイト管理者は、{% data variables.product.prodname_ghe_server %} の脆弱性のある依存関係に対して{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} セキュリティ{% endif %}アラートを有効にできます。' versions: enterprise-server: '*' --- @@ -14,14 +14,17 @@ versions: {% data reusables.repositories.tracks-vulnerabilities %} 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」を参照してください。 -You can connect {% data variables.product.product_location_enterprise %} to {% data variables.product.prodname_dotcom_the_website %}, then sync vulnerability data to your instance and generate {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts in repositories with a vulnerable dependency. +{% data variables.product.product_location_enterprise %} を {% data variables.product.prodname_dotcom_the_website %} に接続し、脆弱性データをインスタンスに同期して、脆弱性のある依存関係を持つリポジトリで {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートを生成できます。 -After connecting {% data variables.product.product_location_enterprise %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. また、脆弱性データはいつでも手動で同期することができます。 {% data variables.product.product_location_enterprise %} からのコードまたはコードに関する情報は、{% data variables.product.prodname_dotcom_the_website %} にアップロードされません。 +{% data variables.product.product_location_enterprise %} を {% data variables.product.prodname_dotcom_the_website %} に接続し、脆弱性のある依存関係に対して {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートを有効化すると、脆弱性データは 1 時間に 1 回 {% data variables.product.prodname_dotcom_the_website %} からインスタンスに同期されます。 また、脆弱性データはいつでも手動で同期することができます。 {% data variables.product.product_location_enterprise %} からのコードまたはコードに関する情報は、{% data variables.product.prodname_dotcom_the_website %} にアップロードされません。 -{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send {% data variables.product.prodname_dependabot_short %} alerts to owners and people with admin access in those repositories. {% data variables.product.prodname_dependabot_short %} アラートを受け取る方法をカスタマイズできます。 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)」を参照してください。 +{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send {% data variables.product.prodname_dependabot_short %} alerts. You can customize how you receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)." {% endif %} -{% if currentVersion ver_lt "enterprise-server@2.21" or currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts to owners and people with admin access in those repositories. セキュリティアラートの受信方法をカスタマイズすることができます。 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)」を参照してください。 +{% if currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts. You can customize how you receive security alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)." +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts. You can customize how you receive security alerts. 詳しい情報については「[通知の配信方法を選択する](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications#choosing-the-delivery-method-for-security-alerts-for-vulnerable-dependencies)」を参照してください。 {% endif %} {% if currentVersion ver_gt "enterprise-server@2.21" %} @@ -30,22 +33,29 @@ After connecting {% data variables.product.product_location_enterprise %} to {% ### {% data variables.product.prodname_ghe_server %}で脆弱性のある依存関係に対するアラートを有効化する {% endif %} -Before enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location_enterprise %}, you must connect {% data variables.product.product_location_enterprise %} to {% data variables.product.prodname_dotcom_the_website %}. 詳細は、「[{% data variables.product.prodname_ghe_server %}を{% data variables.product.prodname_ghe_cloud %}に接続する](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)」を参照してください。 +{% data variables.product.product_location_enterprise %} 上の脆弱性のある依存関係に対する {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} セキュリティ{% endif %}アラートを有効にする前に、{% data variables.product.product_location_enterprise %} を {% data variables.product.prodname_dotcom_the_website %} に接続する必要があります。 詳細は、「[{% data variables.product.prodname_ghe_server %}を{% data variables.product.prodname_ghe_cloud %}に接続する](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)」を参照してください。 {% if currentVersion ver_gt "enterprise-server@2.20" %} -{% if currentVersion ver_gt "enterprise-server@2.21" %}We recommend configuring {% data variables.product.prodname_dependabot_short %} alerts without notifications for the first few days to avoid an overload of emails. 数日後、通知を有効化すれば、通常どおり {% data variables.product.prodname_dependabot_short %} アラートを受信できます。{% endif %} +{% if currentVersion ver_gt "enterprise-server@2.21" %}メールの過負荷を避けるため、最初の数日間は {% data variables.product.prodname_dependabot_short %} アラートを通知なしに設定することをお勧めします。 数日後、通知を有効化すれば、通常どおり {% data variables.product.prodname_dependabot_short %} アラートを受信できます。{% endif %} -{% if currentVersion == "enterprise-server@2.21" %}We recommend configuring security alerts without notifications for the first few days to avoid an overload of emails. 数日後、通知を有効化すれば、通常どおりセキュリティアラートを受信できます。{% endif %} +{% if currentVersion == "enterprise-server@2.21" %}メールの過負荷を避けるため、最初の数日間はセキュリティアラートを通知なしに設定することをお勧めします。 数日後、通知を有効化すれば、通常どおりセキュリティアラートを受信できます。{% endif %} {% endif %} {% data reusables.enterprise_site_admin_settings.sign-in %} -1. In the administrative shell, enable the {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location_enterprise %}: +1. 管理シェルで、{% data variables.product.product_location_enterprise %} の脆弱性のある依存関係に対する {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートを有効にします。 ``` shell $ ghe-dep-graph-enable ``` -3. Return to + {% note %} + + **Note**: For more information about enabling access to the administrative shell via SSH, see "[Accessing the administrative shell (SSH)](/enterprise/{{ currentVersion }}/admin/configuration/accessing-the-administrative-shell-ssh)." + + {% endnote %} + +3. 次に、 + {% data variables.product.prodname_ghe_server %}. {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} diff --git a/translations/ja-JP/content/admin/configuration/enabling-subdomain-isolation.md b/translations/ja-JP/content/admin/configuration/enabling-subdomain-isolation.md index 004ec95068..54300ed792 100644 --- a/translations/ja-JP/content/admin/configuration/enabling-subdomain-isolation.md +++ b/translations/ja-JP/content/admin/configuration/enabling-subdomain-isolation.md @@ -16,8 +16,8 @@ Subdomain Isolationは、クロスサイトスクリプティングや関連す Subdomain Isolation が有効な場合、{% data variables.product.prodname_ghe_server %} はいくつかのパスをサブドメインで置き換えます。 {% if currentVersion ver_gt "enterprise-server@2.21" %} -To use Docker with -{% data variables.product.prodname_registry %}, you must also enable subdomain isolation. 詳しい情報については、「[{% data variables.product.prodname_registry %} で使用するために Docker を設定する](/enterprise/{{ currentVersion }}/user/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages)」を参照してください。 +Docker を +{% data variables.product.prodname_registry %} で使用するには、Subdomain Isolation も有効にする必要があります。 詳しい情報については、「[{% data variables.product.prodname_registry %} で使用するために Docker を設定する](/enterprise/{{ currentVersion }}/user/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages)」を参照してください。 {% data reusables.package_registry.packages-ghes-release-stage %} | diff --git a/translations/ja-JP/content/admin/configuration/index.md b/translations/ja-JP/content/admin/configuration/index.md index c179646b07..a88efd2cd5 100644 --- a/translations/ja-JP/content/admin/configuration/index.md +++ b/translations/ja-JP/content/admin/configuration/index.md @@ -53,7 +53,7 @@ versions: {% if currentVersion ver_gt "enterprise-server@2.21" %} {% note %} -**Note:** To configure {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} for your enterprise, see "[Managing GitHub Actions for your enterprise](/admin/github-actions)" or "[Managing GitHub Packages for your enterprise](/admin/packages)." +**注釈:** Enterprise 向けに {% data variables.product.prodname_actions %} または {% data variables.product.prodname_registry %} を設定するには、「[GitHub Actions を Enterprise 向けに管理する](/admin/github-actions)」または「[GitHub Packages を Enterprise 向けに管理する](/admin/packages)」を参照してください。 {% endnote %} {% endif %} diff --git a/translations/ja-JP/content/admin/enterprise-management/about-cluster-nodes.md b/translations/ja-JP/content/admin/enterprise-management/about-cluster-nodes.md index c4f02a14ae..4e38776fd9 100644 --- a/translations/ja-JP/content/admin/enterprise-management/about-cluster-nodes.md +++ b/translations/ja-JP/content/admin/enterprise-management/about-cluster-nodes.md @@ -63,7 +63,7 @@ versions: #### クラスタの図の例 {% note %} -**注意：これは例に過ぎません。**組織にとって最適なクラスタの設計は、組織に特有の要求に依存します。 Talk to your dedicated representative or {% data variables.contact.contact_enterprise_sales %} so we can help you determine the best cluster configuration. +**注意：これは例に過ぎません。**組織にとって最適なクラスタの設計は、組織に特有の要求に依存します。 専任の担当者または {% data variables.contact.contact_enterprise_sales %} にご相談ください。最適なクラスタ設定を決めるためのお手伝いをいたします。 {% endnote %} diff --git a/translations/ja-JP/content/admin/enterprise-management/about-clustering.md b/translations/ja-JP/content/admin/enterprise-management/about-clustering.md index 583bab024d..2c67a5e322 100644 --- a/translations/ja-JP/content/admin/enterprise-management/about-clustering.md +++ b/translations/ja-JP/content/admin/enterprise-management/about-clustering.md @@ -14,7 +14,7 @@ versions: {% data variables.product.prodname_ghe_server %}は、一連のサービスから構成されています。 クラスタでは、これらのサービスは複数のノードにまたがって動作し、リクエストはそれらのノード間でロードバランスされます。 変更は、冗長なコピーと共に個別のノードに自動的に保存されます。 ほとんどのサービスは、同じサービスの他のインスタンスと同等のピア群です。 ただし`mysql-server`と`redis-server`サービスは例外です。 これらは1つの_プライマリ_ノードと、1つ以上の_レプリカ_ノード上で動作します。 -Learn more about [services required for clustering](/enterprise/{{ currentVersion }}/admin/enterprise-management/about-cluster-nodes#services-required-for-clustering). +[クラスタリングに必要なサービスの詳細](/enterprise/{{ currentVersion }}/admin/enterprise-management/about-cluster-nodes#services-required-for-clustering)をご覧ください。 ### クラスタリングは組織に適切か？ @@ -26,4 +26,4 @@ Learn more about [services required for clustering](/enterprise/{{ currentVersio ### クラスタリングを利用するには？ -クラスタリングは特定のスケーリングの状況のために設計されており、すべての組織を対象としたものではありません。 If clustering is something you'd like to consider, please contact your dedicated representative or {% data variables.contact.contact_enterprise_sales %}. +クラスタリングは特定のスケーリングの状況のために設計されており、すべての組織を対象としたものではありません。 クラスタリングをご検討される場合は、専任の担当者または {% data variables.contact.contact_enterprise_sales %} にお問い合わせください。 diff --git a/translations/ja-JP/content/admin/enterprise-management/about-geo-replication.md b/translations/ja-JP/content/admin/enterprise-management/about-geo-replication.md index a8cba2fc74..b78cc042b7 100644 --- a/translations/ja-JP/content/admin/enterprise-management/about-geo-replication.md +++ b/translations/ja-JP/content/admin/enterprise-management/about-geo-replication.md @@ -18,7 +18,7 @@ Geo-replicationがスムーズに動作するためには、[Amazon's Route 53 ### 制限事項 -レプリカへの書き込みリクエストには、データをプライマリとすべてのレプリカへ送信することが必要です。 This means that the performance of all writes are limited by the slowest replica, although new geo-replicas can seed the majority of their data from existing co-located geo-replicas, rather than from the primary. Geo-replication は、{% data variables.product.prodname_ghe_server %} インスタンスに容量を追加したり、不十分な CPU やメモリリソースに関連するパフォーマンスの問題を解決したりしません。 プライマリのアプライアンスがオフラインである場合、アクティブなレプリカはいかなる読み込みや書き込みのリクエストも処理できません。 +レプリカへの書き込みリクエストには、データをプライマリとすべてのレプリカへ送信することが必要です。 これは、すべての書き込みのパフォーマンスが最も遅いレプリカによって制限されることを意味しますが、新しいジオレプリカは、プライマリからではなく、既存の同じ場所に配置された Geo レプリカからデータの大部分をシードできます。 Geo-replication は、{% data variables.product.prodname_ghe_server %} インスタンスに容量を追加したり、不十分な CPU やメモリリソースに関連するパフォーマンスの問題を解決したりしません。 プライマリのアプライアンスがオフラインである場合、アクティブなレプリカはいかなる読み込みや書き込みのリクエストも処理できません。 ### Geo-replication設定のモニタリング diff --git a/translations/ja-JP/content/admin/enterprise-management/about-high-availability-configuration.md b/translations/ja-JP/content/admin/enterprise-management/about-high-availability-configuration.md index d9c28e97fc..0f4f99de73 100644 --- a/translations/ja-JP/content/admin/enterprise-management/about-high-availability-configuration.md +++ b/translations/ja-JP/content/admin/enterprise-management/about-high-availability-configuration.md @@ -52,7 +52,7 @@ Geo-replication を使用している場合は、トラフィックを最も近 `ghe-repl-setup` コマンドは、{% data variables.product.prodname_ghe_server %} アプライアンスをレプリカスタンバイモードにします。 - - An encrypted WireGuard VPN tunnel is configured for communication between the two appliances. + - 2 つのアプライアンス間の通信のために、暗号化された WireGuard VPN トンネルが設定されます。 - レプリケーションのためのデータベースサービスが設定され、起動されます。 - アプリケーションサービスは無効化されます。 HTTP、Git、あるいはその他のサポートされているプロトコルでレプリカアプライアンスへアクセスしようとすると、"appliance in replica mode"メンテナンスページあるいはエラーメッセージが返されます。 diff --git a/translations/ja-JP/content/admin/enterprise-management/cluster-network-configuration.md b/translations/ja-JP/content/admin/enterprise-management/cluster-network-configuration.md index bf7c71f90e..69e1d81b52 100644 --- a/translations/ja-JP/content/admin/enterprise-management/cluster-network-configuration.md +++ b/translations/ja-JP/content/admin/enterprise-management/cluster-network-configuration.md @@ -12,7 +12,7 @@ versions: クラスタリングのための最もシンプルなネットワーク設計は、ノード群を単一のLANに置くことです。 If a cluster must span subnets, we do not recommend configuring any firewall rules between the networks. The latency between nodes should be less than 1 millisecond. -{% if currentVersion ver_gt "enterprise-server@2.21" %}For high availability, the latency between the network with the active nodes and the network with the passive nodes must be less than 70 milliseconds. We don't recommend configuring a firewall between the two networks.{% endif %} +{% if currentVersion ver_gt "enterprise-server@2.21" %} 高可用性を実現するには、アクティブノードを備えたネットワークとパッシブノードを備えたネットワーク間の遅延が 70 ミリ秒未満である必要があります。 We don't recommend configuring a firewall between the two networks.{% endif %} #### エンドユーザーのためのアプリケーションポート diff --git a/translations/ja-JP/content/admin/enterprise-management/configuring-collectd.md b/translations/ja-JP/content/admin/enterprise-management/configuring-collectd.md index 796402b09e..8107efa345 100644 --- a/translations/ja-JP/content/admin/enterprise-management/configuring-collectd.md +++ b/translations/ja-JP/content/admin/enterprise-management/configuring-collectd.md @@ -53,6 +53,6 @@ ssh -p 122 admin@[hostname] -- 'ghe-export-graphs' && scp -P 122 admin@[hostname #### 中心の collectd サーバはデータを受信していない -{% data variables.product.prodname_enterprise %} ships with `collectd` version 5.x. `collectd` 5.x is not backwards compatible with the 4.x release series. {% data variables.product.product_location_enterprise %}から送られるデータを受信するには、中心の`collectd`サーバは 5.x 以上のバージョンでなければなりません。 +{% data variables.product.prodname_enterprise %} は `collectd` バージョン 5.x に付属しています。 `collectd` 5.x is not backwards compatible with the 4.x release series. {% data variables.product.product_location_enterprise %}から送られるデータを受信するには、中心の`collectd`サーバは 5.x 以上のバージョンでなければなりません。 他に質問や問題がある場合、{% data variables.contact.contact_ent_support %}までお問い合わせください。 diff --git a/translations/ja-JP/content/admin/enterprise-management/configuring-high-availability-replication-for-a-cluster.md b/translations/ja-JP/content/admin/enterprise-management/configuring-high-availability-replication-for-a-cluster.md index 56c0a6a2a3..9ba73f331e 100644 --- a/translations/ja-JP/content/admin/enterprise-management/configuring-high-availability-replication-for-a-cluster.md +++ b/translations/ja-JP/content/admin/enterprise-management/configuring-high-availability-replication-for-a-cluster.md @@ -1,6 +1,6 @@ --- title: Configuring high availability replication for a cluster -intro: 'You can configure a passive replica of your entire {% data variables.product.prodname_ghe_server %} cluster in a different location, allowing your cluster to fail over to redundant nodes.' +intro: '{% data variables.product.prodname_ghe_server %} クラスタ全体のパッシブレプリカを別の場所に設定することで、クラスタを冗長ノードにフェイルオーバーできるようにすることができます。' miniTocMaxHeadingLevel: 4 redirect_from: - /enterprise/admin/enterprise-management/configuring-high-availability-replication-for-a-cluster @@ -10,11 +10,11 @@ versions: ### About high availability replication for clusters -You can configure a cluster deployment of {% data variables.product.prodname_ghe_server %} for high availability, where an identical set of passive nodes sync with the nodes in your active cluster. If hardware or software failures affect the datacenter with your active cluster, you can manually fail over to the replica nodes and continue processing user requests without data loss. +High Availability を実現するために、{% data variables.product.prodname_ghe_server %} のクラスタデプロイメントを設定できます。この場合、パッシブノードの同一のセットがアクティブクラスタ内のノードと同期されます。 If hardware or software failures affect the datacenter with your active cluster, you can manually fail over to the replica nodes and continue processing user requests without data loss. In high availability mode, each active node syncs regularly with a corresponding passive node. The passive node runs in standby and does not serve applications or process user requests. -We recommend configuring high availability as a part of a comprehensive disaster recovery plan for {% data variables.product.prodname_ghe_server %}. We also recommend performing regular backups. 詳しくは、"[ アプライアンスでのバックアップの設定](/enterprise/admin/configuration/configuring-backups-on-your-appliance)。"を参照してください。 +{% data variables.product.prodname_ghe_server %} の包括的なシステム災害復旧計画の一部として High Availability を設定することをお勧めします。 We also recommend performing regular backups. 詳しくは、"[ アプライアンスでのバックアップの設定](/enterprise/admin/configuration/configuring-backups-on-your-appliance)。"を参照してください。 ### 必要な環境 @@ -22,11 +22,11 @@ We recommend configuring high availability as a part of a comprehensive disaster For each existing node in your active cluster, you'll need to provision a second virtual machine with identical hardware resources. For example, if your cluster has 11 nodes and each node has 12 vCPUs, 96 GB of RAM, and 750 GB of attached storage, you must provision 11 new virtual machines that each have 12 vCPUs, 64 GB of RAM, and 750 GB of attached storage. -On each new virtual machine, install the same version of {% data variables.product.prodname_ghe_server %} that runs on the nodes in your active cluster. You don't need to upload a license or perform any additional configuration. 詳細は「[{% data variables.product.prodname_ghe_server %}インスタンスをセットアップする](/enterprise/admin/installation/setting-up-a-github-enterprise-server-instance)」を参照してください。 +新しい仮想マシンごとに、アクティブクラスタ内のノードで実行されているものと同じバージョンの {% data variables.product.prodname_ghe_server %} をインストールします。 You don't need to upload a license or perform any additional configuration. 詳細は「[{% data variables.product.prodname_ghe_server %}インスタンスをセットアップする](/enterprise/admin/installation/setting-up-a-github-enterprise-server-instance)」を参照してください。 {% note %} -**Note**: The nodes that you intend to use for high availability replication should be standalone {% data variables.product.prodname_ghe_server %} instances. Don't initialize the passive nodes as a second cluster. +**Note**: High Availability レプリケーションに使用する予定のノードは、スタンドアロンの {% data variables.product.prodname_ghe_server %} インスタンスである必要があります。 Don't initialize the passive nodes as a second cluster. {% endnote %} @@ -61,7 +61,7 @@ Before you define a secondary datacenter for your passive nodes, ensure that you - Optionally, change the name of the primary datacenter to something more descriptive or accurate by editing the value of `primary-datacenter`. -4. {% data reusables.enterprise_clustering.configuration-file-heading %} Under each node's heading, add a new key-value pair to assign the node to a datacenter. Use the same value as `primary-datacenter` from step 3 above. For example, if you want to use the default name (`default`), add the following key-value pair to the section for each node. +4. {% data reusables.enterprise_clustering.configuration-file-heading %} 各ノードの見出しの下に、新しいキー/値ペアのペアを追加して、ノードをデータセンターに割り当てます。 Use the same value as `primary-datacenter` from step 3 above. For example, if you want to use the default name (`default`), add the following key-value pair to the section for each node. datacenter = default @@ -88,7 +88,7 @@ Before you define a secondary datacenter for your passive nodes, ensure that you {% data reusables.enterprise_clustering.configuration-finished %} -After {% data variables.product.prodname_ghe_server %} returns you to the prompt, you've finished assigning your nodes to the cluster's primary datacenter. +{% data variables.product.prodname_ghe_server %} がプロンプトに戻ったら、ノードをクラスタのプライマリデータセンターに割り当てます。 #### Adding passive nodes to the cluster configuration file @@ -101,7 +101,7 @@ To configure high availability, you must define a corresponding passive node for For an example configuration, see "[Example configuration](#example-configuration)." -1. For each node in your cluster, provision a matching virtual machine with identical specifications, running the same version of {% data variables.product.prodname_ghe_server %}. Note the IPv4 address and hostname for each new cluster node. For more information, see "[Prerequisites](#prerequisites)." +1. クラスタ内のノードごとに、同じバージョンの {% data variables.product.prodname_ghe_server %} を実行して、同じ仕様で一致する仮想マシンをプロビジョニングします。 Note the IPv4 address and hostname for each new cluster node. For more information, see "[Prerequisites](#prerequisites)." {% note %} @@ -204,7 +204,7 @@ For an example configuration, see "[Example configuration](#example-configuratio ghe-cluster-config-init ``` -14. After the initialization finishes, {% data variables.product.prodname_ghe_server %} displays the following message. +14. 初期化が完了すると、{% data variables.product.prodname_ghe_server %} は次のメッセージを表示します。 ```shell Finished cluster initialization @@ -260,7 +260,7 @@ The configuration for an active node in your cluster's storage tier should look The configuration for the corresponding passive node in the storage tier should look like the following example. - Important differences from the corresponding active node are **bold**. -- {% data variables.product.prodname_ghe_server %} assigns values for `vpn`, `uuid`, and `wireguard-pubkey` automatically, so you shouldn't define the values for passive nodes that you will initialize. +- {% data variables.product.prodname_ghe_server %} は、`vpn`、`uuid`、`wireguard-pubkey` の値を自動的に割り当てるため、初期化するパッシブノードの値を定義しないでください。 - The server roles, defined by `*-server` keys, match the corresponding active node. ```shell @@ -288,9 +288,9 @@ The configuration for the corresponding passive node in the storage tier should ### Monitoring replication between active and passive cluster nodes -Initial replication between the active and passive nodes in your cluster takes time. The amount of time depends on the amount of data to replicate and the activity levels for {% data variables.product.prodname_ghe_server %}. +Initial replication between the active and passive nodes in your cluster takes time. 時間は、複製するデータの量と {% data variables.product.prodname_ghe_server %} のアクティビティレベルによって異なります。 -You can monitor the progress on any node in the cluster, using command-line tools available via the {% data variables.product.prodname_ghe_server %} administrative shell. For more information about the administrative shell, see "[Accessing the administrative shell (SSH)](/enterprise/admin/configuration/accessing-the-administrative-shell-ssh)." +{% data variables.product.prodname_ghe_server %} 管理シェルから利用できるコマンドラインツールを使用して、クラスタ内の任意のノードの進行状況を監視できます。 For more information about the administrative shell, see "[Accessing the administrative shell (SSH)](/enterprise/admin/configuration/accessing-the-administrative-shell-ssh)." - Monitor replication of databases: @@ -327,7 +327,7 @@ The process for reconfiguring high availability is identical to the initial conf ### Disabling high availability replication for a cluster -You can stop replication to the passive nodes for your cluster deployment of {% data variables.product.prodname_ghe_server %}. +{% data variables.product.prodname_ghe_server %} のクラスタデプロイメントのパッシブノードへのレプリケーションを停止できます。 {% data reusables.enterprise_clustering.ssh-to-a-node %} @@ -341,4 +341,4 @@ You can stop replication to the passive nodes for your cluster deployment of {% {% data reusables.enterprise_clustering.configuration-finished %} -After {% data variables.product.prodname_ghe_server %} returns you to the prompt, you've finished disabling high availability replication. +{% data variables.product.prodname_ghe_server %} がプロンプトに戻ったら、High Availability レプリケーションの無効化が完了したことになります。 diff --git a/translations/ja-JP/content/admin/enterprise-management/creating-a-high-availability-replica.md b/translations/ja-JP/content/admin/enterprise-management/creating-a-high-availability-replica.md index 0c50324891..acf19ae646 100644 --- a/translations/ja-JP/content/admin/enterprise-management/creating-a-high-availability-replica.md +++ b/translations/ja-JP/content/admin/enterprise-management/creating-a-high-availability-replica.md @@ -49,7 +49,7 @@ versions: (replica2)$ ghe-repl-setup --add PRIMARY IP (replica2)$ ghe-repl-start ``` -3. By default, replicas are configured to the same datacenter, and will now attempt to seed from an existing node in the same datacenter. レプリカを別のデータセンターに設定するには、datacenter オプションに異なる値を設定します。 具体的な値は、それらが互いに異なる限り、どのようなものでもかまいません。 各ノードで `ghe-repl-node` コマンドを実行し、データセンターを指定します。 +3. デフォルトでは、レプリカは同じデータセンターに設定され、同じノードにある既存のノードからシードを試行します。 レプリカを別のデータセンターに設定するには、datacenter オプションに異なる値を設定します。 具体的な値は、それらが互いに異なる限り、どのようなものでもかまいません。 各ノードで `ghe-repl-node` コマンドを実行し、データセンターを指定します。 プライマリでは以下のコマンドを実行します。 ```shell diff --git a/translations/ja-JP/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md b/translations/ja-JP/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md index 7ab5af5b8d..c78787cf46 100644 --- a/translations/ja-JP/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md +++ b/translations/ja-JP/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md @@ -30,6 +30,15 @@ versions: 5. レプリカの IP アドレスを指すように DNS レコードを更新します。 TTL 期間が経過すると、トラフィックはレプリカに転送されます。 ロードバランサを使用している場合は、トラフィックがレプリカに送信されるように設定されていることを確認します。 6. 通常の操作が再開できることをユーザーに通知します。 7. 必要に応じて、新しいプライマリから既存のアプライアンスや以前のプライマリへのレプリケーションをセットアップします。 詳細は「[High Availability の設定について](/enterprise/{{ currentVersion }}/admin/guides/installation/about-high-availability-configuration/#utilities-for-replication-management)」を参照してください。 +8. Appliances you do not intend to setup replication to that were part of the high availability configuration prior the failover, need to be removed from the high availability configuration by UUID. + - On the former appliances, get their UUID via `cat /data/user/common/uuid`. + ```shell + $ cat /data/user/common/uuid + ``` + - On the new primary, remove the UUIDs using `ghe-repl-teardown`. Please replace *`UUID`* with a UUID you retrieved in the previous step. + ```shell + $ ghe-repl-teardown -u UUNID + ``` ### 参考リンク diff --git a/translations/ja-JP/content/admin/enterprise-management/initiating-a-failover-to-your-replica-cluster.md b/translations/ja-JP/content/admin/enterprise-management/initiating-a-failover-to-your-replica-cluster.md index 4a335aa7d1..2b2776c248 100644 --- a/translations/ja-JP/content/admin/enterprise-management/initiating-a-failover-to-your-replica-cluster.md +++ b/translations/ja-JP/content/admin/enterprise-management/initiating-a-failover-to-your-replica-cluster.md @@ -1,6 +1,6 @@ --- title: Initiating a failover to your replica cluster -intro: 'If your {% data variables.product.prodname_ghe_server %} cluster fails, you can fail over to the passive replica .' +intro: '{% data variables.product.prodname_ghe_server %} クラスタに障害が発生した場合は、パッシブレプリカにフェイルオーバーできます。' redirect_from: - /enterprise/admin/enterprise-management/initiating-a-failover-to-your-replica-cluster versions: @@ -33,4 +33,4 @@ To fail over to passive replica nodes, you must have configured high availabilit 3. Update the DNS record to point to the IP address of the load balancer for your passive cluster. TTL 期間が経過すると、トラフィックはレプリカに転送されます。 -After {% data variables.product.prodname_ghe_server %} returns you to the prompt and your DNS updates have propagated, you've finished failing over. Users can access {% data variables.product.prodname_ghe_server %} using the usual hostname for your cluster. +{% data variables.product.prodname_ghe_server %} がプロンプトに戻り、DNS 更新が伝播されたら、フェイルオーバーが完了となります。 ユーザは、クラスタの通常のホスト名を使用して {% data variables.product.prodname_ghe_server %} にアクセスできます。 diff --git a/translations/ja-JP/content/admin/enterprise-management/migrating-elasticsearch-indices-to-github-enterprise-server-214-or-later.md b/translations/ja-JP/content/admin/enterprise-management/migrating-elasticsearch-indices-to-github-enterprise-server-214-or-later.md index b5078c6f58..3cb0cfed07 100644 --- a/translations/ja-JP/content/admin/enterprise-management/migrating-elasticsearch-indices-to-github-enterprise-server-214-or-later.md +++ b/translations/ja-JP/content/admin/enterprise-management/migrating-elasticsearch-indices-to-github-enterprise-server-214-or-later.md @@ -13,7 +13,7 @@ versions: -{% data variables.product.prodname_ghe_server %} 2.14 includes an upgrade to Elasticsearch 5.6. Before upgrading to {% data variables.product.prodname_ghe_server %} 2.14 or later from 2.12 or 2.13, we recommend you download, install, and run the Elasticsearch migration tools, so your largest indices are migrated online while your appliance still has online access. +{% data variables.product.prodname_ghe_server %} 2.14 には、Elasticsearch 5.6 へのアップグレードが含まれています。 2.12 または 2.13 から {% data variables.product.prodname_ghe_server %} 2.14 以降にアップグレードする前に、Elasticsearch 移行ツールをダウンロード、インストール、実行することをお勧めします。これにより、アプライアンスはオンラインアクセスを維持しながら、最大のインデックスがオンラインで移行されます。 ### 検索インデックス diff --git a/translations/ja-JP/content/admin/enterprise-management/upgrade-requirements.md b/translations/ja-JP/content/admin/enterprise-management/upgrade-requirements.md index 8ac08214c5..682b5082de 100644 --- a/translations/ja-JP/content/admin/enterprise-management/upgrade-requirements.md +++ b/translations/ja-JP/content/admin/enterprise-management/upgrade-requirements.md @@ -21,7 +21,7 @@ versions: ### 推奨される対応 -- アップグレードのプロセスに含めるアップグレードは、できるだけ少なくしてください。 たとえば {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} から {{ enterpriseVersions.supported[1] }} を経て {{ enterpriseVersions.latest }} にアップグレードする代わりに、{% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} から {{ enterpriseVersions.latest }} にアップグレードできます。 +- アップグレードのプロセスに含めるアップグレードは、できるだけ少なくしてください。 たとえば {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} から {{ enterpriseServerReleases.supported[1] }} を経て {{ enterpriseServerReleases.latest }} にアップグレードする代わりに、{% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} から {{ enterpriseServerReleases.latest }} にアップグレードできます。 - バージョンが数バージョン古いのであれば、{% data variables.product.product_location_enterprise %}をアップグレードのプロセスの各ステップでできる限り先までアップグレードしてください。 各アップグレードで可能な限りの最新バージョンを使うことで、パフォーマンスの改善やバグフィックスのメリットが得られます。 たとえば{% data variables.product.prodname_enterprise %}2.7から2.8を経て2.10へアップグレードすることができますが、{% data variables.product.prodname_enterprise %}2.7から2.9を経て2.10へのアップグレードすれば、2番目のステップでより新しいバージョンを利用できます。 - アップグレードの際には、最新のパッチリリースを使ってください。 {% data reusables.enterprise_installation.enterprise-download-upgrade-pkg %} - アップグレードのステップのテストには、ステージングインスタンスを使ってください。 詳しい情報については "[ステージングインスタンスのセットアップ](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-staging-instance/)"を参照してください。 @@ -29,7 +29,7 @@ versions: ### 要件 -- アップグレードは、**最大でも**2リリース前のフィーチャリリースから行わなければなりません。 たとえば {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.latest }} にアップグレードするためには、{% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[1] }} あるいは {{ enterpriseVersions.supported[2] }} でなければなりません。 +- アップグレードは、**最大でも**2リリース前のフィーチャリリースから行わなければなりません。 たとえば {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.latest }} にアップグレードするためには、{% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[1] }} あるいは {{ enterpriseServerReleases.supported[2] }} でなければなりません。 - {% data reusables.enterprise_installation.hotpatching-explanation %} - ホットパッチは、影響するサービス（カーネル、MySQL、Elasticsearchなど）がVMの再起動やサービスの再起動を必要とするなら、ダウンタイムが必要になります。 リブートや再起動が必要になったときには通知されます。 リブートや再起動は後で完了させることができます。 - ホットパッチでアップグレードをする場合、アップグレードの完了までに特定のサービスの複数バージョンがインストールされることから、追加のルートストレージが利用できなければなりません。 十分なルートディスクストレージがなければ、事前チェックで通知されます。 diff --git a/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md index 659dbb5bbf..e331f637ec 100644 --- a/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,7 +59,7 @@ versions: {% data variables.contact.enterprise_support %} は、以下の米国の祝日を休日としています。 ただし、緊急サポートチケットにはグローバルサポートチームが対応しています。 -| アメリカ合衆国の祝日 祝日 | Date observed | +| アメリカ合衆国の祝日 祝日 | 対象日付 | | --------------------------- | --------------------------- | | New Year's Day | January 1 | | Martin Luther King, Jr. Day | Third Monday in January | diff --git a/translations/ja-JP/content/admin/enterprise-support/providing-data-to-github-support.md b/translations/ja-JP/content/admin/enterprise-support/providing-data-to-github-support.md index 459d688b9a..aee3a71600 100644 --- a/translations/ja-JP/content/admin/enterprise-support/providing-data-to-github-support.md +++ b/translations/ja-JP/content/admin/enterprise-support/providing-data-to-github-support.md @@ -99,12 +99,12 @@ Web べースの {% data variables.enterprise.management_console %} と外部の #### Enterprise アカウントを使用して Support Bundle をアップロードする -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} -4. [{% data variables.product.prodname_enterprise %} Help] の下で、[**Upload a support bundle**] をクリックします。 ![Support Bundle リンクをアップロードする](/assets/images/enterprise/support/upload-support-bundle.png) +3. 左のサイドバーで、** Enterprise licensing（Enterpriseライセンス）**をクリックしてください。 ![[Enterprise account settings] サイトバーの "Enterprise licensing"](/assets/images/help/enterprises/enterprise-licensing-tab.png) +4. [{% data variables.product.prodname_enterprise %} Help] の下にある [**Upload a support bundle**] をクリックします。 ![Support Bundle リンクをアップロードする](/assets/images/enterprise/support/upload-support-bundle.png) 5. [Select an enterprise account] で、ドロップダウンメニューから Support Bundle に関連付けられているアカウントを選択します。 ![Support Bundle の Enterprise アカウントを選択する](/assets/images/enterprise/support/support-bundle-account.png) -6. [Upload a support bundle for {% data variables.contact.enterprise_support %}] で、Support Bundle を選択するには、[**Choose file**] をクリックするか、Support Bundle ファイルを [**Choose file**] にドラッグします。 ![Support Bundle ファイルをアップロードする](/assets/images/enterprise/support/choose-support-bundle-file.png) +6. [Upload a support bundle for {% data variables.contact.enterprise_support %}] で Support Bundle を選択するには、[**Choose file**] をクリックするか、Support Bundle ファイルを [**Choose file**] にドラッグします。 ![Support Bundle ファイルをアップロードする](/assets/images/enterprise/support/choose-support-bundle-file.png) 7. [**Upload**] をクリックします。 #### SSHを使ったSupport Bundleの直接アップロード @@ -120,13 +120,13 @@ Web べースの {% data variables.enterprise.management_console %} と外部の ### 拡張Support Bundleの作成と提供 -Support Bundleには過去2日分のログが含まれますが、_拡張_Support Bundleには過去7日分のログが含まれます。 {% data variables.contact.github_support %} が調査しているイベントが 2 日以上前に起きたのであれば、拡張Support Bundleの共有をお願いすることがあります。 拡張Support BundleのダウンロードにはSSHアクセスが必要です。拡張Support Bundleを{% data variables.enterprise.management_console %}からダウンロードすることはできません。 +Support Bundleには過去2日分のログが含まれますが、_拡張_Support Bundleには過去7日分のログが含まれます。 {% data variables.contact.github_support %} が調査しているイベントが 2 日以上前に発生した場合は、拡張 Support Bundle の共有をお願いする場合があります。 拡張 Support Bundle をダウンロードするには、SSH アクセスが必要です。{% data variables.enterprise.management_console %} から拡張 Support Bundle をダウンロードすることはできません。 バンドルが大きくなりすぎるのを避けるために、バンドルにはローテーションや圧縮されていないログだけが含まれます。 {% data variables.product.prodname_ghe_server %} でのログのローテーションは、それぞれのログがどの程度の大きさになるかの予想に応じて、ログごとに様々な頻度 (日次あるいは週次) で行われます。 #### SSHを使った拡張Support Bundleの作成 -{% data variables.product.prodname_ghe_server %} アプライアンスにSSHでアクセスでき、外部のインターネットへアクセスできるのであれば、以下の手順で拡張Support Bundleを作成し、共有できます。 +{% data variables.product.prodname_ghe_server %} アプライアンスに SSH でアクセスでき、外部のインターネットへアクセスできるのであれば、以下の手順で拡張 Support Bundle を作成し、共有できます。 1. `ghe-support-bundle`コマンドに`-x`フラグを追加して、SSH経由で拡張Support Bundleをダウンロードしてください。 ```shell diff --git a/translations/ja-JP/content/admin/enterprise-support/submitting-a-ticket.md b/translations/ja-JP/content/admin/enterprise-support/submitting-a-ticket.md index 6e4ceff791..e78caaa2ec 100644 --- a/translations/ja-JP/content/admin/enterprise-support/submitting-a-ticket.md +++ b/translations/ja-JP/content/admin/enterprise-support/submitting-a-ticket.md @@ -22,9 +22,9 @@ versions: ### Enterprise アカウントを使用してチケットをサブミットする -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. 左のサイドバーで、** Enterprise licensing（Enterpriseライセンス）**をクリックしてください。 ![[Enterprise account settings] サイトバーの "Enterprise licensing"](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. [{% data variables.product.prodname_enterprise %} Help] の下で、[**{% data variables.contact.enterprise_support %} Portal**] をクリックします。 ![Enterprise Support サイトに移動するリンク](/assets/images/enterprise/support/enterprise-support-link.png) 5. [**Submit a Ticket**] をクリックします。 ![Enterprise Support チームにチケットをサブミットする](/assets/images/enterprise/support/submit-ticket-button.png) {% data reusables.enterprise_enterprise_support.submit-support-ticket-first-section %} diff --git a/translations/ja-JP/content/admin/github-actions/about-using-githubcom-actions-on-github-enterprise-server.md b/translations/ja-JP/content/admin/github-actions/about-using-githubcom-actions-on-github-enterprise-server.md index 74f1bdabd5..fdc405255e 100644 --- a/translations/ja-JP/content/admin/github-actions/about-using-githubcom-actions-on-github-enterprise-server.md +++ b/translations/ja-JP/content/admin/github-actions/about-using-githubcom-actions-on-github-enterprise-server.md @@ -1,6 +1,6 @@ --- title: About using GitHub.com actions on GitHub Enterprise Server -intro: '{% data variables.product.prodname_ghe_server %} includes most {% data variables.product.prodname_dotcom %}-authored actions, and has options for enabling access to other actions from {% data variables.product.prodname_dotcom_the_website %} and {% data variables.product.prodname_marketplace %}.' +intro: '{% data variables.product.prodname_ghe_server %} には、ほとんどの {% data variables.product.prodname_dotcom %} 作成のアクションが含まれ、{% data variables.product.prodname_dotcom_the_website %} および {% data variables.product.prodname_marketplace %} からの他のアクションへのアクセスを有効にするためのオプションがあります。' redirect_from: - /enterprise/admin/github-actions/about-using-githubcom-actions-on-github-enterprise-server versions: @@ -12,24 +12,24 @@ versions: {% data reusables.actions.enterprise-no-internet-actions %} -### Official actions bundled with {% data variables.product.prodname_ghe_server %} +### {% data variables.product.prodname_ghe_server %} にバンドルされている公式アクション -Most official {% data variables.product.prodname_dotcom %}-authored actions are automatically bundled with {% data variables.product.prodname_ghe_server %}, and are captured at a point in time from {% data variables.product.prodname_marketplace %}. When your {% data variables.product.prodname_ghe_server %} instance receives updates, the bundled official actions are also updated. +ほとんどの公式の {% data variables.product.prodname_dotcom %} 作成のアクションは自動的に {% data variables.product.prodname_ghe_server %} にバンドルされ、{% data variables.product.prodname_marketplace %} からある時点でキャプチャされます。 {% data variables.product.prodname_ghe_server %} インスタンスが更新を受信すると、バンドルされている公式アクションも更新されます。 -The bundled official actions include `actions/checkout`, `actions/upload-artifact`, `actions/download-artifact`, `actions/labeler`, and various `actions/setup-` actions, among others. To see all the official actions included on your enterprise instance, browse to the `actions` organization on your instance: https://{% data variables.product.product_url %}/actions. +The bundled official actions include `actions/checkout`, `actions/upload-artifact`, `actions/download-artifact`, `actions/labeler`, and various `actions/setup-` actions, among others. Enterprise インスタンスに含まれるすべての公式アクションを表示するには、インスタンスの `actions` Organization を参照します (https://{% data variables.product.product_url %}/actions)。 Each action is a repository in the `actions` organization, and each action repository includes the necessary tags, branches, and commit SHAs that your workflows can use to reference the action. {% note %} -**Note:** When using setup actions (such as `actions/setup-LANGUAGE`) on {% data variables.product.prodname_ghe_server %} with self-hosted runners, you might need to set up the tools cache on runners that do not have internet access. For more information, see "[Setting up the tool cache on self-hosted runners without internet access](/enterprise/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access)." +**注釈:** セルフホストランナーを使用して {% data variables.product.prodname_ghe_server %} でセットアップアクション（`actions/setup-LANGUAGE` など）を使用する場合、インターネットにアクセスできないランナーでツールキャッシュをセットアップする必要がある場合があります。 For more information, see "[Setting up the tool cache on self-hosted runners without internet access](/enterprise/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access)." {% endnote %} -### Configuring access to actions on {% data variables.product.prodname_dotcom_the_website %} +### {% data variables.product.prodname_dotcom_the_website %} でアクションへのアクセスを設定する -If users on your enterprise instance need access to other actions from {% data variables.product.prodname_dotcom_the_website %} or {% data variables.product.prodname_marketplace %}, there are a few configuration options. +Enterprise インスタンスのユーザが {% data variables.product.prodname_dotcom_the_website %} または {% data variables.product.prodname_marketplace %} から他のアクションにアクセスする必要がある場合、いくつかの設定オプションがあります。 -You can manually download and sync actions onto your enterprise instance using the `actions-sync` tool. For more information, see "[Manually syncing actions from {% data variables.product.prodname_dotcom_the_website %}](/enterprise/admin/github-actions/manually-syncing-actions-from-githubcom)." +You can manually download and sync actions onto your enterprise instance using the `actions-sync` tool. 詳しい情報については、「[{% data variables.product.prodname_dotcom_the_website %} からのアクションを手動で同期する](/enterprise/admin/github-actions/manually-syncing-actions-from-githubcom)」を参照してください。 -Alternatively, you can enable automatic access to all actions from {% data variables.product.prodname_dotcom_the_website %} by connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %} using {% data variables.product.prodname_github_connect %}. For more information, see "[Enabling automatic access to {% data variables.product.prodname_dotcom_the_website %} actions using {% data variables.product.prodname_github_connect %}](/enterprise/admin/github-actions/enabling-automatic-access-to-githubcom-actions-using-github-connect)". +または、{% data variables.product.prodname_github_connect %} を使用して {% data variables.product.prodname_ghe_server %} を {% data variables.product.prodname_ghe_cloud %} に接続することにより、{% data variables.product.prodname_dotcom_the_website %} からのすべてのアクションへの自動アクセスを有効にすることができます。 詳しい情報については、「[{% data variables.product.prodname_github_connect %} を使用した {% data variables.product.prodname_dotcom_the_website %} アクションへの自動アクセスを有効化する](/enterprise/admin/github-actions/enabling-automatic-access-to-githubcom-actions-using-github-connect)」を参照してください。 diff --git a/translations/ja-JP/content/admin/github-actions/enabling-automatic-access-to-githubcom-actions-using-github-connect.md b/translations/ja-JP/content/admin/github-actions/enabling-automatic-access-to-githubcom-actions-using-github-connect.md index df9dd1d405..28da2234b9 100644 --- a/translations/ja-JP/content/admin/github-actions/enabling-automatic-access-to-githubcom-actions-using-github-connect.md +++ b/translations/ja-JP/content/admin/github-actions/enabling-automatic-access-to-githubcom-actions-using-github-connect.md @@ -1,7 +1,7 @@ --- title: Enabling automatic access to GitHub.com actions using GitHub Connect -intro: 'To allow {% data variables.product.prodname_actions %} on your enterprise instance to use actions from {% data variables.product.prodname_dotcom_the_website %}, you can connect {% data variables.product.product_location_enterprise %} to {% data variables.product.prodname_ghe_cloud %}.' -permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable access to all {% data variables.product.prodname_dotcom_the_website %} actions.' +intro: 'Enterprise インスタンスの {% data variables.product.prodname_actions %} が {% data variables.product.prodname_dotcom_the_website %} のアクションを使用できるようにするには、{% data variables.product.product_location_enterprise %} を {% data variables.product.prodname_ghe_cloud %} に接続します。' +permissions: '接続された {% data variables.product.prodname_ghe_cloud %} Organization または Enterprise アカウントの所有者でもある {% data variables.product.prodname_ghe_server %} のサイト管理者は、すべての {% data variables.product.prodname_dotcom_the_website %} アクションへのアクセスを有効にできます。' redirect_from: - /enterprise/admin/github-actions/enabling-automatic-access-to-githubcom-actions-using-github-connect versions: @@ -11,13 +11,13 @@ versions: {% data variables.product.prodname_actions %} の支払いを管理する {% data variables.product.prodname_dotcom %}は、macOSランナーのホストに[MacStadium](https://www.macstadium.com/)を使用しています。 -By default, {% data variables.product.prodname_actions %} workflows on {% data variables.product.prodname_ghe_server %} cannot use actions directly from {% data variables.product.prodname_dotcom_the_website %} or [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions). +デフォルトでは、{% data variables.product.prodname_ghe_server %} の {% data variables.product.prodname_actions %} ワークフローは {% data variables.product.prodname_dotcom_the_website %} または [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions) から直接アクションを使用できません。 -To make all actions from {% data variables.product.prodname_dotcom_the_website %} available on your enterprise instance, you can connect {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %} using {% data variables.product.prodname_github_connect %}. For other ways of accessing actions from {% data variables.product.prodname_dotcom_the_website %}, see "[About using {% data variables.product.prodname_dotcom_the_website %} actions on {% data variables.product.prodname_ghe_server %}](/enterprise/admin/github-actions/about-using-githubcom-actions-on-github-enterprise-server)." +{% data variables.product.prodname_dotcom_the_website %} からのすべてのアクションを Enterprise インスタンスで使用できるようにするには、{% data variables.product.prodname_github_connect %} を使用して{% data variables.product.prodname_ghe_server %} を {% data variables.product.prodname_ghe_cloud %} に接続します。 {% data variables.product.prodname_dotcom_the_website %} からアクションにアクセスする他の方法については、「[{% data variables.product.prodname_ghe_server %} での {% data variables.product.prodname_dotcom_the_website %} アクションの使用について](/enterprise/admin/github-actions/about-using-githubcom-actions-on-github-enterprise-server)」を参照してください。 -### Enabling automatic access to all {% data variables.product.prodname_dotcom_the_website %} actions +### すべての {% data variables.product.prodname_dotcom_the_website %} アクションへの自動アクセスを有効化する -Before enabling access to all actions from {% data variables.product.prodname_dotcom_the_website %} on {% data variables.product.product_location_enterprise %}, you must connect {% data variables.product.product_location_enterprise %} to {% data variables.product.prodname_dotcom_the_website %}. 詳細は、「[{% data variables.product.prodname_ghe_server %}を{% data variables.product.prodname_ghe_cloud %}に接続する](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)」を参照してください。 +{% data variables.product.product_location_enterprise %} 上の {% data variables.product.prodname_dotcom_the_website %} からのすべてのアクションへのアクセスを有効にする前に、{% data variables.product.product_location_enterprise %} を {% data variables.product.prodname_dotcom_the_website %} に接続する必要があります。 詳細は、「[{% data variables.product.prodname_ghe_server %}を{% data variables.product.prodname_ghe_cloud %}に接続する](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)」を参照してください。 {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} diff --git a/translations/ja-JP/content/admin/github-actions/enabling-github-actions-and-configuring-storage.md b/translations/ja-JP/content/admin/github-actions/enabling-github-actions-and-configuring-storage.md index 02e7641308..ab320cf89f 100644 --- a/translations/ja-JP/content/admin/github-actions/enabling-github-actions-and-configuring-storage.md +++ b/translations/ja-JP/content/admin/github-actions/enabling-github-actions-and-configuring-storage.md @@ -1,7 +1,7 @@ --- title: Enabling GitHub Actions and configuring storage -intro: 'External storage must be configured as part of enabling {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %}.' -permissions: 'Site administrators can enable {% data variables.product.prodname_actions %} and configure enterprise settings.' +intro: '{% data variables.product.prodname_ghe_server %} で {% data variables.product.prodname_actions %} を有効化する一環として、外部ストレージを設定する必要があります。' +permissions: 'サイト管理者は、{% data variables.product.prodname_actions %} を有効化して、Enterprise 設定を構成できます。' redirect_from: - /enterprise/admin/github-actions/enabling-github-actions-and-configuring-storage versions: @@ -11,7 +11,7 @@ versions: {% if currentVersion == "enterprise-server@2.22" %} {% note %} -**Note:** {% data variables.product.prodname_actions %} support on {% data variables.product.prodname_ghe_server %} 2.22 is a limited public beta. Review the external storage requirements below and [sign up for the beta](https://resources.github.com/beta-signup/). +**注釈:** {% data variables.product.prodname_ghe_server %} 2.22 での {% data variables.product.prodname_actions %} サポートは、限定パブリックベータです。 Review the external storage requirements below and [sign up for the beta](https://resources.github.com/beta-signup/). {% endnote %} {% endif %} @@ -19,11 +19,11 @@ versions: ### About external storage requirements -To enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %}, you must have access to external blob storage. +{% data variables.product.prodname_ghe_server %} で {% data variables.product.prodname_actions %} を有効にするには、外部 Blob ストレージにアクセスできる必要があります。 -{% data variables.product.prodname_actions %} uses blob storage to store artifacts generated by workflow runs, such as workflow logs and user-uploaded build artifacts. 必要なストレージ容量は、{% data variables.product.prodname_actions %} の使用状況によって異なります。 +{% data variables.product.prodname_actions %} は、blob ストレージを使用して、ワークフローログやユーザがアップロードしたビルドアーティファクトなど、ワークフロー実行によって生成されたアーティファクトを保存します。 必要なストレージ容量は、{% data variables.product.prodname_actions %} の使用状況によって異なります。 -{% data variables.product.prodname_actions %} supports these storage providers: +{% data variables.product.prodname_actions %} は、次のストレージプロバイダをサポートしています。 * Amazon S3 * Azure Blob storage @@ -31,7 +31,7 @@ To enable {% data variables.product.prodname_actions %} on {% data variables.pro #### Amazon S3 permissions -If you use Amazon S3, {% data variables.product.prodname_actions %} requires the following permissions for your AWS access key ID and secret: +Amazon S3 を使用する場合、{% data variables.product.prodname_actions %} には AWS アクセスキー ID とシークレットに対して次の権限が必要です。 * `s3:PutObject` * `s3:GetObject` @@ -40,12 +40,12 @@ If you use Amazon S3, {% data variables.product.prodname_actions %} requires the * `s3:AbortMultipartUpload` * `s3:DeleteObject` -### Enabling {% data variables.product.prodname_actions %} +### {% data variables.product.prodname_actions %} の有効化 {% if currentVersion == "enterprise-server@2.22" %} -{% data variables.product.prodname_actions %} support on {% data variables.product.prodname_ghe_server %} 2.22 is a limited public beta. [Sign up for the beta](https://resources.github.com/beta-signup/). +{% data variables.product.prodname_ghe_server %} 2.22 での {% data variables.product.prodname_actions %} サポートは、限定パブリックベータです。 [Sign up for the beta](https://resources.github.com/beta-signup/). {% endif %} ### 参考リンク -- "Hardware considerations" for your platform in "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise/admin/installation/setting-up-a-github-enterprise-server-instance)" +- 「[{% data variables.product.prodname_ghe_server %} インスタンスを設定する](/enterprise/admin/installation/setting-up-a-github-enterprise-server-instance)」のプラットフォームに関する「ハードウェアの留意点」 diff --git a/translations/ja-JP/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md b/translations/ja-JP/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md index 6668def0a5..0340d460e8 100644 --- a/translations/ja-JP/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md +++ b/translations/ja-JP/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md @@ -1,6 +1,6 @@ --- title: Enforcing GitHub Actions policies for your enterprise -intro: 'Enterprise administrators can manage access to {% data variables.product.prodname_actions %} in an enterprise.' +intro: 'Enterprise 管理者は、Enterprise 内の {% data variables.product.prodname_actions %} へのアクセスを管理できます。' redirect_from: - /enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise versions: @@ -10,11 +10,11 @@ versions: {% data variables.product.prodname_actions %} の支払いを管理する {% data variables.product.prodname_dotcom %}は、macOSランナーのホストに[MacStadium](https://www.macstadium.com/)を使用しています。 -### About {% data variables.product.prodname_actions %} permissions for your enterprise +### Enterprise の {% data variables.product.prodname_actions %} 権限について -When you enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %}, it is enabled for all organizations in your enterprise. You can choose to disable {% data variables.product.prodname_actions %} for all organizations in your enterprise, or only allow specific organizations. You can also limit the use of public actions, so that people can only use local actions that exist in an organization. +{% data variables.product.prodname_ghe_server %} で {% data variables.product.prodname_actions %} を有効にすると、企業内のすべての Organization で有効になります。 Enterprise 内のすべての Organization に対して {% data variables.product.prodname_actions %} を無効化するか、特定の Organization のみを許可するかを選択できます。 You can also limit the use of public actions, so that people can only use local actions that exist in an organization. -### Managing {% data variables.product.prodname_actions %} permissions for your enterprise +### Enterprise の {% data variables.product.prodname_actions %} 権限の管理 {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} diff --git a/translations/ja-JP/content/admin/github-actions/index.md b/translations/ja-JP/content/admin/github-actions/index.md index 254751127a..f07be6dc31 100644 --- a/translations/ja-JP/content/admin/github-actions/index.md +++ b/translations/ja-JP/content/admin/github-actions/index.md @@ -1,6 +1,6 @@ --- title: Managing GitHub Actions for your enterprise -intro: 'Enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %}, and manage {% data variables.product.prodname_actions %} policies and settings.' +intro: '{% data variables.product.prodname_ghe_server %} で {% data variables.product.prodname_actions %} を有効にし、{% data variables.product.prodname_actions %} のポリシーと設定を管理します。' redirect_from: - /enterprise/admin/github-actions versions: diff --git a/translations/ja-JP/content/admin/github-actions/managing-access-to-actions-from-githubcom.md b/translations/ja-JP/content/admin/github-actions/managing-access-to-actions-from-githubcom.md index 51d601c89f..8bf718279d 100644 --- a/translations/ja-JP/content/admin/github-actions/managing-access-to-actions-from-githubcom.md +++ b/translations/ja-JP/content/admin/github-actions/managing-access-to-actions-from-githubcom.md @@ -1,6 +1,6 @@ --- title: Managing access to actions from GitHub.com -intro: 'Controlling which actions on {% data variables.product.prodname_dotcom_the_website %} and {% data variables.product.prodname_marketplace %} can be used in your enterprise.' +intro: '{% data variables.product.prodname_dotcom_the_website %} および {% data variables.product.prodname_marketplace %} で Enterprise で使用できるアクションを制御します。' mapTopic: true redirect_from: - /enterprise/admin/github-actions/managing-access-to-actions-from-githubcom diff --git a/translations/ja-JP/content/admin/github-actions/manually-syncing-actions-from-githubcom.md b/translations/ja-JP/content/admin/github-actions/manually-syncing-actions-from-githubcom.md index 93c2a6b11d..e7bf1added 100644 --- a/translations/ja-JP/content/admin/github-actions/manually-syncing-actions-from-githubcom.md +++ b/translations/ja-JP/content/admin/github-actions/manually-syncing-actions-from-githubcom.md @@ -1,6 +1,6 @@ --- title: Manually syncing actions from GitHub.com -intro: 'For users that need access to actions from {% data variables.product.prodname_dotcom_the_website %}, you can sync specific actions to your {% data variables.product.prodname_ghe_server %} instance.' +intro: '{% data variables.product.prodname_dotcom_the_website %} からのアクションにアクセスする必要があるユーザは、特定のアクションを {% data variables.product.prodname_ghe_server %} インスタンスに同期できます。' redirect_from: - /enterprise/admin/github-actions/manually-syncing-actions-from-githubcom versions: @@ -12,15 +12,15 @@ versions: {% data reusables.actions.enterprise-no-internet-actions %} -To make specific actions from {% data variables.product.prodname_dotcom_the_website %} available to use in workflows, you can use {% data variables.product.company_short %}'s open source [`actions-sync`](https://github.com/actions/actions-sync) tool to sync action repositories from {% data variables.product.prodname_dotcom_the_website %} to your enterprise instance. For other ways of accessing actions from {% data variables.product.prodname_dotcom_the_website %}, see "[About using {% data variables.product.prodname_dotcom_the_website %} actions on {% data variables.product.prodname_ghe_server %}](/enterprise/admin/github-actions/about-using-githubcom-actions-on-github-enterprise-server)." +{% data variables.product.prodname_dotcom_the_website %} の特定のアクションをワークフローで使用できるようにするには、{% data variables.product.company_short %} のオープンソースの [`actions-sync`](https://github.com/actions/actions-sync) ツールを使用して、アクションリポジトリを {% data variables.product.prodname_dotcom_the_website %} から Enterprise インスタンスに同期します。 {% data variables.product.prodname_dotcom_the_website %} からアクションにアクセスする他の方法については、「[{% data variables.product.prodname_ghe_server %} での {% data variables.product.prodname_dotcom_the_website %} アクションの使用について](/enterprise/admin/github-actions/about-using-githubcom-actions-on-github-enterprise-server)」を参照してください。 ### About the `actions-sync` tool -The `actions-sync` tool must be run on a machine that can access the {% data variables.product.prodname_dotcom_the_website %} API and your {% data variables.product.prodname_ghe_server %} instance's API. The machine doesn't need to be connected to both at the same time. +`actions-sync` ツールは、{% data variables.product.prodname_dotcom_the_website %} API と {% data variables.product.prodname_ghe_server %} インスタンスの API にアクセスできるマシンで実行する必要があります。 The machine doesn't need to be connected to both at the same time. If your machine has access to both systems at the same time, you can do the sync with a single `actions-sync sync` command. If you can only access one system at a time, you can use the `actions-sync pull` and `push` commands. -The `actions-sync` tool can only download actions from {% data variables.product.prodname_dotcom_the_website %} that are stored in public repositories. +`actions-sync` ツールは、パブリックリポジトリに保存されている {% data variables.product.prodname_dotcom_the_website %} からのみアクションをダウンロードできます。 ### 必要な環境 @@ -29,11 +29,11 @@ The `actions-sync` tool can only download actions from {% data variables.product ### Example: Using the `actions-sync` tool -This example demonstrates using the `actions-sync` tool to sync an individual action from {% data variables.product.prodname_dotcom_the_website %} to an enterprise instance. +この例は、`actions-sync` ツールを使用して、個々のアクションを {% data variables.product.prodname_dotcom_the_website %} から Enterprise インスタンスに同期する方法を示しています。 {% note %} -**Note:** This example uses the `actions-sync sync` command, which requires concurrent access to both the {% data variables.product.prodname_dotcom_the_website %} API and your {% data variables.product.prodname_ghe_server %} instance's API from your machine. If you can only access one system at a time, you can use the `actions-sync pull` and `push` commands. For more information, see the [`actions-sync` README](https://github.com/actions/actions-sync#not-connected-instances). +**注釈:** この例では、`actions-sync sync` コマンドを使用します。これには、マシンから {% data variables.product.prodname_dotcom_the_website %} API と {% data variables.product.prodname_ghe_server %} インスタンスの API の両方への同時アクセスが必要です。 If you can only access one system at a time, you can use the `actions-sync pull` and `push` commands. For more information, see the [`actions-sync` README](https://github.com/actions/actions-sync#not-connected-instances). {% endnote %} @@ -56,7 +56,7 @@ This example demonstrates using the `actions-sync` tool to sync an individual ac * `--destination-url`: The URL of the destination enterprise instance. * `--repo-name`: The action repository to sync. This takes the format of `owner/repository:destination_owner/destination_repository`. - * The above example syncs the [`docker/build-push-action`](https://github.com/docker/build-push-action) repository to the `synced-actions/docker-build-push-action` repository on the destination {% data variables.product.prodname_ghe_server %} instance. You must create the organization named `synced-actions` on your enterprise instance before running the above command. + * 上記の例では、[`docker/build-push-action`](https://github.com/docker/build-push-action) リポジトリを宛先 {% data variables.product.prodname_ghe_server %} インスタンスの `synced-actions/docker-build-push-action` リポジトリに同期します。 You must create the organization named `synced-actions` on your enterprise instance before running the above command. * If you omit `:destination_owner/destination_repository`, the tool uses the original owner and repository name for your enterprise instance. Before running the command, you must create a new organization on your instance that matches the owner name of the action. Consider using a central organization to store the synced actions on your instance, as this means you will not need to create multiple new organizations if you sync actions from different owners. * You can sync multiple actions by replacing the `--repo-name` parameter with `--repo-name-list` or `--repo-name-list-file`. For more information, see the [`actions-sync` README](https://github.com/actions/actions-sync#actions-sync). 1. After the action repository is created on your enterprise instance, people in your enterprise can use the destination repository to reference the action in their workflows. For the example action shown above: diff --git a/translations/ja-JP/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md b/translations/ja-JP/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md index 60e44c854d..2e5fa0dbed 100644 --- a/translations/ja-JP/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md +++ b/translations/ja-JP/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md @@ -14,28 +14,28 @@ versions: {% data reusables.actions.enterprise-no-internet-actions %} -Most official {% data variables.product.prodname_dotcom %}-authored actions are automatically bundled with {% data variables.product.prodname_ghe_server %}. However, self-hosted runners without internet access will require some configuration before they can use the included `actions/setup-LANGUAGE` actions, such as `setup-node`. +ほとんどの公式の {% data variables.product.prodname_dotcom %} 作成のアクションは自動的に {% data variables.product.prodname_ghe_server %} にバンドルされます。 However, self-hosted runners without internet access will require some configuration before they can use the included `actions/setup-LANGUAGE` actions, such as `setup-node`. The `actions/setup-LANGUAGE` actions normally need internet access to download the required environment binaries into the runner's tool cache. Self-hosted runners without internet access can't download the binaries, so you must manually populate the tool cache on the runner. -You can populate the runner tool cache by running a {% data variables.product.prodname_actions %} workflow on {% data variables.product.prodname_dotcom_the_website %} that uploads a {% data variables.product.prodname_dotcom %}-hosted runner's tool cache as an artifact, which you can then transfer and extract on your internet-disconnected self-hosted runner. +{% data variables.product.prodname_dotcom_the_website %} で {% data variables.product.prodname_actions %} ワークフローを実行してランナーツールキャッシュにデータを入力できます。このワークフローは、{% data variables.product.prodname_dotcom %} ホストランナーのツールキャッシュをアーティファクトとしてアップロードし、インターネットで切断されたセルフホストランナーで転送および抽出できます。 {% note %} -**Note:** You can only use a {% data variables.product.prodname_dotcom %}-hosted runner's tool cache for a self-hosted runner that has an identical operating system and architecture. For example, if you are using a `ubuntu-18.04` {% data variables.product.prodname_dotcom %}-hosted runner to generate a tool cache, your self-hosted runner must be a 64-bit Ubuntu 18.04 machine. For more information on {% data variables.product.prodname_dotcom %}-hosted runners, see "Virtual environments for GitHub-hosted runners." +**注釈:** {% data variables.product.prodname_dotcom %} ホストランナーのツールキャッシュは、同じオペレーティングシステムとアーキテクチャを含むセルフホストランナーにのみ使用できます。 たとえば、`ubuntu-18.04` {% data variables.product.prodname_dotcom %} ホストランナーを使用してツールキャッシュを生成している場合、セルフホストランナーは 64 ビットの Ubuntu18.04 マシンである必要があります。 サポートされている {% data variables.product.prodname_dotcom %} ホストランナーに関する詳しい情報については、「GitHub ホストランナーの仮想環境」を参照してください。 {% endnote %} ### 必要な環境 * Determine which development environments your self-hosted runners will need. The following example demonstrates how to populate a tool cache for the `setup-node` action, using Node.js versions 10 and 12. -* Access to a repository on {% data variables.product.prodname_dotcom_the_website %} that you can use to run a workflow. +* ワークフロー実行に使用できる {% data variables.product.prodname_dotcom_the_website %} のリポジトリへのアクセス。 * Access to your self-hosted runner's file system to populate the tool cache folder. ### Populating the tool cache for a self-hosted runner -1. On {% data variables.product.prodname_dotcom_the_website %}, navigate to a repostory that you can use to run a {% data variables.product.prodname_actions %} workflow. -1. Create a new workflow file in the repository's `.github/workflows` folder that uploads an artifact containing the {% data variables.product.prodname_dotcom %}-hosted runner's tool cache. +1. On {% data variables.product.prodname_dotcom_the_website %}, navigate to a repository that you can use to run a {% data variables.product.prodname_actions %} workflow. +1. {% data variables.product.prodname_dotcom %} ホストランナーのツールキャッシュを含むアーティファクトをアップロードする、リポジトリの `.github/workflows` フォルダに新しいワークフローファイルを作成します。 The following example demonstrates a workflow that uploads the tool cache for an Ubuntu 18.04 environment, using the `setup-node` action with Node.js versions 10 and 12. @@ -69,7 +69,7 @@ You can populate the runner tool cache by running a {% data variables.product.pr path: ${{runner.tool_cache}}/tool_cache.tar.gz ``` {% endraw %} -1. Download the tool cache artifact from the workflow run. Download the tool cache artifact from the workflow run. +1. Download the tool cache artifact from the workflow run. アーティファクトのダウンロード手順については、「[ワークフローアーティファクトをダウンロードする](/actions/managing-workflow-runs/downloading-workflow-artifacts)」を参照してください。 1. Transfer the tool cache artifact to your self hosted runner and extract it to the local tool cache directory. The default tool cache directory is `RUNNER_DIR/_work/_tool`. If the runner hasn't processed any jobs yet, you might need to create the `_work/_tool` directories. After extracting the tool cache artifact uploaded in the above example, you should have a directory structure on your self-hosted runner that is similar to the following example: diff --git a/translations/ja-JP/content/admin/index.md b/translations/ja-JP/content/admin/index.md index f2f44bf232..4e75d99224 100644 --- a/translations/ja-JP/content/admin/index.md +++ b/translations/ja-JP/content/admin/index.md @@ -1,5 +1,5 @@ --- -title: Enterprise Administrators +title: Enterprise 管理者 redirect_from: - /enterprise/admin/hidden/migrating-from-github-fi/ - /enterprise/admin diff --git a/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md b/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md index 6a75ab2ba9..a84ce7cd5d 100644 --- a/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md +++ b/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md @@ -25,8 +25,7 @@ Google Cloud Platformde{% data variables.product.product_location_enterprise %} #### サポートされているマシンタイプ {% data variables.product.prodname_ghe_server %} は、次の Google Compute Engine (GCE) マシンタイプでサポートされています。 詳しい情報については[Google Cloud Platformのマシンタイプの記事](https://cloud.google.com/compute/docs/machine-types)を参照してください。 -| -{% if currentVersion != "free-pro-team@latest" %} + | | ハイメモリ | | | ------------- | | | n1-highmem-4 | @@ -35,7 +34,6 @@ Google Cloud Platformde{% data variables.product.product_location_enterprise %} | | n1-highmem-32 | | | n1-highmem-64 | | | n1-highmem-96 | -{% endif %} #### 推奨マシンタイプ diff --git a/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-openstack-kvm.md b/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-openstack-kvm.md index c56f1a4ae6..dd265a1a03 100644 --- a/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-openstack-kvm.md +++ b/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-openstack-kvm.md @@ -29,9 +29,9 @@ versions: {% data reusables.enterprise_installation.create-ghe-instance %} -1. In OpenStack Horizon, upload the +1. OpenStack Horizon で、 -{% data variables.product.prodname_ghe_server %} image you downloaded. 手順については、OpenStack ガイドの「[Upload and manage images](https://docs.openstack.org/horizon/latest/user/manage-images.html)」の 「Upload an image」セクションを参照してください。 +ダウンロードした {% data variables.product.prodname_ghe_server %} の画像をアップロードします。 手順については、OpenStack ガイドの「[Upload and manage images](https://docs.openstack.org/horizon/latest/user/manage-images.html)」の 「Upload an image」セクションを参照してください。 {% data reusables.enterprise_installation.create-attached-storage-volume %} 手順については、OpenStack ガイドの「[Create and manage volumes](https://docs.openstack.org/horizon/latest/user/manage-volumes.html)」を参照してください。 3. セキュリティグループを作成し、下の表の各ポートについて新しいセキュリティグループルールを追加してください。 その方法についてはOpenStackのガイド"[Configure access and security for instances](https://docs.openstack.org/horizon/latest/user/configure-access-and-security-for-instances.html)"を参照してください。 diff --git a/translations/ja-JP/content/admin/overview/managing-your-github-enterprise-license.md b/translations/ja-JP/content/admin/overview/managing-your-github-enterprise-license.md index e5307b4c61..05f661a9cb 100644 --- a/translations/ja-JP/content/admin/overview/managing-your-github-enterprise-license.md +++ b/translations/ja-JP/content/admin/overview/managing-your-github-enterprise-license.md @@ -30,12 +30,12 @@ versions: {% data variables.product.prodname_enterprise %} のユーザライセンスを更新または追加する場合は、{% data variables.contact.contact_enterprise_sales %} にお問い合わせください。 注文完了したら、新しいライセンスのファイルが直ちにダウンロード可能となります。 -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. 左のサイドバーで、** Enterprise licensing（Enterpriseライセンス）**をクリックしてください。 ![[Enterprise account settings] サイトバーの "Enterprise licensing"](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. [Enterprise Server Instances] で、{% octicon "download" aria-label="The download icon" %} をクリックしてライセンスファイルをダウンロードします。 ![GitHub Enterprise Server ライセンスをダウンロードする](/assets/images/help/business-accounts/download-ghes-license.png) -5. Log into your -{% data variables.product.prodname_ghe_server %} instance as a site administrator. +5. サイト管理者として +{% data variables.product.prodname_ghe_server %} インスタンスにログインします。 {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% data reusables.enterprise-accounts.settings-tab %} @@ -46,28 +46,29 @@ versions: ### ライセンス使用状況を表示する -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. 左のサイドバーで、** Enterprise licensing（Enterpriseライセンス）**をクリックしてください。 ![[Enterprise account settings] サイトバーの "Enterprise licensing"](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. 現在の {% data variables.product.prodname_enterprise %} ライセンスと、使用済みで利用可能なユーザライセンスを確認します。 ### ユーザライセンスの使用状況を自動で{% data variables.product.prodname_ghe_cloud %}と同期する -{% data variables.product.prodname_github_connect %}を使用して、{% data variables.product.prodname_ghe_server %}と{% data variables.product.prodname_ghe_cloud %}の間でユーザライセンスの数と使用状況を自動で同期できます。 詳細は、「[{% data variables.product.prodname_ghe_server %}と{% data variables.product.prodname_ghe_cloud %}の間で自動ユーザライセンス同期を有効化する](/enterprise/{{currentVersion}}/admin/installation/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud)」を参照してください。 +{% data variables.product.prodname_github_connect %} を使用して、{% data variables.product.prodname_ghe_server %} と {% data variables.product.prodname_ghe_cloud %} の間でユーザライセンスの数と使用状況を自動で同期できます。 詳しい情報については、「[{% data variables.product.prodname_ghe_server %} と {% data variables.product.prodname_ghe_cloud %} の間で自動ユーザライセンス同期を有効化する](/enterprise/{{currentVersion}}/admin/installation/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud)」を参照してください。 ### {% data variables.product.prodname_ghe_server %} と {% data variables.product.prodname_ghe_cloud %} の間でユーザライセンスの使用状況を手動で同期する -{% data variables.product.prodname_ghe_server %}からJSONファイルをダウンロードして{% data variables.product.prodname_ghe_cloud %}にそのファイルをアップロードし、2つのデプロイメント間でユーザライセンスの使用状況を手動で同期できます。 +{% data variables.product.prodname_ghe_server %} から JSON ファイルをダウンロードして {% data variables.product.prodname_ghe_cloud %} にそのファイルをアップロードし、2 つのデプロイメント間でユーザライセンスの使用状況を手動で同期できます。 {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.license-tab %} -5. [Quick links] で、{% data variables.product.prodname_ghe_server %}上の現在のライセンスを含むファイルをダウンロードするには、[**Export license usage**] をクリックします。 ![ライセンス使用状況リンクをエクスポートする](/assets/images/enterprise/business-accounts/export-license-usage-link.png) -6. Navigate to -{% data variables.product.prodname_ghe_cloud %}. -{% data reusables.enterprise-accounts.access-enterprise %} +5. [Quick links] で、 +{% data variables.product.prodname_ghe_server %} に現在のライセンス使用状況を含むファイルをダウンロードするには、[**Export license usage**] をクリックします。 + ![ライセンス使用状況リンクをエクスポートする](/assets/images/enterprise/business-accounts/export-license-usage-link.png) +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +8. 左のサイドバーで、** Enterprise licensing（Enterpriseライセンス）**をクリックしてください。 ![[Enterprise account settings] サイトバーの "Enterprise licensing"](/assets/images/help/enterprises/enterprise-licensing-tab.png) +{% data reusables.enterprise-accounts.license-tab %} 10. [Enterprise Server Instances] の下で、[**Add server usage**] をクリックします。 ![GitHub Enterprise Serversの使用状況リンクをアップロードする](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png) 11. {% data variables.product.prodname_ghe_server %}からダウンロードしたJSONファイルをアップロードします。 ![アップロードするファイルをドラッグアンドドロップまたは選択する](/assets/images/help/business-accounts/upload-ghe-server-usage-file.png) diff --git a/translations/ja-JP/content/admin/user-management/about-migrations.md b/translations/ja-JP/content/admin/user-management/about-migrations.md index 2c24984bc9..15d860a4f7 100644 --- a/translations/ja-JP/content/admin/user-management/about-migrations.md +++ b/translations/ja-JP/content/admin/user-management/about-migrations.md @@ -33,7 +33,7 @@ versions: | Team | チームの**@メンション**はターゲットにマッチするよう書き換えられます。 | | マイルストーン | タイムスタンプは保持されます。 | | プロジェクトボード | リポジトリやリポジトリを所有するOrganizationに関連するプロジェクトボードは移行されます。 | -| 問題 | Issueへの参照とタイムスタンプは保持されます。 | +| Issue | Issueへの参照とタイムスタンプは保持されます。 | | Issueのコメント | コメントへの相互参照は、ターゲットインスタンスに合わせて書き換えられます。 | | プルリクエスト | プルリクエストへの相互参照はターゲットにマッチするよう書き換えられます。 タイムスタンプは保持されます。 | | プルリクエストのレビュー | プルリクエストのレビューと関連データは移行されます。 | diff --git a/translations/ja-JP/content/admin/user-management/audit-logging.md b/translations/ja-JP/content/admin/user-management/audit-logging.md index 832b84dc5b..92f79ea035 100644 --- a/translations/ja-JP/content/admin/user-management/audit-logging.md +++ b/translations/ja-JP/content/admin/user-management/audit-logging.md @@ -9,7 +9,7 @@ versions: enterprise-server: '*' --- -For a full list, see "[Audited actions](/enterprise/{{ currentVersion }}/admin/guides/installation/audited-actions)." For more information on finding a particular action, see "[Searching the audit log](/enterprise/{{ currentVersion }}/admin/guides/installation/searching-the-audit-log)." +リスト全体については「[監査されたアクション](/enterprise/{{ currentVersion }}/admin/guides/installation/audited-actions)」を参照してください。 特定のアクションの検索についての詳細は、「[Audit log を検索する](/enterprise/{{ currentVersion }}/admin/guides/installation/searching-the-audit-log)」を参照してください。 ### プッシュのログ diff --git a/translations/ja-JP/content/admin/user-management/configuring-email-for-notifications.md b/translations/ja-JP/content/admin/user-management/configuring-email-for-notifications.md index 07fd846e2c..2337db1aca 100644 --- a/translations/ja-JP/content/admin/user-management/configuring-email-for-notifications.md +++ b/translations/ja-JP/content/admin/user-management/configuring-email-for-notifications.md @@ -44,7 +44,7 @@ versions: 1. インスタンスのポート25がSMTPサーバにアクセスできることを確認してください。 2. `reply.[hostname]`を指すAレコードを作成してください。 DNSプロバイダとインスタンスのホスト設定によっては、 `*.[hostname]`を指す単一のAレコードを作成できる場合があります。 3. `reply.[hostname]`を指すMXレコードを作成して、このドメインへのメールがインスタンスにルーティングされるようにしてください。 -4. `noreply.[hostname]` が `[hostname]` を指すようにする MX レコードを作成し、 通知メールの `cc` アドレスへの返信がインスタンスにルーティングされるようにしてください。 For more information, see {% if currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}." +4. `noreply.[hostname]` が `[hostname]` を指すようにする MX レコードを作成し、 通知メールの `cc` アドレスへの返信がインスタンスにルーティングされるようにしてください。 詳しい情報については、{% if currentVersion ver_gt "enterprise-server@2.20" %}「[通知を設定する](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications){% else %}「[メール通知について](/github/receiving-notifications-about-activity-on-github/about-email-notifications)」を参照してください{% endif %}。 DNSの設定ができたら、うまく動作するかをテストできます。 diff --git a/translations/ja-JP/content/admin/user-management/configuring-git-large-file-storage-for-your-enterprise.md b/translations/ja-JP/content/admin/user-management/configuring-git-large-file-storage-for-your-enterprise.md index 038cd701e2..2c3792c127 100644 --- a/translations/ja-JP/content/admin/user-management/configuring-git-large-file-storage-for-your-enterprise.md +++ b/translations/ja-JP/content/admin/user-management/configuring-git-large-file-storage-for-your-enterprise.md @@ -94,11 +94,11 @@ versions: $ git add .lfsconfig $ git commit -m "Adding LFS config file" ``` -3. 既存の {% data variables.large_files.product_name_short %} アセットを移行します。 For more information, see "[Migrating to a different {% data variables.large_files.product_name_long %} server](#migrating-to-a-different-git-large-file-storage-server)." +3. 既存の {% data variables.large_files.product_name_short %} アセットを移行します。 詳しい情報については、「[異なる {% data variables.large_files.product_name_long %} サーバーへ移行する](#migrating-to-a-different-git-large-file-storage-server)」を参照してください。 ### 異なるGit Large File Storageサーバへの移行 -異なる{% data variables.large_files.product_name_long %}サーバに移行する前に、サードパーティサーバを使うよう{% data variables.large_files.product_name_short %}を設定しなければなりません。 For more information, see "[Configuring {% data variables.large_files.product_name_long %} to use a third party server](#configuring-git-large-file-storage-to-use-a-third-party-server)." +異なる{% data variables.large_files.product_name_long %}サーバに移行する前に、サードパーティサーバを使うよう{% data variables.large_files.product_name_short %}を設定しなければなりません。 詳しい情報については、「[サードパーティサーバーを使用するように {% data variables.large_files.product_name_long %} を設定する](#configuring-git-large-file-storage-to-use-a-third-party-server)」を参照してください。 1. 2 番目のリモートでリポジトリを設定します。 ```shell diff --git a/translations/ja-JP/content/admin/user-management/customizing-user-messages-on-your-instance.md b/translations/ja-JP/content/admin/user-management/customizing-user-messages-on-your-instance.md index ed725857c9..eebef4b2b6 100644 --- a/translations/ja-JP/content/admin/user-management/customizing-user-messages-on-your-instance.md +++ b/translations/ja-JP/content/admin/user-management/customizing-user-messages-on-your-instance.md @@ -3,7 +3,7 @@ title: インスタンス上でのユーザメッセージをカスタマイズ redirect_from: - /enterprise/admin/user-management/creating-a-custom-sign-in-message/ - /enterprise/admin/user-management/customizing-user-messages-on-your-instance -intro: 'You can create custom messages that users will see on the sign in and sign out pages{% if currentVersion ver_gt "enterprise-server@2.21" %} or in an announcement banner at the top of every page{% endif %}.' +intro: 'サインインおよびサインアウトページ {% if currentVersion ver_gt "enterprise-server@2.21" %}、またはすべてのページの上部にあるアナウンスバナーでユーザに表示されるカスタムメッセージを作成できます{% endif %}。' versions: enterprise-server: '*' --- diff --git a/translations/ja-JP/content/admin/user-management/exporting-migration-data-from-githubcom.md b/translations/ja-JP/content/admin/user-management/exporting-migration-data-from-githubcom.md index eed55fbae3..0031546919 100644 --- a/translations/ja-JP/content/admin/user-management/exporting-migration-data-from-githubcom.md +++ b/translations/ja-JP/content/admin/user-management/exporting-migration-data-from-githubcom.md @@ -1,6 +1,6 @@ --- title: GitHub.comからの移行データのエクスポート -intro: 'You can export migration data from an organization on {% data variables.product.prodname_dotcom_the_website %} by using the API to select repositories to migrate, then generating a migration archive that you can import into a {% data variables.product.prodname_ghe_server %} instance.' +intro: 'API を使用して移行するリポジトリを選択し、{% data variables.product.prodname_ghe_server %} インスタンスにインポートできる移行アーカイブを生成することで、{% data variables.product.prodname_dotcom_the_website %} 上の Organization から移行データをエクスポートできます。' redirect_from: - /enterprise/admin/guides/migrations/exporting-migration-data-from-github-com - /enterprise/admin/migrations/exporting-migration-data-from-githubcom @@ -13,7 +13,7 @@ versions: enterprise-server: '*' --- -### Preparing the source organization on {% data variables.product.prodname_dotcom %} +### {% data variables.product.prodname_dotcom %} でソース Organization を準備する 1. ソースOrganizationのリポジトリに[オーナー権限](/articles/permission-levels-for-an-organization/)を持っていることを確認してください。 diff --git a/translations/ja-JP/content/admin/user-management/exporting-migration-data-from-your-enterprise.md b/translations/ja-JP/content/admin/user-management/exporting-migration-data-from-your-enterprise.md index 49cf64912a..377bf5ff9d 100644 --- a/translations/ja-JP/content/admin/user-management/exporting-migration-data-from-your-enterprise.md +++ b/translations/ja-JP/content/admin/user-management/exporting-migration-data-from-your-enterprise.md @@ -1,6 +1,6 @@ --- title: Exporting migration data from your enterprise -intro: 'To change platforms or move from a trial instance to a production instance, you can export migration data from a {% data variables.product.prodname_ghe_server %} instance by preparing the instance, locking the repositories, and generating a migration archive.' +intro: 'プラットフォームの変更、およびトライアルインスタンスから本番インスタンスに移行するには、インスタンスを準備して、リポジトリをロックし、移行アーカイブを生成することで、{% data variables.product.prodname_ghe_server %} インスタンスから移行データをエクスポートできます。' redirect_from: - /enterprise/admin/guides/migrations/exporting-migration-data-from-github-enterprise/ - /enterprise/admin/migrations/exporting-migration-data-from-github-enterprise-server @@ -13,7 +13,7 @@ versions: enterprise-server: '*' --- -### Preparing the {% data variables.product.prodname_ghe_server %} source instance +### {% data variables.product.prodname_ghe_server %} ソースインスタンスを準備する 1. {% data variables.product.prodname_ghe_server %} ソースのサイト管理者であることを確認します。 そのための最善の方法は、[インスタンスへのSSH](/enterprise/admin/guides/installation/accessing-the-administrative-shell-ssh/)が可能であることを確認することです。 @@ -21,7 +21,7 @@ versions: {% data reusables.enterprise_migrations.make-a-list %} -### Exporting the {% data variables.product.prodname_ghe_server %} source repositories +### {% data variables.product.prodname_ghe_server %} ソースリポジトリをエクスポートする {% data reusables.enterprise_migrations.locking-repositories %} diff --git a/translations/ja-JP/content/admin/user-management/importing-data-from-third-party-version-control-systems.md b/translations/ja-JP/content/admin/user-management/importing-data-from-third-party-version-control-systems.md index 0f229aa045..a958c3331a 100644 --- a/translations/ja-JP/content/admin/user-management/importing-data-from-third-party-version-control-systems.md +++ b/translations/ja-JP/content/admin/user-management/importing-data-from-third-party-version-control-systems.md @@ -70,4 +70,4 @@ versions: ### 参考リンク -- "[Command-line-utilities](/enterprise/{{ currentVersion }}/admin/guides/installation/command-line-utilities/#import-and-export)" +- "[コマンドラインユーティリティ](/enterprise/{{ currentVersion }}/admin/guides/installation/command-line-utilities/#import-and-export)" diff --git a/translations/ja-JP/content/admin/user-management/managing-dormant-users.md b/translations/ja-JP/content/admin/user-management/managing-dormant-users.md index aafde4061a..f795fb9ba8 100644 --- a/translations/ja-JP/content/admin/user-management/managing-dormant-users.md +++ b/translations/ja-JP/content/admin/user-management/managing-dormant-users.md @@ -14,7 +14,7 @@ versions: - {% data variables.product.prodname_ghe_server %} へのサインイン。 - Issue やプルリクエストへのコメント。 - リポジトリの作成、削除、Watch、スター付け。 -- Pushing commits.{% if currentVersion ver_gt "enterprise-server@2.21" %} +- コミットのプッシュ。{% if currentVersion ver_gt "enterprise-server@2.21" %} - Accessing resources by using a personal access token or SSH key.{% endif %} ### 休眠ユーザの表示 diff --git a/translations/ja-JP/content/admin/user-management/migrating-data-to-your-enterprise.md b/translations/ja-JP/content/admin/user-management/migrating-data-to-your-enterprise.md index 119a1db8c9..453ba11236 100644 --- a/translations/ja-JP/content/admin/user-management/migrating-data-to-your-enterprise.md +++ b/translations/ja-JP/content/admin/user-management/migrating-data-to-your-enterprise.md @@ -15,7 +15,7 @@ versions: enterprise-server: '*' --- -### Applying the imported data on {% data variables.product.prodname_ghe_server %} +### インポートしたデータを {% data variables.product.prodname_ghe_server %} に適用する {% data reusables.enterprise_installation.ssh-into-target-instance %} @@ -106,7 +106,7 @@ $ ghe-migrator audit -s failed_import,failed_map,failed_rename,failed_merge -g < 失敗したインポートに関する懸念があるなら、{% data variables.contact.contact_ent_support %}に連絡してください。 -### Completing the import on {% data variables.product.prodname_ghe_server %} +### {% data variables.product.prodname_ghe_server %} でインポートを完了する After your migration is applied to your target instance and you have reviewed the migration, you''ll unlock the repositories and delete them off the source. ソースデータを削除する前に、すべてが期待どおりに機能していることを確認するため2週間ほど待つことをおすすめします。 @@ -117,7 +117,7 @@ After your migration is applied to your target instance and you have reviewed th ### ソース上でのリポジトリのアンロック -#### Unlocking repositories from an organization on {% data variables.product.prodname_dotcom_the_website %} +#### {% data variables.product.prodname_dotcom_the_website %} で Organization からリポジトリのロックを解除する {% data variables.product.prodname_dotcom_the_website %} Organization のリポジトリをアンロックするには、`DELETE` リクエストを移行アンロックエンドポイントに送信します。 以下が必要です: * 認証のためのアクセストークン @@ -129,9 +129,9 @@ curl -H "Authorization: token GITHUB_ACCESS_TOKEN" -X DELETE \ https://api.github.com/orgs/orgname/migrations/id/repos/repo_name/lock ``` -#### Deleting repositories from an organization on {% data variables.product.prodname_dotcom_the_website %} +#### {% data variables.product.prodname_dotcom_the_website %} で Organization からリポジトリを削除する -After unlocking the {% data variables.product.prodname_dotcom_the_website %} organization's repositories, you should delete every repository you previously migrated using [the repository delete endpoint](/enterprise/{{ currentVersion }}/v3/repos/#delete-a-repository). 認証のためのアクセストークンが必要になります。 +{% data variables.product.prodname_dotcom_the_website %} Organization のリポジトリをロック解除した後、[リポジトリ削除エンドポイント](/enterprise/{{ currentVersion }}/v3/repos/#delete-a-repository)を使用して以前に移行したすべてのリポジトリを削除する必要があります。 認証のためのアクセストークンが必要になります。 ```shell curl -H "Authorization: token GITHUB_ACCESS_TOKEN" -X DELETE \ https://api.github.com/repos/orgname/repo_name diff --git a/translations/ja-JP/content/admin/user-management/preparing-to-migrate-data-to-your-enterprise.md b/translations/ja-JP/content/admin/user-management/preparing-to-migrate-data-to-your-enterprise.md index 523b1d66bd..ab158fba4a 100644 --- a/translations/ja-JP/content/admin/user-management/preparing-to-migrate-data-to-your-enterprise.md +++ b/translations/ja-JP/content/admin/user-management/preparing-to-migrate-data-to-your-enterprise.md @@ -12,7 +12,7 @@ versions: enterprise-server: '*' --- -### Preparing the migrated data for import to {% data variables.product.prodname_ghe_server %} +### 移行したデータを {% data variables.product.prodname_ghe_server %} にインポートするための準備 1. [`scp`](https://linuxacademy.com/blog/linux/ssh-and-scp-howto-tips-tricks#scp) コマンドを使って、ソースインスタンスまたは Organization から生成された移行アーカイブを {% data variables.product.prodname_ghe_server %} ターゲットにコピーします: @@ -120,7 +120,7 @@ $ ghe-migrator audit -m user -g MIGRATION_GUID > users.csv たとえばユーザ`octocat`の名前をターゲット`https://example-gh.target`上で`monalisa`に変更したいのであれば、以下の内容の行を作成します。 -| `model_name` | `source_url` | `target_url` | `状態` | +| `model_name` | `source_url` | `target_url` | `state` | | ------------ | ----------------------------------- | ------------------------------------ | -------- | | `ユーザ` | `https://example-gh.source/octocat` | `https://example-gh.target/monalisa` | `rename` | diff --git a/translations/ja-JP/content/admin/user-management/rebuilding-contributions-data.md b/translations/ja-JP/content/admin/user-management/rebuilding-contributions-data.md index 74a23fd7b0..0ecd2c08cb 100644 --- a/translations/ja-JP/content/admin/user-management/rebuilding-contributions-data.md +++ b/translations/ja-JP/content/admin/user-management/rebuilding-contributions-data.md @@ -15,5 +15,5 @@ versions: 3. ページ左にある、**Admin** をクリックする。 ![[Admin] タブ](/assets/images/enterprise/site-admin-settings/admin-tab.png) 4. **Contributions data** で、**Rebuild** をクリックする。 ![[Rebuild] ボタン](/assets/images/enterprise/site-admin-settings/rebuild-button.png) -{% data variables.product.prodname_enterprise %} will now start background jobs to re-link commits with that user's account. +{% data variables.product.prodname_enterprise %} は、コミットをユーザアカウントに再度リンクするためのバックグラウンドジョブを開始します。 ![待ち行列に入っている再構築ジョブ](/assets/images/enterprise/site-admin-settings/rebuild-jobs.png) diff --git a/translations/ja-JP/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md b/translations/ja-JP/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md index b1e190a5a3..082e2c779a 100644 --- a/translations/ja-JP/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md +++ b/translations/ja-JP/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md @@ -11,7 +11,7 @@ LDAP あるいはビルトイン認証を使っている場合、{% data variabl {% data reusables.enterprise_user_management.external_auth_disables_2fa %} -詳しい情報については[2FAをサポートする認証方式に関するこのチャート](/enterprise/{{ currentVersion }}/user/articles/about-two-factor-authentication/#authentication-methods-that-support-2fa)を参照してください。 +詳しい情報については「[2 要素認証について](/github/authenticating-to-github/about-two-factor-authentication)」を参照してください。 ### 2 要素認証実施にあたっての要件 diff --git a/translations/ja-JP/content/admin/user-management/suspending-and-unsuspending-users.md b/translations/ja-JP/content/admin/user-management/suspending-and-unsuspending-users.md index f67a97998a..247c69c690 100644 --- a/translations/ja-JP/content/admin/user-management/suspending-and-unsuspending-users.md +++ b/translations/ja-JP/content/admin/user-management/suspending-and-unsuspending-users.md @@ -84,4 +84,4 @@ fatal: The remote end hung up unexpectedly ``` ### 参考リンク -- "[Suspend a user](/enterprise/{{ currentVersion }}/v3/enterprise-admin/users/#suspend-a-user)" +- 「[ユーザーをサスペンドする](/enterprise/{{ currentVersion }}/v3/enterprise-admin/users/#suspend-a-user)」 diff --git a/translations/ja-JP/content/desktop/contributing-and-collaborating-using-github-desktop/cloning-a-repository-from-github-to-github-desktop.md b/translations/ja-JP/content/desktop/contributing-and-collaborating-using-github-desktop/cloning-a-repository-from-github-to-github-desktop.md index f904f7d0b1..d0a2f3527a 100644 --- a/translations/ja-JP/content/desktop/contributing-and-collaborating-using-github-desktop/cloning-a-repository-from-github-to-github-desktop.md +++ b/translations/ja-JP/content/desktop/contributing-and-collaborating-using-github-desktop/cloning-a-repository-from-github-to-github-desktop.md @@ -15,7 +15,7 @@ versions: {% mac %} -1. Sign in to +1. まず、 {% data variables.product.product_location %} and {% data variables.product.prodname_desktop %} before you start to clone. {% data reusables.repositories.navigate-to-repo %} @@ -34,7 +34,7 @@ versions: {% windows %} -1. Sign in to +1. まず、 {% data variables.product.product_location %} and {% data variables.product.prodname_desktop %} before you start to clone. {% data reusables.repositories.navigate-to-repo %} diff --git a/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/authenticating-to-github.md b/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/authenticating-to-github.md index 1f3077a57a..2a3cf56e23 100644 --- a/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/authenticating-to-github.md +++ b/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/authenticating-to-github.md @@ -37,8 +37,8 @@ versions: {% data reusables.desktop.mac-select-desktop-menu %} {% data reusables.desktop.mac-select-accounts %} {% data reusables.desktop.choose-product-authenticate %} -4. To add a -{% data variables.product.prodname_enterprise %} account, type your credentials under "Enterprise server address," then click **Continue**. +4. 次に、 +{% data variables.product.prodname_enterprise %} アカウントを追加するには、[Enterprise server address] の下に認証情報を入力し、[**Continue**] をクリックします。 ![GitHub EnterpriseのSign Inボタン](/assets/images/help/desktop/mac-sign-in-button-enterprise.png) {% data reusables.desktop.retrieve-2fa %} @@ -67,8 +67,8 @@ versions: {% data reusables.desktop.windows-choose-options %} {% data reusables.desktop.windows-select-accounts %} {% data reusables.desktop.choose-product-authenticate %} -4. To add a -{% data variables.product.prodname_enterprise %} account, type your credentials under "Enterprise server address," then click **Continue**. +4. 次に、 +{% data variables.product.prodname_enterprise %} アカウントを追加するには、[Enterprise server address] の下に認証情報を入力し、[**Continue**] をクリックします。 ![GitHub EnterpriseのSign Inボタン](/assets/images/help/desktop/windows-sign-in-button-enterprise.png) {% data reusables.desktop.retrieve-2fa %} diff --git a/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/installing-github-desktop.md b/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/installing-github-desktop.md index 655cfa5b2d..70701385e8 100644 --- a/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/installing-github-desktop.md +++ b/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/installing-github-desktop.md @@ -1,16 +1,16 @@ --- title: GitHub Desktopのインストール方法 shortTitle: インストール -intro: You can install GitHub Desktop on supported Windows or macOS operating systems. +intro: サポートされている Windows または macOS オペレーティングシステムに GitHub デスクトップをインストールできます。 redirect_from: - /desktop/getting-started-with-github-desktop/installing-github-desktop versions: free-pro-team: '*' --- -### About {% data variables.product.prodname_desktop %} installation +### {% data variables.product.prodname_desktop %} のインストールについて -You can install {% data variables.product.prodname_desktop %} on supported operating systems. If you have an account on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, you can connect your account to {% data variables.product.prodname_desktop %}. For more information about creating an account, see "[Signing up for a new {% data variables.product.prodname_dotcom %} account](/articles/signing-up-for-a-new-github-account/)" or contact your {% data variables.product.prodname_enterprise %} site administrator. +サポートされているオペレーティングシステムに {% data variables.product.prodname_desktop %} をインストールできます。 {% data variables.product.prodname_dotcom %} または {% data variables.product.prodname_enterprise %} にアカウントをお持ちの場合は、アカウントを {% data variables.product.prodname_desktop %} に接続できます。 アカウントの作成の詳細については、「[新しい {% data variables.product.prodname_dotcom %} アカウントへのサインアップ](/articles/signing-up-for-a-new-github-account/)」を参照するか、{% data variables.product.prodname_enterprise %} のサイト管理者にお問い合わせください。 {% windows %} diff --git a/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/setting-up-github-desktop.md b/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/setting-up-github-desktop.md index 31cc0cc6df..6477368678 100644 --- a/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/setting-up-github-desktop.md +++ b/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/setting-up-github-desktop.md @@ -1,43 +1,43 @@ --- title: GitHub Desktopの設定方法 -shortTitle: Setup -intro: 'You can set up {% data variables.product.prodname_desktop %} to suit your needs and contribute to projects.' +shortTitle: セットアップ +intro: 'ニーズに合わせて {% data variables.product.prodname_desktop %} を設定し、プロジェクトに貢献することができます。' redirect_from: - /desktop/getting-started-with-github-desktop/setting-up-github-desktop versions: free-pro-team: '*' --- -### Part 1: Installing {% data variables.product.prodname_desktop %} +### パート 1: {% data variables.product.prodname_desktop %} のインストール方法 -You can install {% data variables.product.prodname_desktop %} on any supported operating system. For more information, see "[Supported Operating Systems](/desktop/getting-started-with-github-desktop/supported-operating-systems)." +You can install {% data variables.product.prodname_desktop %} on any supported operating system. 詳しい情報については、「[サポートされているオペレーティングシステム](/desktop/getting-started-with-github-desktop/supported-operating-systems)」を参照してください。 -To install {% data variables.product.prodname_desktop %}, navigate to [https://desktop.github.com/](https://desktop.github.com/) and download the appropriate version of {% data variables.product.prodname_desktop %} for your operating system. Follow the prompts to complete the installation. 詳しい情報については「[{% data variables.product.prodname_desktop %}のインストール](/desktop/getting-started-with-github-desktop/installing-github-desktop)」を参照してください。 +{% data variables.product.prodname_desktop %} をインストールするには、[https://desktop.github.com/](https://desktop.github.com/) に移動し、オペレーティングシステムに適したバージョンの {% data variables.product.prodname_desktop %} をダウンロードします。 プロンプトに従って、インストールを完了します。 詳しい情報については「[{% data variables.product.prodname_desktop %}のインストール](/desktop/getting-started-with-github-desktop/installing-github-desktop)」を参照してください。 -### Part 2: Configuring your account +### パート 2: アカウントの設定 -If you have an account on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, you can use {% data variables.product.prodname_desktop %} to exchange data between your local and remote repositories. +{% data variables.product.prodname_dotcom %} または {% data variables.product.prodname_enterprise %} にアカウントがある場合は、{% data variables.product.prodname_desktop %} を使用してローカルリポジトリとリモートリポジトリの間でデータを交換できます。 -#### Creating an account -If you do not already have an account on {% data variables.product.prodname_dotcom %}, see "[Signing up for a new {% data variables.product.prodname_dotcom %} account](/articles/signing-up-for-a-new-github-account/)." +#### アカウントを作成する +{% data variables.product.prodname_dotcom %} のアカウントをまだお持ちでない場合は、「[新しい{% data variables.product.prodname_dotcom %} アカウントにサインアップする](/articles/signing-up-for-a-new-github-account/)」を参照してください。 -If you are part of an organization that uses {% data variables.product.prodname_enterprise %} and you do not have an account, contact your {% data variables.product.prodname_enterprise %} site administrator. +{% data variables.product.prodname_enterprise %} を使用している Organization に所属していて、アカウントを持っていない場合は、{% data variables.product.prodname_enterprise %} のサイト管理者に連絡してください。 #### {% data variables.product.prodname_dotcom %} への認証を行う -To connect to {% data variables.product.prodname_desktop %} with {% data variables.product.prodname_dotcom %}, you'll need to authenticate your account. 詳しい情報については「[{% data variables.product.prodname_desktop %}への認証を行う](/desktop/getting-started-with-github-desktop/authenticating-to-github)」を参照してください。 +{% data variables.product.prodname_dotcom %} を使用して {% data variables.product.prodname_desktop %} に接続するには、アカウントを認証する必要があります。 詳しい情報については「[{% data variables.product.prodname_desktop %}への認証を行う](/desktop/getting-started-with-github-desktop/authenticating-to-github)」を参照してください。 -After authenticating your account, you are ready to manage and contribute to projects with {% data variables.product.prodname_desktop %}. +アカウントを認証すると、{% data variables.product.prodname_desktop %} を使用してプロジェクトを管理し、貢献を開始できます。 -### Part 3: Configuring Git -You must have Git installed before using {% data variables.product.prodname_desktop %}. If you do not already have Git installed, you can download and install the latest version of Git from [https://git-scm.com/downloads](https://git-scm.com/downloads). +### パート 3: Git の設定 +{% data variables.product.prodname_desktop %} を使用する前に Git をインストールしておく必要があります。 Git をまだインストールしていない場合は、[https://git-scm.com/downloads](https://git-scm.com/downloads) から最新バージョンの Git をダウンロードしてインストールできます。 -After you have Git installed, you'll need to configure Git for {% data variables.product.prodname_desktop %}. For more information, see "[Configuring Git for {% data variables.product.prodname_desktop %}](/desktop/getting-started-with-github-desktop/configuring-git-for-github-desktop)." +Git をインストールしたら、{% data variables.product.prodname_desktop %} 用に Git を設定する必要があります。 詳しい情報については、「[{% data variables.product.prodname_desktop %} の Git を設定する](/desktop/getting-started-with-github-desktop/configuring-git-for-github-desktop)」を参照してください。 -### Part 4: Customizing {% data variables.product.prodname_desktop %} -You can adjust defaults and settings to tailor {% data variables.product.prodname_desktop %} to your needs. +### パート 4: {% data variables.product.prodname_desktop %} のカスタマイズ +デフォルトや設定を変更して、{% data variables.product.prodname_desktop %} をニーズに合わせて調整できます。 -#### Choosing a default text editor -You can open a text editor from {% data variables.product.prodname_desktop %} to manipulate files and repositories. {% data variables.product.prodname_desktop %} supports a variety of text editors and integrated development environments (IDEs) for Windows and macOS. You can choose a default editor in the {% data variables.product.prodname_desktop %} settings. For more information, see "[Configuring a default editor](/desktop/getting-started-with-github-desktop/configuring-a-default-editor)." +#### デフォルトのテキストエディタを選択する +{% data variables.product.prodname_desktop %} からテキストエディタを開いて、ファイルとリポジトリを操作できます。 {% data variables.product.prodname_desktop %} は、Windows および macOS 用のさまざまなテキストエディタと統合開発環境 (IDE) をサポートしています。 {% data variables.product.prodname_desktop %} 設定でデフォルトのエディタを選択できます。 For more information, see "[Configuring a default editor](/desktop/getting-started-with-github-desktop/configuring-a-default-editor)." -#### Choosing a theme -{% data variables.product.prodname_desktop %} has multiple themes available to customize the look and feel of the app. You can choose a theme in the {% data variables.product.prodname_desktop %} settings. For more information, see "[Setting a theme for {% data variables.product.prodname_desktop %}](/desktop/getting-started-with-github-desktop/setting-a-theme-for-github-desktop)." +#### テーマを選択する +{% data variables.product.prodname_desktop %} には、アプリの見た目をカスタマイズする際に利用できる複数のテーマがあります。 {% data variables.product.prodname_desktop %} 設定でテーマを選択できます。 詳しい情報については、「[{% data variables.product.prodname_desktop %} のテーマを設定する](/desktop/getting-started-with-github-desktop/setting-a-theme-for-github-desktop)」を参照してください。 diff --git a/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/supported-operating-systems.md b/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/supported-operating-systems.md index 3714e5a98c..5e88191f5c 100644 --- a/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/supported-operating-systems.md +++ b/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/supported-operating-systems.md @@ -24,8 +24,8 @@ macOS で {% data variables.product.prodname_desktop %} を使用して問題が このエラーのトラブルシューティングを行うには、次のステップを実行します。 1. 「Keychain Access」アプリケーションを開きます。 -2. [**login**] を右クリックして、[**Lock Keychain "login"**] をクリックします。 ![The "Lock Keychain "login" option](/assets/images/help/desktop/mac-lock-keychain.png) -3. [**login**] を右クリックして、[**Unlock Keychain "login"**] をクリックします。 画面の指示に従って、Keychain "login" のロック解除を完了します。 ![The "Unlock Keychain "login" option](/assets/images/help/desktop/mac-unlock-keychain.png) +2. [**login**] を右クリックして、[**Lock Keychain "login"**] をクリックします。 !["Lock Keychain "login" オプション](/assets/images/help/desktop/mac-lock-keychain.png) +3. [**login**] を右クリックして、[**Unlock Keychain "login"**] をクリックします。 画面の指示に従って、Keychain "login" のロック解除を完了します。 !["Unlock Keychain "login" オプション](/assets/images/help/desktop/mac-unlock-keychain.png) 4. {% data variables.product.prodname_dotcom %} または {% data variables.product.prodname_enterprise %} でアカウントを再認証します。 #### アップデート確認時のエラー：`Could not create temporary directory: Permission denied`（一時ディレクトリを作成できませんでした：権限が拒否されました） @@ -38,24 +38,24 @@ macOS で {% data variables.product.prodname_desktop %} を使用して問題が 2. 「Finder」を開き、`~/Library/Caches/` に移動します。 3. `com.github.GitHubClient.ShipIt` を右クリックし、[**Get Info**] をクリックします。 4. [Sharing & Permissions] の左にある矢印をクリックします。 -5. ユーザアカウントの右にある権限に「Read & Write」と表示されていない場合は、テキストをクリックして、[**Read & Write**] をクリックします。 ![The "Sharing & Permissions" options](/assets/images/help/desktop/mac-adjust-permissions.png) +5. ユーザアカウントの右にある権限に「Read & Write」と表示されていない場合は、テキストをクリックして、[**Read & Write**] をクリックします。 !["Sharing & Permissions" オプション](/assets/images/help/desktop/mac-adjust-permissions.png) 6. {% data variables.product.prodname_desktop %} を開き、更新を確認します。 ### Windows に関する問題のトラブルシューティング Windows で {% data variables.product.prodname_desktop %} を使用して問題が発生した場合は、以下の解決策を試してください。 詳しい情報については、[`known-issues`](https://github.com/desktop/desktop/blob/development/docs/known-issues.md) を参照してください。 -#### `The revocation function was unable to check revocation for the certificate.` error +#### エラー: `The revocation function was unable to check revocation for the certificate.`（失効機能で証明書の失効を確認できませんでした。） -This error can occur if you are using {% data variables.product.prodname_desktop %} on a corporate network that blocks Windows from checking the revocation status of a certificate. +このエラーは、Windows が証明書の失効ステータスチェックをブロックする企業ネットワークで {% data variables.product.prodname_desktop %} を使用している場合に発生する可能性があります。 -To troubleshoot, contact your system administrator. +トラブルシューティングを行うには、システム管理者にお問い合わせください。 -#### `git clone failed` error while cloning a repository configured with Folder Redirection +#### エラー: `git clone failed` (フォルダリダイレクトで設定されたリポジトリのクローン作成中にエラーが発生しました) -{% data variables.product.prodname_desktop %} does not support repositories configured with Folder Redirection. +{% data variables.product.prodname_desktop %} は、フォルダリダイレクトで設定されたリポジトリをサポートしていません。 -#### `cygheap base mismatch detected` error +#### エラー: `cygheap base mismatch detected` (cygheap ベースの不一致が検出されました) -This error can occur when Mandatory ASLR is enabled. Enabling Mandatory ASLR affects the MSYS2 core library, which {% data variables.product.prodname_desktop %} relies upon to emulate process forking. +このエラーは、必須 ASLR が有効になっている場合に発生する可能性があります。 必須 ASLR を有効にすると、{% data variables.product.prodname_desktop %} がプロセスのフォークをエミュレートするために依存している MSYS2 コアライブラリに影響します。 -To troubleshoot this error, either disable Mandatory ASLR or explicitly allow all executables under `\usr\bin` which depend on MSYS2. +このエラーのトラブルシューティングを行うには、必須 ASLR を無効にするか、MSYS2 に依存する `\usr\bin` 下のすべての実行可能ファイルを明示的に許可します。 diff --git a/translations/ja-JP/content/developers/apps/about-apps.md b/translations/ja-JP/content/developers/apps/about-apps.md index 8c0d306e73..463ae39f87 100644 --- a/translations/ja-JP/content/developers/apps/about-apps.md +++ b/translations/ja-JP/content/developers/apps/about-apps.md @@ -1,6 +1,6 @@ --- -title: About apps -intro: 'You can build integrations with the {% data variables.product.prodname_dotcom %} APIs to add flexibility and reduce friction in your own workflow. You can also share integrations with others on [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace).' +title: アプリケーションについて +intro: '{% data variables.product.prodname_dotcom %} API でインテグレーションを構築し、ワークフローにおいて柔軟性を高めて摩擦を軽減できます。 また、[{% data variables.product.prodname_marketplace %}](https://github.com/marketplace) でインテグレーションを共有することも可能です。' redirect_from: - /apps/building-integrations/setting-up-a-new-integration/ - /apps/building-integrations/ @@ -11,89 +11,89 @@ versions: enterprise-server: '*' --- -Apps on {% data variables.product.prodname_dotcom %} allow you to automate and improve your workflow. You can build apps to improve your workflow.{% if currentVersion == "free-pro-team@latest" %} You can also share or sell apps in [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace). To learn how to list an app on {% data variables.product.prodname_marketplace %}, see "[Getting started with GitHub Marketplace](/marketplace/getting-started/)."{% endif %} +{% data variables.product.prodname_dotcom %} のアプリケーションを使用すると、ワークフローを自動化し改善できます。 アプリケーションを構築して、ワークフローを改善できます。{% if currentVersion == "free-pro-team@latest" %} また、[{% data variables.product.prodname_marketplace %}](https://github.com/marketplace) でアプリケーションを共有または販売することも可能です。 {% data variables.product.prodname_marketplace %} にアプリを掲載する方法については、「[GitHub Marketplace を使ってみる](/marketplace/getting-started/)」を参照してください。{% endif %} -{% data reusables.marketplace.github_apps_preferred %}, but GitHub supports both {% data variables.product.prodname_oauth_app %}s and {% data variables.product.prodname_github_apps %}. For information on choosing a type of app, see "[About apps](/apps/about-apps/)" and "[Differences between apps](/apps/differences-between-apps/)." +{% data reusables.marketplace.github_apps_preferred %}。ただし、GitHub は {% data variables.product.prodname_oauth_app %} と {% data variables.product.prodname_github_apps %} の両方をサポートしています。 アプリケーションのタイプ選択に関する情報については、「[アプリケーションについて](/apps/about-apps/)」および「[アプリケーション間の違いについて](/apps/differences-between-apps/)」を参照してください。 {% data reusables.apps.general-apps-restrictions %} -For a walkthrough of the process of building a {% data variables.product.prodname_github_app %}, see "[Building Your First {% data variables.product.prodname_github_app %}](/apps/building-your-first-github-app)." +{% data variables.product.prodname_github_app %} を構築する手順については、「[はじめての {% data variables.product.prodname_github_app %} 構築](/apps/building-your-first-github-app)」を参照してください。 ### {% data variables.product.prodname_github_apps %} について -{% data variables.product.prodname_github_apps %} are first-class actors within GitHub. A {% data variables.product.prodname_github_app %} acts on its own behalf, taking actions via the API directly using its own identity, which means you don't need to maintain a bot or service account as a separate user. +{% data variables.product.prodname_github_apps %} は GitHub の中でも主役級の存在です。 {% data variables.product.prodname_github_app %} は独自で動作し、独自の ID を使用して API 経由で直接アクションを実行します。つまり、ボットやサービスアカウントを別途維持する必要がありません。 -{% data variables.product.prodname_github_apps %} can be installed directly on organizations and user accounts and granted access to specific repositories. They come with built-in webhooks and narrow, specific permissions. When you set up your {% data variables.product.prodname_github_app %}, you can select the repositories you want it to access. For example, you can set up an app called `MyGitHub` that writes issues in the `octocat` repository and _only_ the `octocat` repository. To install a {% data variables.product.prodname_github_app %}, you must be an organization owner or have admin permissions in a repository. +{% data variables.product.prodname_github_apps %} は、Organization やユーザアカウントに直接インストールでき、特定のリポジトリへのアクセス権を付与できます。 精細なアクセス権限が付いており、webhook が組み込まれています。 {% data variables.product.prodname_github_app %} をセットアップする際、アクセスさせるリポジトリを選択できます。 たとえば、`octocat` リポジトリ _のみ_ に IssueIssue を書き込む、`MyGitHub` というアプリケーションをセットアップできます。 {% data variables.product.prodname_github_app %} をインストールするには、Organization のオーナーであるか、リポジトリで管理者権限を持っている必要があります。 {% data reusables.apps.app_manager_role %} -{% data variables.product.prodname_github_apps %} are applications that need to be hosted somewhere. For step-by-step instructions that cover servers and hosting, see "[Building Your First {% data variables.product.prodname_github_app %}](/apps/building-your-first-github-app)." +{% data variables.product.prodname_github_apps %} は、どこかにホストする必要があるアプリケーションです。 サーバーとホスティングに関するステップバイステップガイドについては、[はじめての {% data variables.product.prodname_github_app %} 構築](/apps/building-your-first-github-app)」を参照してください。 -To improve your workflow, you can create a {% data variables.product.prodname_github_app %} that contains multiple scripts or an entire application, and then connect that app to many other tools. For example, you can connect {% data variables.product.prodname_github_apps %} to GitHub, Slack, other in-house apps you may have, email programs, or other APIs. +ワークフローを改善するため、複数のスクリプトまたはアプリケーション全体を含む {% data variables.product.prodname_github_app %} を作成し、それをその他の数多くのツールと接続できます。 たとえば、{% data variables.product.prodname_github_apps %} を GitHub、Slack、その他の社内アプリケーション、電子メールプログラム、その他の API などに接続できます。 -Keep these ideas in mind when creating {% data variables.product.prodname_github_apps %}: +{% data variables.product.prodname_github_apps %} を作成する際は、以下に気を付けてください。 {% if currentVersion == "free-pro-team@latest" %} * {% data reusables.apps.maximum-github-apps-allowed %} {% endif %} -* A {% data variables.product.prodname_github_app %} should take actions independent of a user (unless the app is using a [user-to-server](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps#user-to-server-requests) token). {% data reusables.apps.expiring_user_authorization_tokens %} +* {% data variables.product.prodname_github_app %} は、ユーザと独立したアクションを実行する必要があります (アプリケーションが [user-to-server](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps#user-to-server-requests) トークンを使用する場合を除きます)。 {% data reusables.apps.expiring_user_authorization_tokens %} -* Make sure the {% data variables.product.prodname_github_app %} integrates with specific repositories. -* The {% data variables.product.prodname_github_app %} should connect to a personal account or an organization. -* Don't expect the {% data variables.product.prodname_github_app %} to know and do everything a user can. -* Don't use a {% data variables.product.prodname_github_app %} if you just need a "Login with GitHub" service. But a {% data variables.product.prodname_github_app %} can use a [user identification flow](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/) to log users in _and_ do other things. -* Don't build a {% data variables.product.prodname_github_app %} if you _only_ want to act as a GitHub user and do everything that user can do.{% if currentVersion == "free-pro-team@latest" %} +* {% data variables.product.prodname_github_app %} は、必ず特定のリポジトリと統合するようにしてください。 +* {% data variables.product.prodname_github_app %} は個人アカウントまたは Organization に接続する必要があります。 +* ユーザができる全てのことを {% data variables.product.prodname_github_app %} が知り、行えるとは思わないでください。 +* 単に「GitHub でログイン」するサービスが必要な場合は、{% data variables.product.prodname_github_app %} を使用しないでください。 [ユーザ識別フロー](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)でユーザをログインさせ、_かつ_他のことを行う場合は、{% data variables.product.prodname_github_app %} を使用できます。 +* GitHub ユーザとして振る舞い、ユーザが実行できることを全て実行したい_だけ_の場合は、{% data variables.product.prodname_github_app %} を構築しないでください。{% if currentVersion == "free-pro-team@latest" %} * {% data reusables.apps.general-apps-restrictions %}{% endif %} -To begin developing {% data variables.product.prodname_github_apps %}, start with "[Creating a {% data variables.product.prodname_github_app %}](/apps/building-github-apps/creating-a-github-app/)."{% if currentVersion == "free-pro-team@latest" %} To learn how to use {% data variables.product.prodname_github_app %} Manifests, which allow people to create preconfigured {% data variables.product.prodname_github_apps %}, see "[Creating {% data variables.product.prodname_github_apps %} from a manifest](/apps/building-github-apps/creating-github-apps-from-a-manifest/)."{% endif %} +{% data variables.product.prodname_github_apps %} アプリケーションの開発を始めるには、「[{% data variables.product.prodname_github_app %} を作成する](/apps/building-github-apps/creating-a-github-app/)」から取りかかってください。{% if currentVersion == "free-pro-team@latest" %}事前設定された {% data variables.product.prodname_github_apps %} を作成できる {% data variables.product.prodname_github_app %} マニフェストの使い方については、「[マニフェストから {% data variables.product.prodname_github_apps %} を作成する](/apps/building-github-apps/creating-github-apps-from-a-manifest/)」を参照してください。{% endif %} -### About {% data variables.product.prodname_oauth_app %}s +### {% data variables.product.prodname_oauth_app %} について -OAuth2 is a protocol that lets external applications request authorization to private details in a user's {% data variables.product.prodname_dotcom %} account without accessing their password. This is preferred over Basic Authentication because tokens can be limited to specific types of data and can be revoked by users at any time. +OAuth2 は、外部アプリケーションがパスワードにアクセスすることなく、ユーザの {% data variables.product.prodname_dotcom %} アカウントの個人情報への認証を要求できるようにするプロトコルです。 これは Basic 認証よりも好ましい方法です。なぜなら、トークンは特定の種類のデータに限定でき、ユーザがいつでも取り消すことができるからです。 {% data reusables.apps.deletes_ssh_keys %} -An {% data variables.product.prodname_oauth_app %} uses {% data variables.product.prodname_dotcom %} as an identity provider to authenticate as the user who grants access to the app. This means when a user grants an {% data variables.product.prodname_oauth_app %} access, they grant permissions to _all_ repositories they have access to in their account, and also to any organizations they belong to that haven't blocked third-party access. +{% data variables.product.prodname_oauth_app %} は、アプリケーションにアクセス権を付与するユーザを認証するため、アイデンティティプロバイダとして {% data variables.product.prodname_dotcom %} を使用します。 つまり、ユーザが {% data variables.product.prodname_oauth_app %} にアクセス権を付与すると、アカウントでアクセスできる _すべての_ リポジトリ、およびサードパーティのアクセスをブロックしていないあらゆる Organization に対してアクセスを許可することになります。 -Building an {% data variables.product.prodname_oauth_app %} is a good option if you are creating more complex processes than a simple script can handle. Note that {% data variables.product.prodname_oauth_app %}s are applications that need to be hosted somewhere. +単純なスクリプトで処理できるよりも複雑なプロセスを作成する場合、{% data variables.product.prodname_oauth_app %} を構築するのは良い選択肢です。 {% data variables.product.prodname_oauth_app %} は、どこかにホストする必要があるアプリケーションであることに注意してください。 -Keep these ideas in mind when creating {% data variables.product.prodname_oauth_app %}s: +{% data variables.product.prodname_oauth_app %} を作成する際は、以下に気を付けてください。 {% if currentVersion == "free-pro-team@latest" %} * {% data reusables.apps.maximum-oauth-apps-allowed %} {% endif %} -* An {% data variables.product.prodname_oauth_app %} should always act as the authenticated {% data variables.product.prodname_dotcom %} user across all of {% data variables.product.prodname_dotcom %} (for example, when providing user notifications). -* An {% data variables.product.prodname_oauth_app %} can be used as an identity provider by enabling a "Login with {% data variables.product.prodname_dotcom %}" for the authenticated user. -* Don't build an {% data variables.product.prodname_oauth_app %} if you want your application to act on a single repository. With the `repo` OAuth scope, {% data variables.product.prodname_oauth_app %}s can act on _all_ of the authenticated user's repositories. -* Don't build an {% data variables.product.prodname_oauth_app %} to act as an application for your team or company. {% data variables.product.prodname_oauth_app %}s authenticate as a single user, so if one person creates an {% data variables.product.prodname_oauth_app %} for a company to use, and then they leave the company, no one else will have access to it.{% if currentVersion == "free-pro-team@latest" %} +* {% data variables.product.prodname_oauth_app %} は、{% data variables.product.prodname_dotcom %} 全体にわたって、常に認証された {% data variables.product.prodname_dotcom %} ユーザとして振る舞う必要があります (たとえば、ユーザ通知を行う場合など)。 +* 認証されたユーザに対して「{% data variables.product.prodname_dotcom %} でログイン」を有効化することにより、{% data variables.product.prodname_oauth_app %} をアイデンティティプロバイダとして使用できます。 +* 単一のリポジトリで動作するアプリケーションが必要な場合、{% data variables.product.prodname_oauth_app %} を構築しないでください。 `repo` OAuth スコープを使用すると、{% data variables.product.prodname_oauth_app %} は認証されたユーザの_全ての_リポジトリで動作します。 +* Team や企業を代理するアプリケーションとして {% data variables.product.prodname_oauth_app %} を構築しないでください。 {% data variables.product.prodname_oauth_app %} は単一のユーザとして認証を行うので、ある人が {% data variables.product.prodname_oauth_app %} を会社が使用するものとして作成し、その人が会社を辞めた場合は、他の人がアクセスできなくなります。{% if currentVersion == "free-pro-team@latest" %} * {% data reusables.apps.oauth-apps-restrictions %}{% endif %} -For more on {% data variables.product.prodname_oauth_app %}s, see "[Creating an {% data variables.product.prodname_oauth_app %}](/apps/building-oauth-apps/creating-an-oauth-app/)" and "[Registering your app](/v3/guides/basics-of-authentication/#registering-your-app)." +{% data variables.product.prodname_oauth_app %} の詳細については、「[{% data variables.product.prodname_oauth_app %} を作成する](/apps/building-oauth-apps/creating-an-oauth-app/)」および「[アプリケーションを登録する](/v3/guides/basics-of-authentication/#registering-your-app)」を参照してください。 ### 個人アクセストークン -A [personal access token](/articles/creating-a-personal-access-token-for-the-command-line/) is a string of characters that functions similarly to an [OAuth token](/apps/building-oauth-apps/authorizing-oauth-apps/) in that you can specify its permissions via [scopes](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/). A personal access token is also similar to a password, but you can have many of them and you can revoke access to each one at any time. +[個人アクセストークン](/articles/creating-a-personal-access-token-for-the-command-line/)は、権限を[スコープ](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/)で特定できる点において、[OAuth トークン](/apps/building-oauth-apps/authorizing-oauth-apps/)と機能が似ている文字列です。 また、個人アクセストークンはパスワードとも似ています。ただし、個人アクセストークンは複数所有でき、それぞれのアクセス権をいつでも取り消すことができます。 -As an example, you can enable a personal access token to write to your repositories. If then you run a cURL command or write a script that [creates an issue](/v3/issues/#create-an-issue) in your repository, you would pass the personal access token to authenticate. You can store the personal access token as an environment variable to avoid typing it every time you use it. +たとえば、個人アクセストークンにリポジトリへの書き込みをできるように設定できます。 そして、リポジトリで[Issue を作成する](/v3/issues/#create-an-issue) cURL コマンドを実行するかスクリプトを記述する場合、個人アクセストークンを渡して認証します。 個人アクセストークンを環境変数として保存することで、使用のたびに入力することを避けることができます。 -Keep these ideas in mind when using personal access tokens: +個人アクセストークンを使用する際は、以下に気を付けてください。 -* Remember to use this token to represent yourself only. -* You can perform one-off cURL requests. -* You can run personal scripts. -* Don't set up a script for your whole team or company to use. -* Don't set up a shared user account to act as a bot user. +* トークンは自分自身のみを表すものとして使用してください。 +* 1 回限りの cURL リクエストを実行できます。 +* 個人用のスクリプトを実行できます。 +* Team や会社全体が使用するスクリプトは設定しないでください。 +* ボットユーザとして振る舞う共有ユーザアカウントは設定しないでください。 -### Determining which integration to build +### 構築すべきインテグレーションを決定する -Before you get started creating integrations, you need to determine the best way to access, authenticate, and interact with the {% data variables.product.prodname_dotcom %} APIs. The following image offers some questions to ask yourself when deciding whether to use personal access tokens, {% data variables.product.prodname_github_apps %}, or {% data variables.product.prodname_oauth_app %}s for your integration. +インテグレーションの作成に取りかかる前に、{% data variables.product.prodname_dotcom %} API を使用したアクセス、認証、対話に最善の方法を見極める必要があります。 以下の画像にある質問に答えていくと、個人アクセストークン、{% data variables.product.prodname_github_apps %}、{% data variables.product.prodname_oauth_app %} のどれをインテグレーションとして使用するかを決めることができます。 -![Intro to apps question flow](/assets/images/intro-to-apps-flow.png) +![アプリケーションの質問フローの紹介](/assets/images/intro-to-apps-flow.png) -Consider these questions about how your integration needs to behave and what it needs to access: +インテグレーションがどう振る舞うべきか、何にアクセスできるべきかについては、以下の質問を検討してください。 -* Will my integration act only as me, or will it act more like an application? -* Do I want it to act independently of me as its own entity? -* Will it access everything that I can access, or do I want to limit its access? -* Is it simple or complex? For example, personal access tokens are good for simple scripts and cURLs, whereas an {% data variables.product.prodname_oauth_app %} can handle more complex scripting. +* インテグレーションは自分自身としてのみ振る舞うのか、それともアプリケーションのように振る舞うのか? +* 独自のエンティティとして、自分から独立して動作させるのか? +* 自分がアクセスできるもの全てにアクセスするのか、それともアクセスを制限するのか? +* 単純か、それとも複雑か? たとえば、個人アクセストークンは単純なスクリプトや cURL に適し、{% data variables.product.prodname_oauth_app %} はより複雑なスクリプトを処理できます。 ### サポートのリクエスト diff --git a/translations/ja-JP/content/developers/apps/activating-beta-features-for-apps.md b/translations/ja-JP/content/developers/apps/activating-beta-features-for-apps.md index f349501d5f..074c71b427 100644 --- a/translations/ja-JP/content/developers/apps/activating-beta-features-for-apps.md +++ b/translations/ja-JP/content/developers/apps/activating-beta-features-for-apps.md @@ -1,25 +1,24 @@ --- -title: Activating beta features for apps -intro: 'You can test new app features released in public beta for your {% data variables.product.prodname_github_apps %} and {% data variables.product.prodname_oauth_app %}s.' +title: アプリケーションのベータ版機能を有効化する +intro: 'パブリックベータでリリースたれた新しいアプリケーションの機能を、{% data variables.product.prodname_github_apps %} および {% data variables.product.prodname_oauth_app %} でテストできます。' versions: free-pro-team: '*' --- {% warning %} -**Warning:** Features available in public beta are subject to change. +**警告:** パブリックベータで利用できる機能は変更される場合があります。 {% endwarning %} -### Activating beta features for {% data variables.product.prodname_github_apps %} +### {% data variables.product.prodname_github_apps %} でベータ版機能を有効化する {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} -3. Select the -{% data variables.product.prodname_github_app %} you want to enable a beta feature for. +3. ベータ版機能を有効化する {% data variables.product.prodname_github_app %} を選択します。 {% data reusables.apps.beta_feature_activation %} -### Activating beta features for {% data variables.product.prodname_oauth_app %}s +### {% data variables.product.prodname_oauth_app %} でベータ版機能を有効化する {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} diff --git a/translations/ja-JP/content/developers/apps/authenticating-with-github-apps.md b/translations/ja-JP/content/developers/apps/authenticating-with-github-apps.md index 79dd1fc619..e1c7fd0d75 100644 --- a/translations/ja-JP/content/developers/apps/authenticating-with-github-apps.md +++ b/translations/ja-JP/content/developers/apps/authenticating-with-github-apps.md @@ -1,5 +1,5 @@ --- -title: Authenticating with GitHub Apps +title: GitHub App による認証 intro: '{% data reusables.shortdesc.authenticating_with_github_apps %}' redirect_from: - /apps/building-integrations/setting-up-and-registering-github-apps/about-authentication-options-for-github-apps/ @@ -10,57 +10,57 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} -### Generating a private key +### 秘密鍵を生成する -After you create a GitHub App, you'll need to generate one or more private keys. You'll use the private key to sign access token requests. +GitHub App の作成後は、1 つ以上の秘密鍵を生成する必要があります。 アクセストークンのリクエストに署名するには、この秘密鍵を使用します。 -You can create multiple private keys and rotate them to prevent downtime if a key is compromised or lost. To verify that a private key matches a public key, see [Verifying private keys](#verifying-private-keys). +鍵が危殆化したり、鍵を紛失した場合にダウンタイムを回避するため、複数の秘密鍵を作成してローテーションすることができます。 秘密鍵が公開鍵と適合することを確認するには、[秘密鍵を検証する](#verifying-private-keys)を参照してください。 -To generate a private key: +秘密鍵を生成するには、以下の手順に従います。 {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} {% data reusables.user-settings.github_apps %} {% data reusables.user-settings.modify_github_app %} -5. In "Private keys," click **Generate a private key**. ![Generate private key](/assets/images/github-apps/github_apps_generate_private_keys.png) -6. You will see a private key in PEM format downloaded to your computer. Make sure to store this file because GitHub only stores the public portion of the key. +5. [Private keys] で、[**Generate a private key**] をクリックします。 ![秘密鍵の生成](/assets/images/github-apps/github_apps_generate_private_keys.png) +6. お手元のコンピュータにダウンロードされた PEM フォーマットの秘密鍵が表示されます。 このファイルは必ず保存してください。GitHub では公開鍵の部分しか保存しません。 {% note %} -**Note:** If you're using a library that requires a specific file format, the PEM file you download will be in `PKCS#1 RSAPrivateKey` format. +**注釈:** 特定のファイルフォーマットが必要なライブラリを使用している場合、ダウンロードする PEM ファイルは `PKCS#1 RSAPrivateKey` フォーマットになります。 {% endnote %} -### Verifying private keys -{% data variables.product.product_name %} generates a fingerprint for each private and public key pair using the {% if currentVersion ver_lt "enterprise-server@2.23" %}SHA-1{% else %}SHA-256{% endif %} hash function. You can verify that your private key matches the public key stored on {% data variables.product.product_name %} by generating the fingerprint of your private key and comparing it to the fingerprint shown on {% data variables.product.product_name %}. +### 秘密鍵を検証する +{% data variables.product.product_name %} は、 {% if currentVersion ver_lt "enterprise-server@2.23" %}SHA-1{% else %}SHA-256{% endif %} ハッシュ関数を使用して、秘密鍵と公開鍵との各ペアに対してフィンガープリントを生成します。 秘密鍵のフィンガープリントを生成し、{% data variables.product.product_name %} で表示されているフィンガープリントと比較することにより、秘密鍵が {% data variables.product.product_name %} に保存宇されている公開鍵と適合することを検証できます。 -To verify a private key: +秘密鍵を検証するには、以下の手順に従います。 -1. Find the fingerprint for the private and public key pair you want to verify in the "Private keys" section of your {% data variables.product.prodname_github_app %}'s developer settings page. For more information, see [Generating a private key](#generating-a-private-key). ![Private key fingerprint](/assets/images/github-apps/github_apps_private_key_fingerprint.png) -2. Generate the fingerprint of your private key (PEM) locally by using the following command: +1. {% data variables.product.prodname_github_app %} の開発者設定ページにある [Private keys] セクションで、検証する秘密鍵と公開鍵のペアを見つけます。 詳しい情報については、[秘密鍵を生成する](#generating-a-private-key)を参照してください。 ![秘密鍵のフィンガープリント](/assets/images/github-apps/github_apps_private_key_fingerprint.png) +2. 次のコマンドを使用して、秘密鍵 (PEM) のフィンガープリントをローカルで生成します。 ```shell $ openssl rsa -in PATH_TO_PEM_FILE -pubout -outform DER | openssl {% if currentVersion ver_lt "enterprise-server@2.23" %}sha1 -c{% else %}sha256 -binary | openssl base64{% endif %} ``` -3. Compare the results of the locally generated fingerprint to the fingerprint you see in {% data variables.product.product_name %}. +3. ローカルで生成されたフィンガープリントの結果と、{% data variables.product.product_name %} に表示されているフィンガープリントを比較します。 -### Deleting private keys -You can remove a lost or compromised private key by deleting it, but you must have at least one private key. When you only have one key, you will need to generate a new one before deleting the old one. ![Deleting last private key](/assets/images/github-apps/github_apps_delete_key.png) +### 秘密鍵を削除する +紛失や危殆化した秘密鍵は削除できますが、最低 1 つは秘密鍵を所有する必要があります。 鍵が 1 つしかない場合、その鍵を削除する前に新しい鍵を生成する必要があります。 ![直近の秘密鍵を削除する](/assets/images/github-apps/github_apps_delete_key.png) -### Authenticating as a {% data variables.product.prodname_github_app %} +### {% data variables.product.prodname_github_app %} として認証を行う -Authenticating as a {% data variables.product.prodname_github_app %} lets you do a couple of things: +{% data variables.product.prodname_github_app %} として認証を行うと、以下のことが可能になります。 -* You can retrieve high-level management information about your {% data variables.product.prodname_github_app %}. -* You can request access tokens for an installation of the app. +* {% data variables.product.prodname_github_app %} について管理情報の概要を取得できます。 +* アプリケーションのインストールのため、アクセストークンをリクエストできます。 -To authenticate as a {% data variables.product.prodname_github_app %}, [generate a private key](#generating-a-private-key) in PEM format and download it to your local machine. You'll use this key to sign a [JSON Web Token (JWT)](https://jwt.io/introduction) and encode it using the `RS256` algorithm. {% data variables.product.product_name %} checks that the request is authenticated by verifying the token with the app's stored public key. +{% data variables.product.prodname_github_app %} として認証するには、PEM フォーマットで[秘密鍵を生成](#generating-a-private-key)し、ローカルマシンにダウンロードします。 この鍵を使用して [JSON Web Token (JWT)](https://jwt.io/introduction) に署名し、`RS256` アルゴリズムを使用してエンコードします。 {% data variables.product.product_name %} は、トークンをアプリケーションが保存する公開鍵で検証することにより、リクエストが認証されていることを確認します。 -Here's a quick Ruby script you can use to generate a JWT. Note you'll have to run `gem install jwt` before using it. +JWT を生成するために使用できる簡単な Ruby スクリプトを掲載します。 `gem install jwt` を実行してから、このスクリプトを使用してください。 @@ -86,13 +86,13 @@ jwt = JWT.encode(payload, private_key, "RS256") puts jwt ``` -`YOUR_PATH_TO_PEM` and `YOUR_APP_ID` are the values you must replace. +`YOUR_PATH_TO_PEM` と `YOUR_APP_ID` の値は置き換えてください。 -Use your {% data variables.product.prodname_github_app %}'s identifier (`YOUR_APP_ID`) as the value for the JWT [iss](https://tools.ietf.org/html/rfc7519#section-4.1.1) (issuer) claim. You can obtain the {% data variables.product.prodname_github_app %} identifier via the initial webhook ping after [creating the app](/apps/building-github-apps/creating-a-github-app/), or at any time from the app settings page in the GitHub.com UI. +{% data variables.product.prodname_github_app %} の識別子 (`YOUR_APP_ID`) を、JWT [iss](https://tools.ietf.org/html/rfc7519#section-4.1.1) (発行者) クレームの値として使用します。 {% data variables.product.prodname_github_app %} 識別子は、[アプリケーションを作成](/apps/building-github-apps/creating-a-github-app/)後の最初の webhook ping から、または GitHub.com UI のアプリケーション設定ページからいつでも取得できます。 -After creating the JWT, set it in the `Header` of the API request: +JWT を作成後は、それを API リクエストの `Header` に設定します。 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -H "Authorization: Bearer YOUR_JWT" -H "Accept: application/vnd.github.machine-man-preview+json" {% data variables.product.api_url_pre %}/app ``` @@ -102,9 +102,9 @@ $ curl -i -H "Authorization: Bearer YOUR_JWT" -H "Accept: application/vnd.github ``` {% endif %} -`YOUR_JWT` is the value you must replace. +`YOUR_JWT` の値は置き換えてください。 -The example above uses the maximum expiration time of 10 minutes, after which the API will start returning a `401` error: +上記の例では、最大有効期限として 10 分間を設定し、その後は API が `401` エラーを返し始めます。 ```json { @@ -113,21 +113,21 @@ The example above uses the maximum expiration time of 10 minutes, after which th } ``` -You'll need to create a new JWT after the time expires. +有効期限が経過した後は、JWT を新しく作成する必要があります。 -### Accessing API endpoints as a {% data variables.product.prodname_github_app %} +### {% data variables.product.prodname_github_app %} として API エンドポイントにアクセスする -For a list of REST API endpoints you can use to get high-level information about a {% data variables.product.prodname_github_app %}, see "[GitHub Apps](/v3/apps/)." +{% data variables.product.prodname_github_app %} の概要を取得するために使用できる REST API エンドポイントの一覧については、「[GitHub App](/v3/apps/)」を参照してください。 -### Authenticating as an installation +### インストールとして認証を行う -Authenticating as an installation lets you perform actions in the API for that installation. Before authenticating as an installation, you must create an installation access token. These installation access tokens are used by {% data variables.product.prodname_github_app %}s to authenticate. +インストールとして認証を行うと、そのインストールの API でアクションを実行できます。 インストールとして認証を行う前に、インストールアクセストークンを作成する必要があります。 インストールアクセストークンは、認証を行うため {% data variables.product.prodname_github_app %} により使用されます。 -By default, installation access tokens are scoped to all the repositories that an installation can access. You can limit the scope of the installation access token to specific repositories by using the `repository_ids` parameter. See the [Create an installation access token for an app](/v3/apps/#create-an-installation-access-token-for-an-app) endpoint for more details. Installation access tokens have the permissions configured by the {% data variables.product.prodname_github_app %} and expire after one hour. +デフォルトでは、インストールトークンのスコープは、インストールがアクセスできるすべてのリポジトリにアクセスできるよう設定されています。 `repository_ids` パラメータを使用すると、インストールアクセストークンのスコープを特定のリポジトリに限定できます。 詳細については、[アプリケーション (エンドポイント) に対するアクセストークンの作成](/v3/apps/#create-an-installation-access-token-for-an-app)を参照してください。 インストールアクセストークンは {% data variables.product.prodname_github_app %} によって設定された権限を持ち、1 時間後に期限切れになります。 -To create an installation access token, include the JWT [generated above](#jwt-payload) in the Authorization header in the API request: +インストールアクセストークンを作成するには、[上記で生成した](#jwt-payload) JWT を API リクエストの Authorization ヘッダに含めます。 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -X POST \ -H "Authorization: Bearer YOUR_JWT" \ @@ -143,11 +143,11 @@ $ curl -i -X POST \ ``` {% endif %} -The response will include your installation access token, the expiration date, the token's permissions, and the repositories that the token can access. For more information about the response format, see the [Create an installation access token for an app](/v3/apps/#create-an-installation-access-token-for-an-app) endpoint. +レスポンスには、インストールアクセストークン、有効期限、トークンの権限、およびトークンがアクセスできるリポジトリが含まれます。 レスポンスのフォーマットに関する詳しい情報については、[アプリケーション (エンドポイント) に対するアクセストークンの作成](/v3/apps/#create-an-installation-access-token-for-an-app)を参照してください。 -To authenticate with an installation access token, include it in the Authorization header in the API request: +インストールアクセストークンで認証を行うには、インストールアクセストークンを API リクエストの Authorization ヘッダに含めます。 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i \ -H "Authorization: token YOUR_INSTALLATION_ACCESS_TOKEN" \ @@ -163,17 +163,17 @@ $ curl -i \ ``` {% endif %} -`YOUR_INSTALLATION_ACCESS_TOKEN` is the value you must replace. +`YOUR_INSTALLATION_ACCESS_TOKEN` の値は置き換えてください。 -### Accessing API endpoints as an installation +### インストールとして API エンドポイントにアクセスする -For a list of REST API endpoints that are available for use by {% data variables.product.prodname_github_app %}s using an installation access token, see "[Available Endpoints](/v3/apps/available-endpoints/)." +インストールアクセストークンを使用して {% data variables.product.prodname_github_app %} の概要を取得するために利用できる REST API エンドポイントの一覧については、「[利用可能なエンドポイント](/v3/apps/available-endpoints/)」を参照してください。 -For a list of endpoints related to installations, see "[Installations](/v3/apps/installations/)." +インストールに関連するエンドポイントの一覧については、「[インストール](/v3/apps/installations/)」を参照してください。 -### HTTP-based Git access by an installation +### インストールによる HTTP ベースの Git アクセス -Installations with [permissions](/apps/building-github-apps/setting-permissions-for-github-apps/) on `contents` of a repository, can use their installation access tokens to authenticate for Git access. Use the installation access token as the HTTP password: +リポジトリの `contents` に[権限](/apps/building-github-apps/setting-permissions-for-github-apps/)があるインストールは、インストールアクセストークンを使用して Git へのアクセスを認証できます。 インストールアクセストークンを HTTP パスワードとして使用してください。 ```shell git clone https://x-access-token:<token>@github.com/owner/repo.git diff --git a/translations/ja-JP/content/developers/apps/authorizing-oauth-apps.md b/translations/ja-JP/content/developers/apps/authorizing-oauth-apps.md index 87f8be6975..837ccb238f 100644 --- a/translations/ja-JP/content/developers/apps/authorizing-oauth-apps.md +++ b/translations/ja-JP/content/developers/apps/authorizing-oauth-apps.md @@ -1,5 +1,5 @@ --- -title: Authorizing OAuth Apps +title: OAuth アプリケーションの認可 intro: '{% data reusables.shortdesc.authorizing_oauth_apps %}' redirect_from: - /apps/building-integrations/setting-up-and-registering-oauth-apps/about-authorization-options-for-oauth-apps/ @@ -13,84 +13,83 @@ versions: enterprise-server: '*' --- -{% data variables.product.product_name %}'s OAuth implementation supports the standard [authorization code grant type](https://tools.ietf.org/html/rfc6749#section-4.1){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} and the OAuth 2.0 [Device Authorization Grant](https://tools.ietf.org/html/rfc8628) for apps that don't have access to a web browser{% endif %}. +{% data variables.product.product_name %}のOAuthの実装は、標準の[認可コード許可タイプ](https://tools.ietf.org/html/rfc6749#section-4.1){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}及びWebブラウザを利用できないアプリケーションのためのOAuth 2.0の[Device Authorization Grant](https://tools.ietf.org/html/rfc8628){% endif %}をサポートしています。 -If you want to skip authorizing your app in the standard way, such as when testing your app, you can use the [non-web application flow](#non-web-application-flow). +アプリケーションをテストする場合のように、標準的な方法でのアプリケーションの認可をスキップしたい場合には[非Webアプリケーションフロー](#non-web-application-flow)を利用できます。 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -To authorize your OAuth app, consider which authorization flow best fits your app. +OAuthアプリケーションを認可する場合は、そのアプリケーションにどの認可フローが最も適切かを考慮してください。 -- [web application flow](#web-application-flow): Used to authorize users for standard OAuth apps that run in the browser. (The [implicit grant type](https://tools.ietf.org/html/rfc6749#section-4.2) is not supported.) -- [device flow](#device-flow): Used for headless apps, such as CLI tools. +- [Webアプリケーションフロー](#web-application-flow): ブラウザで実行される標準的なOAuthアプリケーションのためのユーザを認可するために使われます。 （[暗黙の許可タイプ](https://tools.ietf.org/html/rfc6749#section-4.2)はサポートされません） +- [でバイスフロー](#device-flow): CLIツールなど、ヘッドレスアプリケーションに使われます。 {% else %} -For standard apps that run in the browser, use the [web application flow](#web-application-flow) to obtain an authorization code and exchange it for a token. (The [implicit grant type](https://tools.ietf.org/html/rfc6749#section-4.2) is not supported.) +ブラウザ上で実行される標準的なアプリケーションでは、認可コードを取得してトークンと交換するために[Webアプリケーションフロー](#web-application-flow)を利用してください。 （[暗黙の許可タイプ](https://tools.ietf.org/html/rfc6749#section-4.2)はサポートされません） {% endif %} -### Web application flow +### Web アプリケーションフロー {% note %} -**Note:** If you are building a GitHub App, you can still use the OAuth web application flow, but the setup has some important differences. See "[Identifying and authorizing users for GitHub Apps](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)" for more information. +**ノート:** GitHub Appを構築しているなら、OAuth Webアプリケーションフローを使うこともできますが、セットアップには多少の重要な違いがあります。 詳しい情報については「[GitHub Appのユーザの特定と認可](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)」を参照してください。 {% endnote %} -The web application flow to authorize users for your app is: +アプリケーションのユーザの認可のためのWebアプリケーションフローは以下のとおりです。 -1. Users are redirected to request their GitHub identity -2. Users are redirected back to your site by GitHub -3. Your app accesses the API with the user's access token +1. ユーザはGitHubのアイデンティティをリクエストするためにリダイレクトされます +2. ユーザはGitHubによってサイトにリダイレクトして戻されます +3. アプリケーションはユーザのアクセストークンと共にAPIにアクセスします -#### 1. Request a user's GitHub identity +#### 1. ユーザのGitHubアイデンティティのリクエスト GET {% data variables.product.oauth_host_code %}/login/oauth/authorize -When your GitHub App specifies a `login` parameter, it prompts users with a specific account they can use for signing in and authorizing your app. +GitHub Appが`login`パラメータを指定すると、ユーザに対して利用できる特定のアカウントでサインインしてアプリケーションを認可するよう求めます。 -##### Parameters +##### パラメータ -Name | Type | Description ------|------|-------------- -`client_id`|`string` | **Required**. The client ID you received from GitHub when you {% if currentVersion == "free-pro-team@latest" %}[registered](https://github.com/settings/applications/new){% else %}registered{% endif %}. -`redirect_uri`|`string` | The URL in your application where users will be sent after authorization. See details below about [redirect urls](#redirect-urls). -`login` | `string` | Suggests a specific account to use for signing in and authorizing the app. -`scope`|`string` | A space-delimited list of [scopes](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/). If not provided, `scope` defaults to an empty list for users that have not authorized any scopes for the application. For users who have authorized scopes for the application, the user won't be shown the OAuth authorization page with the list of scopes. Instead, this step of the flow will automatically complete with the set of scopes the user has authorized for the application. For example, if a user has already performed the web flow twice and has authorized one token with `user` scope and another token with `repo` scope, a third web flow that does not provide a `scope` will receive a token with `user` and `repo` scope. -`state` | `string` | {% data reusables.apps.state_description %} -`allow_signup`|`string` | Whether or not unauthenticated users will be offered an option to sign up for GitHub during the OAuth flow. The default is `true`. Use `false` when a policy prohibits signups. +| 名前 | 種類 | 説明 | +| -------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `string` | **必須**。 ユーザが{% if currentVersion == "free-pro-team@latest" %}[登録](https://github.com/settings/applications/new){% else %}登録{% endif %}されたときに受け取るクライアントID。 | +| `redirect_uri` | `string` | 認可の後にユーザが送られるアプリケーション中のURL。 [リダイレクトURL](#redirect-urls)に関する詳細については下を参照してください。 | +| `login` | `string` | サインインとアプリケーションの認可に使われるアカウントを指示します。 | +| `scope` | `string` | スペース区切りの[スコープ](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/)のリスト。 渡されなかった場合、ユーザの`スコープ`のデフォルトは空のリストになり、アプリケーションにはどのスコープも認可されません。 アプリケーションに対して認可したスコープがあるユーザに対しては、スコープのリストを含むOAuthの認可ページは示されません。 その代わりに、フローのこのステップはユーザがアプリケーションに認可したスコープ群で自動的に完了します。 たとえば、ユーザがすでにWebフローを2回行っており、1つのトークンで`user`スコープを、もう1つのトークンで`repo`スコープを認可している場合、3番目のWebフローで`scope`が渡されなければ、`user`及び`repo`スコープを持つトークンが返されます。 | +| `state` | `string` | {% data reusables.apps.state_description %} +| `allow_signup` | `string` | OAuthフローの間に、認証されていないユーザに対してGitHubへのサインアップの選択肢が提示されるかどうか。 デフォルトは `true` です。 ポリシーでサインアップが禁止されている場合は`false`を使ってください。 | -#### 2. Users are redirected back to your site by GitHub +#### 2. GitHubによるサイトへのユーザのリダイレクト -If the user accepts your request, {% data variables.product.product_name %} redirects back to your site with a temporary `code` in a code parameter as well as the state you provided in the previous step in a `state` parameter. The temporary code will expire after 10 minutes. If the states don't match, then a third party created the request, and you should abort the process. +ユーザがリクエストを受け付けると、{% data variables.product.product_name %}は一時的な`コード`をcodeパラメータに、そして前のステップで渡された状態を`state`パラメータに入れてリダイレクトさせ、サイトに戻します。 一時コードは10分後に期限切れになります。 状態が一致しない場合は、リクエストを作成したサードパーティとユーザはこのプロセスを中止しなければなりません。 -Exchange this `code` for an access token: +この`コード`のアクセストークンとの交換 POST {% data variables.product.oauth_host_code %}/login/oauth/access_token -##### Parameters +##### パラメータ -Name | Type | Description ------|------|-------------- -`client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_github_app %}. -`client_secret` | `string` | **Required.** The client secret you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_github_app %}. -`code` | `string` | **Required.** The code you received as a response to Step 1. -`redirect_uri` | `string` | The URL in your application where users are sent after authorization. -`state` | `string` | The unguessable random string you provided in Step 1. +| 名前 | 種類 | 説明 | +| --------------- | -------- | --------------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `string` | **必須。** {% data variables.product.prodname_github_app %}に対して{% data variables.product.product_name %}から受け取ったクライアントID。 | +| `client_secret` | `string` | **必須。** {% data variables.product.prodname_github_app %}に対して{% data variables.product.product_name %}から受け取ったクライアントシークレット。 | +| `code` | `string` | **必須。** ステップ1でレスポンスとして受け取ったコード。 | +| `redirect_uri` | `string` | 認可の後にユーザが送られるアプリケーション中のURL。 | +| `state` | `string` | ステップ1で提供した推測できないランダムな文字列。 | -##### Response +##### レスポンス -By default, the response takes the following form: +デフォルトでは、レスポンスは以下の形式になります。 access_token=e72e16c7e42f292c6912e7710c838347ae178b4a&token_type=bearer -You can also receive the content in different formats depending on the Accept -header: +Acceptヘッダに応じて、異なる形式でコンテンツを受け取ることもできます。 Accept: application/json {"access_token":"e72e16c7e42f292c6912e7710c838347ae178b4a", "scope":"repo,gist", "token_type":"bearer"} - + Accept: application/xml bearer @@ -98,50 +97,50 @@ header: e72e16c7e42f292c6912e7710c838347ae178b4a -#### 3. Use the access token to access the API +#### 3. アクセストークンを使ったAPIへのアクセス -The access token allows you to make requests to the API on a behalf of a user. +このアクセストークンを使えば、ユーザの代わりにAPIへのリクエストを発行できます。 Authorization: token OAUTH-TOKEN GET {% data variables.product.api_url_code %}/user -For example, in curl you can set the Authorization header like this: +たとえば、curlでは以下のようにAuthorizationヘッダを設定できます。 ```shell curl -H "Authorization: token OAUTH-TOKEN" {% data variables.product.api_url_pre %}/user ``` {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -### Device flow +### デバイスフロー {% note %} -**Note:** The device flow is in public beta and subject to change.{% if currentVersion == "free-pro-team@latest" %} To enable this beta feature, see "[Activating beta features for apps](/developers/apps/activating-beta-features-for-apps)."{% endif %} +**ノート:** デバイスフローはパブリックベータであり、変更されることがあります。{% if currentVersion == "free-pro-team@latest" %} このベータの機能を有効化するには、「[アプリケーションのベータ機能のアクティベート](/developers/apps/activating-beta-features-for-apps)」を参照してください。{% endif %} {% endnote %} -The device flow allows you to authorize users for a headless app, such as a CLI tool or Git credential manager. +デバイスフローを使えば、CLIツールやGit認証情報マネージャーなどのヘッドレスアプリケーションのユーザを認可できます。 -#### Overview of the device flow +#### デバイスフローの概要 -1. Your app requests device and user verification codes and gets the authorization URL where the user will enter the user verification code. -2. The app prompts the user to enter a user verification code at {% data variables.product.device_authorization_url %}. -3. The app polls for the user authentication status. Once the user has authorized the device, the app will be able to make API calls with a new access token. +1. アプリケーションはデバイスとユーザの検証コードをリクエストし、ユーザがユーザ検証コードを入力する認可URLを取得します。 +2. アプリケーションは{% data variables.product.device_authorization_url %}でユーザ検証コードを入力するようユーザに求めます。 +3. アプリケーションはユーザ認証のステータスをポーリングします。 ユーザがデバイスを認可すると、アプリケーションは新しいアクセストークンと共にAPIコールを発行できるようになります。 -#### Step 1: App requests the device and user verification codes from GitHub +#### ステップ1: アプリケーションによるGitHubからのデバイス及びユーザ検証コードの要求 POST {% data variables.product.oauth_host_code %}/login/device/code -Your app must request a user verification code and verification URL that the app will use to prompt the user to authenticate in the next step. This request also returns a device verification code that the app must use to receive an access token and check the status of user authentication. +アプリケーションは、次のステップでユーザに認可を求めるために使うユーザ検証コードと検証URLをリクエストしなければなりません。 このリクエストには、アプリケーションがアクセストークンの受け取りとユーザの認可のステータスチェックに使わなければならないデバイス検証コードも返されます。 -##### Input Parameters +##### 入力パラメータ -Name | Type | Description ------|------|-------------- -`client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your app. -`scope` | `string` | The scope that your app is requesting access to. +| 名前 | 種類 | 説明 | +| ----------- | -------- | ---------------------------------------------------------------------------- | +| `client_id` | `string` | **必須。** {% data variables.product.product_name %}から受け取るアプリケーションのためのクライアントID。 | +| `scope` | `string` | アプリケーションがアクセスをリクエストしているスコープ。 | -##### Response +##### レスポンス {% if currentVersion == "free-pro-team@latest" %} ```JSON @@ -165,41 +164,41 @@ Name | Type | Description ``` {% endif %} -##### Response parameters +##### レスポンスのパラメータ -Name | Type | Description ------|------|-------------- -`device_code` | `string` | The device verification code is 40 characters and used to verify the device. -`user_code` | `string` | The user verification code is displayed on the device so the user can enter the code in a browser. This code is 8 characters with a hyphen in the middle. -`verification_uri` | `string` | The verification URL where users need to enter the `user_code`: {% data variables.product.device_authorization_url %}. -`expires_in` | `integer`| The number of seconds before the `device_code` and `user_code` expire. The default is 900 seconds or 15 minutes. -`interval` | `integer` | The minimum number of seconds that must pass before you can make a new access token request (`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`) to complete the device authorization. For example, if the interval is 5, then you cannot make a new request until 5 seconds pass. If you make more than one request over 5 seconds, then you will hit the rate limit and receive a `slow_down` error. +| 名前 | 種類 | 説明 | +| ------------------ | --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `device_code` | `string` | デバイス検証コードは40文字で、デバイスの検証に使われます。 | +| `user_code` | `string` | ユーザ検証コードは、ユーザがブラウザに入力できるようにデバイスに表示されます。 このコードは8文字で、途中にハイフンがあります。 | +| `verification_uri` | `string` | ユーザが`user_code`を入力しなければならない検証URL: {% data variables.product.device_authorization_url %}。 | +| `expires_in` | `integer` | `device_code`及び`user_code`が期限切れになるまでの秒数。 デフォルトは900秒、すなわち15分です。 | +| `interval` | `integer` | デバイスの認可を完了するための新しいアクセストークンのリクエスト（`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`）を発行できるようになるまでに経過しなければならない最小の秒数。 たとえばintervalが5であれば、5秒が経過するまでは新しいリクエストを発行できません。 5秒間に複数のリクエストを発行すると、レート制限に達して`slow_down`エラーが返されます。 | -#### Step 2: Prompt the user to enter the user code in a browser +#### ステップ2: ブラウザでユーザコードの入力をユーザに促す -Your device will show the user verification code and prompt the user to enter the code at {% data variables.product.device_authorization_url %}. +デバイスはユーザ検証コードを表示し、ユーザに対してこのコードを{% data variables.product.device_authorization_url %}で入力するように求めます。 - ![Field to enter the user verification code displayed on your device](/assets/images/github-apps/device_authorization_page_for_user_code.png) + ![デバイスに表示されたユーザ検証コードの入力フィールド](/assets/images/github-apps/device_authorization_page_for_user_code.png) -#### Step 3: App polls GitHub to check if the user authorized the device +#### ステップ3: ユーザがデバイスを認証したか、アプリケーションがGitHubをポーリング POST {% data variables.product.oauth_host_code %}/login/oauth/access_token -Your app will make device authorization requests that poll `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`, until the device and user codes expire or the user has successfully authorized the app with a valid user code. The app must use the minimum polling `interval` retrieved in step 1 to avoid rate limit errors. For more information, see "[Rate limits for the device flow](#rate-limits-for-the-device-flow)." +アプリケーションは、デバイス及びユーザコードが期限切れになるか、有効なユーザコードでアプリケーションが認可されるまで、`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`をポーリングするデバイス認可リクエストを発行します。 アプリケーションは、レート制限エラーを避けるために、ステップ1で取得したポーリングの最小`interval`を使います。 詳しい情報については「[デバイスフローのためのレート制限](#rate-limits-for-the-device-flow)」を参照してください。 -The user must enter a valid code within 15 minutes (or 900 seconds). After 15 minutes, you will need to request a new device authorization code with `POST {% data variables.product.oauth_host_code %}/login/device/code`. +ユーザは、15分（あるいは900秒）以内に有効なコードを入力しなければなりません。 15分が経過すると、新たなデバイス認可コードを`POST {% data variables.product.oauth_host_code %}/login/device/code`でリクエストしなければなりません。 -Once the user has authorized, the app will receive an access token that can be used to make requests to the API on behalf of a user. +ユーザが認可されると、アプリケーションはユーザの代わりにAPIにリクエストを発行するために利用できるアクセストークンを受け取ります。 -##### Input parameters +##### 入力パラメータ -Name | Type | Description ------|------|-------------- -`client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_oauth_app %}. -`device_code` | `string` | **Required.** The device verification code you received from the `POST {% data variables.product.oauth_host_code %}/login/device/code` request. -`grant_type` | `string` | **Required.** The grant type must be `urn:ietf:params:oauth:grant-type:device_code`. +| 名前 | 種類 | 説明 | +| ------------- | -------- | ---------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `string` | **必須。** {% data variables.product.prodname_oauth_app %}に対して{% data variables.product.product_name %}から受け取ったクライアントID。 | +| `device_code` | `string` | **必須。** `POST {% data variables.product.oauth_host_code %}/login/device/code`リクエストから受け取ったデバイス検証コード。 | +| `grant_type` | `string` | **必須。** 許可タイプは`urn:ietf:params:oauth:grant-type:device_code`でなければなりません。 | -##### Response +##### レスポンス ```json { @@ -209,50 +208,44 @@ Name | Type | Description } ``` -#### Rate limits for the device flow +#### デバイスフローのレート制限 -When a user submits the verification code on the browser, there is a there is a rate limit of 50 submissions in an hour per application. +ユーザがブラウザ上で検証コードをサブミットする場合、アプリケーションごとに1時間に50回のサブミットというレート制限があります。 -If you make more than one access token request (`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`) within the required minimum timeframe between requests (or `interval`), you'll hit the rate limit and receive a `slow_down` error response. The `slow_down` error response adds 5 seconds to the last `interval`. For more information, see the [Errors for the device flow](#errors-for-the-device-flow). +リクエスト間で要求される最小の時間間隔（あるいは`interval`）内で複数のアクセストークンリクエスト（`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`）を発行すると、レート制限に達し、`slow_down`のエラーレスポンスが返されます。 `slow_down`エラーレスポンスは、最後の`interval`に5秒を追加します。 詳しい情報については[デバイスフローのエラー](#errors-for-the-device-flow)を参照してください。 -#### Error codes for the device flow +#### デバイスフローのエラーコード -| Error code | Description | -|----|----| -| `authorization_pending`| This error occurs when the authorization request is pending and the user hasn't entered the user code yet. The app is expected to keep polling the `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token` request without exceeding the [`interval`](#response-parameters), which requires a minimum number of seconds between each request. | -| `slow_down` | When you receive the `slow_down` error, 5 extra seconds are added to the minimum `interval` or timeframe required between your requests using `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`. For example, if the starting interval required at least 5 seconds between requests and you get a `slow_down` error response, you must now wait a minimum of 10 seconds before making a new request for an OAuth access token. The error response includes the new `interval` that you must use. -| `expired_token` | If the device code expired, then you will see the `token_expired` error. You must make a new request for a device code. -| `unsupported_grant_type` | The grant type must be `urn:ietf:params:oauth:grant-type:device_code` and included as an input parameter when you poll the OAuth token request `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`. -| `incorrect_client_credentials` | For the device flow, you must pass your app's client ID, which you can find on your app settings page. The `client_secret` is not needed for the device flow. -| `incorrect_device_code` | The device_code provided is not valid. -| `access_denied` | When a user clicks cancel during the authorization process, you'll receive a `access_denied` error and the user won't be able to use the verification code again. +| エラーコード | 説明 | +| ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `authorization_pending` | このエラーコードは、認可リクエストが保留中で、ユーザがユーザコードをまだ入力していない場合に生じます。 アプリケーションには[`interval`](#response-parameters)を超えない範囲で`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`リクエストをポーリングし続けることが期待されます。この際には、リクエスト間に最小の秒数を空けることが必要です。 | +| `slow_down` | `slow_down`エラーが返された場合、最小の`interval`、あるいは`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`を利用するリクエストの間に必要な時間間隔に5秒が追加されます。 たとえば、開始時のインターバルとしてリクエスト間に最小で5秒の間隔が必要だった場合に、`slow_down`エラーレスポンスが返されたなら、OAuthアクセストークンを求める新しいリクエストを発行するまでに最短でも10秒待たなければならなくなります。 エラーレスポンスには、使用しなければならない新しい`interval`が含まれます。 | +| `expired_token` | デバイスコードの有効期限が切れると、`token_expired`エラーが返されます。 デバイスコードを求める新しいリクエストを発行しなければなりません。 | +| `unsupported_grant_type` | OAuthトークンリクエストの`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`でポーリングする際には、許可タイプを`urn:ietf:params:oauth:grant-type:device_code`として、入力パラメータに含めなければなりません。 | +| `incorrect_client_credentials` | デバイスフローでは、アプリケーションのクライアントIDを渡さなければなりません。これは、アプリケーションの設定ページにあります。 デバイスフローでは`client_secret`は必要ありません。 | +| `incorrect_device_code` | 渡されたdevice_codeが有効ではありません。 | +| `access_denied` | 認可プロセスの間でユーザがキャンセルをクリックした場合、`access_denied`エラーが返され、ユーザは検証コードを再度利用することができなくなります。 | -For more information, see the "[OAuth 2.0 Device Authorization Grant](https://tools.ietf.org/html/rfc8628#section-3.5)." +詳しい情報については、「[OAuth 2.0デバイス認可の許可](https://tools.ietf.org/html/rfc8628#section-3.5)」を参照してください。 {% endif %} -### Non-Web application flow +### 非Webアプリケーションフロー -Non-web authentication is available for limited situations like testing. If you need to, you can use [Basic Authentication](/v3/auth#basic-authentication) to create a personal access token using your [Personal access tokens settings page](/articles/creating-an-access-token-for-command-line-use). This technique enables the user to revoke access at any time. +テストのような限定的な状況では、非Web認証が利用できます。 必要な場合は、[個人アクセストークン設定ページ](/articles/creating-an-access-token-for-command-line-use)を使い、[Basic認証](/v3/auth#basic-authentication)を利用して個人アクセストークンを作成できます。 この手法を使えば、ユーザはいつでもアクセスを取り消せます。 {% note %} -**Note:** When using the non-web application flow to create an OAuth2 token, make sure to understand how to [work with -two-factor authentication](/v3/auth/#working-with-two-factor-authentication) if -you or your users have two-factor authentication enabled. +**ノート:** 非Webアプリケーションフローを使ってOAuth2トークンを作成する場合で、ユーザが2要素認証を有効化しているなら[2要素認証の利用](/v3/auth/#working-with-two-factor-authentication)方法を必ず理解しておいてください。 {% endnote %} -### Redirect URLs +### リダイレクトURL -The `redirect_uri` parameter is optional. If left out, GitHub will -redirect users to the callback URL configured in the OAuth Application -settings. If provided, the redirect URL's host and port must exactly -match the callback URL. The redirect URL's path must reference a -subdirectory of the callback URL. +`redirect_uri`パラメータはオプションです。 指定しなかった場合、GitHubはOAuthアプリケーションで設定されているコールバックURLにユーザをリダイレクトさせます。 指定する場合、リダイレクトURLのホストとポートはコールバックURLと完全に一致していなければなりません。 リダイレクトURLのパスは、コールバックURLのサブディレクトリを参照していなければなりません。 CALLBACK: http://example.com/path - + GOOD: http://example.com/path GOOD: http://example.com/path/subdir/other BAD: http://example.com/bar @@ -261,29 +254,29 @@ subdirectory of the callback URL. BAD: http://oauth.example.com:8080/path BAD: http://example.org -#### Localhost redirect urls +#### ローカルホストのリダイレクトURL -The optional `redirect_uri` parameter can also be used for localhost URLs. If the application specifies a localhost URL and a port, then after authorizing the application users will be redirected to the provided URL and port. The `redirect_uri` does not need to match the port specified in the callback url for the app. +オプションの`redirect_uri`パラメータは、ローカルホストURLにも使用できます。 アプリケーションがローカルホストのURLとポートを指定した場合、アプリケーションを認可した後ユーザは渡されたURLとポートにリダイレクトされます。 `redirect_uri`は、アプリケーションのコールバックURLで指定されたポートにマッチしている必要はありません。 -For the `http://localhost/path` callback URL, you can use this `redirect_uri`: +`http://localhost/path`というコールバックURLに対して、以下の`redirect_uri`が利用できます。 http://localhost:1234/path -### Creating multiple tokens for OAuth Apps +### OAuthアプリケーションに複数のトークンを作成する -You can create multiple tokens for a user/application/scope combination to create tokens for specific use cases. +ユーザ／アプリケーション／スコープの組み合わせに対して複数のトークンを作成し、特定のユースケースに対応できます。 -This is useful if your OAuth App supports one workflow that uses GitHub for sign-in and only requires basic user information. Another workflow may require access to a user's private repositories. Using multiple tokens, your OAuth App can perform the web flow for each use case, requesting only the scopes needed. If a user only uses your application to sign in, they are never required to grant your OAuth App access to their private repositories. +OAuthアプリケーションが、サインインにGitHubを利用し、基本的なユーザ情報しか必要としないワークフローを1つサポートするだけであれば、これは有益です。 別のワークフローはユーザのプライベートリポジトリへのアクセスを必要としていてもかまいません。 複数のトークンを使えば、OAuthアプリケーションはそれぞれのユースケースに対してWebフローを実行でき、必要なスコープだけをリクエストします。 ユーザがサインインにアプリケーションだけを使うなら、ユーザは自分のプライベートリポジトリへのアクセスをOAuthアプリケーションに許可する必要はありません。 -There is a limit to the number of tokens that are issued per user/application/scope combination. If your application requests enough tokens to go over one of the limits, older tokens _with the same scope being requested_ will stop working. +ユーザ／アプリケーション／スコープの組み合わせごとに、発行できるトークン数には制限があります。 アプリケーションが制限のいずれかを超えるトークンをリクエストした場合、_リクエストされたのと同じスコープを持つ_古いトークンは働かなくなります。 {% data reusables.apps.deletes_ssh_keys %} -### Directing users to review their access +### ユーザにアクセスをレビューしてもらう -You can link to authorization information for an OAuth App so that users can review and revoke their application authorizations. +OAuthアプリケーションへの認可情報へリンクし、ユーザがアプリケーションの認可をレビューし、取り消しできるようにすることができます。 -To build this link, you'll need your OAuth Apps `client_id` that you received from GitHub when you registered the application. +このリンクを構築するには、アプリケーションを登録したときにGitHubから受け取ったOAuthアプリケーションの`client_id`が必要です。 ``` {% data variables.product.oauth_host_code %}/settings/connections/applications/:client_id @@ -291,14 +284,14 @@ To build this link, you'll need your OAuth Apps `client_id` that you received fr {% tip %} -**Tip:** To learn more about the resources that your OAuth App can access for a user, see "[Discovering resources for a user](/v3/guides/discovering-resources-for-a-user/)." +**Tip:** OAuthアプリケーションがユーザのためにアクセスできるリソースについてさらに学ぶには、「[ユーザのためにリソースを見つける](/v3/guides/discovering-resources-for-a-user/)」を参照してください。 {% endtip %} -### Troubleshooting +### トラブルシューティング -* "[Troubleshooting authorization request errors](/apps/managing-oauth-apps/troubleshooting-authorization-request-errors)" -* "[Troubleshooting OAuth App access token request errors](/apps/managing-oauth-apps/troubleshooting-oauth-app-access-token-request-errors)" +* 「[認可リクエストエラーのトラブルシューティング](/apps/managing-oauth-apps/troubleshooting-authorization-request-errors)」 +* 「[OAuthアプリケーションのアクセストークンのリクエストエラー](/apps/managing-oauth-apps/troubleshooting-oauth-app-access-token-request-errors)」 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -* "[Device flow errors](#errors-for-the-device-flow)" +* 「[デバイスフローのエラー](#errors-for-the-device-flow)」 {% endif %} diff --git a/translations/ja-JP/content/developers/apps/building-github-apps.md b/translations/ja-JP/content/developers/apps/building-github-apps.md index a086827638..d153d36af7 100644 --- a/translations/ja-JP/content/developers/apps/building-github-apps.md +++ b/translations/ja-JP/content/developers/apps/building-github-apps.md @@ -1,6 +1,6 @@ --- -title: Building GitHub Apps -intro: You can build GitHub Apps for personal or public use. Learn how to register and set up permissions and authentication options for GitHub Apps. +title: GitHub App を構築する +intro: GitHub App を、個人用または一般用として構築できます。 GitHub App の登録と、権限および認証オプションの設定方法について学びましょう。 mapTopic: true redirect_from: - /apps/building-integrations/setting-up-and-registering-github-apps/ diff --git a/translations/ja-JP/content/developers/apps/building-oauth-apps.md b/translations/ja-JP/content/developers/apps/building-oauth-apps.md index 61e6a69762..0fc9e79379 100644 --- a/translations/ja-JP/content/developers/apps/building-oauth-apps.md +++ b/translations/ja-JP/content/developers/apps/building-oauth-apps.md @@ -1,6 +1,6 @@ --- -title: Building OAuth Apps -intro: You can build OAuth Apps for personal or public use. Learn how to register and set up permissions and authorization options for OAuth Apps. +title: OAuth App を構築する +intro: OAuth App を、個人用または一般用として構築できます。 OAuth App の登録と、権限および認可オプションの設定方法について学びましょう。 mapTopic: true redirect_from: - /apps/building-integrations/setting-up-and-registering-oauth-apps/ diff --git a/translations/ja-JP/content/developers/apps/creating-a-custom-badge-for-your-github-app.md b/translations/ja-JP/content/developers/apps/creating-a-custom-badge-for-your-github-app.md index b81a5b5193..5b00503a5c 100644 --- a/translations/ja-JP/content/developers/apps/creating-a-custom-badge-for-your-github-app.md +++ b/translations/ja-JP/content/developers/apps/creating-a-custom-badge-for-your-github-app.md @@ -1,5 +1,5 @@ --- -title: Creating a custom badge for your GitHub App +title: GitHub App のカスタムバッジを作成する intro: '{% data reusables.shortdesc.creating_custom_badges_github_apps %}' redirect_from: - /apps/building-github-apps/creating-custom-badges-for-github-apps @@ -8,34 +8,34 @@ versions: enterprise-server: '*' --- -By default, a new GitHub App will have an automatically generated [identicon](https://github.com/blog/1586-identicons). An identicon badge looks something like this: +デフォルトでは、新しい GitHub App に対して、[アイデンティコン](https://github.com/blog/1586-identicons)が自動的に生成されます。 アイデンティコンバッジとは、次のようなものです。 -![Identicon](/assets/images/identicon.png) +![アイデンティコン](/assets/images/identicon.png) -After you create a GitHub App, you can customize your app's badge by uploading a logo and selecting a background color. A badge is a square logo image inside of a circular badge. You can choose a background color for the badge, which can visually distinguish your app. +GitHub App の作成後、ロゴをアップロードし、背景色を設定することで、アプリケーションのバッジをカスタマイズできます。 バッジは、丸の中に正方形のロゴ画像があります。 バッジの背景色を選んで、他のアプリケーションと視覚的に区別させることができます。 -Your logo should be a PNG, JPG, or GIF file under 1 MB in size. For the best quality rendering, we recommend an image size of at least 200px x 200px. {% if currentVersion == "free-pro-team@latest" %}See "[Tips for logo and badge images](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/#guidelines-for-logos)" for more guidance on customizing badges.{% endif %} +ロゴは、1 MB 未満の PNG、JPG または GIF ファイルである必要があります。 最高の画質を得るため、画像の大きさは 200 x 200 ピクセル以上にすることをお勧めします。 {% if currentVersion == "free-pro-team@latest" %}バッジのカスタマイズに関する詳細については、「[ロゴとバッジ画像のためのヒント](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/#guidelines-for-logos)」を参照してください。{% endif %} {% if currentVersion == "free-pro-team@latest" %} -You can change a custom badge for a GitHub App that already has an approved Marketplace listing by navigating to https://github.com/marketplace/manage. +Marketplace に掲載が承認されている GitHub App のカスタムバッジを変更するには、https://github.com/marketplace/manage に移動します。 {% endif %} -To create a custom badge: +カスタムバッジを作成するには、以下の手順に従います。 {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} {% data reusables.user-settings.github_apps %} {% data reusables.user-settings.modify_github_app %} -5. In "Display information", drag-and-drop an image from a local folder or click **Upload a logo** to select an image from your computer. ![Upload a logo](/assets/images/github-apps/github_apps_upload_logo.png) -6. 画像をクロッピングします。 When you're done, click **Set new avatar**. ![Crop and set logo ](/assets/images/github-apps/github_apps_crop_and_set_avatar.png) -7. In "Badge background color", type the [hexadecimal color code](http://www.color-hex.com/) of the background color for your badge. {% if currentVersion == "free-pro-team@latest" %}**Note:** The "Badge background color" input field will only appear after you upload an application logo.{% endif %} ![Badge background color](/assets/images/github-apps/github_apps_badge_background_color.png) +5. [Display information] にローカルフォルダの画像をドラッグアンドドロップするか、[**Upload a logo**] をクリックして、お手元のコンピューターから画像を選択します。 ![ロゴをアップロード](/assets/images/github-apps/github_apps_upload_logo.png) +6. 画像をクロッピングします。 完了したら、[ **Set new avatar**] をクリックします。 ![ロゴをトリミングして設定 ](/assets/images/github-apps/github_apps_crop_and_set_avatar.png) +7. [Badge background color] に、バッジの背景色を[16 進数カラーコード](http://www.color-hex.com/)で入力します。 {% if currentVersion == "free-pro-team@latest" %}**注釈:** [Badge background color] 入力フィールドは、アプリケーションロゴをアップロードした後に表示されます。{% endif %} ![バッジの背景色](/assets/images/github-apps/github_apps_badge_background_color.png) {% if currentVersion == "free-pro-team@latest" %} ### 次のステップ -For more information about creating a Marketplace listing for this app, see "[Listing on GitHub Marketplace](/marketplace/listing-on-github-marketplace/)". +このアプリケーションを Marketplace に掲載する方法の詳細については、「[GitHub Marketplace に掲載する](/marketplace/listing-on-github-marketplace/)」を参照してください。 {% endif %} diff --git a/translations/ja-JP/content/developers/apps/creating-a-custom-badge-for-your-oauth-app.md b/translations/ja-JP/content/developers/apps/creating-a-custom-badge-for-your-oauth-app.md index a917d8ba0b..c9a1ee2029 100644 --- a/translations/ja-JP/content/developers/apps/creating-a-custom-badge-for-your-oauth-app.md +++ b/translations/ja-JP/content/developers/apps/creating-a-custom-badge-for-your-oauth-app.md @@ -1,5 +1,5 @@ --- -title: Creating a custom badge for your OAuth App +title: OAuth App のカスタムバッジを作成する intro: '{% data reusables.shortdesc.creating_custom_badges_oauth_apps %}' redirect_from: - /apps/building-oauth-apps/creating-custom-badges-for-oauth-apps @@ -8,37 +8,37 @@ versions: enterprise-server: '*' --- -By default, a new OAuth App will have an automatically generated [identicon](https://github.com/blog/1586-identicons). An identicon badge looks something like this: +デフォルトでは、新しい OAuth App に対して、[アイデンティコン](https://github.com/blog/1586-identicons)が自動的に生成されます。 アイデンティコンバッジとは、次のようなものです。 -![Identicon](/assets/images/identicon.png) +![アイデンティコン](/assets/images/identicon.png) -After you create an OAuth App, you can customize the app's badge by uploading a logo and selecting a background color. A badge is a square logo image inside of a circular badge. You can choose a background color for the badge, which can be used to visually distinguish your app. +OAuth App の作成後、ロゴをアップロードし、背景色を設定することで、アプリケーションのバッジをカスタマイズできます。 バッジは、丸の中に正方形のロゴ画像があります。 バッジの背景色を選ぶと、他のアプリケーションと視覚的に区別させることができます。 -Your logo should be a PNG, JPG, or GIF file under 1 MB in size. For the best quality rendering, we recommend an image size of at least 200px x 200px. {% if currentVersion == "free-pro-team@latest" %}See "[Tips for logo and badge images](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/#guidelines-for-logos)" for more guidance on customizing badges.{% endif %} +ロゴは、1 MB 未満の PNG、JPG または GIF ファイルである必要があります。 最高の画質を得るため、画像の大きさは 200 x 200 ピクセル以上にすることをお勧めします。 {% if currentVersion == "free-pro-team@latest" %}バッジのカスタマイズに関する詳細については、「[ロゴとバッジ画像のためのヒント](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/#guidelines-for-logos)」を参照してください。{% endif %} {% if currentVersion == "free-pro-team@latest" %} -You can change a custom badge for a GitHub App that already has an approved Marketplace listing by navigating to https://github.com/marketplace/manage. +Marketplace に掲載が承認されている GitHub App のカスタムバッジを変更するには、https://github.com/marketplace/manage に移動します。 {% endif %} -To create a custom badge: +カスタムバッジを作成するには、以下の手順に従います。 {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} {% data reusables.user-settings.oauth_apps %} {% data reusables.user-settings.modify_oauth_app %} -1. In "Application logo", drag-and-drop an image from a local folder or click **Upload new logo** to select an image from your computer. ![Upload a logo](/assets/images/oauth-apps/oauth_apps_upload_logo.png) -6. 画像をクロッピングします。 When you're done, click **Set new application logo**. ![Crop and set logo](/assets/images/oauth-apps/oauth_apps_crop_and_set_logo.png) -7. In "Badge background color", type the [hexadecimal color code](http://www.color-hex.com/) of the background color for your badge. -{% if currentVersion == "free-pro-team@latest" %}**Note:** The "Badge background color" input field will be visible after an application logo has been uploaded.{% endif %} -![Badge background color](/assets/images/oauth-apps/oauth_apps_badge_background_color.png) +1. [Application logo] にローカルフォルダの画像をドラッグアンドドロップするか、[**Upload new logo**] をクリックして、お手元のコンピューターから画像を選択します。 ![ロゴをアップロード](/assets/images/oauth-apps/oauth_apps_upload_logo.png) +6. 画像をクロッピングします。 完了したら、[**Set new application logo**] をクリックします。 ![ロゴをトリミングして設定](/assets/images/oauth-apps/oauth_apps_crop_and_set_logo.png) +7. [Badge background color] に、バッジの背景色を[16 進数カラーコード](http://www.color-hex.com/)で入力します。 +{% if currentVersion == "free-pro-team@latest" %}**注釈:** [Badge background color] 入力フィールドは、アプリケーションロゴをアップロードした後に表示されます。{% endif %} +![バッジの背景色](/assets/images/oauth-apps/oauth_apps_badge_background_color.png) {% data reusables.user-settings.update_oauth_app %} {% if currentVersion == "free-pro-team@latest" %} ### 次のステップ -For more information about creating a Marketplace listing for this app, see "[Listing on GitHub Marketplace](/marketplace/listing-on-github-marketplace/)". +このアプリケーションを Marketplace に掲載する方法の詳細については、「[GitHub Marketplace に掲載する](/marketplace/listing-on-github-marketplace/)」を参照してください。 {% endif %} diff --git a/translations/ja-JP/content/developers/apps/creating-a-github-app-from-a-manifest.md b/translations/ja-JP/content/developers/apps/creating-a-github-app-from-a-manifest.md index 7bce4a2600..84afa02faf 100644 --- a/translations/ja-JP/content/developers/apps/creating-a-github-app-from-a-manifest.md +++ b/translations/ja-JP/content/developers/apps/creating-a-github-app-from-a-manifest.md @@ -1,6 +1,6 @@ --- -title: Creating a GitHub App from a manifest -intro: 'A GitHub App Manifest is a preconfigured GitHub App you can share with anyone who wants to use your app in their personal repositories. The manifest flow allows someone to quickly create, install, and start extending a GitHub App without needing to register the app or connect the registration to the hosted app code.' +title: マニフェストから GitHub App を作成する +intro: 'GitHub App マニフェストは、アプリケーションを個人のリポジトリで使いたい人と共有できる、事前設定された GitHub App です。 マニフェストフローにより、ユーザはアプリケーションを登録したり、ホストされたアプリケーションコードに登録を接続したりすることなく、GitHub App の拡張を素早く作成、インストール、開始できるようになります。' redirect_from: - /apps/building-github-apps/creating-github-apps-from-a-manifest versions: @@ -9,9 +9,9 @@ versions: --- -### About GitHub App Manifests +### GitHub App マニフェストについて -When someone creates a GitHub App from a manifest, they only need to follow a URL and name the app. The manifest includes the permissions, events, and webhook URL needed to automatically register the app. The manifest flow creates the GitHub App registration and retrieves the app's webhook secret, private key (PEM file), and GitHub App ID. The person who creates the app from the manifest will own the app and can choose to [edit the app's configuration settings](/apps/managing-github-apps/modifying-a-github-app/), delete it, or transfer it to another person on GitHub. +GitHub App をマニフェストから作成する場合、URL とアプリケーションの名前をフォローするだけで済みます。 マニフェストには、アプリケーションを自動的に登録するために必要な権限、イベント、webhook URL が含まれています。 マニフェストフローは、GitHub App の登録を作成し、アプリケーションの webhook シークレット、秘密鍵 (PEM ファイル)、および GitHub App ID を取得します。 マニフェストからアプリケーションを作成した人はそのアプリケーションを所有し、[アプリケーションの構成設定を編集](/apps/managing-github-apps/modifying-a-github-app/)、削除、または GitHub 上の他のユーザに移譲することを選択できます。 You can use [Probot](https://probot.github.io/) to get started with GitHub App Manifests or see an example implementation. See "[Using Probot to implement the GitHub App Manifest flow](#using-probot-to-implement-the-github-app-manifest-flow)" to learn more. @@ -71,9 +71,9 @@ The `hook_attributes` object has the following key: ##### パラメータ - | 名前 | 種類 | 説明 | - | ---- | -------- | ------------------------------------------- | - | `状態` | `string` | {% data reusables.apps.state_description %} + | 名前 | 種類 | 説明 | + | ------- | -------- | ------------------------------------------- | + | `state` | `string` | {% data reusables.apps.state_description %} ##### サンプル @@ -162,7 +162,7 @@ You must complete this step of the GitHub App Manifest flow within one hour. {% endnote %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% data reusables.pre-release-program.fury-pre-release %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/ja-JP/content/developers/apps/creating-a-github-app-using-url-parameters.md b/translations/ja-JP/content/developers/apps/creating-a-github-app-using-url-parameters.md index d718d3f89b..2c963c933c 100644 --- a/translations/ja-JP/content/developers/apps/creating-a-github-app-using-url-parameters.md +++ b/translations/ja-JP/content/developers/apps/creating-a-github-app-using-url-parameters.md @@ -27,93 +27,93 @@ The complete list of available query parameters, permissions, and events is list ### {% data variables.product.prodname_github_app %} configuration parameters - Name | Type | Description ------|------|------------- -`name` | `string` | The name of the {% data variables.product.prodname_github_app %}. Give your app a clear and succinct name. Your app cannot have the same name as an existing GitHub user, unless it is your own user or organization name. A slugged version of your app's name will be shown in the user interface when your integration takes an action. -`description` | `string` | A description of the {% data variables.product.prodname_github_app %}. -`url` | `string` | The full URL of your {% data variables.product.prodname_github_app %}'s website homepage. -`callback_url` | `string` | The full URL to redirect to after someone authorizes an installation. This URL is used if your app needs to identify and authorize user-to-server requests. -`request_oauth_on_install` | `boolean` | If your app authorizes users using the OAuth flow, you can set this option to `true` to allow people to authorize the app when they install it, saving a step. If you select this option, the `setup_url` becomes unavailable and users will be redirected to your `callback_url` after installing the app. -`setup_url` | `string` | The full URL to redirect to after someone installs the {% data variables.product.prodname_github_app %} if the app requires additional setup after installation. -`setup_on_update` | `boolean` | Set to `true` to redirect people to the setup URL when installations have been updated, for example, after repositories are added or removed. -`public` | `boolean` | Set to `true` when your {% data variables.product.prodname_github_app %} is available to the public or `false` when it is only accessible to the owner of the app. -`webhook_url` | `string` | The full URL that you would like to send webhook event payloads to. -`webhook_secret` | `string` | You can specify a secret to secure your webhooks. See "[Securing your webhooks](/webhooks/securing/)" for more details. -`events` | `array of strings` | Webhook events. Some webhook events require `read` or `write` permissions for a resource before you can select the event when registering a new {% data variables.product.prodname_github_app %}. See the "[{% data variables.product.prodname_github_app %} webhook events](#github-app-webhook-events)" section for available events and their required permissions. You can select multiple events in a query string. For example, `events[]=public&events[]=label`. -`domain` | `string` | The URL of a content reference. -`single_file_name` | `string` | When you grant `read` or `write` access to the `single_file` permission, this field provides the path to the single file your {% data variables.product.prodname_github_app %} will manage. + | 名前 | 種類 | 説明 | + | -------------------------- | ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | + | `name` | `string` | The name of the {% data variables.product.prodname_github_app %}. Give your app a clear and succinct name. Your app cannot have the same name as an existing GitHub user, unless it is your own user or organization name. A slugged version of your app's name will be shown in the user interface when your integration takes an action. | + | `説明` | `string` | A description of the {% data variables.product.prodname_github_app %}. | + | `url` | `string` | The full URL of your {% data variables.product.prodname_github_app %}'s website homepage. | + | `callback_url` | `string` | The full URL to redirect to after someone authorizes an installation. This URL is used if your app needs to identify and authorize user-to-server requests. | + | `request_oauth_on_install` | `boolean` | If your app authorizes users using the OAuth flow, you can set this option to `true` to allow people to authorize the app when they install it, saving a step. If you select this option, the `setup_url` becomes unavailable and users will be redirected to your `callback_url` after installing the app. | + | `setup_url` | `string` | The full URL to redirect to after someone installs the {% data variables.product.prodname_github_app %} if the app requires additional setup after installation. | + | `setup_on_update` | `boolean` | Set to `true` to redirect people to the setup URL when installations have been updated, for example, after repositories are added or removed. | + | `public` | `boolean` | Set to `true` when your {% data variables.product.prodname_github_app %} is available to the public or `false` when it is only accessible to the owner of the app. | + | `webhook_url` | `string` | The full URL that you would like to send webhook event payloads to. | + | `webhook_secret` | `string` | You can specify a secret to secure your webhooks. See "[Securing your webhooks](/webhooks/securing/)" for more details. | + | `イベント` | `array of strings` | webhook イベント. Some webhook events require `read` or `write` permissions for a resource before you can select the event when registering a new {% data variables.product.prodname_github_app %}. See the "[{% data variables.product.prodname_github_app %} webhook events](#github-app-webhook-events)" section for available events and their required permissions. You can select multiple events in a query string. For example, `events[]=public&events[]=label`. | + | `ドメイン` | `string` | The URL of a content reference. | + | `single_file_name` | `string` | When you grant `read` or `write` access to the `single_file` permission, this field provides the path to the single file your {% data variables.product.prodname_github_app %} will manage. | ### {% data variables.product.prodname_github_app %} permissions You can select permissions in a query string using the permission name in the following table as the query parameter name and the permission type as the query value. For example, to select `Read & write` permissions in the user interface for `contents`, your query string would include `&contents=write`. To select `Read-only` permissions in the user interface for `blocking`, your query string would include `&blocking=read`. To select `no-access` in the user interface for `checks`, your query string would not include the `checks` permission. -Permission | Description ----------- | ----------- -[`administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-administration) | Grants access to various endpoints for organization and repository administration. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} -[`blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-blocking) | Grants access to the [Blocking Users API](/v3/users/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} -[`checks`](/rest/reference/permissions-required-for-github-apps/#permission-on-checks) | Grants access to the [Checks API](/v3/checks/). Can be one of: `none`, `read`, or `write`. -`content_references` | Grants access to the "[Create a content attachment](/v3/apps/installations/#create-a-content-attachment)" endpoint. Can be one of: `none`, `read`, or `write`. -[`contents`](/rest/reference/permissions-required-for-github-apps/#permission-on-contents) | Grants access to various endpoints that allow you to modify repository contents. Can be one of: `none`, `read`, or `write`. -[`deployments`](/rest/reference/permissions-required-for-github-apps/#permission-on-deployments) | Grants access to the [Deployments API](/rest/reference/repos#deployments). Can be one of: `none`, `read`, or `write`. -[`emails`](/rest/reference/permissions-required-for-github-apps/#permission-on-emails) | Grants access to the [Emails API](/v3/users/emails/). Can be one of: `none`, `read`, or `write`. -[`followers`](/rest/reference/permissions-required-for-github-apps/#permission-on-followers) | Grants access to the [Followers API](/v3/users/followers/). Can be one of: `none`, `read`, or `write`. -[`gpg_keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-gpg-keys) | Grants access to the [GPG Keys API](/v3/users/gpg_keys/). Can be one of: `none`, `read`, or `write`. -[`issues`](/rest/reference/permissions-required-for-github-apps/#permission-on-issues) | Grants access to the [Issues API](/v3/issues/). Can be one of: `none`, `read`, or `write`. -[`keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-keys) | Grants access to the [Public Keys API](/v3/users/keys/). Can be one of: `none`, `read`, or `write`. -[`members`](/rest/reference/permissions-required-for-github-apps/#permission-on-members) | Grants access to manage an organization's members. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} -[`metadata`](/rest/reference/permissions-required-for-github-apps/#metadata-permissions) | Grants access to read-only endpoints that do not leak sensitive data. Can be `read` or `none`. Defaults to `read` when you set any permission, or defaults to `none` when you don't specify any permissions for the {% data variables.product.prodname_github_app %}. -[`organization_administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-administration) | Grants access to "[Update an organization](/v3/orgs/#update-an-organization)" endpoint and the [Organization Interaction Restrictions API](/v3/interactions/orgs/#set-interaction-restrictions-for-an-organization). Can be one of: `none`, `read`, or `write`.{% endif %} -[`organization_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-hooks) | Grants access to the [Organization Webhooks API](/rest/reference/orgs#webhooks/). Can be one of: `none`, `read`, or `write`. -`organization_plan` | Grants access to get information about an organization's plan using the "[Get an organization](/v3/orgs/#get-an-organization)" endpoint. Can be one of: `none` or `read`. -[`organization_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`.{% if currentVersion == "free-pro-team@latest" %} -[`organization_user_blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Blocking Organization Users API](/v3/orgs/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} -[`pages`](/rest/reference/permissions-required-for-github-apps/#permission-on-pages) | Grants access to the [Pages API](/rest/reference/repos#pages). Can be one of: `none`, `read`, or `write`. -`plan` | Grants access to get information about a user's GitHub plan using the "[Get a user](/v3/users/#get-a-user)" endpoint. Can be one of: `none` or `read`. -[`pull_requests`](/rest/reference/permissions-required-for-github-apps/#permission-on-pull-requests) | Grants access to various pull request endpoints. Can be one of: `none`, `read`, or `write`. -[`repository_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-hooks) | Grants access to the [Repository Webhooks API](/v3/repos/hooks/). Can be one of: `none`, `read`, or `write`. -[`repository_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`. -[`single_file`](/rest/reference/permissions-required-for-github-apps/#permission-on-single-file) | Grants access to the [Contents API](/v3/repos/contents/). Can be one of: `none`, `read`, or `write`. -[`starring`](/rest/reference/permissions-required-for-github-apps/#permission-on-starring) | Grants access to the [Starring API](/v3/activity/starring/). Can be one of: `none`, `read`, or `write`. -[`statuses`](/rest/reference/permissions-required-for-github-apps/#permission-on-statuses) | Grants access to the [Statuses API](/v3/repos/statuses/). Can be one of: `none`, `read`, or `write`. -[`team_discussions`](/rest/reference/permissions-required-for-github-apps/#permission-on-team-discussions) | Grants access to the [Team Discussions API](/v3/teams/discussions/) and the [Team Discussion Comments API](/v3/teams/discussion_comments/). Can be one of: `none`, `read`, or `write`. -`vulnerability_alerts`| Grants access to receive security alerts for vulnerable dependencies in a repository. See "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies)" to learn more. Can be one of: `none` or `read`. -`watching` | Grants access to list and change repositories a user is subscribed to. Can be one of: `none`, `read`, or `write`. +| 権限 | 説明 | +| -------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| [`管理`](/rest/reference/permissions-required-for-github-apps/#permission-on-administration) | Grants access to various endpoints for organization and repository administration. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} +| [`blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-blocking) | Grants access to the [Blocking Users API](/v3/users/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} +| [`チェック`](/rest/reference/permissions-required-for-github-apps/#permission-on-checks) | Grants access to the [Checks API](/v3/checks/). Can be one of: `none`, `read`, or `write`. | +| `content_references` | Grants access to the "[Create a content attachment](/v3/apps/installations/#create-a-content-attachment)" endpoint. Can be one of: `none`, `read`, or `write`. | +| [`コンテンツ`](/rest/reference/permissions-required-for-github-apps/#permission-on-contents) | Grants access to various endpoints that allow you to modify repository contents. Can be one of: `none`, `read`, or `write`. | +| [`デプロイメント`](/rest/reference/permissions-required-for-github-apps/#permission-on-deployments) | Grants access to the [Deployments API](/rest/reference/repos#deployments). Can be one of: `none`, `read`, or `write`. | +| [`emails`](/rest/reference/permissions-required-for-github-apps/#permission-on-emails) | Grants access to the [Emails API](/v3/users/emails/). Can be one of: `none`, `read`, or `write`. | +| [`フォロワー`](/rest/reference/permissions-required-for-github-apps/#permission-on-followers) | Grants access to the [Followers API](/v3/users/followers/). Can be one of: `none`, `read`, or `write`. | +| [`gpg_keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-gpg-keys) | Grants access to the [GPG Keys API](/v3/users/gpg_keys/). Can be one of: `none`, `read`, or `write`. | +| [`issues`](/rest/reference/permissions-required-for-github-apps/#permission-on-issues) | Grants access to the [Issues API](/v3/issues/). Can be one of: `none`, `read`, or `write`. | +| [`キー`](/rest/reference/permissions-required-for-github-apps/#permission-on-keys) | Grants access to the [Public Keys API](/v3/users/keys/). Can be one of: `none`, `read`, or `write`. | +| [`members`](/rest/reference/permissions-required-for-github-apps/#permission-on-members) | Grants access to manage an organization's members. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} +| [`メタデータ`](/rest/reference/permissions-required-for-github-apps/#metadata-permissions) | Grants access to read-only endpoints that do not leak sensitive data. Can be `read` or `none`. Defaults to `read` when you set any permission, or defaults to `none` when you don't specify any permissions for the {% data variables.product.prodname_github_app %}. | +| [`organization_administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-administration) | Grants access to "[Update an organization](/v3/orgs/#update-an-organization)" endpoint and the [Organization Interaction Restrictions API](/v3/interactions/orgs/#set-interaction-restrictions-for-an-organization). Can be one of: `none`, `read`, or `write`.{% endif %} +| [`organization_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-hooks) | Grants access to the [Organization Webhooks API](/rest/reference/orgs#webhooks/). Can be one of: `none`, `read`, or `write`. | +| `organization_plan` | Grants access to get information about an organization's plan using the "[Get an organization](/v3/orgs/#get-an-organization)" endpoint. Can be one of: `none` or `read`. | +| [`organization_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`.{% if currentVersion == "free-pro-team@latest" %} +| [`organization_user_blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Blocking Organization Users API](/v3/orgs/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} +| [`ページ`](/rest/reference/permissions-required-for-github-apps/#permission-on-pages) | Grants access to the [Pages API](/rest/reference/repos#pages). Can be one of: `none`, `read`, or `write`. | +| `plan` | Grants access to get information about a user's GitHub plan using the "[Get a user](/v3/users/#get-a-user)" endpoint. Can be one of: `none` or `read`. | +| [`pull_requests`](/rest/reference/permissions-required-for-github-apps/#permission-on-pull-requests) | Grants access to various pull request endpoints. Can be one of: `none`, `read`, or `write`. | +| [`repository_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-hooks) | Grants access to the [Repository Webhooks API](/v3/repos/hooks/). Can be one of: `none`, `read`, or `write`. | +| [`repository_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`. | +| [`single_file`](/rest/reference/permissions-required-for-github-apps/#permission-on-single-file) | Grants access to the [Contents API](/v3/repos/contents/). Can be one of: `none`, `read`, or `write`. | +| [`star`](/rest/reference/permissions-required-for-github-apps/#permission-on-starring) | Grants access to the [Starring API](/v3/activity/starring/). Can be one of: `none`, `read`, or `write`. | +| [`ステータス`](/rest/reference/permissions-required-for-github-apps/#permission-on-statuses) | Grants access to the [Statuses API](/v3/repos/statuses/). Can be one of: `none`, `read`, or `write`. | +| [`team_discussions`](/rest/reference/permissions-required-for-github-apps/#permission-on-team-discussions) | Grants access to the [Team Discussions API](/v3/teams/discussions/) and the [Team Discussion Comments API](/v3/teams/discussion_comments/). Can be one of: `none`, `read`, or `write`. | +| `vulnerability_alerts` | Grants access to receive security alerts for vulnerable dependencies in a repository. See "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies)" to learn more. Can be one of: `none` or `read`. | +| `Watch` | Grants access to list and change repositories a user is subscribed to. Can be one of: `none`, `read`, or `write`. | ### {% data variables.product.prodname_github_app %} webhook events -Webhook event name | Required permission | Description ------------------- | ------------------- | ----------- -[`check_run`](/webhooks/event-payloads/#check_run) |`checks` | {% data reusables.webhooks.check_run_short_desc %} -[`check_suite`](/webhooks/event-payloads/#check_suite) |`checks` | {% data reusables.webhooks.check_suite_short_desc %} -[`commit_comment`](/webhooks/event-payloads/#commit_comment) | `contents` | {% data reusables.webhooks.commit_comment_short_desc %} -[`content_reference`](/webhooks/event-payloads/#content_reference) |`content_references` | {% data reusables.webhooks.content_reference_short_desc %} -[`create`](/webhooks/event-payloads/#create) | `contents` | {% data reusables.webhooks.create_short_desc %} -[`delete`](/webhooks/event-payloads/#delete) | `contents` | {% data reusables.webhooks.delete_short_desc %} -[`deployment`](/webhooks/event-payloads/#deployment) | `deployments` | {% data reusables.webhooks.deployment_short_desc %} -[`deployment_status`](/webhooks/event-payloads/#deployment_status) | `deployments` | {% data reusables.webhooks.deployment_status_short_desc %} -[`fork`](/webhooks/event-payloads/#fork) | `contents` | {% data reusables.webhooks.fork_short_desc %} -[`gollum`](/webhooks/event-payloads/#gollum) | `contents` | {% data reusables.webhooks.gollum_short_desc %} -[`issues`](/webhooks/event-payloads/#issues) | `issues` | {% data reusables.webhooks.issues_short_desc %} -[`issue_comment`](/webhooks/event-payloads/#issue_comment) | `issues` | {% data reusables.webhooks.issue_comment_short_desc %} -[`label`](/webhooks/event-payloads/#label) | `metadata` | {% data reusables.webhooks.label_short_desc %} -[`member`](/webhooks/event-payloads/#member) | `members` | {% data reusables.webhooks.member_short_desc %} -[`membership`](/webhooks/event-payloads/#membership) | `members` | {% data reusables.webhooks.membership_short_desc %} -[`milestone`](/webhooks/event-payloads/#milestone) | `pull_request` | {% data reusables.webhooks.milestone_short_desc %}{% if currentVersion == "free-pro-team@latest" %} -[`org_block`](/webhooks/event-payloads/#org_block) | `organization_administration` | {% data reusables.webhooks.org_block_short_desc %}{% endif %} -[`organization`](/webhooks/event-payloads/#organization) | `members` | {% data reusables.webhooks.organization_short_desc %} -[`page_build`](/webhooks/event-payloads/#page_build) | `pages` | {% data reusables.webhooks.page_build_short_desc %} -[`project`](/webhooks/event-payloads/#project) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_short_desc %} -[`project_card`](/webhooks/event-payloads/#project_card) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_card_short_desc %} -[`project_column`](/webhooks/event-payloads/#project_column) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_column_short_desc %} -[`public`](/webhooks/event-payloads/#public) | `metadata` | {% data reusables.webhooks.public_short_desc %} -[`pull_request`](/webhooks/event-payloads/#pull_request) | `pull_requests` | {% data reusables.webhooks.pull_request_short_desc %} -[`pull_request_review`](/webhooks/event-payloads/#pull_request_review) | `pull_request` | {% data reusables.webhooks.pull_request_review_short_desc %} -[`pull_request_review_comment`](/webhooks/event-payloads/#pull_request_review_comment) | `pull_request` | {% data reusables.webhooks.pull_request_review_comment_short_desc %} -[`push`](/webhooks/event-payloads/#push) | `contents` | {% data reusables.webhooks.push_short_desc %} -[`release`](/webhooks/event-payloads/#release) | `contents` | {% data reusables.webhooks.release_short_desc %} -[`repository`](/webhooks/event-payloads/#repository) |`metadata` | {% data reusables.webhooks.repository_short_desc %}{% if currentVersion == "free-pro-team@latest"%} -[`repository_dispatch`](/webhooks/event-payloads/#repository_dispatch) | `contents` | Allows integrators using GitHub Actions to trigger custom events.{% endif %} -[`status`](/webhooks/event-payloads/#status) | `statuses` | {% data reusables.webhooks.status_short_desc %} -[`team`](/webhooks/event-payloads/#team) | `members` | {% data reusables.webhooks.team_short_desc %} -[`team_add`](/webhooks/event-payloads/#team_add) | `members` | {% data reusables.webhooks.team_add_short_desc %} -[`watch`](/webhooks/event-payloads/#watch) | `metadata` | {% data reusables.webhooks.watch_short_desc %} +| Webhook イベント名 | Required permission | 説明 | +| -------------------------------------------------------------------------------------- | ------------------------------------------------ | ----------------------------------------------------------------------------------------------------- | +| [`check_run`](/webhooks/event-payloads/#check_run) | `チェック` | {% data reusables.webhooks.check_run_short_desc %} +| [`check_suite`](/webhooks/event-payloads/#check_suite) | `チェック` | {% data reusables.webhooks.check_suite_short_desc %} +| [`commit_comment`](/webhooks/event-payloads/#commit_comment) | `コンテンツ` | {% data reusables.webhooks.commit_comment_short_desc %} +| [`content_reference`](/webhooks/event-payloads/#content_reference) | `content_references` | {% data reusables.webhooks.content_reference_short_desc %} +| [`create`](/webhooks/event-payloads/#create) | `コンテンツ` | {% data reusables.webhooks.create_short_desc %} +| [`delete`](/webhooks/event-payloads/#delete) | `コンテンツ` | {% data reusables.webhooks.delete_short_desc %} +| [`deployment`](/webhooks/event-payloads/#deployment) | `デプロイメント` | {% data reusables.webhooks.deployment_short_desc %} +| [`deployment_status`](/webhooks/event-payloads/#deployment_status) | `デプロイメント` | {% data reusables.webhooks.deployment_status_short_desc %} +| [`フォーク`](/webhooks/event-payloads/#fork) | `コンテンツ` | {% data reusables.webhooks.fork_short_desc %} +| [`gollum`](/webhooks/event-payloads/#gollum) | `コンテンツ` | {% data reusables.webhooks.gollum_short_desc %} +| [`issues`](/webhooks/event-payloads/#issues) | `issues` | {% data reusables.webhooks.issues_short_desc %} +| [`issue_comment`](/webhooks/event-payloads/#issue_comment) | `issues` | {% data reusables.webhooks.issue_comment_short_desc %} +| [`ラベル`](/webhooks/event-payloads/#label) | `メタデータ` | {% data reusables.webhooks.label_short_desc %} +| [`member`](/webhooks/event-payloads/#member) | `members` | {% data reusables.webhooks.member_short_desc %} +| [`membership`](/webhooks/event-payloads/#membership) | `members` | {% data reusables.webhooks.membership_short_desc %} +| [`マイルストーン`](/webhooks/event-payloads/#milestone) | `pull_request` | {% data reusables.webhooks.milestone_short_desc %}{% if currentVersion == "free-pro-team@latest" %} +| [`org_block`](/webhooks/event-payloads/#org_block) | `organization_administration` | {% data reusables.webhooks.org_block_short_desc %}{% endif %} +| [`Organization`](/webhooks/event-payloads/#organization) | `members` | {% data reusables.webhooks.organization_short_desc %} +| [`page_build`](/webhooks/event-payloads/#page_build) | `ページ` | {% data reusables.webhooks.page_build_short_desc %} +| [`project`](/webhooks/event-payloads/#project) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_short_desc %} +| [`project_card`](/webhooks/event-payloads/#project_card) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_card_short_desc %} +| [`project_column`](/webhooks/event-payloads/#project_column) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_column_short_desc %} +| [`public`](/webhooks/event-payloads/#public) | `メタデータ` | {% data reusables.webhooks.public_short_desc %} +| [`pull_request`](/webhooks/event-payloads/#pull_request) | `pull_requests` | {% data reusables.webhooks.pull_request_short_desc %} +| [`pull_request_review`](/webhooks/event-payloads/#pull_request_review) | `pull_request` | {% data reusables.webhooks.pull_request_review_short_desc %} +| [`pull_request_review_comment`](/webhooks/event-payloads/#pull_request_review_comment) | `pull_request` | {% data reusables.webhooks.pull_request_review_comment_short_desc %} +| [`プッシュ`](/webhooks/event-payloads/#push) | `コンテンツ` | {% data reusables.webhooks.push_short_desc %} +| [`リリース`](/webhooks/event-payloads/#release) | `コンテンツ` | {% data reusables.webhooks.release_short_desc %} +| [`リポジトリ`](/webhooks/event-payloads/#repository) | `メタデータ` | {% data reusables.webhooks.repository_short_desc %}{% if currentVersion == "free-pro-team@latest"%} +| [`repository_dispatch`](/webhooks/event-payloads/#repository_dispatch) | `コンテンツ` | Allows integrators using GitHub Actions to trigger custom events.{% endif %} +| [`ステータス`](/webhooks/event-payloads/#status) | `ステータス` | {% data reusables.webhooks.status_short_desc %} +| [`Team`](/webhooks/event-payloads/#team) | `members` | {% data reusables.webhooks.team_short_desc %} +| [`team_add`](/webhooks/event-payloads/#team_add) | `members` | {% data reusables.webhooks.team_add_short_desc %} +| [`Watch`](/webhooks/event-payloads/#watch) | `メタデータ` | {% data reusables.webhooks.watch_short_desc %} diff --git a/translations/ja-JP/content/developers/apps/creating-a-github-app.md b/translations/ja-JP/content/developers/apps/creating-a-github-app.md index 8781979ce0..177a646855 100644 --- a/translations/ja-JP/content/developers/apps/creating-a-github-app.md +++ b/translations/ja-JP/content/developers/apps/creating-a-github-app.md @@ -1,5 +1,5 @@ --- -title: Creating a GitHub App +title: GitHub App を作成する intro: '{% data reusables.shortdesc.creating_github_apps %}' redirect_from: - /early-access/integrations/creating-an-integration/ @@ -10,7 +10,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion == "free-pro-team@latest" %}To learn how to use GitHub App Manifests, which allow people to create preconfigured GitHub Apps, see "[Creating GitHub Apps from a manifest](/apps/building-github-apps/creating-github-apps-from-a-manifest/)."{% endif %} +{% if currentVersion == "free-pro-team@latest" %}事前設定された GitHub App を作成できる GitHub App Manifest の使い方については、「[マニフェストから GitHub App を作成する](/apps/building-github-apps/creating-github-apps-from-a-manifest/)」を参照してください。{% endif %} {% if currentVersion == "free-pro-team@latest" %} {% note %} @@ -23,37 +23,37 @@ versions: {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} {% data reusables.user-settings.github_apps %} -4. Click **New GitHub App**. ![Button to create a new GitHub App](/assets/images/github-apps/github_apps_new.png) -5. In "GitHub App name", type the name of your app. ![Field for the name of your GitHub App](/assets/images/github-apps/github_apps_app_name.png) +4. [**New GitHub App**] をクリックします。 ![新しい GitHub App を作成するボタン](/assets/images/github-apps/github_apps_new.png) +5. [GitHub App name] に、アプリケーションの名前を入力します。 ![GitHub App の名前フィールド](/assets/images/github-apps/github_apps_app_name.png) Give your app a clear and succinct name. Your app cannot have the same name as an existing GitHub user, unless it is your own user or organization name. A slugged version of your app's name will be shown in the user interface when your integration takes an action. -6. Optionally, in "Description", type a description of your app that users will see. ![Field for a description of your GitHub App](/assets/images/github-apps/github_apps_description.png) -7. In "Homepage URL", type the full URL to your app's website. ![Field for the homepage URL of your GitHub App](/assets/images/github-apps/github_apps_homepage_url.png) -8. In "User authorization callback URL", type the full URL to redirect to after a user authorizes an installation. This URL is used if your app needs to identify and authorize user-to-server requests. ![Field for the user authorization callback URL of your GitHub App](/assets/images/github-apps/github_apps_user_authorization.png) +6. 必要に応じて、ユーザーに表示されるアプリケーションの説明を [Description] に入力します。 ![GitHub App の説明フィールド](/assets/images/github-apps/github_apps_description.png) +7. [Homepage URL] に、アプリケーションのウェブサイトの完全な URL を入力します。 ![GitHub App のホームページ URL フィールド](/assets/images/github-apps/github_apps_homepage_url.png) +8. [User authorization callback URL] に、ユーザーがインストールを認可した後にリダイレクトされる URL を完全な形で入力します。 This URL is used if your app needs to identify and authorize user-to-server requests. ![GitHub App のユーザ認可コールバック URL フィールド](/assets/images/github-apps/github_apps_user_authorization.png) {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -9. By default, to improve your app's security, your app will use expiring user authorization tokens. To opt-out of using expiring user tokens, you must deselect "Expire user authorization tokens". To learn more about setting up a refresh token flow and the benefits of expiring user tokens, see "[Refreshing user-to-server access tokens](/apps/building-github-apps/refreshing-user-to-server-access-tokens/)." ![Option to opt-in to expiring user tokens during GitHub Apps setup](/assets/images/github-apps/expire-user-tokens-selection.png) +9. デフォルトでは、アプリケーションのセキュリティを高めるため、アプリケーションは期限付きのユーザ認可トークンを使用します。 期限付きのユーザトークンの使用をオプトアウトするには、[Expire user authorization tokens] の選択を解除する必要があります。 リフレッシュトークンフローの設定と、期限付きユーザトークンの利点に関する詳細については、「[ユーザからサーバーに対するアクセストークンをリフレッシュする](/apps/building-github-apps/refreshing-user-to-server-access-tokens/)」を参照してください。 ![GitHub App のセットアップ中に期限付きユーザトークンをオプトインするオプション](/assets/images/github-apps/expire-user-tokens-selection.png) {% endif %} -9. If your app authorizes users using the OAuth flow, you can select **Request user authorization (OAuth) during installation** to allow people to authorize the app when they install it, saving a step. If you select this option, the "Setup URL" becomes unavailable and users will be redirected to your "User authorization callback URL" after installing the app. See "[Authorizing users during installation](/apps/installing-github-apps/#authorizing-users-during-installation)" for more information. ![Request user authorization during installation](/assets/images/github-apps/github_apps_request_auth_upon_install.png) -10. If additional setup is required after installation, add a "Setup URL" to redirect users to after they install your app. ![Field for the setup URL of your GitHub App ](/assets/images/github-apps/github_apps_setup_url.png) +9. アプリケーションが OAuth フローを使用してユーザを認可する場合、[**Request user authorization (OAuth) during installation**] を選択して、ユーザーかアプリをインストール時に認可するようにできます。 このオプションを選択した場合、[Setup URL] が利用できなくなり、アプリケーションのインストール後にユーザはあなたが設定した [User authorization callback URL] にリダイレクトされます。 詳しい情報については「[インストール中にユーザを認可する](/apps/installing-github-apps/#authorizing-users-during-installation)」を参照してください。 ![インストール時にユーザの認可を要求する](/assets/images/github-apps/github_apps_request_auth_upon_install.png) +10. インストール後に追加の設定が必要な場合、[Setup URL] を追加して、アプリケーションをインストールした後にユーザをリダイレクトします。 ![GitHub App のセットアップ URL フィールド ](/assets/images/github-apps/github_apps_setup_url.png) {% note %} - **Note:** When you select **Request user authorization (OAuth) during installation** in the previous step, this field becomes unavailable and people will be redirected to the "User authorization callback URL" after installing the app. + **注釈:** 前のステップで [**Request user authorization (OAuth) during installation**] を選択した場合、このフィールドは利用できなくなり、アプリケーションのインストール後にユーザは [User authorization callback URL] にリダイレクトされます。 {% endnote %} -11. In "Webhook URL", type the URL that events will POST to. Each app receives its own webhook which will notify you every time the app is installed or modified, as well as any other events the app subscribes to. ![Field for the webhook URL of your GitHub App](/assets/images/github-apps/github_apps_webhook_url.png) +11. [Webhook URL] に、イベントが POST する URL を入力します。 各アプリケーションは、アプリケーションがインストールまたは変更されたり、アプリケーションがサブスクライブしているその他のイベントが発生したりするたびに、アプリケーションで設定した webhook を受信します。 ![GitHub App の webhook URL フィールド](/assets/images/github-apps/github_apps_webhook_url.png) -12. Optionally, in "Webhook Secret", type an optional secret token used to secure your webhooks. ![Field to add a secret token for your webhook](/assets/images/github-apps/github_apps_webhook_secret.png) +12. 必要に応じて、webhook を保護するための、オプションのシークレットトークンを [Webhook Secret] に入力します。 ![webhook にシークレットトークンを追加するフィールド](/assets/images/github-apps/github_apps_webhook_secret.png) {% note %} - **Note:** We highly recommend that you set a secret token. 詳しい情報については「[webhookをセキュアにする](/webhooks/securing/)」を参照してください。 + **注釈:** シークレットトークンは、設定することを強くお勧めします。 詳しい情報については「[webhookをセキュアにする](/webhooks/securing/)」を参照してください。 {% endnote %} -13. In "Permissions", choose the permissions your app will request. For each type of permission, use the drop-down menu and click **Read-only**, **Read & write**, or **No access**. ![Various permissions for your GitHub App](/assets/images/github-apps/github_apps_new_permissions_post2dot13.png) -14. In "Subscribe to events", choose whether to subscribe your app to **Label**, **Public**, **Repository**, or **Watch** events. ![Subscribe to events options for your GitHub App](/assets/images/github-apps/github_apps_subscribe_to_events.png) -15. To choose where the app can be installed, select either **Only on this account** or **Any account**. For more information on installation options, see "[Making a GitHub App public or private](/apps/managing-github-apps/making-a-github-app-public-or-private/)." ![Installation options for your GitHub App](/assets/images/github-apps/github_apps_installation_options.png) -16. Click **Create GitHub App**. ![Button to create your GitHub App](/assets/images/github-apps/github_apps_create_github_app.png) +13. [Permissions] で、アプリケーションが要求する権限を選択します。 権限の各タイプで、ドロップダウンメニューを使用して [**Read-only**]、[**Read & write**]、または[**No access**] をクリックします。 ![GitHub App のさまざまな権限](/assets/images/github-apps/github_apps_new_permissions_post2dot13.png) +14. [Subscribe to events] で、アプリケーションが [**Label**]、[**Public**]、 [**Repository**]、[**Watch**] イベントにサブスクライブするかどうかを選択します。 ![GitHub App のイベントオプションにサブスクライブする](/assets/images/github-apps/github_apps_subscribe_to_events.png) +15. アプリケーションをインストールする場所を、[**Only on this account**] (このアカウントのみ) と [**Any account**] (すべてのアカウント) から選びます。 これらのオプションに関する詳しい情報については、「[GitHub App をパブリックまたはプライベートにする](/apps/managing-github-apps/making-a-github-app-public-or-private/)」を参照してください。 ![GitHub App のインストールオプション](/assets/images/github-apps/github_apps_installation_options.png) +16. [**Create GitHub App**] をクリックします。 ![GitHub App を作成するボタン](/assets/images/github-apps/github_apps_create_github_app.png) diff --git a/translations/ja-JP/content/developers/apps/creating-an-oauth-app.md b/translations/ja-JP/content/developers/apps/creating-an-oauth-app.md index 0e9f469f29..071d823544 100644 --- a/translations/ja-JP/content/developers/apps/creating-an-oauth-app.md +++ b/translations/ja-JP/content/developers/apps/creating-an-oauth-app.md @@ -35,7 +35,7 @@ versions: {% endwarning %} -7. In "Homepage URL", type the full URL to your app's website. ![Field for the homepage URL of your app](/assets/images/oauth-apps/oauth_apps_homepage_url.png) +7. [Homepage URL] に、アプリケーションのウェブサイトの完全な URL を入力します。 ![Field for the homepage URL of your app](/assets/images/oauth-apps/oauth_apps_homepage_url.png) 8. Optionally, in "Application description", type a description of your app that users will see. ![Field for a description of your app](/assets/images/oauth-apps/oauth_apps_application_description.png) 9. In "Authorization callback URL", type the callback URL of your app. ![Field for the authorization callback URL of your app](/assets/images/oauth-apps/oauth_apps_authorization_callback_url.png) 10. **Register application** をクリックする。 ![Button to register an application](/assets/images/oauth-apps/oauth_apps_register_application.png) diff --git a/translations/ja-JP/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/translations/ja-JP/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md index 95d7ec2ffc..7224f52b69 100644 --- a/translations/ja-JP/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md +++ b/translations/ja-JP/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md @@ -25,30 +25,30 @@ To authorize users for standard apps that run in the browser, use the [web appli To authorize users for headless apps without direct access to the browser, such as CLI tools or Git credential managers, use the [device flow](#device-flow). The device flow uses the OAuth 2.0 [Device Authorization Grant](https://tools.ietf.org/html/rfc8628). {% endif %} -### Web application flow +### Web アプリケーションフロー Using the web application flow, the process to identify users on your site is: -1. Users are redirected to request their GitHub identity -2. Users are redirected back to your site by GitHub +1. ユーザはGitHubのアイデンティティをリクエストするためにリダイレクトされます +2. ユーザはGitHubによってサイトにリダイレクトして戻されます 3. Your GitHub App accesses the API with the user's access token If you select **Request user authorization (OAuth) during installation** when creating or modifying your app, step 1 will be completed during app installation. For more information, see "[Authorizing users during installation](/apps/installing-github-apps/#authorizing-users-during-installation)." -#### 1. Request a user's GitHub identity +#### 1. ユーザのGitHubアイデンティティのリクエスト GET {% data variables.product.oauth_host_code %}/login/oauth/authorize -When your GitHub App specifies a `login` parameter, it prompts users with a specific account they can use for signing in and authorizing your app. +GitHub Appが`login`パラメータを指定すると、ユーザに対して利用できる特定のアカウントでサインインしてアプリケーションを認可するよう求めます。 -##### Parameters +##### パラメータ -Name | Type | Description ------|------|------------ -`client_id` | `string` | **Required.** The client ID for your GitHub App. You can find this in your [GitHub App settings](https://github.com/settings/apps) when you select your app. -`redirect_uri` | `string` | The URL in your application where users will be sent after authorization. This must be an exact match to the URL you provided in the **User authorization callback URL** field when setting up your GitHub App and can't contain any additional parameters. -`state` | `string` | This should contain a random string to protect against forgery attacks and could contain any other arbitrary data. -`login` | `string` | Suggests a specific account to use for signing in and authorizing the app. +| 名前 | 種類 | 説明 | +| -------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `string` | **Required.** The client ID for your GitHub App. You can find this in your [GitHub App settings](https://github.com/settings/apps) when you select your app. | +| `redirect_uri` | `string` | 認可の後にユーザが送られるアプリケーション中のURL。 This must be an exact match to the URL you provided in the **User authorization callback URL** field when setting up your GitHub App and can't contain any additional parameters. | +| `state` | `string` | This should contain a random string to protect against forgery attacks and could contain any other arbitrary data. | +| `login` | `string` | サインインとアプリケーションの認可に使われるアカウントを指示します。 | {% note %} @@ -56,7 +56,7 @@ Name | Type | Description {% endnote %} -#### 2. Users are redirected back to your site by GitHub +#### 2. ユーザはGitHubによってサイトにリダイレクトして戻されます If the user accepts your request, GitHub redirects back to your site with a temporary `code` in a code parameter as well as the state you provided in the previous step in a `state` parameter. If the states don't match, the request was created by a third party and the process should be aborted. @@ -72,17 +72,17 @@ Expiring user tokens are currently part of the user-to-server token expiration b POST {% data variables.product.oauth_host_code %}/login/oauth/access_token -##### Parameters +##### パラメータ -Name | Type | Description ------|------|------------ -`client_id` | `string` | **Required.** The client ID for your GitHub App. -`client_secret` | `string` | **Required.** The client secret for your GitHub App. -`code` | `string` | **Required.** The code you received as a response to Step 1. -`redirect_uri` | `string` | The URL in your application where users are sent after authorization. -`state` | `string` | The unguessable random string you provided in Step 1. +| 名前 | 種類 | 説明 | +| --------------- | -------- | ----------------------------------------------------- | +| `client_id` | `string` | **Required.** The client ID for your GitHub App. | +| `client_secret` | `string` | **Required.** The client secret for your GitHub App. | +| `コード` | `string` | **必須。** ステップ1でレスポンスとして受け取ったコード。 | +| `redirect_uri` | `string` | 認可の後にユーザが送られるアプリケーション中のURL。 | +| `state` | `string` | ステップ1で提供した推測できないランダムな文字列。 | -##### Response +##### レスポンス {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} @@ -100,7 +100,7 @@ By default, the response takes the following form. The response parameters `expi ``` {% else %} -By default, the response takes the following form: +デフォルトでは、レスポンスは以下の形式になります。 access_token=e72e16c7e42f292c6912e7710c838347ae178b4a&token_type=bearer @@ -113,22 +113,22 @@ The user's access token allows the GitHub App to make requests to the API on beh Authorization: token OAUTH-TOKEN GET {% data variables.product.api_url_code %}/user -For example, in curl you can set the Authorization header like this: +たとえば、curlでは以下のようにAuthorizationヘッダを設定できます。 ```shell curl -H "Authorization: token OAUTH-TOKEN" {% data variables.product.api_url_pre %}/user ``` {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -### Device flow +### デバイスフロー {% note %} -**Note:** The device flow is in public beta and subject to change.{% if currentVersion == "free-pro-team@latest" %} To enable this beta feature, see "[Activating beta features for apps](/developers/apps/activating-beta-features-for-apps)."{% endif %} +**ノート:** デバイスフローはパブリックベータであり、変更されることがあります。{% if currentVersion == "free-pro-team@latest" %} このベータの機能を有効化するには、「[アプリケーションのベータ機能のアクティベート](/developers/apps/activating-beta-features-for-apps)」を参照してください。{% endif %} {% endnote %} -The device flow allows you to authorize users for a headless app, such as a CLI tool or Git credential manager. +デバイスフローを使えば、CLIツールやGit認証情報マネージャーなどのヘッドレスアプリケーションのユーザを認可できます。 For more information about authorizing users using the device flow, see "[Authorizing OAuth Apps](/developers/apps/authorizing-oauth-apps#device-flow)". @@ -136,7 +136,7 @@ For more information about authorizing users using the device flow, see "[Author ### Check which installation's resources a user can access -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -208,7 +208,7 @@ While most of your API interaction should occur using your server-to-server inst {% endif %} {% if currentVersion == "free-pro-team@latest" %} -##### Artifacts +##### 成果物 * [List artifacts for a repository](/v3/actions/artifacts/#list-artifacts-for-a-repository) * [List workflow run artifacts](/v3/actions/artifacts/#list-workflow-run-artifacts) @@ -217,7 +217,7 @@ While most of your API interaction should occur using your server-to-server inst * [Download an artifact](/v3/actions/artifacts/#download-an-artifact) {% endif %} -##### Check Runs +##### チェックラン * [Create a check run](/v3/checks/runs/#create-a-check-run) * [Get a check run](/v3/checks/runs/#get-a-check-run) @@ -226,7 +226,7 @@ While most of your API interaction should occur using your server-to-server inst * [List check runs in a check suite](/v3/checks/runs/#list-check-runs-in-a-check-suite) * [List check runs for a Git reference](/v3/checks/runs/#list-check-runs-for-a-git-reference) -##### Check Suites +##### チェックスイート * [Create a check suite](/v3/checks/suites/#create-a-check-suite) * [Get a check suite](/v3/checks/suites/#get-a-check-suite) @@ -245,19 +245,19 @@ While most of your API interaction should occur using your server-to-server inst * [Create a deployment status](/rest/reference/repos#create-a-deployment-status) * [Get a deployment status](/rest/reference/repos#get-a-deployment-status) -##### Deployments +##### デプロイメント * [List deployments](/rest/reference/repos#list-deployments) * [Create a deployment](/rest/reference/repos#create-a-deployment) * [Get a deployment](/rest/reference/repos#get-a-deployment){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} * [Delete a deployment](/rest/reference/repos#delete-a-deployment){% endif %} -##### Events +##### イベント * [List public events for a network of repositories](/rest/reference/activity#list-public-events-for-a-network-of-repositories) * [List public organization events](/rest/reference/activity#list-public-organization-events) -##### Feeds +##### フィード * [Get feeds](/rest/reference/activity#get-feeds) @@ -330,13 +330,13 @@ While most of your API interaction should occur using your server-to-server inst * [List timeline events for an issue](/v3/issues/timeline/#list-timeline-events-for-an-issue) -##### Issues +##### 問題 * [List issues assigned to the authenticated user](/v3/issues/#list-issues-assigned-to-the-authenticated-user) * [List assignees](/v3/issues/assignees/#list-assignees) * [Check if a user can be assigned](/v3/issues/assignees/#check-if-a-user-can-be-assigned) * [List repository issues](/v3/issues/#list-repository-issues) -* [Create an issue](/v3/issues/#create-an-issue) +* [Issue を作成します](/v3/issues/#create-an-issue) * [Get an issue](/v3/issues/#get-an-issue) * [Update an issue](/v3/issues/#update-an-issue) * [Lock an issue](/v3/issues/#lock-an-issue) @@ -350,7 +350,7 @@ While most of your API interaction should occur using your server-to-server inst * [List jobs for a workflow run](/v3/actions/workflow-jobs/#list-jobs-for-a-workflow-run) {% endif %} -##### Labels +##### ラベル * [List labels for an issue](/v3/issues/labels/#list-labels-for-an-issue) * [Add labels to an issue](/v3/issues/labels/#add-labels-to-an-issue) @@ -364,7 +364,7 @@ While most of your API interaction should occur using your server-to-server inst * [Delete a label](/v3/issues/labels/#delete-a-label) * [Get labels for every issue in a milestone](/v3/issues/labels/#list-labels-for-issues-in-a-milestone) -##### Licenses +##### ライセンス * [Get all commonly used licenses](/v3/licenses/#get-all-commonly-used-licenses) * [Get a license](/v3/licenses/#get-a-license) @@ -374,11 +374,11 @@ While most of your API interaction should occur using your server-to-server inst * [Render a Markdown document](/v3/markdown/#render-a-markdown-document) * [Render a markdown document in raw mode](/v3/markdown/#render-a-markdown-document-in-raw-mode) -##### Meta +##### メタ情報 -* [Meta](/v3/meta/#meta) +* [メタ情報](/v3/meta/#meta) -##### Milestones +##### マイルストーン * [List milestones](/v3/issues/milestones/#list-milestones) * [Create a milestone](/v3/issues/milestones/#create-a-milestone) @@ -422,7 +422,7 @@ While most of your API interaction should occur using your server-to-server inst * [Convert an organization member to outside collaborator](/v3/orgs/outside_collaborators/#convert-an-organization-member-to-outside-collaborator) * [Remove outside collaborator from an organization](/v3/orgs/outside_collaborators/#remove-outside-collaborator-from-an-organization) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Organization Pre Receive Hooks * [List pre-receive hooks for an organization](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-an-organization) @@ -442,7 +442,7 @@ While most of your API interaction should occur using your server-to-server inst ##### Organization Team Repositories -* [List team repositories](/v3/teams/#list-team-repositories) +* [Team リポジトリの一覧表示](/v3/teams/#list-team-repositories) * [Check team permissions for a repository](/v3/teams/#check-team-permissions-for-a-repository) * [Add or update team repository permissions](/v3/teams/#add-or-update-team-repository-permissions) * [Remove a repository from a team](/v3/teams/#remove-a-repository-from-a-team) @@ -460,7 +460,7 @@ While most of your API interaction should occur using your server-to-server inst * [List teams](/v3/teams/#list-teams) * [Create a team](/v3/teams/#create-a-team) * [Get a team by name](/v3/teams/#get-a-team-by-name) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} * [Get a team](/v3/teams/#get-a-team) {% endif %} * [Update a team](/v3/teams/#update-a-team) @@ -475,7 +475,7 @@ While most of your API interaction should occur using your server-to-server inst * [List child teams](/v3/teams/#list-child-teams) * [List teams for the authenticated user](/v3/teams/#list-teams-for-the-authenticated-user) -##### Organizations +##### Organization * [List organizations](/v3/orgs/#list-organizations) * [Get an organization](/v3/orgs/#get-an-organization) @@ -524,7 +524,7 @@ While most of your API interaction should occur using your server-to-server inst * [Remove project collaborator](/v3/projects/collaborators/#remove-project-collaborator) * [Get project permission for a user](/v3/projects/collaborators/#get-project-permission-for-a-user) -##### Projects +##### プロジェクト * [List organization projects](/v3/projects/#list-organization-projects) * [Create an organization project](/v3/projects/#create-an-organization-project) @@ -585,7 +585,7 @@ While most of your API interaction should occur using your server-to-server inst * [Check if a pull request has been merged](/v3/pulls/#check-if-a-pull-request-has-been-merged) * [Merge a pull request (Merge Button)](/v3/pulls/#merge-a-pull-request) -##### Reactions +##### リアクション {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}* [Delete a reaction](/v3/reactions/#delete-a-reaction-legacy){% else %}* [Delete a reaction](/v3/reactions/#delete-a-reaction){% endif %} * [List reactions for a commit comment](/v3/reactions/#list-reactions-for-a-commit-comment) @@ -607,16 +607,16 @@ While most of your API interaction should occur using your server-to-server inst * [Delete team discussion reaction](/v3/reactions/#delete-team-discussion-reaction) * [Delete team discussion comment reaction](/v3/reactions/#delete-team-discussion-comment-reaction){% endif %} -##### Repositories +##### リポジトリ -* [List organization repositories](/v3/repos/#list-organization-repositories) +* [Organization リポジトリの一覧表示](/v3/repos/#list-organization-repositories) * [Create a repository for the authenticated user](/v3/repos/#create-a-repository-for-the-authenticated-user) -* [Get a repository](/v3/repos/#get-a-repository) +* [リポジトリの Get](/v3/repos/#get-a-repository) * [Update a repository](/v3/repos/#update-a-repository) * [Delete a repository](/v3/repos/#delete-a-repository) * [Compare two commits](/v3/repos/commits/#compare-two-commits) * [List repository contributors](/v3/repos/#list-repository-contributors) -* [List forks](/rest/reference/repos#list-forks) +* [一覧表示のフォーク](/rest/reference/repos#list-forks) * [Create a fork](/v3/repos/forks/#create-a-fork) * [List repository languages](/v3/repos/#list-repository-languages) * [List repository tags](/v3/repos/#list-repository-tags) @@ -624,7 +624,7 @@ While most of your API interaction should occur using your server-to-server inst * [Transfer a repository](/v3/repos/#transfer-a-repository) * [List public repositories](/v3/repos/#list-public-repositories) * [List repositories for the authenticated user](/v3/repos/#list-repositories-for-the-authenticated-user) -* [List repositories for a user](/v3/repos/#list-repositories-for-a-user) +* [ユーザのリポジトリの一覧表示](/v3/repos/#list-repositories-for-a-user) * [Create repository using a repository template](/v3/repos/#create-repository-using-a-repository-template) ##### Repository Activity @@ -635,7 +635,7 @@ While most of your API interaction should occur using your server-to-server inst * [Check if a repository is starred by the authenticated user](/rest/reference/activity#check-if-a-repository-is-starred-by-the-authenticated-user) * [Star a repository for the authenticated user](/rest/reference/activity#star-a-repository-for-the-authenticated-user) * [Unstar a repository for the authenticated user](/rest/reference/activity#unstar-a-repository-for-the-authenticated-user) -* [List repositories watched by a user](/rest/reference/activity#list-repositories-watched-by-a-user) +* [ユーザが Watch しているリポジトリの一覧表示](/rest/reference/activity#list-repositories-watched-by-a-user) {% if currentVersion == "free-pro-team@latest" %} ##### Repository Automated Security Fixes @@ -762,7 +762,7 @@ While most of your API interaction should occur using your server-to-server inst * [Get GitHub Pages build](/rest/reference/repos#get-github-pages-build) * [Get latest pages build](/rest/reference/repos#get-latest-pages-build) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Repository Pre Receive Hooks * [List pre-receive hooks for a repository](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-a-repository) @@ -773,10 +773,10 @@ While most of your API interaction should occur using your server-to-server inst ##### Repository Releases -* [List releases](/rest/reference/repos/#list-releases) +* [リリースの一覧表示](/rest/reference/repos/#list-releases) * [Create a release](/rest/reference/repos/#create-a-release) * [Get a release](/rest/reference/repos/#get-a-release) -* [Update a release](/rest/reference/repos/#update-a-release) +* [リリースの更新](/rest/reference/repos/#update-a-release) * [Delete a release](/rest/reference/repos/#delete-a-release) * [List release assets](/rest/reference/repos/#list-release-assets) * [Get a release asset](/rest/reference/repos/#get-a-release-asset) @@ -794,28 +794,28 @@ While most of your API interaction should occur using your server-to-server inst * [Get the hourly commit count for each day](/v3/repos/statistics/#get-the-hourly-commit-count-for-each-day) {% if currentVersion == "free-pro-team@latest" %} -##### Repository Vulnerability Alerts +##### リポジトリ脆弱性アラート * [Enable vulnerability alerts](/v3/repos/#enable-vulnerability-alerts) * [Disable vulnerability alerts](/v3/repos/#disable-vulnerability-alerts) {% endif %} -##### Root +##### ルート -* [Root endpoint](/v3/#root-endpoint) -* [Emojis](/v3/emojis/#emojis) +* [ルートエンドポイント](/v3/#root-endpoint) +* [絵文字](/v3/emojis/#emojis) * [Get rate limit status for the authenticated user](/v3/rate_limit/#get-rate-limit-status-for-the-authenticated-user) -##### Search +##### 検索 * [Search code](/v3/search/#search-code) * [Search commits](/v3/search/#search-commits) * [Search labels](/v3/search/#search-labels) -* [Search repositories](/v3/search/#search-repositories) +* [リポジトリを検索](/v3/search/#search-repositories) * [Search topics](/v3/search/#search-topics) * [Search users](/v3/search/#search-users) -##### Statuses +##### ステータス * [Get the combined status for a specific reference](/v3/repos/statuses/#get-the-combined-status-for-a-specific-reference) * [List commit statuses for a reference](/v3/repos/statuses/#list-commit-statuses-for-a-reference) @@ -840,7 +840,7 @@ While most of your API interaction should occur using your server-to-server inst * [Replace all repository topics](/v3/repos/#replace-all-repository-topics) {% if currentVersion == "free-pro-team@latest" %} -##### Traffic +##### トラフィック * [Get repository clones](/v3/repos/traffic/#get-repository-clones) * [Get top referral paths](/v3/repos/traffic/#get-top-referral-paths) @@ -896,7 +896,7 @@ While most of your API interaction should occur using your server-to-server inst * [Delete a public SSH key for the authenticated user](/v3/users/keys/#delete-a-public-ssh-key-for-the-authenticated-user) * [List public keys for a user](/v3/users/keys/#list-public-keys-for-a-user) -##### Users +##### ユーザ * [Get the authenticated user](/v3/users/#get-the-authenticated-user) * [List app installations accessible to the user access token](/v3/apps/installations/#list-app-installations-accessible-to-the-user-access-token) @@ -920,7 +920,7 @@ While most of your API interaction should occur using your server-to-server inst {% endif %} {% if currentVersion == "free-pro-team@latest" %} -##### Workflows +##### ワークフロー * [List repository workflows](/v3/actions/workflows/#list-repository-workflows) * [Get a workflow](/v3/actions/workflows/#get-a-workflow) diff --git a/translations/ja-JP/content/developers/apps/installing-github-apps.md b/translations/ja-JP/content/developers/apps/installing-github-apps.md index 85a635fff5..ff6dd370a9 100644 --- a/translations/ja-JP/content/developers/apps/installing-github-apps.md +++ b/translations/ja-JP/content/developers/apps/installing-github-apps.md @@ -52,7 +52,7 @@ These steps assume you have [built a {% data variables.product.prodname_github_a You can simplify the authorization process by completing it during app installation. To do this, select **Request user authorization (OAuth) during installation** when creating or modifying your app in GitHub. See "[Creating a GitHub App](/apps/building-github-apps/creating-a-github-app/)" to learn more. -Once someone has installed your app, you will need to get an access token for the user. See steps 2 and 3 in "[Identifying a users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. +Once someone has installed your app, you will need to get an access token for the user. See steps 2 and 3 in "[Identifying users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. ### Preserving an application state during installation You can provide a `state` parameter in an app's installation URL to preserve the state of the application page and return people back to that state after they install, authenticate, or accept updates to your GitHub App. For example, you could use the `state` to correlate an installation to a user or account. diff --git a/translations/ja-JP/content/developers/apps/refreshing-user-to-server-access-tokens.md b/translations/ja-JP/content/developers/apps/refreshing-user-to-server-access-tokens.md index f98f8f7523..a2bc9aec73 100644 --- a/translations/ja-JP/content/developers/apps/refreshing-user-to-server-access-tokens.md +++ b/translations/ja-JP/content/developers/apps/refreshing-user-to-server-access-tokens.md @@ -64,7 +64,7 @@ When you create a new {% data variables.product.prodname_github_app %}, by defau If you want your app to use non-expiring user-to-server access tokens, you can deselect "Expire user authorization tokens" on the app settings page. -![Option to opt-in to expiring user tokens during GitHub Apps setup](/assets/images/github-apps/expire-user-tokens-selection.png) +![GitHub App のセットアップ中に期限付きユーザトークンをオプトインするオプション](/assets/images/github-apps/expire-user-tokens-selection.png) Existing {% data variables.product.prodname_github_app %}s using user-to-server authorization tokens are only affected by this new flow when the app owner enables expiring user tokens for their app. diff --git a/translations/ja-JP/content/developers/apps/scopes-for-oauth-apps.md b/translations/ja-JP/content/developers/apps/scopes-for-oauth-apps.md index ff5b4dc331..b6aabe3b56 100644 --- a/translations/ja-JP/content/developers/apps/scopes-for-oauth-apps.md +++ b/translations/ja-JP/content/developers/apps/scopes-for-oauth-apps.md @@ -19,7 +19,8 @@ When setting up an OAuth App on GitHub, requested scopes are displayed to the us {% endnote %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -If your {% data variables.product.prodname_oauth_app %} doesn't have access to a browser, such as a CLI tool, then you don't need to specify a scope for users to authenticate to your app. For more information, see "[Authorizing OAuth apps](/developers/apps/authorizing-oauth-apps#device-flow)." +If your +{% data variables.product.prodname_oauth_app %} doesn't have access to a browser, such as a CLI tool, then you don't need to specify a scope for users to authenticate to your app. For more information, see "[Authorizing OAuth apps](/developers/apps/authorizing-oauth-apps#device-flow)." {% endif %} Check headers to see what OAuth scopes you have, and what the API action accepts: @@ -36,47 +37,46 @@ X-Accepted-OAuth-Scopes: user ### Available scopes -Name | Description ------|-----------| -**`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if currentVersion != "free-pro-team@latest" %} -**`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/v3/enterprise-admin).{% endif %} -**`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects. - `repo:status`| Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. - `repo_deployment`| Grants access to [deployment statuses](/v3/repos/deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code. - `public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories. - `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21"%} - `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/v3/code-scanning).{% endif %} -**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. - `write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories. - `read:repo_hook`| Grants read and ping access to hooks in public or private repositories. -**`admin:org`** | Fully manage the organization and its teams, projects, and memberships. - `write:org`| Read and write access to organization membership, organization projects, and team membership. - `read:org`| Read-only access to organization membership, organization projects, and team membership. -**`admin:public_key`** | Fully manage public keys. - `write:public_key`| Create, list, and view details for public keys. - `read:public_key`| List and view details for public keys. -**`admin:org_hook`** | Grants read, write, ping, and delete access to organization hooks. **Note:** OAuth tokens will only be able to perform these actions on organization hooks which were created by the OAuth App. Personal access tokens will only be able to perform these actions on organization hooks created by a user. -**`gist`** | Grants write access to gists. -**`notifications`** | Grants:
    * read access to a user's notifications
    * mark as read access to threads
    * watch and unwatch access to a repository, and
    * read, write, and delete access to thread subscriptions. -**`user`** | Grants read/write access to profile info only. Note that this scope includes `user:email` and `user:follow`. - `read:user`| Grants access to read a user's profile data. - `user:email`| Grants read access to a user's email addresses. - `user:follow`| Grants access to follow or unfollow other users. -**`delete_repo`** | Grants access to delete adminable repositories. -**`write:discussion`** | Allows read and write access for team discussions. - `read:discussion` | Allows read access for team discussions.{% if currentVersion == "free-pro-team@latest" %} -**`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[Publishing a package](/github/managing-packages-with-github-packages/publishing-a-package)". -**`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[Installing a package](/github/managing-packages-with-github-packages/installing-a-package)". -**`delete:packages`** | Grants access to delete packages from {% data variables.product.prodname_registry %}. For more information, see "[Deleting packages](/github/managing-packages-with-github-packages/deleting-a-package)".{% endif %} -**`admin:gpg_key`** | Fully manage GPG keys. - `write:gpg_key`| Create, list, and view details for GPG keys. - `read:gpg_key`| List and view details for GPG keys.{% if currentVersion == "free-pro-team@latest" %} -**`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository.{% endif %} +| 名前 | 説明 | +| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if enterpriseServerVersions contains currentVersion %} +| **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/v3/enterprise-admin).{% endif %} +| **`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects. | +|  `repo:status` | Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. | +|  `repo_deployment` | Grants access to [deployment statuses](/v3/repos/deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code. | +|  `public_repo` | Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories. | +|  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21"%} +|  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/v3/code-scanning).{% endif %} +| **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. | +|  `write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories. | +|  `read:repo_hook` | Grants read and ping access to hooks in public or private repositories. | +| **`admin:org`** | Fully manage the organization and its teams, projects, and memberships. | +|  `write:org` | Read and write access to organization membership, organization projects, and team membership. | +|  `read:org` | Read-only access to organization membership, organization projects, and team membership. | +| **`admin:public_key`** | Fully manage public keys. | +|  `write:public_key` | Create, list, and view details for public keys. | +|  `read:public_key` | List and view details for public keys. | +| **`admin:org_hook`** | Grants read, write, ping, and delete access to organization hooks. **Note:** OAuth tokens will only be able to perform these actions on organization hooks which were created by the OAuth App. Personal access tokens will only be able to perform these actions on organization hooks created by a user. | +| **`gist`** | Grants write access to gists. | +| **`通知`** | Grants:
    * read access to a user's notifications
    * mark as read access to threads
    * watch and unwatch access to a repository, and
    * read, write, and delete access to thread subscriptions. | +| **`ユーザ`** | Grants read/write access to profile info only. Note that this scope includes `user:email` and `user:follow`. | +|  `read:user` | Grants access to read a user's profile data. | +|  `user:email` | Grants read access to a user's email addresses. | +|  `user:follow` | Grants access to follow or unfollow other users. | +| **`delete_repo`** | Grants access to delete adminable repositories. | +| **`write:discussion`** | Allows read and write access for team discussions. | +|  `read:discussion` | Allows read access for team discussions.{% if currentVersion == "free-pro-team@latest" %} +| **`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[Publishing a package](/github/managing-packages-with-github-packages/publishing-a-package)". | +| **`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[Installing a package](/github/managing-packages-with-github-packages/installing-a-package)". | +| **`delete:packages`** | Grants access to delete packages from {% data variables.product.prodname_registry %}. For more information, see "[Deleting packages](/github/managing-packages-with-github-packages/deleting-a-package)".{% endif %} +| **`admin:gpg_key`** | Fully manage GPG keys. | +|  `write:gpg_key` | Create, list, and view details for GPG keys. | +|  `read:gpg_key` | List and view details for GPG keys.{% if currentVersion == "free-pro-team@latest" %} +| **`ワークフロー`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes, see https://docs.github.com/en/free-pro-team@latest/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token for details.{% endif %} {% note %} -**Note:** Your OAuth App can request the scopes in the initial redirection. You -can specify multiple scopes by separating them with a space: +**Note:** Your OAuth App can request the scopes in the initial redirection. You can specify multiple scopes by separating them with a space: https://github.com/login/oauth/authorize? client_id=...& @@ -86,29 +86,14 @@ can specify multiple scopes by separating them with a space: ### Requested scopes and granted scopes -The `scope` attribute lists scopes attached to the token that were granted by -the user. Normally, these scopes will be identical to what you requested. -However, users can edit their scopes, effectively -granting your application less access than you originally requested. Also, users -can edit token scopes after the OAuth flow is completed. -You should be aware of this possibility and adjust your application's behavior -accordingly. +The `scope` attribute lists scopes attached to the token that were granted by the user. Normally, these scopes will be identical to what you requested. However, users can edit their scopes, effectively granting your application less access than you originally requested. Also, users can edit token scopes after the OAuth flow is completed. You should be aware of this possibility and adjust your application's behavior accordingly. -It's important to handle error cases where a user chooses to grant you -less access than you originally requested. For example, applications can warn -or otherwise communicate with their users that they will see reduced -functionality or be unable to perform some actions. +It's important to handle error cases where a user chooses to grant you less access than you originally requested. For example, applications can warn or otherwise communicate with their users that they will see reduced functionality or be unable to perform some actions. -Also, applications can always send users back through the flow again to get -additional permission, but don’t forget that users can always say no. +Also, applications can always send users back through the flow again to get additional permission, but don’t forget that users can always say no. -Check out the [Basics of Authentication guide](/guides/basics-of-authentication/), which -provides tips on handling modifiable token scopes. +Check out the [Basics of Authentication guide](/guides/basics-of-authentication/), which provides tips on handling modifiable token scopes. ### Normalized scopes -When requesting multiple scopes, the token is saved with a normalized list -of scopes, discarding those that are implicitly included by another requested -scope. For example, requesting `user,gist,user:email` will result in a -token with `user` and `gist` scopes only since the access granted with -`user:email` scope is included in the `user` scope. +When requesting multiple scopes, the token is saved with a normalized list of scopes, discarding those that are implicitly included by another requested scope. For example, requesting `user,gist,user:email` will result in a token with `user` and `gist` scopes only since the access granted with `user:email` scope is included in the `user` scope. diff --git a/translations/ja-JP/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md b/translations/ja-JP/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md index 3bb17e6442..bcb936899a 100644 --- a/translations/ja-JP/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md +++ b/translations/ja-JP/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md @@ -251,7 +251,7 @@ You'll learn about authenticating as an installation in the [next section](#auth [Authenticating as a GitHub App](/apps/building-github-apps/authenticating-with-github-apps/#authenticating-as-a-github-app) lets you do a couple of things: * You can retrieve high-level management information about your GitHub App. - * You can request access tokens for an installation of the app. + * アプリケーションのインストールのため、アクセストークンをリクエストできます。 For example, you would authenticate as a GitHub App to retrieve a list of the accounts (organization and personal) that have installed your app. But this authentication method doesn't allow you to do much with the API. To access a repository's data and perform operations on behalf of the installation, you need to authenticate as an installation. To do that, you'll need to authenticate as a GitHub App first to request an installation access token. @@ -285,7 +285,7 @@ end The code above generates a [JSON Web Token (JWT)](https://jwt.io/introduction) and uses it (along with your app's private key) to initialize the Octokit client. GitHub checks a request's authentication by verifying the token with the app's stored public key. To learn more about how this code works, see "[Authenticating as a GitHub App](/apps/building-github-apps/authenticating-with-github-apps/#authenticating-as-a-github-app)." -##### Authenticating as an installation +##### インストールとして認証を行う _インストレーション_とは、アプリケーションをインストールしたユーザまたは Organization のアカウントを指します。 Even if someone installs the app on more than one repository, it only counts as one installation because it's within the same account. The last helper method `authenticate_installation` initializes an [Octokit client](http://octokit.github.io/octokit.rb/Octokit/Client.html) authenticated as an installation. This Octokit client is what you'd use to make authenticated API calls. diff --git a/translations/ja-JP/content/developers/apps/suspending-a-github-app-installation.md b/translations/ja-JP/content/developers/apps/suspending-a-github-app-installation.md index 2a6beab999..1bb9ceeee0 100644 --- a/translations/ja-JP/content/developers/apps/suspending-a-github-app-installation.md +++ b/translations/ja-JP/content/developers/apps/suspending-a-github-app-installation.md @@ -24,8 +24,7 @@ People who have installed a GitHub App, also called installation owners, can onl {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} {% data reusables.user-settings.github_apps %} -4. Select the -{% data variables.product.prodname_github_app %} you want to suspend. +4. {% data variables.product.prodname_github_app %} you want to suspend. ![App selection](/assets/images/github-apps/github_apps_select-app.png) {% data reusables.user-settings.github_apps_advanced %} 6. Next to the suspension settings for the installation, click **Suspend** or **Unsuspend**. ![Suspend a GitHub App](/assets/images/github-apps/suspend-a-github-app.png) diff --git a/translations/ja-JP/content/developers/github-marketplace/about-github-marketplace.md b/translations/ja-JP/content/developers/github-marketplace/about-github-marketplace.md index 470acef422..a7fd7721f3 100644 --- a/translations/ja-JP/content/developers/github-marketplace/about-github-marketplace.md +++ b/translations/ja-JP/content/developers/github-marketplace/about-github-marketplace.md @@ -1,6 +1,6 @@ --- title: GitHub Marketplaceについて -intro: 'Learn the basics to prepare your app for review before joining {% data variables.product.prodname_marketplace %}.' +intro: '{% data variables.product.prodname_marketplace %}に参加する前に、アプリケーションをレビューに備えるための基本を学んでください。' redirect_from: - /apps/marketplace/getting-started/ - /marketplace/getting-started @@ -8,58 +8,58 @@ versions: free-pro-team: '*' --- -[{% data variables.product.prodname_marketplace %}](https://github.com/marketplace) connects you to developers who want to extend and improve their {% data variables.product.prodname_dotcom %} workflows. You can list free and paid tools for developers to use in {% data variables.product.prodname_marketplace %}. {% data variables.product.prodname_marketplace %} offers developers two types of tools: {% data variables.product.prodname_actions %} and Apps, and each tool requires different steps for adding it to {% data variables.product.prodname_marketplace %}. +[{% data variables.product.prodname_marketplace %}](https://github.com/marketplace)は、{% data variables.product.prodname_dotcom %}のワークフローを拡張し、改善したい開発者とあなたをつなぎます。 {% data variables.product.prodname_marketplace %}で利用する、開発者のための無料及び有料のツールをリストできます。 {% data variables.product.prodname_marketplace %}は、開発者に{% data variables.product.prodname_actions %}とアプリケーションという2種類のツールを提供します。それぞれのツールは、{% data variables.product.prodname_marketplace %}への追加に際して異なるステップを必要とします。 ### GitHub Actions {% data reusables.actions.actions-not-verified %} -To learn about publishing {% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}, see "[{% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}](/marketplace/actions/)." +{% data variables.product.prodname_marketplace %}での{% data variables.product.prodname_actions %}の公開について学ぶには、「[GitHub Marketplaceでのactionsの公開](/actions/creating-actions/publishing-actions-in-github-marketplace)」を参照してください。 -### アプリ +### アプリケーション -You can list verified and unverified apps in {% data variables.product.prodname_marketplace %}. Unverified apps do not go through the security, testing, and verification cycle {% data variables.product.prodname_dotcom %} requires for verified apps. +{% data variables.product.prodname_marketplace %}において、検証済み及び未検証のアプリケーションをリストできます。 未検証のアプリケーションは、検証済みのアプリケーションに{% data variables.product.prodname_dotcom %}が求めるセキュリティ、テスト、検証のサイクルを通っていません。 -Verified apps have a green badge in {% data variables.product.prodname_marketplace %}. Unverified apps have a grey badge next to their listing and are only available as free apps. +検証済みのアプリケーションは、{% data variables.product.prodname_marketplace %}で緑のバッジが付きます。 未検証のアプリケーションは、リストの隣に灰色のバッジが付き、無料のアプリケーションとしてのみ利用できます。 -![Green verified and grey unverified badge](/assets/images/marketplace/marketplace_verified_badges.png) +![検証済みの緑と未検証の灰色のバッジ](/assets/images/marketplace/marketplace_verified_badges.png) -If you're interested in creating an app for {% data variables.product.prodname_marketplace %}, but you're new to {% data variables.product.prodname_github_apps %} and {% data variables.product.prodname_oauth_app %}s, see "[Building apps](/apps/)." +{% data variables.product.prodname_marketplace %}のアプリケーションの作成に関心があるものの、{% data variables.product.prodname_github_apps %}や{% data variables.product.prodname_oauth_app %}については初心者なら、「[アプリケーションの構築](/apps/)」を参照してください。 -{% data reusables.marketplace.github_apps_preferred %}, although you can list both OAuth and {% data variables.product.prodname_github_app %}s in {% data variables.product.prodname_marketplace %}. See "[Differences between GitHub and OAuth apps](/apps/differences-between-apps/)" for more details. To learn more about switching from OAuth to {% data variables.product.prodname_github_apps %}, see [Migrating OAuth Apps to {% data variables.product.prodname_github_app %}s](/apps/migrating-oauth-apps-to-github-apps/). +{% data reusables.marketplace.github_apps_preferred %}、{% data variables.product.prodname_marketplace %}ではOAuthと{% data variables.product.prodname_github_app %}をどちらもリストできます。 詳細については「[GitHubとOAuthのアプリケーションの違い](/apps/differences-between-apps/)」を参照してください。 OAuthから{% data variables.product.prodname_github_apps %}への切り替えについてさらに学ぶには、[OAuth Appsから{% data variables.product.prodname_github_app %}への移行](/apps/migrating-oauth-apps-to-github-apps/)を参照してください。 -If you have questions about {% data variables.product.prodname_marketplace %}, please contact {% data variables.contact.contact_support %} directly. +{% data variables.product.prodname_marketplace %}に関する質問がある場合は、{% data variables.contact.contact_support %}に直接お問い合わせください。 -#### Unverified Apps +#### 未検証のアプリケーション -Unverified apps do not need to meet the "[Requirements for listing an app on {% data variables.product.prodname_marketplace %}](/marketplace/getting-started/requirements-for-listing-an-app-on-github-marketplace/)" or go through the "[Security review process](/marketplace/getting-started/security-review-process/)". +未検証のアプリケーションは、「[{% data variables.product.prodname_marketplace %}でのアプリケーションのリストの要件](/marketplace/getting-started/requirements-for-listing-an-app-on-github-marketplace/)」を満たしていたり、「[セキュリティレビューのプロセス](/marketplace/getting-started/security-review-process/)」を通る必要はありません。 -{% data reusables.marketplace.unverified-apps %} Having a published paid plan will prevent you from being able to submit an unverified app. You must remove paid plans or keep them in draft mode before publishing an unverified app. +{% data reusables.marketplace.unverified-apps %} 有料プランを公開すると、未検証のアプリケーションはサブミットできなくなります。 未検証のアプリケーションを公開する前には、有料プランを削除するか、有料プランをドラフトモードにしておかなければなりません。 -To list your unverified app in {% data variables.product.prodname_marketplace %}, you only need to create a "[Listing on {% data variables.product.prodname_marketplace %}](/marketplace/listing-on-github-marketplace/)" and submit it as an unverified listing. +{% data variables.product.prodname_marketplace %}で未検証のアプリケションをリストするには、「[{% data variables.product.prodname_marketplace %}上でリスト](/marketplace/listing-on-github-marketplace/)」を作成し、それを未検証のリストとしてサブミットするだけです。 {% data reusables.marketplace.launch-with-free %} -#### Verified Apps +#### 検証済みアプリケーション -If you've already built an app and you're interested in submitting a verified listing in {% data variables.product.prodname_marketplace %}, start here: +すでにアプリケーションを構築済みで、{% data variables.product.prodname_marketplace %}に検証済みのリストをサブミットしたい場合には、以下から始めてください。 -1. [Getting started with {% data variables.product.prodname_marketplace %}](/marketplace/getting-started/)
    Learn about requirements, guidelines, and the app submission process. +1. [{% data variables.product.prodname_marketplace %}を始める](/marketplace/getting-started/)
    要件、ガイドライン、アプリケーションのサブミットのプロセスについて学んでください。 -1. [Integrating with the {% data variables.product.prodname_marketplace %} API](/marketplace/integrating-with-the-github-marketplace-api/)
    Before you can list your app on {% data variables.product.prodname_marketplace %}, you'll need to integrate billing flows using the {% data variables.product.prodname_marketplace %} API and webhook events. +1. [{% data variables.product.prodname_marketplace %} APIとのインテグレーション](/marketplace/integrating-with-the-github-marketplace-api/)
    アプリケーションを{% data variables.product.prodname_marketplace %}でリストできるようにするには、{% data variables.product.prodname_marketplace %} APIとwebhookイベントを使って支払いフローをインテグレーションしなければなりません。 -1. [Listing on {% data variables.product.prodname_marketplace %}](/marketplace/listing-on-github-marketplace/)
    Create a draft {% data variables.product.prodname_marketplace %} listing, configure webhook settings, and set up pricing plans. +1. [{% data variables.product.prodname_marketplace %}でのリスト](/marketplace/listing-on-github-marketplace/)
    ドラフトの{% data variables.product.prodname_marketplace %}のリストを作成し、webhookを設定し、価格プランをセットアップします。 -1. [Selling your app](/marketplace/selling-your-app/)
    Learn about pricing plans, billing cycles, and how to receive payment from {% data variables.product.prodname_dotcom %} for your app. +1. [アプリケーションの販売](/marketplace/selling-your-app/)
    価格プラン、支払いサイクル、アプリケーションに対する{% data variables.product.prodname_dotcom %}カラの支払いの受け取り方を学んでください。 -1. [{% data variables.product.prodname_marketplace %} Insights](/marketplace/github-marketplace-insights/)
    See how your app is performing in {% data variables.product.prodname_marketplace %}. You can use metrics collected by {% data variables.product.prodname_dotcom %} to guide your marketing campaign and be successful in {% data variables.product.prodname_marketplace %}. +1. [{% data variables.product.prodname_marketplace %}のインサイト](/marketplace/github-marketplace-insights/)
    {% data variables.product.prodname_marketplace %}でのアプリケーションのパフォーマンスを見てください。 {% data variables.product.prodname_dotcom %}が収集したメトリクスを使ってマーケティングキャンペーンを導き、{% data variables.product.prodname_marketplace %}で成功してください。 -1. [{% data variables.product.prodname_marketplace %} transactions](/marketplace/github-marketplace-transactions/)
    Download and view transaction data for your {% data variables.product.prodname_marketplace %} listing. +1. [{% data variables.product.prodname_marketplace %}のトランザクション](/marketplace/github-marketplace-transactions/)
    {% data variables.product.prodname_marketplace %}のリストからトランザクションデータをダウンロードして見てください。 -### Reviewing your app +### アプリケーションのレビュー -We want to make sure that the apps offered on {% data variables.product.prodname_marketplace %} are safe, secure, and well tested. The {% data variables.product.prodname_marketplace %} onboarding specialists will review your app to ensure that it meets all requirements. Follow the guidelines in these articles before submitting your app: +弊社は、{% data variables.product.prodname_marketplace %}から提供されているアプリケーションが安全であり、十分テストされていることを確実にしたいと考えています。 {% data variables.product.prodname_marketplace %}のオンボーディングスペシャリストがアプリケーションをレビューし、すべての要件を満たしていることを確認します。 アプリケーションをサブミットする前に、以下の記事のガイドラインに従ってください。 -* [Requirements for listing an app on {% data variables.product.prodname_marketplace %}](/marketplace/getting-started/requirements-for-listing-an-app-on-github-marketplace/) -* [Security review process](/marketplace/getting-started/security-review-process/) +* [{% data variables.product.prodname_marketplace %}でのアプリケーションのリストに対する要件](/marketplace/getting-started/requirements-for-listing-an-app-on-github-marketplace/) +* [セキュリティレビュープロセス](/marketplace/getting-started/security-review-process/) diff --git a/translations/ja-JP/content/developers/github-marketplace/billing-customers.md b/translations/ja-JP/content/developers/github-marketplace/billing-customers.md index 8eba62aa34..270b7aa97a 100644 --- a/translations/ja-JP/content/developers/github-marketplace/billing-customers.md +++ b/translations/ja-JP/content/developers/github-marketplace/billing-customers.md @@ -1,6 +1,6 @@ --- -title: Billing customers -intro: 'Apps on {% data variables.product.prodname_marketplace %} should adhere to GitHub''s billing guidelines and support recommended services. Following our guidelines helps customers navigate the billing process without any surprises.' +title: 顧客への課金 +intro: '{% data variables.product.prodname_marketplace %}上のアプリケーションは、GitHubの課金ガイドラインと、推奨サービスのサポートを遵守しなければなりません。 弊社のガイドラインに従うことで、顧客は予想外のことなく支払いプロセスを進んで行きやすくなります。' redirect_from: - /apps/marketplace/administering-listing-plans-and-user-accounts/billing-customers-in-github-marketplace/ - /apps/marketplace/selling-your-app/billing-customers-in-github-marketplace/ @@ -11,38 +11,38 @@ versions: -### Understanding the billing cycle +### 支払いを理解する -Customers can choose a monthly or yearly billing cycle when they purchase your app. All changes customers make to the billing cycle and plan selection will trigger a `marketplace_purchase` event. You can refer to the `marketplace_purchase` webhook payload to see which billing cycle a customer selects and when the next billing date begins (`effective_date`). For more information about webhook payloads, see "[{% data variables.product.prodname_marketplace %} webhook events](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/)." +顧客は、アプリケーションの購入時に月次あるいは年次の支払いサイクルを選択できます。 顧客が行う支払いサイクルとプランの選択に対するすべての変更は、`marketplace_purchase`イベントを発生させます。 `marketplace_purchase` webhookのペイロードを参照すれば、顧客がどの支払いサイクルを選択したのか、そして次の支払日がいつ始まるのか（`effective_date`）を知ることができます。 webhookのペイロードに関する詳しい情報については「[{% data variables.product.prodname_marketplace %}のwebhookイベント](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/)」を参照してください。 -### Providing billing services in your app's UI +### アプリケーションのUIにおける支払いサービスの提供 -Customers must be able to perform the following actions from your app's website: -- Customers must be able to modify or cancel their {% data variables.product.prodname_marketplace %} plans for personal and organizational accounts separately. +アプリケーションのWebサイトでは、顧客が以下のアクションを行えなければなりません。 +- 顧客は個人及びOrganizationアカウントで別々に{% data variables.product.prodname_marketplace %}のプランを変更したりキャンセルしたりできなければなりません。 {% data reusables.marketplace.marketplace-billing-ui-requirements %} -### Billing services for upgrades, downgrades, and cancellations +### アップグレード、ダウングレード、キャンセルのための支払いサービス -Follow these guidelines for upgrades, downgrades, and cancellations to maintain a clear and consistent billing process. For more detailed instructions about the {% data variables.product.prodname_marketplace %} purchase events, see "[Billing flows](/marketplace/integrating-with-the-github-marketplace-api/#billing-flows)." +明確で一貫性のある支払いプロセスを保つために、アップグレード、ダウングレード、キャンセルについて以下のガイドラインに従ってください。 {% data variables.product.prodname_marketplace %}の購入イベントに関する詳細な手順については「[支払いのフロー](/marketplace/integrating-with-the-github-marketplace-api/#billing-flows)」を参照してください。 -You can use the `marketplace_purchase` webhook's `effective_date` key to determine when a plan change will occur and periodically synchronize the [List accounts for a plan](/v3/apps/marketplace/#list-accounts-for-a-plan). +`marketplace_purchase` webhookの`effective_date`キーを使えば、プランの変更がいつ生じるのかを確認し、定期的に[プランのアカウントのリスト](/v3/apps/marketplace/#list-accounts-for-a-plan)を同期できます。 #### アップグレード -When a customer upgrades their pricing plan or changes their billing cycle from monthly to yearly, you should make the change effective for them immediately. You need to apply a pro-rated discount to the new plan and change the billing cycle. +顧客が価格プランをアップグレードしたり、月次から年次へ支払いサイクルを変更したりした場合、その変更をすぐに有効にしなければなりません。 新しいプランに対して日割引を適用し、支払いサイクルを変更しなければなりません。 {% data reusables.marketplace.marketplace-failed-purchase-event %} -For information about building upgrade and downgrade workflows into your app, see "[Upgrading and downgrading plans](/marketplace/integrating-with-the-github-marketplace-api/upgrading-and-downgrading-plans/)." +アプリケーションへのアップグレードやダウングレードのワークフローの構築に関する情報については「[プランのアップグレード及びダウングレード](/marketplace/integrating-with-the-github-marketplace-api/upgrading-and-downgrading-plans/)」を参照してください。 -#### Downgrades and cancellations +#### ダウングレードとキャンセル -Downgrades occur when a customer moves to a free plan from a paid plan, selects a plan with a lower cost than their current plan, or changes their billing cycle from yearly to monthly. When downgrades or cancellations occur, you don't need to provide a refund. Instead, the current plan will remain active until the last day of the current billing cycle. The `marketplace_purchase` event will be sent when the new plan takes effect at the beginning of the customer's next billing cycle. +ダウングレードは、顧客がFreeプランから有料プランに移行し、現在のプランよりも低コストなプランを選択するか、支払いサイクルを年次から月次に変更した場合に生じます。 ダウングレードもしくはキャンセルが生じた場合、返金は必要ありません。 その代わりに、現在のプランは現在の支払いサイクルの最終日まで有効です。 顧客の次の支払いサイクルの開始時点で、新しいプランが有効になると、`marketplace_purchase`イベントが送信されます。 -When a customer cancels a plan, you must: -- Automatically downgrade them to the free plan, if it exists. +顧客がプランをキャンセルした場合、以下を行わなければなりません。 +- Freeプランがある場合には、自動的にFreeプランにダウングレードします。 {% data reusables.marketplace.cancellation-clarification %} -- Enable them to upgrade the plan through GitHub if they would like to continue the plan at a later time. +- 顧客が後でプランを継続したくなった場合には、GitHubを通じてプランをアップグレードできるようにします。 -For information about building cancellation workflows into your app, see "[Cancelling plans](/marketplace/integrating-with-the-github-marketplace-api/cancelling-plans/)." +アプリケーションへのキャンセルのワークフローの構築に関する情報については「[プランのキャンセル](/marketplace/integrating-with-the-github-marketplace-api/cancelling-plans/)」を参照してください。 diff --git a/translations/ja-JP/content/developers/github-marketplace/configuring-a-webhook-to-notify-you-of-plan-changes.md b/translations/ja-JP/content/developers/github-marketplace/configuring-a-webhook-to-notify-you-of-plan-changes.md index bcedc91429..f663973313 100644 --- a/translations/ja-JP/content/developers/github-marketplace/configuring-a-webhook-to-notify-you-of-plan-changes.md +++ b/translations/ja-JP/content/developers/github-marketplace/configuring-a-webhook-to-notify-you-of-plan-changes.md @@ -1,9 +1,9 @@ --- -title: Configuring a webhook to notify you of plan changes -intro: 'After [creating a draft {% data variables.product.prodname_marketplace %} listing](/marketplace/listing-on-github-marketplace/creating-a-draft-github-marketplace-listing/), you can configure a webhook that notifies you when changes to customer account plans occur. After you configure the webhook, you can [handle the `marketplace_purchase` event types](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/) in your app.' +title: プランの変更を通知するようwebhookを設定する +intro: '[ドラフトの{% data variables.product.prodname_marketplace %}リストを作成](/marketplace/listing-on-github-marketplace/creating-a-draft-github-marketplace-listing/)したあと、顧客のアカウントのプランに変更があった場合に通知するよう、webhookを設定できます。 webhookを設定すると、アプリケーション中で[`marketplace_purchase`イベントタイプを処理](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/)できるようになります。' redirect_from: - /apps/adding-integrations/managing-listings-on-github-marketplace/adding-webhooks-for-a-github-marketplace-listing/ - - /apps/marketplace/managing-github-marketplace-listings/adding-webhooks-for-a-github-marketplace-listing/ + - /apps/adding-integrations/managing-listings-on-github-marketplace/adding-webhooks-for-a-github-marketplace-listing/ - /apps/marketplace/setting-up-github-marketplace-webhooks/creating-a-webhook-for-a-github-marketplace-listing/ - /apps/marketplace/listing-on-github-marketplace/configuring-the-github-marketplace-webhook/ - /marketplace/listing-on-github-marketplace/configuring-the-github-marketplace-webhook @@ -13,11 +13,11 @@ versions: -The {% data variables.product.prodname_marketplace %} event webhook can only be set up from your application's {% data variables.product.prodname_marketplace %} listing page. You can configure all other events from your [application's developer settings page](https://github.com/settings/developers). If you haven't created a {% data variables.product.prodname_marketplace %} listing, read "[Creating a draft {% data variables.product.prodname_marketplace %} listing](/marketplace/listing-on-github-marketplace/creating-a-draft-github-marketplace-listing/)" to learn how. +{% data variables.product.prodname_marketplace %}のイベントwebhookは、アプリケーションの{% data variables.product.prodname_marketplace %}リストページからのみセットアップできます。 他のすべてのイベントは、[アプリケーションの開発者設定ページ](https://github.com/settings/developers)から設定できます。 {% data variables.product.prodname_marketplace %}のリストを作成していない場合は、「[ドラフトの{% data variables.product.prodname_marketplace %}リストの作成](/marketplace/listing-on-github-marketplace/creating-a-draft-github-marketplace-listing/)」を読んで、その方法を学んでください。 -### Creating a webhook +### webhookの作成 -To create a webhook for your {% data variables.product.prodname_marketplace %} listing, click **Webhook** in the left sidebar of your [{% data variables.product.prodname_marketplace %} listing page](https://github.com/marketplace/manage). You'll see the following webhook configuration options needed to configure your webhook: +{% data variables.product.prodname_marketplace %}リストのwebhookを作成するには、[{% data variables.product.prodname_marketplace %}リストページ](https://github.com/marketplace/manage)の左のサイドバーで**Webhook**をクリックしてください。 webhookを設定するのに必要な、以下のwebhookの設定オプションが表示されます。 #### Payload URL @@ -25,18 +25,18 @@ To create a webhook for your {% data variables.product.prodname_marketplace %} l #### Content type -{% data reusables.webhooks.content_type %} GitHub recommends using the `application/json` content type. +{% data reusables.webhooks.content_type %} GitHubは、`application/json`コンテンツタイプの利用をおすすめします。 #### Secret {% data reusables.webhooks.secret %} -#### アクティブ +#### Active -By default, webhook deliveries are "Active." You can choose to disable the delivery of webhook payloads during development by deselecting "Active." If you've disabled webhook deliveries, you will need to select "Active" before you submit your app for review. +デフォルトでは、webhookの配信は「Active」です。 「Active」の選択を解除すれば、開発の間webhookペイロードの配信を無効にできます。 webhookの配信を無効にした場合、レビューのためにアプリケーションをサブミットする前には「Active」を選択しなければなりません。 -### Viewing webhook deliveries +### webhookの配信の表示 -Once you've configured your {% data variables.product.prodname_marketplace %} webhook, you'll be able to inspect `POST` request payloads from the **Webhook** page of your application's [{% data variables.product.prodname_marketplace %} listing](https://github.com/marketplace/manage). GitHub doesn't resend failed delivery attempts. Ensure your app can receive all webhook payloads sent by GitHub. +{% data variables.product.prodname_marketplace %} webhookを設定すると、アプリケーションの[{% data variables.product.prodname_marketplace %}リスト](https://github.com/marketplace/manage)の**Webhook**ページから、`POST`リクエストのペイロードを調べることができるようになります。 GitHubは、失敗した配信の試行を再送信しません。 GitHubが送信したすべてのwebhookのペイロードを、アプリケーションが確実に受信できるようにしてください。 -![Inspect recent {% data variables.product.prodname_marketplace %} webhook deliveries](/assets/images/marketplace/marketplace_webhook_deliveries.png) +![最近の{% data variables.product.prodname_marketplace %} webhookの配信の調査](/assets/images/marketplace/marketplace_webhook_deliveries.png) diff --git a/translations/ja-JP/content/developers/github-marketplace/creating-apps-for-github-marketplace.md b/translations/ja-JP/content/developers/github-marketplace/creating-apps-for-github-marketplace.md index 9252c41ece..22a14d8619 100644 --- a/translations/ja-JP/content/developers/github-marketplace/creating-apps-for-github-marketplace.md +++ b/translations/ja-JP/content/developers/github-marketplace/creating-apps-for-github-marketplace.md @@ -1,6 +1,6 @@ --- -title: Creating apps for GitHub Marketplace -intro: 'You can list free and paid tools for developers to use in {% data variables.product.prodname_marketplace %}.' +title: GitHub Marketplace用のアプリケーションの作成 +intro: '{% data variables.product.prodname_marketplace %}で利用する、開発者のための無料及び有料のツールをリストできます。' mapTopic: true versions: free-pro-team: '*' diff --git a/translations/ja-JP/content/developers/github-marketplace/drafting-a-listing-for-your-app.md b/translations/ja-JP/content/developers/github-marketplace/drafting-a-listing-for-your-app.md index 7bc6b6e542..170ba843a4 100644 --- a/translations/ja-JP/content/developers/github-marketplace/drafting-a-listing-for-your-app.md +++ b/translations/ja-JP/content/developers/github-marketplace/drafting-a-listing-for-your-app.md @@ -1,6 +1,6 @@ --- -title: Drafting a listing for your app -intro: 'When you create a {% data variables.product.prodname_marketplace %} listing, GitHub saves it in draft mode until you submit the app for approval. Your listing shows customers how they can use your app.' +title: アプリケーションのリストのドラフト +intro: '{% data variables.product.prodname_marketplace %}のリストを作成すると、GitHubは承認のためにアプリケーションがサブミットされるまで、そのリストをドラフトモードで保存します。 このリストは、顧客に対してアプリケーションがどのように使えるのかを示します。' redirect_from: - /apps/adding-integrations/listing-apps-on-github-marketplace/listing-an-app-on-github-marketplace/ - /apps/marketplace/listing-apps-on-github-marketplace/listing-an-app-on-github-marketplace/ @@ -18,50 +18,50 @@ versions: -### Create a new draft {% data variables.product.prodname_marketplace %} listing +### 新しいドラフトの{% data variables.product.prodname_marketplace %}リストの作成 -You can only create draft listings for apps that are public. Before creating your draft listing, you can read the following guidelines for writing and configuring settings in your {% data variables.product.prodname_marketplace %} listing: +パブリックなアプリケーションについては、ドラフトのリストだけが作成できます。 ドラフトのリストを作成する前に、{% data variables.product.prodname_marketplace %}リストの設定を書いて構成するための以下のガイドラインを読んでください。 -* [Writing {% data variables.product.prodname_marketplace %} listing descriptions](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/) -* [Setting a {% data variables.product.prodname_marketplace %} listing's pricing plan](/marketplace/listing-on-github-marketplace/setting-a-github-marketplace-listing-s-pricing-plan/) -* [Configuring the {% data variables.product.prodname_marketplace %} Webhook](/marketplace/listing-on-github-marketplace/configuring-the-github-marketplace-webhook/) +* [{% data variables.product.prodname_marketplace %}リストの説明を書く](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/) +* [{% data variables.product.prodname_marketplace %}リストの価格プランの設定](/marketplace/listing-on-github-marketplace/setting-a-github-marketplace-listing-s-pricing-plan/) +* [{% data variables.product.prodname_marketplace %} webhookの設定](/marketplace/listing-on-github-marketplace/configuring-the-github-marketplace-webhook/) -To create a {% data variables.product.prodname_marketplace %} listing: +{% data variables.product.prodname_marketplace %}のリストを作成するには、以下のようにします。 {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} -3. In the left sidebar, click either **OAuth Apps** or **GitHub Apps** depending on the app you're adding to {% data variables.product.prodname_marketplace %}. +3. 左のサイドバーで、{% data variables.product.prodname_marketplace %}に追加しようとしているアプリケーションに応じて、**OAuth Apps**もしくは**GitHub Apps**をクリックしてください。 {% note %} - **Note**: You can also add a listing by navigating to https://github.com/marketplace/new, viewing your available apps, and clicking **Create draft listing**. + **ノート**: https://github.com/marketplace/new にアクセスし、利用可能なアプリケーションを見て、**Create draft listing（ドラフトのリストの作成）**をクリックしても、リストを追加できます。 {% endnote %} - ![App type selection](/assets/images/settings/apps_choose_app.png) + ![アプリケーションの種類の選択](/assets/images/settings/apps_choose_app.png) -4. Select the app you'd like to add to +4. 追加したいアプリケーションを選択してください。 {% data variables.product.prodname_marketplace %}. -![App selection for {% data variables.product.prodname_marketplace %} listing](/assets/images/github-apps/github_apps_select-app.png) +![{% data variables.product.prodname_marketplace %}リストのアプリケーションの選択](/assets/images/github-apps/github_apps_select-app.png) {% data reusables.user-settings.edit_marketplace_listing %} -5. Once you've created a new draft listing, you'll see an overview of the sections that you'll need to visit before your {% data variables.product.prodname_marketplace %} listing will be complete. ![GitHub Marketplace listing](/assets/images/marketplace/marketplace_listing_overview.png) +5. 新しいドラフトのリストを作成すると、{% data variables.product.prodname_marketplace %}のリストの完成前にアクセスしておかなければならないセクションの概要が表示されます。 ![GitHub Marketplaceのリスト](/assets/images/marketplace/marketplace_listing_overview.png) {% note %} -**Note:** In the "Contact info" section of your listing, we recommend using individual email addresses, rather than group emails addresses like support@domain.com. GitHub will use these email addresses to contact you about updates to {% data variables.product.prodname_marketplace %} that might affect your listing, new feature releases, marketing opportunities, payouts, and information on conferences and sponsorships. +**ノート:** リストの"Contact info（連絡先の情報）"セクションでは、support@domain.comというようなグループメールアドレスよりは、個人のメールアドレスを使うことをおすすめします。 GitHubはこれらのメールアドレスを、リストに影響するかもしれない{% data variables.product.prodname_marketplace %}のアップデート、新機能、マーケティングの機会、支払い、カンファレンスやスポンサーシップに関する情報などに関する連絡に使用します。 {% endnote %} -### Editing your listing +### リストの編集 -Once you've created a {% data variables.product.prodname_marketplace %} draft listing, you can come back to modify information in your listing anytime. If your app is already approved and in {% data variables.product.prodname_marketplace %}, you can edit the information and images in your listing, but you will not be able to change existing published pricing plans. See "[Setting a {% data variables.product.prodname_marketplace %} listing's pricing plan](/marketplace/listing-on-github-marketplace/setting-a-github-marketplace-listing-s-pricing-plan/)." +{% data variables.product.prodname_marketplace %}のドラフトリストを作成した後は、いつでもリスト内の情報を変更するために戻ってくることができます。 アプリケーションが検証済みで{% data variables.product.prodname_marketplace %}にあるなら、リスト中の情報や画像を編集することはできますが、公開された既存の価格プランを変更することはできません。 「[{% data variables.product.prodname_marketplace %}リストの価格プランの設定](/marketplace/listing-on-github-marketplace/setting-a-github-marketplace-listing-s-pricing-plan/)」を参照してください。 -### Submitting your app +### アプリケーションのサブミット -Once you've completed your {% data variables.product.prodname_marketplace %} listing, you can submit your listing for review from the **Overview** page. You'll need to read and accept the "[{% data variables.product.prodname_marketplace %} Developer Agreement](/articles/github-marketplace-developer-agreement/)," and then you can click **Submit for review**. After you submit your app for review, the {% data variables.product.prodname_marketplace %} onboarding team will contact you with additional information about the onboarding process. You can learn more about the onboarding and security review process in "[Getting started with {% data variables.product.prodname_marketplace %}](/marketplace/getting-started/)." +{% data variables.product.prodname_marketplace %}リストが完成したら、**Overview（概要）**ページからレビューのためにリストをサブミットできます。 「[{% data variables.product.prodname_marketplace %}の開発者契約](/articles/github-marketplace-developer-agreement/)」を読んで同意しなければなりません。続いて**Submit for review（レビューのためにサブミット）**をクリックできます。 レビューのためにアプリケーションをサブミットした後、{% data variables.product.prodname_marketplace %}のオンボーディングチームから、オンボーディングのプロセスに関する追加情報と併せて連絡が来ます。 オンボーディングとセキュリティレビューのプロセスに関する詳細については「[{% data variables.product.prodname_marketplace %}を使い始める](/marketplace/getting-started/)」を参照してください。 -### Removing a {% data variables.product.prodname_marketplace %} listing +### {% data variables.product.prodname_marketplace %}リストの削除 -If you no longer want to list your app in {% data variables.product.prodname_marketplace %}, contact [marketplace@github.com](mailto:marketplace@github.com) to remove your listing. +アプリケーションを{% data variables.product.prodname_marketplace %}のリストに載せたくなくなったなら、リストを削除するために[marketplace@github.com](mailto:marketplace@github.com)に連絡してください。 diff --git a/translations/ja-JP/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md b/translations/ja-JP/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md index 5e0f635e08..a162fefef9 100644 --- a/translations/ja-JP/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md +++ b/translations/ja-JP/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md @@ -1,6 +1,6 @@ --- -title: Handling new purchases and free trials -intro: 'When a customer purchases a paid plan, free trial, or the free version of your {% data variables.product.prodname_marketplace %} app, you''ll receive the [`marketplace_purchase` event](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events) webhook with the `purchased` action, which kicks off the purchasing flow.' +title: 新しい購入や無料トライアルの処理 +intro: '顧客が有料プラン、無料のトライアル、あるいは{% data variables.product.prodname_marketplace %}アプリケーションの無料バージョンを購入した場合、`purchased`アクションが付いた[`marketplace_purchase`イベント](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events) webhookを受信することになり、それによって購入フローが開始されます。' redirect_from: - /apps/marketplace/administering-listing-plans-and-user-accounts/supporting-purchase-plans-for-github-apps/ - /apps/marketplace/administering-listing-plans-and-user-accounts/supporting-purchase-plans-for-oauth-apps/ @@ -14,17 +14,17 @@ versions: {% warning %} -If you offer a GitHub App in {% data variables.product.prodname_marketplace %}, your app must identify users following the OAuth authorization flow. You don't need to set up a separate OAuth App to support this flow. See "[Identifying and authorizing users for GitHub Apps](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)" for more information. +{% data variables.product.prodname_marketplace %}でGitHub Appを提供している場合、アプリケーションはOAuthの認可フローに従ってユーザを識別しなければなりません。 このフローをサポートするために、個別のOAuth Appをセットアップする必要はありません。 詳しい情報については「[GitHub Appのユーザの特定と認可](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)」を参照してください。 {% endwarning %} -### ステップ 1. Initial purchase and webhook event +### ステップ 1. 最初の購入とwebhookイベント -Before a customer purchases your {% data variables.product.prodname_marketplace %} app, they select a [listing plan](/marketplace/selling-your-app/github-marketplace-pricing-plans/). They also choose whether to purchase the app from their personal account or an organization account. +{% data variables.product.prodname_marketplace %}アプリケーションを購入する前に、顧客は[リストプラン](/marketplace/selling-your-app/github-marketplace-pricing-plans/)を選択します。 顧客は、アプリケーションの購入を自分の個人アカウントから行うのか、あるいはOrganizationアカウントから行うのかも選択します。 -The customer completes the purchase by clicking **Complete order and begin installation**. +**Complete order and begin installation（注文を完了してインストールを開始）**をクリックすることで、顧客は購入を完了します。 -GitHub then sends the [`marketplace_purchase`](/webhooks/event-payloads/#marketplace_purchase) webhook with the `purchased` action to your app. +そうすると、GitHubは[`marketplace_purchase`](/webhooks/event-payloads/#marketplace_purchase) webhookに`purchased`アクションを付けてアプリケーションに送信します。 Read the `effective_date` and `marketplace_purchase` object from the `marketplace_purchase` webhook to determine which plan the customer purchased, when the billing cycle starts, and when the next billing cycle begins. diff --git a/translations/ja-JP/content/developers/github-marketplace/viewing-metrics-for-your-listing.md b/translations/ja-JP/content/developers/github-marketplace/viewing-metrics-for-your-listing.md index 045237bda9..f5c01d6a33 100644 --- a/translations/ja-JP/content/developers/github-marketplace/viewing-metrics-for-your-listing.md +++ b/translations/ja-JP/content/developers/github-marketplace/viewing-metrics-for-your-listing.md @@ -47,8 +47,7 @@ To access {% data variables.product.prodname_marketplace %} Insights: {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} {% data reusables.user-settings.marketplace_apps %} -4. Select the -{% data variables.product.prodname_github_app %} that you'd like to view Insights for. +4. {% data variables.product.prodname_github_app %} that you'd like to view Insights for. {% data reusables.user-settings.edit_marketplace_listing %} 6. Click the **Insights** tab. 7. Optionally, select a different time period by clicking the Period dropdown in the upper-right corner of the Insights page. ![Marketplace time period](/assets/images/marketplace/marketplace_insights_time_period.png) diff --git a/translations/ja-JP/content/developers/github-marketplace/viewing-transactions-for-your-listing.md b/translations/ja-JP/content/developers/github-marketplace/viewing-transactions-for-your-listing.md index 15ede21ee3..4d9660677e 100644 --- a/translations/ja-JP/content/developers/github-marketplace/viewing-transactions-for-your-listing.md +++ b/translations/ja-JP/content/developers/github-marketplace/viewing-transactions-for-your-listing.md @@ -39,8 +39,7 @@ To access {% data variables.product.prodname_marketplace %} transactions: {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} {% data reusables.user-settings.marketplace_apps %} -4. Select the -{% data variables.product.prodname_github_app %} that you'd like to view transactions for. +4. {% data variables.product.prodname_github_app %} that you'd like to view transactions for. {% data reusables.user-settings.edit_marketplace_listing %} 6. Click the **Transactions** tab. 7. Optionally, select a different time period by clicking the Period dropdown in the upper-right corner of the Transactions page. ![Marketplace time period](/assets/images/marketplace/marketplace_insights_time_period.png) diff --git a/translations/ja-JP/content/developers/github-marketplace/webhook-events-for-the-github-marketplace-api.md b/translations/ja-JP/content/developers/github-marketplace/webhook-events-for-the-github-marketplace-api.md index 64c0fd2097..4c45d9bd07 100644 --- a/translations/ja-JP/content/developers/github-marketplace/webhook-events-for-the-github-marketplace-api.md +++ b/translations/ja-JP/content/developers/github-marketplace/webhook-events-for-the-github-marketplace-api.md @@ -13,7 +13,7 @@ versions: ### {% data variables.product.prodname_marketplace %} purchase webhook payload -Webhooks `POST` requests have special headers. See "[Webhook delivery headers](/webhooks/event-payloads/#delivery-headers)" for more details. GitHub doesn't resend failed delivery attempts. Ensure your app can receive all webhook payloads sent by GitHub. +Webhooks `POST` requests have special headers. See "[Webhook delivery headers](/webhooks/event-payloads/#delivery-headers)" for more details. GitHubは、失敗した配信の試行を再送信しません。 GitHubが送信したすべてのwebhookのペイロードを、アプリケーションが確実に受信できるようにしてください。 Cancellations and downgrades take effect on the first day of the next billing cycle. Events for downgrades and cancellations are sent when the new plan takes effect at the beginning of the next billing cycle. Events for new purchases and upgrades begin immediately. Use the `effective_date` in the webhook payload to determine when a change will begin. @@ -35,7 +35,7 @@ The `marketplace_purchase` object has the following keys: | -------------------- | --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `アカウント` | `オブジェクト` | The `organization` or `user` account associated with the subscription. Organization accounts will include `organization_billing_email`, which is the organization's administrative email address. To find email addresses for personal accounts, you can use the [Get the authenticated user](/v3/users/#get-the-authenticated-user) endpoint. | | `billing_cycle` | `string` | Can be `yearly` or `monthly`. When the `account` owner has a free GitHub plan and has purchased a free {% data variables.product.prodname_marketplace %} plan, `billing_cycle` will be `nil`. | -| `unit_count` | `整数` | Number of units purchased. | +| `unit_count` | `integer` | Number of units purchased. | | `on_free_trial` | `boolean` | `true` when the `account` is on a free trial. | | `free_trial_ends_on` | `string` | The date the free trial will expire. | | `next_billing_date` | `string` | The date that the next billing cycle will start. When the `account` owner has a free GitHub.com plan and has purchased a free {% data variables.product.prodname_marketplace %} plan, `next_billing_date` will be `nil`. | @@ -45,11 +45,11 @@ The `plan` object has the following keys: | キー | 種類 | 説明 | | ------------------------ | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------- | -| `id` | `整数` | The unique identifier for this plan. | +| `id` | `integer` | The unique identifier for this plan. | | `name` | `string` | The plan's name. | | `説明` | `string` | This plan's description. | -| `monthly_price_in_cents` | `整数` | The monthly price of this plan in cents (US currency). For example, a listing that costs 10 US dollars per month will be 1000 cents. | -| `yearly_price_in_cents` | `整数` | The yearly price of this plan in cents (US currency). For example, a listing that costs 100 US dollars per month will be 10000 cents. | +| `monthly_price_in_cents` | `integer` | The monthly price of this plan in cents (US currency). For example, a listing that costs 10 US dollars per month will be 1000 cents. | +| `yearly_price_in_cents` | `integer` | The yearly price of this plan in cents (US currency). For example, a listing that costs 100 US dollars per month will be 10000 cents. | | `price_model` | `string` | The pricing model for this listing. Can be one of `flat-rate`, `per-unit`, or `free`. | | `has_free_trial` | `boolean` | `true` when this listing offers a free trial. | | `unit_name` | `string` | The name of the unit. If the pricing model is not `per-unit` this will be `nil`. | diff --git a/translations/ja-JP/content/developers/overview/managing-deploy-keys.md b/translations/ja-JP/content/developers/overview/managing-deploy-keys.md index cfe952c333..be524ad04b 100644 --- a/translations/ja-JP/content/developers/overview/managing-deploy-keys.md +++ b/translations/ja-JP/content/developers/overview/managing-deploy-keys.md @@ -27,7 +27,7 @@ In many cases, especially in the beginning of a project, SSH agent forwarding is * Users **must** SSH in to deploy; automated deploy processes can't be used. * SSH agent forwarding can be troublesome to run for Windows users. -##### Setup +##### セットアップ 1. Turn on agent forwarding locally. See [our guide on SSH agent forwarding][ssh-agent-forwarding] for more information. 2. Set your deploy scripts to use agent forwarding. For example, on a bash script, enabling agent forwarding would look something like this: `ssh -A serverA 'bash -s' < deploy.sh` @@ -49,7 +49,7 @@ If you don't want to use SSH keys, you can use [HTTPS with OAuth tokens][git-aut * You must make sure that you configure your token with the correct access scopes. * Tokens are essentially passwords, and must be protected the same way. -##### Setup +##### セットアップ See [our guide on Git automation with tokens][git-automation]. @@ -70,7 +70,7 @@ See [our guide on Git automation with tokens][git-automation]. * Deploy keys only grant access to a single repository. More complex projects may have many repositories to pull to the same server. * Deploy keys are usually not protected by a passphrase, making the key easily accessible if the server is compromised. -##### Setup +##### セットアップ 1. [Run the `ssh-keygen` procedure][generating-ssh-keys] on your server, and remember where you save the generated public/private rsa key pair. 2. In the upper-right corner of any {% data variables.product.product_name %} page, click your profile photo, then click **Your profile**. ![Navigation to profile](/assets/images/profile-page.png) @@ -110,7 +110,7 @@ This means that you cannot automate the creation of accounts. But if you want to * Only organizations can restrict machine users to read-only access. Personal repositories always grant collaborators read/write access. * Machine user keys, like deploy keys, are usually not protected by a passphrase. -##### Setup +##### セットアップ 1. [Run the `ssh-keygen` procedure][generating-ssh-keys] on your server and attach the public key to the machine user account. 2. Give the machine user account access to the repositories you want to automate. You can do this by adding the account as a [collaborator][collaborator], as an [outside collaborator][outside-collaborator], or to a [team][team] in an organization. diff --git a/translations/ja-JP/content/developers/overview/replacing-github-services.md b/translations/ja-JP/content/developers/overview/replacing-github-services.md index eb1925fc9e..7cc93257bf 100644 --- a/translations/ja-JP/content/developers/overview/replacing-github-services.md +++ b/translations/ja-JP/content/developers/overview/replacing-github-services.md @@ -29,7 +29,7 @@ As an alternative to the email service, you can now start using email notificati GitHub Services (sometimes referred to as Service Hooks) is the legacy method of integrating where GitHub hosted a portion of our integrator’s services via [the `github-services` repository](https://github.com/github/github-services). Actions performed on GitHub trigger these services, and you can use these services to trigger actions outside of GitHub. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Finding repositories that use GitHub Services We provide a command-line script that helps you identify which repositories on your appliance use GitHub Services. For more information, see [ghe-legacy-github-services-report](/enterprise/{{currentVersion}}/admin/articles/command-line-utilities/#ghe-legacy-github-services-report).{% endif %} diff --git a/translations/ja-JP/content/developers/webhooks-and-events/about-webhooks.md b/translations/ja-JP/content/developers/webhooks-and-events/about-webhooks.md index 64b973bcf5..f49b64820b 100644 --- a/translations/ja-JP/content/developers/webhooks-and-events/about-webhooks.md +++ b/translations/ja-JP/content/developers/webhooks-and-events/about-webhooks.md @@ -1,5 +1,5 @@ --- -title: About webhooks +title: webhook について intro: Learn the basics of how webhooks work to help you build and set up integrations. redirect_from: - /webhooks @@ -11,11 +11,11 @@ versions: Webhooks allow you to build or set up integrations, such as [{% data variables.product.prodname_github_app %}s](/apps/building-github-apps/) or [{% data variables.product.prodname_oauth_app %}s](/apps/building-oauth-apps/), which subscribe to certain events on GitHub.com. When one of those events is triggered, we'll send a HTTP POST payload to the webhook's configured URL. Webhooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server. You're only limited by your imagination. -Webhooks can be installed on{% if currentVersion != "free-pro-team@latest" %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. +Webhooks can be installed on{% if enterpriseServerVersions contains currentVersion %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. -You can create up to {% if currentVersion != "free-pro-team@latest" %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if currentVersion != "free-pro-team@latest" %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} +You can create up to {% if enterpriseServerVersions contains currentVersion %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if enterpriseServerVersions contains currentVersion %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} -### Events +### イベント {% data reusables.webhooks.webhooks_intro %} diff --git a/translations/ja-JP/content/developers/webhooks-and-events/creating-webhooks.md b/translations/ja-JP/content/developers/webhooks-and-events/creating-webhooks.md index 8b00282ba7..69fd861525 100644 --- a/translations/ja-JP/content/developers/webhooks-and-events/creating-webhooks.md +++ b/translations/ja-JP/content/developers/webhooks-and-events/creating-webhooks.md @@ -14,6 +14,9 @@ Now that we understand [the basics of webhooks][webhooks-overview], let's go thr Creating a webhook is a two-step process. You'll first need to set up how you want your webhook to behave through {% data variables.product.product_name %}--what events should it listen to. After that, you'll set up your server to receive and manage the payload. + +{% data reusables.webhooks.webhooks-rest-api-links %} + ### Setting up a Webhook You can install webhooks on an organization or on a specific repository. @@ -42,9 +45,9 @@ Since we're developing locally for our tutorial, let's set it to `http://localho {% data reusables.webhooks.webhooks_ssl %} -### アクティブ +### Active -By default, webhook deliveries are "Active." You can choose to disable the delivery of webhook payloads by deselecting "Active." +デフォルトでは、webhookの配信は「Active」です。 You can choose to disable the delivery of webhook payloads by deselecting "Active." ### イベント diff --git a/translations/ja-JP/content/developers/webhooks-and-events/github-event-types.md b/translations/ja-JP/content/developers/webhooks-and-events/github-event-types.md index d88565f8cf..eecee1469f 100644 --- a/translations/ja-JP/content/developers/webhooks-and-events/github-event-types.md +++ b/translations/ja-JP/content/developers/webhooks-and-events/github-event-types.md @@ -28,13 +28,13 @@ The event objects returned from the Events API endpoints have the same structure | `actor.id` | The unique identifier for the actor. | | `actor.login` | The username of the actor. | | `actor.display_login` | The specific display format of the username. | -| `actor.gravatar_id` | The unique indentifier of the Gravatar profile for the actor. | +| `actor.gravatar_id` | The unique identifier of the Gravatar profile for the actor. | | `actor.url` | The REST API URL used to retrieve the user object, which includes additional user information. | | `actor.avatar_url` | The URL of the actor's profile image. | | `repo` | The repository object where the event occurred. | | `repo.id` | The unique identifier of the repository. | | `repo.name` | The name of the repository, which includes the owner and repository name. For example, `octocat/hello-world` is the name of the `hello-world` repository owned by the `octocat` user account. | -| `repo.url` | The REST API URL used to retrive the repository object, which includes additional repository information. | +| `repo.url` | The REST API URL used to retrieve the repository object, which includes additional repository information. | | `payload` | The event payload object is unique to the event type. See the event type below for the event API `payload` object. | #### Example WatchEvent event object @@ -199,9 +199,9 @@ This event returns an empty `payload` object. | キー | 種類 | 説明 | | -------------------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `push_id` | `整数` | Unique identifier for the push. | -| `size` | `整数` | The number of commits in the push. | -| `distinct_size` | `整数` | The number of distinct commits in the push. | +| `push_id` | `integer` | Unique identifier for the push. | +| `size` | `integer` | The number of commits in the push. | +| `distinct_size` | `integer` | The number of distinct commits in the push. | | `ref` | `string` | The full [`git ref`](/v3/git/refs/) that was pushed. Example: `refs/heads/main`. | | `head` | `string` | The SHA of the most recent commit on `ref` after the push. | | `before` | `string` | The SHA of the most recent commit on `ref` before the push. | diff --git a/translations/ja-JP/content/developers/webhooks-and-events/issue-event-types.md b/translations/ja-JP/content/developers/webhooks-and-events/issue-event-types.md index 1c6ac7c3b2..0d087c5859 100644 --- a/translations/ja-JP/content/developers/webhooks-and-events/issue-event-types.md +++ b/translations/ja-JP/content/developers/webhooks-and-events/issue-event-types.md @@ -122,20 +122,20 @@ A comment was added to the issue or pull request. {% data reusables.issue-events.timeline_events_object_properties %} -| 名前 | 種類 | 説明 | -| -------------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | -| `url` | `string` | The REST API URL to retrieve the issue comment. | -| `html_url` | `string` | The HTML URL of the issue comment. | -| `issue_url` | `string` | The HTML URL of the issue. | -| `id` | `整数` | The unique identifier of the event. | -| `node_id` | `string` | The [Global Node ID](/v4/guides/using-global-node-ids) of the event. | -| `ユーザ` | `オブジェクト` | The person who commented on the issue. | -| `created_at` | `string` | The timestamp indicating when the comment was added. | -| `updated_at` | `string` | The timestamp indicating when the comment was updated or created, if the comment is never updated. | -| `author_association` | `string` | The permissions the user has in the issue's repository. For example, the value would be `"OWNER"` if the owner of repository created a comment. | -| `body` | `string` | The comment body text. | -| `event` | `string` | The event value is `"commented"`. | -| `actor` | `オブジェクト` | The person who generated the event. | +| 名前 | 種類 | 説明 | +| -------------------- | --------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | +| `url` | `string` | The REST API URL to retrieve the issue comment. | +| `html_url` | `string` | The HTML URL of the issue comment. | +| `issue_url` | `string` | The HTML URL of the issue. | +| `id` | `integer` | The unique identifier of the event. | +| `node_id` | `string` | The [Global Node ID](/v4/guides/using-global-node-ids) of the event. | +| `ユーザ` | `オブジェクト` | The person who commented on the issue. | +| `created_at` | `string` | The timestamp indicating when the comment was added. | +| `updated_at` | `string` | The timestamp indicating when the comment was updated or created, if the comment is never updated. | +| `author_association` | `string` | The permissions the user has in the issue's repository. For example, the value would be `"OWNER"` if the owner of repository created a comment. | +| `body` | `string` | The comment body text. | +| `event` | `string` | The event value is `"commented"`. | +| `actor` | `オブジェクト` | The person who generated the event. | ### committed @@ -229,7 +229,7 @@ The issue or pull request was referenced from another issue or pull request. | --------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `actor` | `オブジェクト` | The person who generated the event. | | `created_at` | `string` | The timestamp indicating when the cross-reference was added. | -| `updated_at` | `string` | The timestamp indicating when the cross-refererence was updated or created, if the cross-reference is never updated. | +| `updated_at` | `string` | The timestamp indicating when the cross-reference was updated or created, if the cross-reference is never updated. | | `資料` | `オブジェクト` | The issue or pull request that added a cross-reference. | | `source[type]` | `string` | This value will always be `"issue"` because pull requests are of type issue. Only cross-reference events triggered by issues or pull requests are returned in the Timeline Events API. To determine if the issue that triggered the event is a pull request, you can check if the `source[issue][pull_request` object exists. | | `source[issue]` | `オブジェクト` | The `issue` object that added the cross-reference. | @@ -347,7 +347,7 @@ The issue or pull request was locked. #### Event object properties -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -579,20 +579,20 @@ The pull request was reviewed. {% data reusables.issue-events.timeline_events_object_properties %} -| 名前 | 種類 | 説明 | -| -------------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | -| `id` | `整数` | The unique identifier of the event. | -| `node_id` | `string` | The [Global Node ID](/v4/guides/using-global-node-ids) of the event. | -| `ユーザ` | `オブジェクト` | The person who commented on the issue. | -| `body` | `string` | The review summary text. | -| `commit_id` | `string` | The SHA of the latest commit in the pull request at the time of the review. | -| `submitted_at` | `string` | The timestamp indicating when the review was submitted. | -| `状態` | `string` | The state of the submitted review. Can be one of: `commented`, `changes_requested`, or `approved`. | -| `html_url` | `string` | The HTML URL of the review. | -| `pull_request_url` | `string` | The REST API URL to retrieve the pull request. | -| `author_association` | `string` | The permissions the user has in the issue's repository. For example, the value would be `"OWNER"` if the owner of repository created a comment. | -| `_links` | `オブジェクト` | The `html_url` and `pull_request_url`. | -| `event` | `string` | The event value is `"reviewed"`. | +| 名前 | 種類 | 説明 | +| -------------------- | --------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | +| `id` | `integer` | The unique identifier of the event. | +| `node_id` | `string` | The [Global Node ID](/v4/guides/using-global-node-ids) of the event. | +| `ユーザ` | `オブジェクト` | The person who commented on the issue. | +| `body` | `string` | The review summary text. | +| `commit_id` | `string` | The SHA of the latest commit in the pull request at the time of the review. | +| `submitted_at` | `string` | The timestamp indicating when the review was submitted. | +| `state` | `string` | The state of the submitted review. Can be one of: `commented`, `changes_requested`, or `approved`. | +| `html_url` | `string` | The HTML URL of the review. | +| `pull_request_url` | `string` | The REST API URL to retrieve the pull request. | +| `author_association` | `string` | The permissions the user has in the issue's repository. For example, the value would be `"OWNER"` if the owner of repository created a comment. | +| `_links` | `オブジェクト` | The `html_url` and `pull_request_url`. | +| `event` | `string` | The event value is `"reviewed"`. | ### subscribed @@ -664,7 +664,7 @@ The issue was unlocked. #### Event object properties -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/ja-JP/content/developers/webhooks-and-events/securing-your-webhooks.md b/translations/ja-JP/content/developers/webhooks-and-events/securing-your-webhooks.md index 0a5ed84359..09dd7373c1 100644 --- a/translations/ja-JP/content/developers/webhooks-and-events/securing-your-webhooks.md +++ b/translations/ja-JP/content/developers/webhooks-and-events/securing-your-webhooks.md @@ -12,6 +12,7 @@ versions: Once your server is configured to receive payloads, it'll listen for any payload sent to the endpoint you configured. For security reasons, you probably want to limit requests to those coming from GitHub. There are a few ways to go about this--for example, you could opt to allow requests from GitHub's IP address--but a far easier method is to set up a secret token and validate the information. +{% data reusables.webhooks.webhooks-rest-api-links %} ### Setting your secret token diff --git a/translations/ja-JP/content/developers/webhooks-and-events/testing-webhooks.md b/translations/ja-JP/content/developers/webhooks-and-events/testing-webhooks.md index 1d4d43045c..eb59c1e9cb 100644 --- a/translations/ja-JP/content/developers/webhooks-and-events/testing-webhooks.md +++ b/translations/ja-JP/content/developers/webhooks-and-events/testing-webhooks.md @@ -13,7 +13,7 @@ Now that you've [configured your local server](/webhooks/configuring/), you migh ### Listing recent deliveries -Every webhook has its own "Recent Deliveries" section, which lists, at a glance whether a deployment was successful (green check) or failed (red x). You can also identify when each delivery was attempted. +Every webhook has its own "Recent Deliveries" section, which lists, at a glance whether a delivery was successful (green check) or failed (red x). You can also identify when each delivery was attempted. {% data variables.product.product_name %} keeps a log of each webhook delivery for {% if currentVersion == "free-pro-team@latest" %} 30 {% else %} 8 {% endif %} days. diff --git a/translations/ja-JP/content/developers/webhooks-and-events/webhook-events-and-payloads.md b/translations/ja-JP/content/developers/webhooks-and-events/webhook-events-and-payloads.md index 79eede76ea..8c9cbe227d 100644 --- a/translations/ja-JP/content/developers/webhooks-and-events/webhook-events-and-payloads.md +++ b/translations/ja-JP/content/developers/webhooks-and-events/webhook-events-and-payloads.md @@ -47,7 +47,7 @@ HTTP POST payloads that are delivered to your webhook's configured URL endpoint | ヘッダ | 説明 | | ----------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `X-GitHub-Event` | Name of the event that triggered the delivery. | -| `X-GitHub-Delivery` | A [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) to identify the delivery.{% if currentVersion != "free-pro-team@latest" %} +| `X-GitHub-Delivery` | A [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) to identify the delivery.{% if enterpriseServerVersions contains currentVersion %} | `X-GitHub-Enterprise-Version` | The version of the {% data variables.product.prodname_ghe_server %} instance that sent the HTTP POST payload. | | `X-GitHub-Enterprise-Host` | The hostname of the {% data variables.product.prodname_ghe_server %} instance that sent the HTTP POST payload.{% endif %}{% if currentVersion != "private-instances@latest" %} | `X-Hub-Signature` | This header is sent if the webhook is configured with a [`secret`](/v3/repos/hooks/#create-hook-config-params). This is the HMAC hex digest of the request body, and is generated using the SHA-1 hash function and the `secret` as the HMAC `key`.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} `X-Hub-Signature` is provided for compatibility with existing integrations, and we recommend that you use the more secure `X-Hub-Signature-256` instead.{% endif %}{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -61,7 +61,7 @@ Also, the `User-Agent` for the requests will have the prefix `GitHub-Hookshot/`. > POST /payload HTTP/1.1 > Host: localhost:4567 -> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if currentVersion != "free-pro-team@latest" %} +> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: 2.15.0 > X-GitHub-Enterprise-Host: example.com{% endif %}{% if currentVersion != "private-instances@latest" %} > X-Hub-Signature: sha1=7d38cdd689735b008b3c702edd92eea23791c5f6{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -332,7 +332,7 @@ Only {% data variables.product.prodname_github_app %}s can receive this event. { {{ webhookPayloadsForCurrentVersion.deployment_status }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### enterprise @@ -617,7 +617,7 @@ For a detailed description of this payload and the payload for each type of `act ### メタ情報 -The webhook this event is configured on was deleted. This event will only listen for changes to the particular hook the event is installed on. Therefore, it must be selected for each hook that you'd like to recieve meta events for. +The webhook this event is configured on was deleted. This event will only listen for changes to the particular hook the event is installed on. Therefore, it must be selected for each hook that you'd like to receive meta events for. #### Availability @@ -626,11 +626,11 @@ The webhook this event is configured on was deleted. This event will only listen #### Webhook payload object -| キー | 種類 | 説明 | -| --------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `action` | `string` | 実行されたアクション。 Can be `deleted`. | -| `hook_id` | `整数` | The id of the modified webhook. | -| `フック` | `オブジェクト` | The modified webhook. This will contain different keys based on the type of webhook it is: repository, organization, business, app, or GitHub Marketplace. | +| キー | 種類 | 説明 | +| --------- | --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action` | `string` | 実行されたアクション。 Can be `deleted`. | +| `hook_id` | `integer` | The id of the modified webhook. | +| `フック` | `オブジェクト` | The modified webhook. This will contain different keys based on the type of webhook it is: repository, organization, business, app, or GitHub Marketplace. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.sender_desc %} @@ -667,18 +667,18 @@ The webhook this event is configured on was deleted. This event will only listen #### Availability -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} - GitHub Enterprise webhooks only receive `created` and `deleted` events. For more information, "[Global webhooks](/rest/reference/enterprise-admin#global-webhooks/).{% endif %} - Organization webhooks only receive the `deleted`, `added`, `removed`, `renamed`, and `invited` events - {% data variables.product.prodname_github_app %}s with the `members` permission #### Webhook payload object -| キー | 種類 | 説明 | -| ------------ | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `action` | `string` | 実行されたアクション. Can be one of:{% if currentVersion != "free-pro-team@latest" %} `created`,{% endif %} `deleted`, `renamed`, `member_added`, `member_removed`, or `member_invited`. | -| `招待` | `オブジェクト` | The invitation for the user or email if the action is `member_invited`. | -| `membership` | `オブジェクト` | The membership between the user and the organization. Not present when the action is `member_invited`. | +| キー | 種類 | 説明 | +| ------------ | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action` | `string` | 実行されたアクション. Can be one of:{% if enterpriseServerVersions contains currentVersion %} `created`,{% endif %} `deleted`, `renamed`, `member_added`, `member_removed`, or `member_invited`. | +| `招待` | `オブジェクト` | The invitation for the user or email if the action is `member_invited`. | +| `membership` | `オブジェクト` | The membership between the user and the organization. Not present when the action is `member_invited`. | {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} {% data reusables.webhooks.sender_desc %} @@ -745,10 +745,10 @@ Activity related to {% data variables.product.prodname_registry %}. {% data reus #### Webhook payload object -| キー | 種類 | 説明 | -| ----- | -------- | -------------------------------------------------------------------------------------- | -| `id` | `整数` | The unique identifier of the page build. | -| `ビルド` | `オブジェクト` | The [List GitHub Pages builds](/rest/reference/repos#list-github-pages-builds) itself. | +| キー | 種類 | 説明 | +| ----- | --------- | -------------------------------------------------------------------------------------- | +| `id` | `integer` | The unique identifier of the page build. | +| `ビルド` | `オブジェクト` | The [List GitHub Pages builds](/rest/reference/repos#list-github-pages-builds) itself. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -770,12 +770,12 @@ Activity related to {% data variables.product.prodname_registry %}. {% data reus #### Webhook payload object -| キー | 種類 | 説明 | -| -------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `zen` | `string` | Random string of GitHub zen. | -| `hook_id` | `整数` | The ID of the webhook that triggered the ping. | -| `フック` | `オブジェクト` | The [webhook configuration](/v3/repos/hooks/#get-a-repository-webhook). | -| `hook[app_id]` | `整数` | When you register a new {% data variables.product.prodname_github_app %}, {% data variables.product.product_name %} sends a ping event to the **webhook URL** you specified during registration. The event contains the `app_id`, which is required for [authenticating](/apps/building-integrations/setting-up-and-registering-github-apps/about-authentication-options-for-github-apps/) an app. | +| キー | 種類 | 説明 | +| -------------- | --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `zen` | `string` | Random string of GitHub zen. | +| `hook_id` | `integer` | The ID of the webhook that triggered the ping. | +| `フック` | `オブジェクト` | The [webhook configuration](/v3/repos/hooks/#get-a-repository-webhook). | +| `hook[app_id]` | `integer` | When you register a new {% data variables.product.prodname_github_app %}, {% data variables.product.product_name %} sends a ping event to the **webhook URL** you specified during registration. The event contains the `app_id`, which is required for [authenticating](/apps/building-integrations/setting-up-and-registering-github-apps/about-authentication-options-for-github-apps/) an app. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.sender_desc %} @@ -974,13 +974,17 @@ Deliveries for `review_requested` and `review_request_removed` events will have | `before` | `string` | The SHA of the most recent commit on `ref` before the push. | | `after` | `string` | The SHA of the most recent commit on `ref` after the push. | | `commits` | `array` | An array of commit objects describing the pushed commits. (The array includes a maximum of 20 commits. If necessary, you can use the [Commits API](/v3/repos/commits/) to fetch additional commits. This limit is applied to timeline events only and isn't applied to webhook deliveries.) | -| `commits[][sha]` | `string` | コミットのSHA。 | +| `commits[][id]` | `string` | コミットのSHA。 | +| `commits[][timestamp]` | `string` | The ISO 8601 timestamp of the commit. | | `commits[][message]` | `string` | コミットメッセージ。 | | `commits[][author]` | `オブジェクト` | The git author of the commit. | | `commits[][author][name]` | `string` | The git author's name. | | `commits[][author][email]` | `string` | The git author's email address. | | `commits[][url]` | `url` | URL that points to the commit API resource. | | `commits[][distinct]` | `boolean` | Whether this commit is distinct from any that have been pushed before. | +| `commits[][added]` | `array` | An array of files added in the commit. | +| `commits[][modified]` | `array` | An array of files modified by the commit. | +| `commits[][removed]` | `array` | An array of files removed in the commit. | | `pusher` | `オブジェクト` | The user who pushed the commits. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} @@ -1042,7 +1046,7 @@ This event occurs when a {% data variables.product.prodname_github_app %} sends | キー | 種類 | 説明 | | -------- | -------- | -------------------------------------------------------- | -| `action` | `string` | 実行されたアクション. This can be one of:
    • `created` - A repository is created.
    • `deleted` - A repository is deleted. This event type is only available to [organization hooks](/rest/reference/orgs#webhooks/)
    • `archived` - A repository is archived.
    • `unarchived` - A repository is unarchived.
      • {% if currentVersion != "free-pro-team@latest" %}
    • `anonymous_access_enabled` - A repository is [enabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories), `anonymous_access_disabled` - A repository is [disabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories)
      • {% endif %}
    • `edited` - A repository's information is edited.
    • `renamed` - A repository is renamed.
    • `transferred` - A repository is transferred.
    • `publicized` - A repository is made public.
    • `privatized` - A repository is made private.
    | +| `action` | `string` | 実行されたアクション. This can be one of:
    • `created` - A repository is created.
    • `deleted` - A repository is deleted. This event type is only available to [organization hooks](/rest/reference/orgs#webhooks/)
    • `archived` - A repository is archived.
    • `unarchived` - A repository is unarchived.
      • {% if enterpriseServerVersions contains currentVersion %}
    • `anonymous_access_enabled` - A repository is [enabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories), `anonymous_access_disabled` - A repository is [disabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories)
      • {% endif %}
    • `edited` - A repository's information is edited.
    • `renamed` - A repository is renamed.
    • `transferred` - A repository is transferred.
    • `publicized` - A repository is made public.
    • `privatized` - A repository is made private.
    | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -1173,14 +1177,14 @@ You can only create a sponsorship webhook on {% data variables.product.prodname_ #### Webhook payload object -| キー | 種類 | 説明 | -| ------------ | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `id` | `整数` | The unique identifier of the status. | -| `sha` | `string` | The Commit SHA. | -| `状態` | `string` | The new state. Can be `pending`, `success`, `failure`, or `error`. | -| `説明` | `string` | The optional human-readable description added to the status. | -| `target_url` | `string` | The optional link added to the status. | -| `ブランチ` | `array` | An array of branch objects containing the status' SHA. Each branch contains the given SHA, but the SHA may or may not be the head of the branch. The array includes a maximum of 10 branches. | +| キー | 種類 | 説明 | +| ------------ | --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `id` | `integer` | The unique identifier of the status. | +| `sha` | `string` | The Commit SHA. | +| `state` | `string` | The new state. Can be `pending`, `success`, `failure`, or `error`. | +| `説明` | `string` | The optional human-readable description added to the status. | +| `target_url` | `string` | The optional link added to the status. | +| `ブランチ` | `array` | An array of branch objects containing the status' SHA. Each branch contains the given SHA, but the SHA may or may not be the head of the branch. The array includes a maximum of 10 branches. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -1244,7 +1248,7 @@ You can only create a sponsorship webhook on {% data variables.product.prodname_ {{ webhookPayloadsForCurrentVersion.team_add }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### ユーザ diff --git a/translations/ja-JP/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md b/translations/ja-JP/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md index 42a0a4f73a..225e99d19f 100644 --- a/translations/ja-JP/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md +++ b/translations/ja-JP/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md @@ -12,7 +12,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" %}{% data reusables.notifications.outbound_email_tip %}{% endif %} +{% if enterpriseServerVersions contains currentVersion %}{% data reusables.notifications.outbound_email_tip %}{% endif %} リポジトリへのプッシュに対する各メール通知は、新しいコミットとそれらのコミットだけを含む diff へのリンクのリストを含みます。 このメール通知には以下が含まれます: diff --git a/translations/ja-JP/content/github/administering-a-repository/about-github-dependabot-version-updates.md b/translations/ja-JP/content/github/administering-a-repository/about-github-dependabot-version-updates.md index 0aff48b5e1..9be1e30d4c 100644 --- a/translations/ja-JP/content/github/administering-a-repository/about-github-dependabot-version-updates.md +++ b/translations/ja-JP/content/github/administering-a-repository/about-github-dependabot-version-updates.md @@ -17,7 +17,7 @@ versions: {% data variables.product.prodname_dependabot_short %} が古い依存関係を特定すると、プルリクエストを発行して、マニフェストを依存関係の最新バージョンに更新します。 For vendored dependencies, {% data variables.product.prodname_dependabot_short %} raises a pull request to directly replace the outdated dependency with the new version. テストに合格したことを確認し、プルリクエストの概要に含まれている変更履歴とリリースノートを確認して、マージします。 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。 -セキュリティアップデートを有効にすると、{% data variables.product.prodname_dependabot %} はプルリクエストを発行し、脆弱性のある依存関係を更新します。 詳しい情報については、「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」を参照してください。 +セキュリティアップデートを有効にすると、{% data variables.product.prodname_dependabot %} はプルリクエストを発行し、脆弱性のある依存関係を更新します。 詳しい情報については、「[{% data variables.product.prodname_dependabot_security_updates %} について](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)」を参照してください。 {% data reusables.dependabot.dependabot-tos %} diff --git a/translations/ja-JP/content/github/administering-a-repository/about-required-commit-signing.md b/translations/ja-JP/content/github/administering-a-repository/about-required-commit-signing.md index 97b5afd5b1..60d556eee5 100644 --- a/translations/ja-JP/content/github/administering-a-repository/about-required-commit-signing.md +++ b/translations/ja-JP/content/github/administering-a-repository/about-required-commit-signing.md @@ -11,7 +11,7 @@ versions: リポジトリでブランチ保護を強制している場合、必須コミット署名をセットアップできます。 詳しい情報については[保護されたブランチの設定](/articles/configuring-protected-branches/)を参照してください。 -When you enable required commit signing on a branch, contibutors {% if currentVersion == "free-pro-team@latest" %}and bots{% endif %} can only push commits that have been signed and verified to the branch. 詳細については、「[コミット署名の検証について](/articles/about-commit-signature-verification)」を参照してください。 +When you enable required commit signing on a branch, contributors {% if currentVersion == "free-pro-team@latest" %}and bots{% endif %} can only push commits that have been signed and verified to the branch. 詳細については、「[コミット署名の検証について](/articles/about-commit-signature-verification)」を参照してください。 コミットが署名および検証されている場合は、いつでもローカルコミットをブランチにプッシュできます。 {% if currentVersion == "free-pro-team@latest" %}You can also merge signed and verified commits into the branch using a pull request on {% data variables.product.product_name %}. However, you cannot squash and merge a pull request into the branch on {% data variables.product.product_name %} unless you are the author of the pull request.{% else %} However, you cannot merge pull requests into the branch on {% data variables.product.product_name %}.{% endif %} You can {% if currentVersion == "free-pro-team@latest" %}squash and {% endif %}merge pull requests locally. For more information, see "[Checking out pull requests locally](/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally)."{% if currentVersion == "free-pro-team@latest" %} For more information about merge methods, see "[About merge methods on {% data variables.product.prodname_dotcom %}](/github/administering-a-repository/about-merge-methods-on-github)."{% endif %} diff --git a/translations/ja-JP/content/github/administering-a-repository/about-securing-your-repository.md b/translations/ja-JP/content/github/administering-a-repository/about-securing-your-repository.md index 7932f33b49..bc531d3540 100644 --- a/translations/ja-JP/content/github/administering-a-repository/about-securing-your-repository.md +++ b/translations/ja-JP/content/github/administering-a-repository/about-securing-your-repository.md @@ -21,9 +21,13 @@ versions: リポジトリのコードのセキュリティの脆弱性について、非公開で議論して修正します。 その後、セキュリティアドバイザリを公開して、コミュニティに脆弱性を警告し、アップグレードするように促すことができます。 詳しい情報については「[{% data variables.product.prodname_security_advisories %}について](/github/managing-security-vulnerabilities/about-github-security-advisories)」を参照してください。 -- **{% data variables.product.prodname_dependabot_short %} アラート** +- **{% data variables.product.prodname_dependabot_short %} alerts and security updates** - セキュリティの脆弱性を含むことを把握している依存関係に関するアラートを表示し、プルリクエストを自動的に生成してこれらの依存関係を更新するかどうかを選択します。 詳しい情報については、「[リポジトリ内の脆弱な依存関係を表示・更新する](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)」および「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」を参照してください。 + セキュリティの脆弱性を含むことを把握している依存関係に関するアラートを表示し、プルリクエストを自動的に生成してこれらの依存関係を更新するかどうかを選択します。 For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." + +- **{% data variables.product.prodname_dependabot_short %} version updates** + + Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. 詳しい情報については、「[{% data variables.product.prodname_dependabot_version_updates %} について](/github/administering-a-repository/about-github-dependabot-version-updates)」を参照してください。 - **{% data variables.product.prodname_code_scanning_capc %} アラート** diff --git a/translations/ja-JP/content/github/administering-a-repository/changing-the-default-branch.md b/translations/ja-JP/content/github/administering-a-repository/changing-the-default-branch.md index cae6ce3ea8..98700ec2f9 100644 --- a/translations/ja-JP/content/github/administering-a-repository/changing-the-default-branch.md +++ b/translations/ja-JP/content/github/administering-a-repository/changing-the-default-branch.md @@ -12,7 +12,7 @@ redirect_from: ### About changing the default branch -You can choose the default branch for a repository. The default branch is the base branch for pull requests and code commits. For more information about the default branch, see "[About branches](/github/collaborating-with-issues-and-pull-requests/about-branches#about-the-default-branch)." +You can choose the default branch for a repository. The default branch is the base branch for pull requests and code commits. デフォルトブランチの詳細については、「[ブランチについて](/github/collaborating-with-issues-and-pull-requests/about-branches#about-the-default-branch)」を参照してください。 {% note %} diff --git a/translations/ja-JP/content/github/administering-a-repository/classifying-your-repository-with-topics.md b/translations/ja-JP/content/github/administering-a-repository/classifying-your-repository-with-topics.md index 1adf59df66..1c63576235 100644 --- a/translations/ja-JP/content/github/administering-a-repository/classifying-your-repository-with-topics.md +++ b/translations/ja-JP/content/github/administering-a-repository/classifying-your-repository-with-topics.md @@ -1,6 +1,6 @@ --- -title: Classifying your repository with topics -intro: 'To help other people find and contribute to your project, you can add topics to your repository related to your project''s intended purpose, subject area, affinity groups, or other important qualities.' +title: トピックでリポジトリを分類する +intro: 'あなたのプロジェクトを他の人が見つけて貢献しやすくするために、プロジェクトの目的、分野、主催グループなどの、リポジトリに関するトピックを追加できます。' redirect_from: - /articles/about-topics/ - /articles/classifying-your-repository-with-topics @@ -9,36 +9,30 @@ versions: enterprise-server: '*' --- -### About topics +### Topics について -With topics, you can explore repositories in a particular subject area, find projects to contribute to, and discover new solutions to a specific problem. Topics appear on the main page of a repository. You can click a topic name to {% if currentVersion == "free-pro-team@latest" %}see related topics and a list of other repositories classified with that topic{% else %}search for other repositories with that topic{% endif %}. +Topics を利用すれば、特定の領域に関するリポジトリを調べたり、コントリビュートするプロジェクトを見つけたり、特定の問題に対する新たなソリューションを見つけ出すことができます。 Topics は、リポジトリのメインページに表示されます。 You can click a topic name to {% if currentVersion == "free-pro-team@latest" %}see related topics and a list of other repositories classified with that topic{% else %}search for other repositories with that topic{% endif %}. -![Main page of the test repository showing topics](/assets/images/help/repository/os-repo-with-topics.png) +![Topics を表示しているテストリポジトリのメインページ](/assets/images/help/repository/os-repo-with-topics.png) -To browse the most used topics, go to https://github.com/topics/. +最も利用されているトピックをブラウズするには https://github.com/topics/ にアクセスしてください。 {% if currentVersion == "free-pro-team@latest" %}You can contribute to {% data variables.product.product_name %}'s set of featured topics in the [github/explore](https://github.com/github/explore) repository. {% endif %} -Repository admins can add any topics they'd like to a repository. Helpful topics to classify a repository include the repository's intended purpose, subject area, community, or language.{% if currentVersion == "free-pro-team@latest" %} Additionally, {% data variables.product.product_name %} analyzes public repository content and generates suggested topics that repository admins can accept or reject. Private repository content is not analyzed and does not receive topic suggestions.{% endif %} +リポジトリの管理者は、リポジトリに好きなトピックを追加できます。 Helpful topics to classify a repository include the repository's intended purpose, subject area, community, or language.{% if currentVersion == "free-pro-team@latest" %} Additionally, {% data variables.product.product_name %} analyzes public repository content and generates suggested topics that repository admins can accept or reject. プライベートリポジトリの内容は分析されず、Topics が推奨されることはありません。{% endif %} -Public and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. +パブリックリポジトリもプライベートリポジトリも Topics を持つことができますが、Topics の検索結果で見えるプライベートリポジトリはアクセス権を持っているものだけです。 -You can search for repositories that are associated with a particular topic. For more information, see "[Searching for repositories](/articles/searching-for-repositories#search-by-topic)." You can also search for a list of topics on {% data variables.product.product_name %}. For more information, see "[Searching topics](/articles/searching-topics)." +特定のトピックに関連付けられているリポジトリを検索できます。 詳しい情報については[リポジトリの検索](/articles/searching-for-repositories#search-by-topic)を参照してください。 また、{% data variables.product.product_name %} 上でトピックのリストを検索することもできます。 詳細は「[トピックを検索する](/articles/searching-topics)」を参照してください。 -### Adding topics to your repository +### Topics をリポジトリに追加する -{% data reusables.repositories.navigate-to-repo %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} -2. Under your repository description, click **Add topics**. - ![Add topics link on a repository's main page](/assets/images/help/repository/add-topics-link.png) -3. Type the topic you want to add to your repository, then type a space. - ![Form to enter topics](/assets/images/help/repository/add-topic-form.png) -4. After you've finished adding topics, click **Done**. - ![Form with a list of topics and Done button](/assets/images/help/repository/add-topics-done-button.png) +{% data reusables.repositories.navigate-to-repo %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +2. リポジトリの説明の下にある [**Add topics**] をクリックします。 ![リポジトリのメインページにトピックリンクを追加](/assets/images/help/repository/add-topics-link.png) +3. リポジトリに追加したいトピックを入力してから、スペースを入力します。 ![トピックの入力フォーム](/assets/images/help/repository/add-topic-form.png) +4. トピックの追加が終わり次第、[**Done**] をクリックします。 ![トピックのリストと [Done] ボタンが表示されているフォーム](/assets/images/help/repository/add-topics-done-button.png) {% else %} -2. To the right of "About", click {% octicon "gear" aria-label="The Gear icon" %}. - ![Gear icon on main page of a repository](/assets/images/help/repository/edit-repository-details-gear.png) -3. Under "Topics", type the topic you want to add to your repository, then type a space. - ![Form to enter topics](/assets/images/help/repository/add-topic-form.png) -4. After you've finished adding topics, click **Save changes**. - !["Save changes" button in "Edit repository details"](/assets/images/help/repository/edit-repository-details-save-changes-button.png) +2. [About] の右にある {% octicon "gear" aria-label="The Gear icon" %} をクリックします。 ![リポジトリのメイン ページにある歯車アイコン](/assets/images/help/repository/edit-repository-details-gear.png) +3. [Topics] で、リポジトリに追加するトピックを入力してから、スペースを入力します。 ![トピックの入力フォーム](/assets/images/help/repository/add-topic-form.png) +4. トピックの追加が完了したら、[**Save changes**] をクリックします。 ![[Save changes] の [Edit repository details] ボタン](/assets/images/help/repository/edit-repository-details-save-changes-button.png) {% endif %} diff --git a/translations/ja-JP/content/github/administering-a-repository/configuration-options-for-dependency-updates.md b/translations/ja-JP/content/github/administering-a-repository/configuration-options-for-dependency-updates.md index 457904d90d..cb15877b9e 100644 --- a/translations/ja-JP/content/github/administering-a-repository/configuration-options-for-dependency-updates.md +++ b/translations/ja-JP/content/github/administering-a-repository/configuration-options-for-dependency-updates.md @@ -544,12 +544,6 @@ updates: Use the `vendor` option to tell {% data variables.product.prodname_dependabot_short %} to vendor dependencies when updating them. -{% note %} - -Currently, {% data variables.product.prodname_dependabot_short %} only supports vendoring dependencies for Bundler. - -{% endnote %} - ```yaml # Configure version updates for both dependencies defined in manifests and vendored dependencies @@ -563,7 +557,13 @@ updates: interval: "weekly" ``` -{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. For Bundler, the dependencies must be in the _vendor/cache_ directory. Other file paths are not supported. For more information, see the [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html). +{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. + +| パッケージマネージャー | Required file path for vendored dependencies | 詳細情報 | +| ----------- | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------- | +| `bundler` | The dependencies must be in the _vendor/cache_ directory.
    Other file paths are not supported. | [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html) | +| `gomod` | No path requirement (dependencies are usually located in the _vendor_ directory) | [`go mod vendor` documentation](https://golang.org/ref/mod#go-mod-vendor) | + ### `versioning-strategy` diff --git a/translations/ja-JP/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/translations/ja-JP/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md index 386a75c9e0..0a9ab1f64c 100644 --- a/translations/ja-JP/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md +++ b/translations/ja-JP/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md @@ -17,7 +17,7 @@ versions: または、リポジトリで {% data variables.product.prodname_actions %} を有効化して、ワークフローで実行できるアクションを制限することもできます。 {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### リポジトリの {% data variables.product.prodname_actions %} 権限を管理する diff --git a/translations/ja-JP/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md b/translations/ja-JP/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md index 3cb9b4f7eb..2fba0efa09 100644 --- a/translations/ja-JP/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md +++ b/translations/ja-JP/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md @@ -1,32 +1,31 @@ --- -title: Enabling force pushes to a protected branch -intro: You can allow force pushes to a protected branch. +title: 保護されたブランチへのフォースプッシュを有効化する +intro: 保護されたブランチへのフォースプッシュを有効化することができます。 product: '{% data reusables.gated-features.protected-branches %}' versions: free-pro-team: '*' enterprise-server: '>=2.20' --- -Anyone with admin permissions to a repository can enable force pushes. +リポジトリに対する管理者権限があるユーザは、フォースプッシュを有効化できます。 -### About force pushes to protected branches +### 保護されたブランチへのフォースプッシュについて -By default, force pushes are blocked on all protected branches. When you enable force pushes to a protected branch, anyone with at least write permissions to the repository can force push to the branch, including those with admin permissions. +デフォルトでは、フォースプッシュはすべての保護されたブランチでブロックされます。 保護されたブランチのフォースプッシュを有効にすると、少なくともリポジトリへの書き込み権限を持つユーザは、管理者権限を持つブランチを含め、ブランチをフォースプッシュできます。 -Enabling force pushes will not override any other branch protection rules. For example, if a branch requires a linear commit history, you cannot force push merge commits to that branch. +フォースプッシュを有効化しても、他のブランチ保護ルールは上書きされません。 たとえば、ブランチに直線状のコミット履歴が必要な場合、そのブランチにマージコミットをフォースプッシュすることはできません。 -{% if currentVersion != "free-pro-team@latest" %}You cannot enable force pushes for a protected branch if a site administrator has blocked force pushes to all branches in your repository. For more information, see "[Blocking force pushes to repositories owned by a user account or organization](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)." +{% if enterpriseServerVersions contains currentVersion %}サイト管理者がリポジトリ内のすべてのブランチへのフォースプッシュをブロックしている場合、保護されたブランチのフォースプッシュを有効にすることはできません。 詳しい情報については、「[ユーザアカウントもしくはOrganizationが所有するリポジトリへのフォースプッシュのブロック](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)」を参照してください。 -If a site administrator has blocked force pushes to the default branch only, you can still enable force pushes for any other protected branch.{% endif %} +サイト管理者がデフォルトブランチへのフォースプッシュのみをブロックしている場合、他の保護されたブランチに対してフォースプッシュを有効にできます。{% endif %} {% data reusables.repositories.protected-branches-options %} -### Enabling force pushes +### フォースプッシュの有効化 {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.repositories.repository-branches %} {% data reusables.repositories.add-branch-protection-rules %} -6. Under "Rules applied to everyone including administrators", select **Allow force pushes**. -![Allow force pushes option](/assets/images/help/repository/allow-force-pushes.png) -7. Click **Create**. +6. [Rules applied to everyone including administrators] で、 [**Allow force pushes**] を選択します。 ![フォースプッシュオプションを許可する](/assets/images/help/repository/allow-force-pushes.png) +7. ** Create（作成）**をクリックしてください。 diff --git a/translations/ja-JP/content/github/administering-a-repository/index.md b/translations/ja-JP/content/github/administering-a-repository/index.md index a918fbf189..7cd0fae66e 100644 --- a/translations/ja-JP/content/github/administering-a-repository/index.md +++ b/translations/ja-JP/content/github/administering-a-repository/index.md @@ -26,7 +26,7 @@ versions: {% link_in_list /viewing-deployment-activity-for-your-repository %} {% link_in_list /managing-the-forking-policy-for-your-repository %} - + {% link_in_list /setting-the-default-branch %} {% link_in_list /disabling-or-limiting-github-actions-for-a-repository %} {% link_in_list /managing-git-lfs-objects-in-archives-of-your-repository %} diff --git a/translations/ja-JP/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/translations/ja-JP/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md index 59f178c3c1..e80309195c 100644 --- a/translations/ja-JP/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md +++ b/translations/ja-JP/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md @@ -9,9 +9,9 @@ versions: ### {% data variables.product.prodname_dependabot %} のプルリクエストについて -{% data variables.product.prodname_dependabot %} は、依存関係を更新するプルリクエストを生成します。 リポジトリの設定によっては、{% data variables.product.prodname_dependabot_short %} がバージョン更新やセキュリティアップデートのプルリクエストを発行する場合があります。 これらのプルリクエストは、他のプルリクエストと同じ方法で管理しますが、追加のコマンドもいくつか用意されています。 {% data variables.product.prodname_dependabot %} 依存関係の更新を有効にする方法については、「[{% data variables.product.prodname_dependabot_security_updates %} を構成する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」および「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。 +{% data reusables.dependabot.pull-request-introduction %} -{% data variables.product.prodname_dependabot %} がプルリクエストを発行すると、リポジトリに対して選択した方法で通知されます。 各プルリクエストには、パッケージ管理システムから取得した、提案された変更に関する詳細情報が含まれています。 これらのプルリクエストは、リポジトリで定義されている通常のチェックとテストに従います。 また、十分な情報がある場合は、互換性スコアが表示されます。 これは、変更をマージするかどうかを決める際にも役立ちます。 このスコアについての詳しい情報は、「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」を参照してください。 +{% data variables.product.prodname_dependabot %} がプルリクエストを発行すると、リポジトリに対して選択した方法で通知されます。 Each pull request contains detailed information about the proposed change, taken from the package manager. これらのプルリクエストは、リポジトリで定義されている通常のチェックとテストに従います。 また、十分な情報がある場合は、互換性スコアが表示されます。 これは、変更をマージするかどうかを決める際にも役立ちます。 For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." 管理する依存関係が多数ある場合は、各パッケージマネージャーの設定をカスタマイズして、プルリクエストに特定のレビュー担当者、アサインされた人、ラベルを付けることができます。 詳しい情報については、「[依存関係の更新をカスタマイズする](/github/administering-a-repository/customizing-dependency-updates)」をご覧ください。 diff --git a/translations/ja-JP/content/github/administering-a-repository/setting-repository-visibility.md b/translations/ja-JP/content/github/administering-a-repository/setting-repository-visibility.md index f3c4f2d6c6..5c2f95797f 100644 --- a/translations/ja-JP/content/github/administering-a-repository/setting-repository-visibility.md +++ b/translations/ja-JP/content/github/administering-a-repository/setting-repository-visibility.md @@ -23,7 +23,7 @@ Organization のオーナーは、リポジトリの可視性を変更する機 {% if currentVersion == "free-pro-team@latest" %}* If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. {% data reusables.gated-features.more-info %} * すべての公開済みの {% data variables.product.prodname_pages %} サイトは自動的に取り下げられます。 {% data variables.product.prodname_pages %} サイトにカスタムドメインを追加した場合、ドメインの乗っ取りリスクを回避するために、リポジトリをプライベートに設定する前に DNS レコードを削除または更新してください。 詳しい情報については、「[{% data variables.product.prodname_pages %} サイト用のカスタムドメインを管理する](/articles/managing-a-custom-domain-for-your-github-pages-site)」を参照してください。 * 今後、{% data variables.product.prodname_dotcom %} は {% data variables.product.prodname_archive %} にリポジトリを含まなくなります。 詳しい情報については、「[{% data variables.product.prodname_dotcom %} のコンテンツとデータのアーカイブについて](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)」を参照してください。{% endif %} - {% if currentVersion != "free-pro-team@latest" %}* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} + {% if enterpriseServerVersions contains currentVersion %}* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} #### リポジトリをパブリックにする diff --git a/translations/ja-JP/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md b/translations/ja-JP/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md index 6defaae2a2..06dc56524e 100644 --- a/translations/ja-JP/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md +++ b/translations/ja-JP/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md @@ -14,7 +14,7 @@ versions: {% endnote %} -リポジトリへの読み取りアクセス権を持つ人は、リポジトリのデプロイメントワークフローが、Deployments API または[{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment) のアプリケーションを通して、{% data variables.product.product_name %} に統合されている場合、現在のすべてのデプロイメントの概要と過去のデプロイメントアクティビティのログを見ることができます。 詳しい情報については、「[デプロイメント](/rest/reference/repos#deployments)」を参照してください。 +リポジトリへの読み取りアクセス権を持つ人は、リポジトリのデプロイメントワークフローが、Deployments API または[{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment) のアプリケーションを通して、{% data variables.product.product_name %} に統合されている場合、現在のすべてのデプロイメントの概要と過去のデプロイメントアクティビティのログを見ることができます。 For more information, see "[Deployments](/rest/reference/repos#deployments)." プルリクエストの [Conversation] タブにもデプロイメント情報が表示されます。 diff --git a/translations/ja-JP/content/github/authenticating-to-github/configuring-two-factor-authentication-recovery-methods.md b/translations/ja-JP/content/github/authenticating-to-github/configuring-two-factor-authentication-recovery-methods.md index 0c2c85baea..f1a1dfce55 100644 --- a/translations/ja-JP/content/github/authenticating-to-github/configuring-two-factor-authentication-recovery-methods.md +++ b/translations/ja-JP/content/github/authenticating-to-github/configuring-two-factor-authentication-recovery-methods.md @@ -93,7 +93,7 @@ Recovery Accounts Elsewhere を使用して、あなたの {% data variables.pro 1. Sign in to your Facebook account, then return to -{% data variables.product.product_name %}. +{% data variables.product.product_name %} の Enterprise 設定を使用してアナウンスバナーを設定することもできます。 {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.security %} 4. 新しいトークンを生成するため、[Recovery tokens] の下にある [**Store new token**] をクリックします。 ![新しいリカバリトークンを保存するボタン](/assets/images/help/settings/store-new-recovery-token.png) diff --git a/translations/ja-JP/content/github/authenticating-to-github/error-bad-file-number.md b/translations/ja-JP/content/github/authenticating-to-github/error-bad-file-number.md index 49c61d1c47..ec96e02b00 100644 --- a/translations/ja-JP/content/github/authenticating-to-github/error-bad-file-number.md +++ b/translations/ja-JP/content/github/authenticating-to-github/error-bad-file-number.md @@ -12,7 +12,7 @@ versions: ```shell $ ssh -vT git@{% data variables.command_line.codeblock %} -> OpenSSH_5.8p1, OpenSSL 1.0.0d 8 Feb 2011 +> OpenSSH_8.1p1, LibreSSL 2.7.3 > debug1: Connecting to {% data variables.command_line.codeblock %} [207.97.227.239] port 22. > debug1: connect to address 207.97.227.239 port 22: Connection timed out > ssh: connect to host {% data variables.command_line.codeblock %} port 22: Connection timed out diff --git a/translations/ja-JP/content/github/authenticating-to-github/generating-a-new-gpg-key.md b/translations/ja-JP/content/github/authenticating-to-github/generating-a-new-gpg-key.md index 17f663baa6..7d781c7ab9 100644 --- a/translations/ja-JP/content/github/authenticating-to-github/generating-a-new-gpg-key.md +++ b/translations/ja-JP/content/github/authenticating-to-github/generating-a-new-gpg-key.md @@ -29,7 +29,7 @@ versions: ```shell $ gpg --default-new-key-algo rsa4096 --gen-key ``` -4. プロンプトで、必要なキーの種類を指定するか、`Enter` キーを押してデフォルトの `RSA and DSA` を受け入れます。 +4. プロンプトで、必要なキーの種類を指定するか、`Enter` キーを押してデフォルトの `RSA and RSA` を受け入れます。 5. 希望のキーサイズを入力します。 キーは少なくとも `4096` ビットである必要があります。 6. キーの有効期間を入力します。 `Enter` キーを押して、無期限を示すデフォルトの選択を指定します。 7. 選択内容が正しいことを確認します。 diff --git a/translations/ja-JP/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/ja-JP/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index ae4767e0ba..ee37d20e2b 100644 --- a/translations/ja-JP/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/ja-JP/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,7 +9,7 @@ versions: free-pro-team: '*' --- -{% data variables.product.prodname_dotcom %} のパブリックキーフィンガープリントを以下に示します: +These are {% data variables.product.prodname_dotcom %}'s public key fingerprints: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/ja-JP/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md b/translations/ja-JP/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md index 367f41378f..54a26a5a8c 100644 --- a/translations/ja-JP/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md +++ b/translations/ja-JP/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md @@ -134,7 +134,7 @@ $ bfg --replace-text passwords.txt {% endnote %} -## 将来にわたって誤ったコミットを回避する +### 将来にわたって誤ったコミットを回避する コミット対象でないものがコミットされるのを回避するためのシンプルな方法がいくつかあります。 @@ -145,5 +145,5 @@ $ bfg --replace-text passwords.txt ### 参考リンク -- [`git filter-branch` メインページ](https://git-scm.com/docs/git-filter-branch) +- [`git filter-branch` man page](https://git-scm.com/docs/git-filter-branch) - [Pro Git：Git ツール - 履歴の書き換え](https://git-scm.com/book/en/Git-Tools-Rewriting-History) diff --git a/translations/ja-JP/content/github/authenticating-to-github/reviewing-your-security-log.md b/translations/ja-JP/content/github/authenticating-to-github/reviewing-your-security-log.md index 38e9334771..9da41aa0b7 100644 --- a/translations/ja-JP/content/github/authenticating-to-github/reviewing-your-security-log.md +++ b/translations/ja-JP/content/github/authenticating-to-github/reviewing-your-security-log.md @@ -1,6 +1,6 @@ --- -title: Reviewing your security log -intro: You can review the security log for your user account to better understand actions you've performed and actions others have performed that involve you. +title: セキュリティログをレビューする +intro: ユーザアカウントのセキュリティログをレビューして、自分が実行したアクションと、他のユーザが実行したアクションについて詳しく知ることができます。 redirect_from: - /articles/reviewing-your-security-log versions: @@ -8,238 +8,233 @@ versions: enterprise-server: '*' --- -### Accessing your security log +### セキュリティログにアクセスする The security log lists all actions performed within the last 90 days{% if currentVersion ver_lt "enterprise-server@2.20" %}, up to 50{% endif %}. {% data reusables.user_settings.access_settings %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -2. In the user settings sidebar, click **Security log**. - ![Security log tab](/assets/images/help/settings/audit-log-tab.png) +2. ユーザ設定サイドバーで [**Security log**] をクリックします。 ![セキュリティログのタブ](/assets/images/help/settings/audit-log-tab.png) {% else %} {% data reusables.user_settings.security %} -3. Under "Security history," your log is displayed. - ![Security log](/assets/images/help/settings/user_security_log.png) -4. Click on an entry to see more information about the event. - ![Security log](/assets/images/help/settings/user_security_history_action.png) +3. [Security history] の下に、自分のログが表示されます。 ![セキュリティ ログ](/assets/images/help/settings/user_security_log.png) +4. エントリをクリックして、イベントに関する詳細情報を表示します。 ![セキュリティ ログ](/assets/images/help/settings/user_security_history_action.png) {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -### Searching your security log +### セキュリティログを検索する {% data reusables.audit_log.audit-log-search %} -#### Search based on the action performed +#### 実行されたアクションに基づく検索 {% else %} -### Understanding events in your security log +### セキュリティログでのイベントを理解する -Actions listed in your security log are grouped within the following categories: -{% endif %} +セキュリティログに一覧表示されるアクションは以下のカテゴリに分類されます。 |{% endif %} +| カテゴリー名 | 説明 | +| ------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest" %} +| `account_recovery_token` | [リカバリトークンの追加](/articles/configuring-two-factor-authentication-recovery-methods)に関連するすべての活動が対象です。 | +| `支払い` | 自分の支払い情報に関連するすべての活動が対象です。 | +| `marketplace_agreement_signature` | {% data variables.product.prodname_marketplace %} Developer Agreement の署名に関連するすべての活動が対象です。 | +| `marketplace_listing` | {% data variables.product.prodname_marketplace %} に一覧表示しているアプリに関連するすべての活動が対象です。{% endif %} +| `oauth_access` | Contains all activities related to [{% data variables.product.prodname_oauth_app %}s](/articles/authorizing-oauth-apps) you've connected with.{% if currentVersion == "free-pro-team@latest" %} +| `payment_method` | {% data variables.product.prodname_dotcom %} プランに対する支払いに関連するすべての活動が対象です。{% endif %} +| `profile_picture` | 自分のプロファイル写真に関連するすべての活動が対象です。 | +| `project` | プロジェクト ボードに関連するすべての活動が対象です。 | +| `public_key` | [公開 SSH キー](/articles/adding-a-new-ssh-key-to-your-github-account)に関連するすべての活動が対象です。 | +| `repo` | Contains all activities related to the repositories you own.{% if currentVersion == "free-pro-team@latest" %} +| `sponsors` | {% data variables.product.prodname_sponsors %}およびスポンサーボタンに関連するすべての活動が対象です (「[{% data variables.product.prodname_sponsors %}について](/articles/about-github-sponsors)」と「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照){% endif %}{% if enterpriseServerVersions contains currentVersion %} +| `Team` | 自分が所属する Team に関連するすべての活動が対象です。{% endif %} +| `two_factor_authentication` | [2 要素認証](/articles/securing-your-account-with-two-factor-authentication-2fa)に関連するすべての活動が対象です。 | +| `ユーザ` | アカウントに関連するすべての活動が対象です。 | -| Category Name | Description -|------------------|-------------------{% if currentVersion == "free-pro-team@latest" %} -| `account_recovery_token` | Contains all activities related to [adding a recovery token](/articles/configuring-two-factor-authentication-recovery-methods). -| `billing` | Contains all activities related to your billing information. -| `marketplace_agreement_signature` | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. -| `marketplace_listing` | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %} -| `oauth_access` | Contains all activities related to [{% data variables.product.prodname_oauth_app %}s](/articles/authorizing-oauth-apps) you've connected with.{% if currentVersion == "free-pro-team@latest" %} -| `payment_method` | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %} -| `profile_picture` | Contains all activities related to your profile picture. -| `project` | Contains all activities related to project boards. -| `public_key` | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). -| `repo` | Contains all activities related to the repositories you own.{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to {% data variables.product.prodname_sponsors %} and sponsor buttons (see "[About {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)" and "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} -| `team` | Contains all activities related to teams you are a part of.{% endif %} -| `two_factor_authentication` | Contains all activities related to [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa). -| `user` | Contains all activities related to your account. - -A description of the events within these categories is listed below. +これらのカテゴリ内のイベントの説明は以下のとおりです。 {% if currentVersion == "free-pro-team@latest" %} -#### The `account_recovery_token` category +#### `account_recovery_token` カテゴリ -| Action | Description -|------------------|------------------- -| confirm | Triggered when you successfully [store a new token with a recovery provider](/articles/configuring-two-factor-authentication-recovery-methods). -| recover | Triggered when you successfully [redeem an account recovery token](/articles/recovering-your-account-if-you-lose-your-2fa-credentials). -| recover_error | Triggered when a token is used but {% data variables.product.prodname_dotcom %} is not able to validate it. +| アクション | 説明 | +| ------------- | ----------------------------------------------------------------------------------------------------------- | +| confirm | 正常に[リカバリプロバイダ付きの新たなトークンを保存する](/articles/configuring-two-factor-authentication-recovery-methods)ときにトリガーされます。 | +| recover | 正常に[アカウント リカバリ トークンを引き換える](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)ときにトリガーされます。 | +| recover_error | トークンが使用されているにもかかわらず {% data variables.product.prodname_dotcom %} がそれを有効にできないときにトリガーされます。 | -#### The `billing` category +#### `billing` カテゴリ -| Action | Description -|------------------|------------------- -| change_billing_type | Triggered when you [change how you pay](/articles/adding-or-editing-a-payment-method) for {% data variables.product.prodname_dotcom %}. -| change_email | Triggered when you [change your email address](/articles/changing-your-primary-email-address). +| アクション | 説明 | +| --------------------- | -------------------------------------------------------------------------------------------------------------------- | +| change_billing_type | {% data variables.product.prodname_dotcom %} の[支払い方法を変更する](/articles/adding-or-editing-a-payment-method)ときにトリガーされます。 | +| change_email | [自分のメール アドレスを変更する](/articles/changing-your-primary-email-address)ときにトリガーされます。 | -#### The `marketplace_agreement_signature` category +#### `marketplace_agreement_signature` カテゴリ -| Action | Description -|------------------|------------------- -| create | Triggered when you sign the {% data variables.product.prodname_marketplace %} Developer Agreement. +| アクション | 説明 | +| ------ | --------------------------------------------------------------------------------------- | +| create | {% data variables.product.prodname_marketplace %} Developer Agreement に署名するときにトリガーされます。 | -#### The `marketplace_listing` category +#### `marketplace_listing` カテゴリ -| Action | Description -|------------------|------------------- -| approve | Triggered when your listing is approved for inclusion in {% data variables.product.prodname_marketplace %}. -| create | Triggered when you create a listing for your app in {% data variables.product.prodname_marketplace %}. -| delist | Triggered when your listing is removed from {% data variables.product.prodname_marketplace %}. -| redraft | Triggered when your listing is sent back to draft state. -| reject | Triggered when your listing is not accepted for inclusion in {% data variables.product.prodname_marketplace %}. +| アクション | 説明 | +| ------- | ----------------------------------------------------------------------------------- | +| 承認 | 一覧表を {% data variables.product.prodname_marketplace %}に掲載することが承認されるときにトリガーされます。 | +| create | {% data variables.product.prodname_marketplace %} で自分のアプリケーションの一覧表を作成するときにトリガーされます。 | +| delist | 一覧表が {% data variables.product.prodname_marketplace %} から削除されるときにトリガーされます。 | +| redraft | 一覧表がドラフト状態に戻されるときにトリガーされます。 | +| reject | 一覧表が {% data variables.product.prodname_marketplace %} に掲載することを認められないときにトリガーされます。 | {% endif %} -#### The `oauth_access` category +#### `oauth_access` カテゴリ -| Action | Description -|------------------|------------------- -| create | Triggered when you [grant access to an {% data variables.product.prodname_oauth_app %}](/articles/authorizing-oauth-apps). -| destroy | Triggered when you [revoke an {% data variables.product.prodname_oauth_app %}'s access to your account](/articles/reviewing-your-authorized-integrations). +| アクション | 説明 | +| ------- | ---------------------------------------------------------------------------------------------------------------------------------------- | +| create | [{% data variables.product.prodname_oauth_app %} へのアクセスを許可する](/articles/authorizing-oauth-apps)ときにトリガーされます。 | +| destroy | [自分のアカウントへの {% data variables.product.prodname_oauth_app %} のアクセス権を取り消す](/articles/reviewing-your-authorized-integrations)ときにトリガーされます。 | {% if currentVersion == "free-pro-team@latest" %} -#### The `payment_method` category +#### `payment_method` カテゴリ -| Action | Description -|------------------|------------------- -| clear | Triggered when [a payment method](/articles/removing-a-payment-method) on file is removed. -| create | Triggered when a new payment method is added, such as a new credit card or PayPal account. -| update | Triggered when an existing payment method is updated. +| アクション | 説明 | +| ------ | -------------------------------------------------------------------- | +| clear | ファイルでの[支払い方法](/articles/removing-a-payment-method)が削除されるときにトリガーされます。 | +| create | 新しいクレジット カードや PayPal アカウントなど、新たな支払い方法が追加されるときにトリガーされます。 | +| update | 既存の支払い方法が更新されるときにトリガーされます。 | {% endif %} -#### The `profile_picture` category +#### `profile_picture` カテゴリ -| Action | Description -|------------------|------------------- -| update | Triggered when you [set or update your profile picture](/articles/setting-your-profile-picture/). +| アクション | 説明 | +| ------ | ---------------------------------------------------------------------------- | +| update | [自分のプロフィール写真を設定または更新する](/articles/setting-your-profile-picture/)ときにトリガーされます。 | -#### The `project` category +#### `project` カテゴリ -| Action | Description -|--------------------|--------------------- -| `create` | Triggered when a project board is created. -| `rename` | Triggered when a project board is renamed. -| `update` | Triggered when a project board is updated. -| `delete` | Triggered when a project board is deleted. -| `link` | Triggered when a repository is linked to a project board. -| `unlink` | Triggered when a repository is unlinked from a project board. -| `project.access` | Triggered when a project board's visibility is changed. -| `update_user_permission` | Triggered when an outside collaborator is added to or removed from a project board or has their permission level changed. +| アクション | 説明 | +| ------------------------ | ------------------------------------------------------------------------------------------------------------------------- | +| `create` | プロジェクト ボードが作成されるときにトリガーされます。 | +| `rename` | プロジェクトボードの名前が変更されるときにトリガーされます。 | +| `update` | プロジェクト ボードが更新されるときにトリガーされます。 | +| `delete` | プロジェクトボードが削除されるときにトリガーされます。 | +| `link` | リポジトリがプロジェクト ボードにリンクされるときにトリガーされます。 | +| `unlink` | リポジトリがプロジェクトボードからリンク解除されるときにトリガーされます。 | +| `project.access` | プロジェクト ボードの可視性が変更されるときにトリガーされます。 | +| `update_user_permission` | Triggered when an outside collaborator is added to or removed from a project board or has their permission level changed. | -#### The `public_key` category +#### `public_key` カテゴリ -| Action | Description -|------------------|------------------- -| create | Triggered when you [add a new public SSH key to your {% data variables.product.product_name %} account](/articles/adding-a-new-ssh-key-to-your-github-account). -| delete | Triggered when you [remove a public SSH key to your {% data variables.product.product_name %} account](/articles/reviewing-your-ssh-keys). +| アクション | 説明 | +| ------ | ------------------------------------------------------------------------------------------------------------------------------------------ | +| create | [新たな公開 SSH キーを自分の {% data variables.product.product_name %} アカウントに追加する](/articles/adding-a-new-ssh-key-to-your-github-account)ときにトリガーされます。 | +| delete | [公開 SSH キーを自分の {% data variables.product.product_name %} アカウントから削除する](/articles/reviewing-your-ssh-keys)ときにトリガーされます。 | -#### The `repo` category +#### `repo` カテゴリ -| Action | Description -|------------------|------------------- -| access | Triggered when you a repository you own is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). -| add_member | Triggered when a {% data variables.product.product_name %} user is {% if currentVersion == "free-pro-team@latest" %}[invited to have collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% else %}[given collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% endif %} to a repository. -| add_topic | Triggered when a repository owner [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. -| archived | Triggered when a repository owner [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} -| config.disable_anonymous_git_access | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. -| config.enable_anonymous_git_access | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. -| config.lock_anonymous_git_access | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). -| config.unlock_anonymous_git_access | Triggered when a repository's [anonymous Git read access setting is unlocked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access).{% endif %} -| create | Triggered when [a new repository is created](/articles/creating-a-new-repository). -| destroy | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} -| disable | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %}{% if currentVersion == "free-pro-team@latest" %} -| enable | Triggered when a repository is re-enabled.{% endif %} -| remove_member | Triggered when a {% data variables.product.product_name %} user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository). -| remove_topic | Triggered when a repository owner removes a topic from a repository. -| rename | Triggered when [a repository is renamed](/articles/renaming-a-repository). -| transfer | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). -| transfer_start | Triggered when a repository transfer is about to occur. -| unarchived | Triggered when a repository owner unarchives a repository. +| アクション | 説明 | +| ------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| access | 自分が所有するリポジトリが["プライベート" から "パブリック" に切り替えられる](/articles/making-a-private-repository-public) (またはその逆) ときにトリガーされます。 | +| add_member | Triggered when a {% data variables.product.product_name %} user is {% if currentVersion == "free-pro-team@latest" %}[invited to have collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% else %}[given collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% endif %} to a repository. | +| add_topic | リポジトリのオーナーがリポジトリに[トピックを追加する](/articles/classifying-your-repository-with-topics)ときにトリガーされます。 | +| archived | リポジトリのオーナーが[リポジトリをアーカイブする](/articles/about-archiving-repositories)ときにトリガーされます。{% if enterpriseServerVersions contains currentVersion %} +| config.disable_anonymous_git_access | 公開リポジトリで[匿名の Git 読み取りアクセスが無効になる](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)ときにトリガーされます。 | +| config.enable_anonymous_git_access | 公開リポジトリで[匿名の Git 読み取りアクセスが有効になる](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)ときにトリガーされます。 | +| config.lock_anonymous_git_access | リポジトリの[匿名の Git 読み取りアクセス設定がロックされる](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access)ときにトリガーされます。 | +| config.unlock_anonymous_git_access | リポジトリの[匿名の Git 読み取りアクセス設定がロック解除される](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access)ときにトリガーされます。{% endif %} +| create | [新たなリポジトリが作成される](/articles/creating-a-new-repository)ときにトリガーされます。 | +| destroy | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} +| disable | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| enable | リポジトリが再び有効になるときにトリガーされます。{% endif %} +| remove_member | {% data variables.product.product_name %}ユーザが[リポジトリのコラボレーターではなくなる](/articles/removing-a-collaborator-from-a-personal-repository)ときにトリガーされます。 | +| remove_topic | リポジトリのオーナーがリポジトリからトピックを削除するときにトリガーされます。 | +| rename | [リポジトリの名前が変更される](/articles/renaming-a-repository)ときにトリガーされます。 | +| 移譲 | [リポジトリが移譲される](/articles/how-to-transfer-a-repository)ときにトリガーされます。 | +| transfer_start | リポジトリの移譲が行われようとしているときにトリガーされます。 | +| unarchived | リポジトリのオーナーがリポジトリをアーカイブ解除するときにトリガーされます。 | {% if currentVersion == "free-pro-team@latest" %} -#### The `sponsors` category +#### `sponsors` カテゴリ -| Action | Description -|------------------|------------------- -| repo_funding_link_button_toggle | Triggered when you enable or disable a sponsor button in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") -| repo_funding_links_file_action | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") -| sponsor_sponsorship_cancel | Triggered when you cancel a sponsorship (see "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)") -| sponsor_sponsorship_create | Triggered when you sponsor a developer (see "[Sponsoring an open source contributor](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor#sponsoring-a-developer)") -| sponsor_sponsorship_preference_change | Triggered when you change whether you receive email updates from a sponsored developer (see "[Managing your sponsorship](/articles/managing-your-sponsorship)") -| sponsor_sponsorship_tier_change | Triggered when you upgrade or downgrade your sponsorship (see "[Upgrading a sponsorship](/articles/upgrading-a-sponsorship)" and "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)") -| sponsored_developer_approve | Triggered when your {% data variables.product.prodname_sponsors %} account is approved (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| sponsored_developer_create | Triggered when your {% data variables.product.prodname_sponsors %} account is created (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| sponsored_developer_profile_update | Triggered when you edit your sponsored developer profile (see "[Editing your profile details for {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/editing-your-profile-details-for-github-sponsors)") -| sponsored_developer_request_approval | Triggered when you submit your application for {% data variables.product.prodname_sponsors %} for approval (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| sponsored_developer_tier_description_update | Triggered when you change the description for a sponsorship tier (see "[Changing your sponsorship tiers](/articles/changing-your-sponsorship-tiers)") -| sponsored_developer_update_newsletter_send | Triggered when you send an email update to your sponsors (see "[Contacting your sponsors](/articles/contacting-your-sponsors)") -| waitlist_invite_sponsored_developer | Triggered when you are invited to join {% data variables.product.prodname_sponsors %} from the waitlist (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| waitlist_join | Triggered when you join the waitlist to become a sponsored developer (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") +| アクション | 説明 | +| ----------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| repo_funding_link_button_toggle | リポジトリでスポンサーボタンの表示を有効化または無効化したときにトリガーされます (「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照) | +| repo_funding_links_file_action | リポジトリで FUNDING ファイルを変更したときにトリガーされます (「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照) | +| sponsor_sponsorship_cancel | スポンサーシップをキャンセルしたときにトリガーされます (「[スポンサーシップをダウングレードする](/articles/downgrading-a-sponsorship)」を参照) | +| sponsor_sponsorship_create | 開発者をスポンサーするとトリガーされます (「[オープンソースコントリビューターに対するスポンサー](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor#sponsoring-a-developer)」を参照) | +| sponsor_sponsorship_preference_change | スポンサード開発者からメールで最新情報を受け取るかどうかを変更したときにトリガーされます (「[スポンサーシップを管理する](/articles/managing-your-sponsorship)」を参照) | +| sponsor_sponsorship_tier_change | スポンサーシップをアップグレードまたはダウングレードしたときにトリガーされます (「[スポンサーシップをアップグレードする](/articles/upgrading-a-sponsorship)」および「[スポンサーシップをダウングレードする](/articles/downgrading-a-sponsorship)」を参照) | +| sponsored_developer_approve | {% data variables.product.prodname_sponsors %}アカウントが承認されるとトリガーされます（「[ユーザアカウントに{% data variables.product.prodname_sponsors %}を設定する](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)」を参照） | +| sponsored_developer_create | {% data variables.product.prodname_sponsors %}アカウントが作成されるとトリガーされます（「[ユーザアカウントに{% data variables.product.prodname_sponsors %}を設定する](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)」を参照） | +| sponsored_developer_profile_update | スポンサード開発者のプロフィールを編集するとトリガーされます（「[{% data variables.product.prodname_sponsors %}のプロフィール詳細を編集する](/github/supporting-the-open-source-community-with-github-sponsors/editing-your-profile-details-for-github-sponsors)」を参照） | +| sponsored_developer_request_approval | 承認のために{% data variables.product.prodname_sponsors %}のアプリケーションをサブミットするとトリガーされます（「[ユーザアカウントに{% data variables.product.prodname_sponsors %}を設定する](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)」を参照） | +| sponsored_developer_tier_description_update | スポンサーシップ層の説明を変更したときにトリガーされます (「[スポンサーシップ層を変更する](/articles/changing-your-sponsorship-tiers)」を参照) | +| sponsored_developer_update_newsletter_send | スポンサーにメールで最新情報を送信したときにトリガーされます (「[スポンサーに連絡する](/articles/contacting-your-sponsors)」を参照) | +| waitlist_invite_sponsored_developer | 待ちリストから{% data variables.product.prodname_sponsors %}に参加するよう招待されたときにトリガーされます（「[ユーザアカウントに{% data variables.product.prodname_sponsors %}を設定する](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)」を参照） | +| waitlist_join | スポンサード開発者になるために待ちリストに参加するとトリガーされます（「[ユーザアカウントに{% data variables.product.prodname_sponsors %}を設定する](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)」を参照） | {% endif %} {% if currentVersion == "free-pro-team@latest" %} -#### The `successor_invitation` category +#### `successor_invitation` カテゴリ -| Action | Description -|------------------|------------------- -| accept | Triggered when you accept a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| cancel | Triggered when you cancel a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| create | Triggered when you create a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| decline | Triggered when you decline a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| revoke | Triggered when you revoke a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") +| アクション | 説明 | +| ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| accept | 継承の招待を承諾するとトリガーされます（「[ユーザアカウントのリポジトリの所有権の継続性を管理する](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)」を参照） | +| cancel | 継承の招待をキャンセルするとトリガーされます（「[ユーザアカウントのリポジトリの所有権の継続性を管理する](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)」を参照） | +| create | 継承の招待を作成するとトリガーされます（「[ユーザアカウントのリポジトリの所有権の継続性を管理する](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)」を参照） | +| decline | 継承の招待を拒否するとトリガーされます（「[ユーザアカウントのリポジトリの所有権の継続性を管理する](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)」を参照） | +| revoke | 継承の招待を取り消すとトリガーされます（「[ユーザアカウントのリポジトリの所有権の継続性を管理する](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)」を参照） | {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} -#### The `team` category +#### `team` カテゴリ -| Action | Description -|------------------|------------------- -| add_member | Triggered when a member of an organization you belong to [adds you to a team](/articles/adding-organization-members-to-a-team). -| add_repository | Triggered when a team you are a member of is given control of a repository. -| create | Triggered when a new team in an organization you belong to is created. -| destroy | Triggered when a team you are a member of is deleted from the organization. -| remove_member | Triggered when a member of an organization is [removed from a team](/articles/removing-organization-members-from-a-team) you are a member of. -| remove_repository | Triggered when a repository is no longer under a team's control. +| アクション | 説明 | +| ----------------- | ------------------------------------------------------------------------------------------------------------- | +| add_member | 自分が所属している Organization のメンバーが[自分を Team に追加する](/articles/adding-organization-members-to-a-team)ときにトリガーされます。 | +| add_repository | 自分がメンバーである Team にリポジトリの管理が任せられるときにトリガーされます。 | +| create | 自分が所属している Organization で新たな Team が作成されるときにトリガーされます。 | +| destroy | 自分がメンバーである Team が Organization から削除されるときにトリガーされます。 | +| remove_member | Organization のメンバーが自分がメンバーである [Team から削除される](/articles/removing-organization-members-from-a-team)ときにトリガーされます。 | +| remove_repository | リポジトリが Team の管理下でなくなるときにトリガーされます。 | {% endif %} -#### The `two_factor_authentication` category +#### `two_factor_authentication` カテゴリ -| Action | Description -|------------------|------------------- -| enabled | Triggered when [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) is enabled. -| disabled | Triggered when two-factor authentication is disabled. +| アクション | 説明 | +| -------- | ---------------------------------------------------------------------------------------------- | +| enabled | [2 要素認証](/articles/securing-your-account-with-two-factor-authentication-2fa)が有効になるときにトリガーされます。 | +| disabled | 2 要素認証が無効になるときにトリガーされます。 | -#### The `user` category +#### `user` カテゴリ -| Action | Description -|--------------------|--------------------- -| add_email | Triggered when you [add a new email address](/articles/changing-your-primary-email-address). -| create | Triggered when you create a new user account. -| remove_email | Triggered when you remove an email address. -| rename | Triggered when you rename your account. -| change_password | Triggered when you change your password. -| forgot_password | Triggered when you ask for [a password reset](/articles/how-can-i-reset-my-password). -| login | Triggered when you log in to {% data variables.product.product_location %}. -| failed_login | Triggered when you failed to log in successfully. -| two_factor_requested | Triggered when {% data variables.product.product_name %} asks you for [your two-factor authentication code](/articles/accessing-github-using-two-factor-authentication). -| show_private_contributions_count | Triggered when you [publicize private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile). +| アクション | 説明 | +| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| add_email | [新たなメール アドレスを追加する](/articles/changing-your-primary-email-address)ときにトリガーされます。 | +| create | 新たなユーザ アカウントを作成するときにトリガーされます。 | +| remove_email | メール アドレスを削除するときにトリガーされます。 | +| rename | 自分のアカウント名を変更するときにトリガーされます。 | +| change_password | 自分のパスワードを変更するときにトリガーされます。 | +| forgot_password | [パスワード のリセット](/articles/how-can-i-reset-my-password)を依頼するときにトリガーされます。 | +| login | {% data variables.product.product_location %} にログインするときにトリガーされます | +| failed_login | 正常にログインできなかったときにトリガーされます | +| two_factor_requested | {% data variables.product.product_name %} が[自分の 2 要素認証コード](/articles/accessing-github-using-two-factor-authentication)を要求するときにトリガーされます。 | +| show_private_contributions_count | [自分のプロフィールでプライベート コントリビューションを公開する](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)ときにトリガーされます。 | | hide_private_contributions_count | Triggered when you [hide private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile).{% if currentVersion == "free-pro-team@latest" %} -| report_content | Triggered when you [report an issue or pull request, or a comment on an issue, pull request, or commit](/articles/reporting-abuse-or-spam).{% endif %} +| report_content | [Issue または Pull Request、あるいは Issue、Pull Request、または Commit でのコメントを報告する](/articles/reporting-abuse-or-spam)ときにトリガーされます。{% endif %} -#### The `user_status` category +#### `user_status` カテゴリ -| Action | Description -|--------------------|--------------------- -| update | Triggered when you set or change the status on your profile. For more information, see "[Setting a status](/articles/personalizing-your-profile/#setting-a-status)." -| destroy | Triggered when you clear the status on your profile. +| アクション | 説明 | +| ------- | ------------------------------------------------------------------------------------------------------------------------- | +| update | 自分のプロファイルでステータスを設定または変更するときにトリガーされます。 詳細は「[ステータスを設定する](/articles/personalizing-your-profile/#setting-a-status)」を参照してください。 | +| destroy | 自分のプロファイルでステータスを消去するときにトリガーされます。 | {% if currentVersion == "free-pro-team@latest" %} -### Exporting your security log +### セキュリティログをエクスポートする {% data reusables.audit_log.export-log %} {% data reusables.audit_log.exported-log-keys-and-values %} diff --git a/translations/ja-JP/content/github/building-a-strong-community/adding-a-license-to-a-repository.md b/translations/ja-JP/content/github/building-a-strong-community/adding-a-license-to-a-repository.md index ed29754de4..b26e96b89c 100644 --- a/translations/ja-JP/content/github/building-a-strong-community/adding-a-license-to-a-repository.md +++ b/translations/ja-JP/content/github/building-a-strong-community/adding-a-license-to-a-repository.md @@ -32,7 +32,7 @@ versions: {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.files.add-file %} diff --git a/translations/ja-JP/content/github/building-a-strong-community/locking-conversations.md b/translations/ja-JP/content/github/building-a-strong-community/locking-conversations.md index 5e86b60383..2eb75c87d5 100644 --- a/translations/ja-JP/content/github/building-a-strong-community/locking-conversations.md +++ b/translations/ja-JP/content/github/building-a-strong-community/locking-conversations.md @@ -1,6 +1,6 @@ --- -title: Locking conversations -intro: 'Repository owners and collaborators, and people with write access to a repository, can lock conversations on issues, pull requests, and commits permanently or temporarily to defuse a heated interaction.' +title: 会話をロックする +intro: 'リポジトリのオーナーおよびコラボレーター、そしてリポジトリへの書き込みアクセスを持つユーザは、過熱した議論を和らげるために、Issue、プルリクエスト、およびコミットに関する会話を、恒久的または一時的にロックすることができます。' redirect_from: - /articles/locking-conversations versions: @@ -8,32 +8,28 @@ versions: enterprise-server: '*' --- -It's appropriate to lock a conversation when the entire conversation is not constructive or violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. When you lock a conversation, you can also specify a reason, which is publicly visible. +It's appropriate to lock a conversation when the entire conversation is not constructive or violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. 会話をロックするとき、理由を指定することもできます。これは誰にでも見ることができます。 -Locking a conversation creates a timeline event that is visible to anyone with read access to the repository. However, the username of the person who locked the conversation is only visible to people with write access to the repository. For anyone without write access, the timeline event is anonymized. +会話をロックすると、リポジトリに対する読み取りアクセスを持つユーザなら誰でも見ることのできるタイムラインイベントが作成されます。 ただし、会話をロックしたユーザの名前は、リポジトリへの書き込みアクセスを持つユーザにしか見えません。 書き込みアクセスを持たないユーザから見ると、タイムラインイベントは匿名化されています。 -![Anonymized timeline event for a locked conversation](/assets/images/help/issues/anonymized-timeline-entry-for-locked-conversation.png) +![ロックした会話について匿名化されたタイムラインイベント](/assets/images/help/issues/anonymized-timeline-entry-for-locked-conversation.png) -While a conversation is locked, only [people with write access](/articles/repository-permission-levels-for-an-organization/) and [repository owners and collaborators](/articles/permission-levels-for-a-user-account-repository/#collaborator-access-on-a-repository-owned-by-a-user-account) can add, hide, and delete comments. +会話がロックされている間も、[書き込みアクセスを持つユーザ](/articles/repository-permission-levels-for-an-organization/)と[リポジトリのオーナーおよびコラボレーター](/articles/permission-levels-for-a-user-account-repository/#collaborator-access-on-a-repository-owned-by-a-user-account)はコメントを追加または削除したり、非表示にしたりできます。 -To search for locked conversations in a repository that is not archived, you can use the search qualifiers `is:locked` and `archived:false`. Conversations are automatically locked in archived repositories. For more information, see "[Searching issues and pull requests](/articles/searching-issues-and-pull-requests#search-based-on-whether-a-conversation-is-locked)." +アーカイブされていないリポジトリでロックされた会話を検索するには、検索修飾子 `is:locked` および `archived:false` を使用できます。 会話はアーカイブされたリポジトリで自動的にロックされます。 詳細は「[Issue およびプルリクエストを検索する](/articles/searching-issues-and-pull-requests#search-based-on-whether-a-conversation-is-locked)」を参照してください。 -1. Optionally, write a comment explaining why you're locking the conversation. -2. In the right margin of the issue or pull request, or above the comment box on the commit page, click **Lock conversation**. -![Lock conversation link](/assets/images/help/repository/lock-conversation.png) -3. Optionally, choose a reason for locking the conversation. -![Reason for locking a conversation menu](/assets/images/help/repository/locking-conversation-reason-menu.png) -4. Read the information about locking conversations and click **Lock conversation on this issue**, **Lock conversation on this pull request**, or **Lock conversation on this commit**. -![Confirm lock with a reason dialog box](/assets/images/help/repository/lock-conversation-confirm-with-reason.png) -5. When you're ready to unlock the conversation, click **Unlock conversation**. -![Unlock conversation link](/assets/images/help/repository/unlock-conversation.png) +1. オプションで、会話をロックする理由を説明するコメントを書いてください。 +2. Issue またはプルリクエストの右マージン、またはコメント ページのコメント ボックスの上で、[**Lock conversation**] をクリックします。 ![[Lock conversation] リンク](/assets/images/help/repository/lock-conversation.png) +3. オプションで、会話をロックする理由を選択します。 ![会話をロックする理由のメニュー](/assets/images/help/repository/locking-conversation-reason-menu.png) +4. 会話のロックに関する情報を読み、[**Lock conversation on this issue**]、[**Lock conversation on this pull request**]、または [ **Lock conversation on this commit**] をクリックします。 ![ロックを確定するダイアログ ボックス](/assets/images/help/repository/lock-conversation-confirm-with-reason.png) +5. 会話のロックを解除できるようになったら、[**Unlock conversation**] をクリックします。 ![[Unlock conversation] リンク](/assets/images/help/repository/unlock-conversation.png) -### Further reading +### 参考リンク -- "[Setting up your project for healthy contributions](/articles/setting-up-your-project-for-healthy-contributions)" -- "[Using templates to encourage useful issues and pull requests](/github/building-a-strong-community/using-templates-to-encourage-useful-issues-and-pull-requests)" +- [健全なコントリビューションを促すプロジェクトをセットアップする](/articles/setting-up-your-project-for-healthy-contributions) +- 「[テンプレートを使用して便利な Issue およびプルリクエストを推進する](/github/building-a-strong-community/using-templates-to-encourage-useful-issues-and-pull-requests)」 - "[Managing disruptive comments](/articles/managing-disruptive-comments)"{% if currentVersion == "free-pro-team@latest" %} -- "[Maintaining your safety on {% data variables.product.prodname_dotcom %}](/github/building-a-strong-community/maintaining-your-safety-on-github)" -- "[Reporting abuse or spam](/articles/reporting-abuse-or-spam)" -- "[Limiting interactions in your repository](/github/building-a-strong-community/limiting-interactions-in-your-repository)" +- 「[{% data variables.product.prodname_dotcom %} での安全性を維持する](/github/building-a-strong-community/maintaining-your-safety-on-github)」 +- [悪用あるいはスパムのレポート](/articles/reporting-abuse-or-spam) +- 「[リポジトリでのインタラクションを制限する](/github/building-a-strong-community/limiting-interactions-in-your-repository)」 {% endif %} diff --git a/translations/ja-JP/content/github/building-a-strong-community/managing-disruptive-comments.md b/translations/ja-JP/content/github/building-a-strong-community/managing-disruptive-comments.md index 809825ccfb..13395dbb44 100644 --- a/translations/ja-JP/content/github/building-a-strong-community/managing-disruptive-comments.md +++ b/translations/ja-JP/content/github/building-a-strong-community/managing-disruptive-comments.md @@ -1,5 +1,5 @@ --- -title: Managing disruptive comments +title: 混乱を生むコメントを管理する intro: 'You can {% if currentVersion == "free-pro-team@latest" %}hide, edit,{% else %}edit{% endif %} or delete comments on issues, pull requests, and commits.' redirect_from: - /articles/editing-a-comment/ @@ -10,76 +10,69 @@ versions: enterprise-server: '*' --- -### Hiding a comment +### コメントを非表示にする -Anyone with write access to a repository can hide comments on issues, pull requests, and commits. +リポジトリに対する書き込み権限があるユーザは、Issue、プルリクエスト、 およびコミットに対するコメントを非表示にすることができます。 -If a comment is off-topic, outdated, or resolved, you may want to hide a comment to keep a discussion focused or make a pull request easier to navigate and review. Hidden comments are minimized but people with read access to the repository can expand them. +1 つのディスカッションに集中し、プルリクエストのナビゲーションとレビューがしやすいように、トピックから外れている、古い、または解決済みのコメントは非表示にすることができます。 非表示のコメントは最小化されますが、リポジトリに対する読み取りアクセスがあるユーザは展開することができます。 -![Minimized comment](/assets/images/help/repository/hidden-comment.png) +![最小化されたコメント](/assets/images/help/repository/hidden-comment.png) -1. Navigate to the comment you'd like to hide. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Hide**. - ![The horizontal kebab icon and comment moderation menu showing the edit, hide, delete options](/assets/images/help/repository/comment-menu.png) -3. Using the "Choose a reason" drop-down menu, click a reason to hide the comment. Then click, **Hide comment**. +1. 非表示にするコメントに移動します。 +2. コメントの右上隅にある {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} をクリックしてから、[**Hide**] をクリックします。 ![編集、非表示、削除のオプションが表示されている水平の kebab アイコンとコメント モデレーション メニュー](/assets/images/help/repository/comment-menu.png) +3. [Choose a reason] ドロップダウン メニューで、コメントを非表示にする理由をクリックします。 次に、[**Hide comment**] をクリックします。 {% if currentVersion == "free-pro-team@latest" %} - ![Choose reason for hiding comment drop-down menu](/assets/images/help/repository/choose-reason-for-hiding-comment.png) + ![[Choose reason for hiding comment] ドロップダウンメニュー](/assets/images/help/repository/choose-reason-for-hiding-comment.png) {% else %} - ![Choose reason for hiding comment drop-down menu](/assets/images/help/repository/choose-reason-for-hiding-comment-ghe.png) + ![[Choose reason for hiding comment] ドロップダウンメニュー](/assets/images/help/repository/choose-reason-for-hiding-comment-ghe.png) {% endif %} -### Unhiding a comment +### コメントを再表示する -Anyone with write access to a repository can unhide comments on issues, pull requests, and commits. +リポジトリに対する書き込み権限があるユーザは、Issue、プルリクエスト、 およびコミットに対するコメントを再表示することができます。 -1. Navigate to the comment you'd like to unhide. -2. In the upper-right corner of the comment, click **{% octicon "fold" aria-label="The fold icon" %} Show comment**. - ![Show comment text](/assets/images/help/repository/hidden-comment-show.png) -3. On the right side of the expanded comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then **Unhide**. - ![The horizontal kebab icon and comment moderation menu showing the edit, unhide, delete options](/assets/images/help/repository/comment-menu-hidden.png) +1. 再表示するコメントに移動します。 +2. コメントの右上隅にある [**{% octicon "fold" aria-label="The fold icon" %}Show comment**] をクリックします。 ![コメント テキストの表示](/assets/images/help/repository/hidden-comment-show.png) +3. 展開したコメントの右側にある {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}をクリックしてから、[**Unhide**] をクリックします。 ![編集、再表示、削除のオプションが表示されている水平の kebab アイコンとコメント モデレーションメニュー](/assets/images/help/repository/comment-menu-hidden.png) -### Editing a comment +### コメントを編集する -Anyone with write access to a repository can edit comments on issues, pull requests, and commits. +リポジトリに対する書き込み権限があるユーザは、Issue、プルリクエスト、およびコミットに対するコメントを編集することができます。 It's appropriate to edit a comment and remove content that doesn't contribute to the conversation and violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. -When you edit a comment, note the location that the content was removed from and optionally, the reason for removing it. +コメントを編集する際には、削除した内容があった元の場所がわかるように記録し、オプションで削除の理由を示します。 -Anyone with read access to a repository can view a comment's edit history. The **edited** dropdown at the top of the comment contains a history of edits showing the user and timestamp for each edit. +リポジトリの読み取りアクセスがあれば、誰でもコミットの編集履歴を見ることができます。 コメントの上部にある [**edited**] ドロップダウンには編集履歴があり、編集したユーザとタイムスタンプが表示されます。 -![Comment with added note that content was redacted](/assets/images/help/repository/content-redacted-comment.png) +![内容を削除編集したというメモを追加したコメント](/assets/images/help/repository/content-redacted-comment.png) -Comment authors and anyone with write access to a repository can also delete sensitive information from a comment's edit history. For more information, see "[Tracking changes in a comment](/github/building-a-strong-community/tracking-changes-in-a-comment)." +コメントの作者とリポジトリの書き込みアクセスがあるユーザは、コメントの編集履歴から機密情報を削除できます。 詳しい情報については、「[コメントの変更を追跡する](/github/building-a-strong-community/tracking-changes-in-a-comment)」を参照してください。 -1. Navigate to the comment you'd like to edit. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Edit**. - ![The horizontal kebab icon and comment moderation menu showing the edit, hide, delete, and report options](/assets/images/help/repository/comment-menu.png) -3. In the comment window, delete the content you'd like to remove, then type `[REDACTED]` to replace it. - ![Comment window with redacted content](/assets/images/help/issues/redacted-content-comment.png) -4. At the bottom of the comment, type a note indicating that you have edited the comment, and optionally, why you edited the comment. - ![Comment window with added note that content was redacted](/assets/images/help/issues/note-content-redacted-comment.png) -5. Click **Update comment**. +1. 編集したいコメントに移動します。 +2. コメントの右上隅にある {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} をクリックし、次に [**Edit**] をクリックします。 ![編集、非表示、削除、レポートのオプションが表示されている水平の kebab アイコンとコメント モデレーション メニュー](/assets/images/help/repository/comment-menu.png) +3. コメント ウィンドウで、問題のある部分を削除し、その場所に `[REDACTED]` と入力します。 ![内容を削除したコメント ウィンドウ](/assets/images/help/issues/redacted-content-comment.png) +4. コメントの下部に、コメントを編集したことを示すメモを入力し、オプションで編集した理由も入力します。 ![内容を削除したというメモを追加したコメント ウィンドウ](/assets/images/help/issues/note-content-redacted-comment.png) +5. [**Update comment**] をクリックします。 -### Deleting a comment +### コメントを削除する -Anyone with write access to a repository can delete comments on issues, pull requests, and commits. Organization owners, team maintainers, and the comment author can also delete a comment on a team page. +リポジトリに対する書き込み権限があるユーザは、Issue、プルリクエスト、 およびコミットに対するコメントを削除することができます。 Organization オーナー、チームメンテナ、コメント作成者は、チームのページのコメントを削除することもできます。 -Deleting a comment is your last resort as a moderator. It's appropriate to delete a comment if the entire comment adds no constructive content to a conversation and violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. +コメントの削除は、モデレーターとしての最終手段です。 It's appropriate to delete a comment if the entire comment adds no constructive content to a conversation and violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. -Deleting a comment creates a timeline event that is visible to anyone with read access to the repository. However, the username of the person who deleted the comment is only visible to people with write access to the repository. For anyone without write access, the timeline event is anonymized. +コメントを削除すると、リポジトリに対する読み取りアクセスを持つユーザなら誰でも見ることのできるタイムラインイベントが作成されます。 ただし、コメントを削除したユーザの名前は、リポジトリへの書き込みアクセスを持つユーザにしか見えません。 書き込みアクセスを持たないユーザから見ると、タイムラインイベントは匿名化されています。 -![Anonymized timeline event for a deleted comment](/assets/images/help/issues/anonymized-timeline-entry-for-deleted-comment.png) +![削除したコメントについて匿名化されたタイムラインイベント](/assets/images/help/issues/anonymized-timeline-entry-for-deleted-comment.png) -If a comment contains some constructive content that adds to the conversation in the issue or pull request, you can edit the comment instead. +Issue やプルリクエストで、会話に役立つ建設的な内容が部分的に含まれているコメントは、削除せず編集してください。 {% note %} -**Note:** The initial comment (or body) of an issue or pull request can't be deleted. Instead, you can edit issue and pull request bodies to remove unwanted content. +**メモ:** Issue またはプルリクエストの最初のコメント (本文) は削除できません。 かわりに、Issue やプルリクエストの本文を編集して、不要な内容を削除してください。 {% endnote %} -1. Navigate to the comment you'd like to delete. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Delete**. - ![The horizontal kebab icon and comment moderation menu showing the edit, hide, delete, and report options](/assets/images/help/repository/comment-menu.png) -3. Optionally, write a comment noting that you deleted a comment and why. +1. 削除したいコメントに移動します。 +2. コメントの右上隅にある {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} をクリックしてから、[**Delete**] をクリックします。 ![編集、非表示、削除、レポートのオプションが表示されている水平の kebab アイコンとコメント モデレーション メニュー](/assets/images/help/repository/comment-menu.png) +3. オプションで、コメントを削除したことを示すコメントとその理由を入力します。 diff --git a/translations/ja-JP/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md b/translations/ja-JP/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md index 0293158786..784a9eb0eb 100644 --- a/translations/ja-JP/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md +++ b/translations/ja-JP/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md @@ -28,7 +28,7 @@ assignees: octocat ``` {% note %} -**注釈:** YAML で予約済みの文字を `:` などの引用符で囲む必要があります。 たとえば、`":bug: Bug"` です。 +**Note:** If a front matter value includes a YAML-reserved character such as `:` , you must put the whole value in quotes. For example, `":bug: Bug"` or `":new: triage needed, :bug: bug"`. {% endnote %} diff --git a/translations/ja-JP/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md b/translations/ja-JP/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md index e3bfb0e46f..5194edf2a5 100644 --- a/translations/ja-JP/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md +++ b/translations/ja-JP/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md @@ -22,7 +22,7 @@ versions: ### プロフィールページからのユーザのブロックの解除 {% data reusables.profile.user_profile_page_navigation %} -2. 左サイドバーで、ユーザプロフィール画像の下にある [**Unblock or report user**] をクリックします。 ![ユーザリンクのブロックの解除または報告](/assets/images/help/profile/profile-unblock-or-report-user.png) +2. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Unblock or report user**. ![ユーザリンクのブロックの解除または報告](/assets/images/help/profile/profile-unblock-or-report-user.png) 3. [**Unblock user**] をクリックします。 ![ユーザのブロックの解除あるいは悪用のレポートの選択肢を持つモーダルボックス](/assets/images/help/profile/profile-unblockuser.png) {% tip %} diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md index 14b5d1902c..6067cf24d9 100644 --- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md +++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md @@ -53,6 +53,13 @@ You can see information about the branch's current deployment status and past de {% data reusables.pull_requests.mark-ready-review %} プルリクエストはいつでもドラフトに変換できます。 詳しい情報については、「[プルリクエストのステージの変更](/articles/changing-the-stage-of-a-pull-request)」を参照してください。 +### Differences between commits on compare and pull request pages + +The compare and pull request pages use different methods to calculate the diff for changed files: + +- Compare pages show the diff between the tip of the head ref and the current common ancestor (that is, the merge base) of the head and base ref. +- Pull request pages show the diff between the tip of the head ref and the common ancestor of the head and base ref at the time when the pull request was created. Consequently, the merge base used for the comparison might be different. + ### 参考リンク - {% data variables.product.prodname_dotcom %} 用語集中の[プルリクエスト](/articles/github-glossary/#pull-request) diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md index 1f234bccaa..a8fcd592de 100644 --- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md +++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md @@ -46,7 +46,7 @@ Organization オーナー、およびリポジトリにプッシュアクセス #### 個々のコミットに関するチェックのスキップとリクエスト -リポジトリがプッシュに対して自動的にチェックをリクエストするように設定されている場合、プッシュする個々のコミットについてチェックをスキップできます。 リポジトリがプッシュに対して自動的にチェックをリクエストするよう設定されて_いない_場合、プッシュする個々のコミットについてチェックをリクエストできます。 これらの設定についての詳しい情報は、「[チェックスイート](/rest/reference/checks#update-repository-preferences-for-check-suites)」を参照してください。 +リポジトリがプッシュに対して自動的にチェックをリクエストするように設定されている場合、プッシュする個々のコミットについてチェックをスキップできます。 リポジトリがプッシュに対して自動的にチェックをリクエストするよう設定されて_いない_場合、プッシュする個々のコミットについてチェックをリクエストできます。 For more information on these settings, see "[Check Suites](/rest/reference/checks#update-repository-preferences-for-check-suites)." コミットに対するチェックをスキップもしくはリクエストするには、以下の追加行のいずれかをコミットメッセージの末尾に追加します: diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md index 14a7f4cb9d..0a2def8bf6 100644 --- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md +++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md @@ -20,6 +20,12 @@ versions: 4. ベースブランチのドロップダウンメニューで、 [変更の比較対象](/github/committing-changes-to-your-project/comparing-commits#comparing-branches)にするベースブランチを選択します。 ![ベースブランチのドロップダウンメニュー ](/assets/images/help/pull_requests/pull-request-edit-base-branch.png) 5. ベースブランチの変更に関する情報を読み、[**Change base**] をクリックします。 ![ベースブランチの変更確認ボタン ](/assets/images/help/pull_requests/pull-request-base-branch-confirm.png) +{% tip %} + +**Tip:** When you open a pull request, {% data variables.product.product_name %} will set the base to the commit that branch references. If the branch is updated in the future, {% data variables.product.product_name %} will not update the base branch's commit. + +{% endtip %} + ### 参考リンク - [プルリクエストの作成](/articles/creating-a-pull-request) diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md index 95ca378e1e..01de983a0a 100644 --- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md +++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md @@ -1,6 +1,6 @@ --- -title: Collaborating on repositories with code quality features -intro: 'Workflow quality features like statuses, {% if currentVersion != "free-pro-team@latest" %}pre-receive hooks, {% endif %}protected branches, and required status checks help collaborators make contributions that meet conditions set by organization and repository administrators.' +title: コード品質保証機能を使ってリポジトリでコラボレーションする +intro: 'ステータス、{% if enterpriseServerVersions contains currentVersion %}pre-receive フック、{% endif %}保護されたブランチ、必須ステータスチェックなどの、ワークフローの品質保証機能は、コラボレーターが Organization やリポジトリの管理者が設定した条件に合うようにコントリビューションを行うために役立ちます。' mapTopic: true redirect_from: - /articles/collaborating-on-repositories-with-code-quality-features-enabled/ diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/index.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/index.md index b0162ca2fd..0b988f0522 100644 --- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/index.md +++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/index.md @@ -28,7 +28,7 @@ versions: {% link_in_list /what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility %} {% topic_link_in_list /collaborating-on-repositories-with-code-quality-features %} {% link_in_list /about-status-checks %} - + {% link_in_list /working-with-pre-receive-hooks %} {% topic_link_in_list /proposing-changes-to-your-work-with-pull-requests %} diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md index 1b9ed3f8d8..0cf80e9eb9 100644 --- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md +++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md @@ -1,6 +1,6 @@ --- -title: Resolving a merge conflict on GitHub -intro: 'You can resolve simple merge conflicts that involve competing line changes on GitHub, using the conflict editor.' +title: GitHub でのマージ コンフリクトを解決する +intro: 'コンフリクト エディターを使用すれば、GitHub で行の変更が競合している単純なマージ コンフリクトを解決できます。' redirect_from: - /articles/resolving-a-merge-conflict-on-github versions: @@ -8,56 +8,53 @@ versions: enterprise-server: '*' --- -You can only resolve merge conflicts on {% data variables.product.product_name %} that are caused by competing line changes, such as when people make different changes to the same line of the same file on different branches in your Git repository. For all other types of merge conflicts, you must resolve the conflict locally on the command line. For more information, see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line/)." +{% data variables.product.product_name %}で解決できるマージコンフリクトは、Git リポジトリの別々のブランチで、同じファイルの同じ行に異なる変更がなされた場合など、互いに矛盾する行変更を原因とするもののみです。 その他すべての種類のマージ コンフリクトについては、コマンド ラインでコンフリクトをローカルに解決する必要があります。 詳細は「[コマンド ラインを使用してマージコンフリクトを解決する](/articles/resolving-a-merge-conflict-using-the-command-line)」を参照してください。 -{% if currentVersion != "free-pro-team@latest" %} -If a site administrator disables the merge conflict editor for pull requests between repositories, you cannot use the conflict editor on {% data variables.product.product_name %} and must resolve merge conflicts on the command line. For example, if the merge conflict editor is disabled, you cannot use it on a pull request between a fork and upstream repository. +{% if enterpriseServerVersions contains currentVersion %} +If a site administrator disables the merge conflict editor for pull requests between repositories, you cannot use the conflict editor on +{% data variables.product.product_name %} and must resolve merge conflicts on the command line. たとえば、マージ コンフリクト エディターが無効な場合、フォークと上流リポジトリの間の Pull Request ではそれを使用できません。 {% endif %} {% warning %} {% if currentVersion ver_lt "enterprise-server@2.22" %} -**Warning:** When you resolve a merge conflict on {% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch), even if the head branch is the default branch of your repository or a protected branch. Make sure you really want to commit to this branch. +**Warning:** When you resolve a merge conflict on +{% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch), even if the head branch is the default branch of your repository or a protected branch. このブランチにコミットすることが間違いでないことを確認してください。 {% else %} -**Warning:** When you resolve a merge conflict on {% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch). Make sure you really want to commit to this branch. If the head branch is the default branch of your repository, you'll be given the option of creating a new branch to serve as the head branch for your pull request. If the head branch is protected you won't be able to merge your conflict resolution into it, so you'll be prompted to create a new head branch. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches)." +**Warning:** When you resolve a merge conflict on +{% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch). このブランチにコミットすることが間違いでないことを確認してください。 If the head branch is the default branch of your repository, you'll be given the option of creating a new branch to serve as the head branch for your pull request. head ブランチが保護されている場合、コンフリクトの解決をマージすることができないため、新しい head ブランチを作成するように求められます。 詳しい情報については[保護されたブランチについて](/github/administering-a-repository/about-protected-branches)を参照してください。 {% endif %} {% endwarning %} {% data reusables.repositories.sidebar-pr %} -1. In the "Pull Requests" list, click the pull request with a merge conflict that you'd like to resolve. -1. Near the bottom of your pull request, click **Resolve conflicts**. -![Resolve merge conflicts button](/assets/images/help/pull_requests/resolve-merge-conflicts-button.png) +1. [Pull Requests] リストで、解決するマージ コンフリクトを起こしている Pull Request をクリックします。 +1. 指定した Pull Request の下部周辺で、[**Resolve conflicts**] をクリックします。 ![[Resolve merge conflicts] ボタン](/assets/images/help/pull_requests/resolve-merge-conflicts-button.png) {% tip %} - **Tip:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line)." + **ヒント:** [**Resolve conflicts**] ボタンが作動しない場合、指定した Pull Request のマージ コンフリクトは {% data variables.product.product_name %} で解決するには複雑すぎ{% if enterpriseServerVersions contains currentVersion %} るか、サイトの管理者がリポジトリ間の Pull Request に対してコンフリクト エディターを無効にしてい{% endif %}ます。 別の Git クライアントを使用するか、コマンドラインで Git を使用して、マージのコンフリクトを解決する必要があります。 詳細は「[コマンド ラインを使用してマージコンフリクトを解決する](/articles/resolving-a-merge-conflict-using-the-command-line)」を参照してください。 {% endtip %} {% data reusables.pull_requests.decide-how-to-resolve-competing-line-change-merge-conflict %} - ![View merge conflict example with conflict markers](/assets/images/help/pull_requests/view-merge-conflict-with-markers.png) -1. If you have more than one merge conflict in your file, scroll down to the next set of conflict markers and repeat steps four and five to resolve your merge conflict. -1. Once you've resolved all the conflicts in the file, click **Mark as resolved**. - ![Click mark as resolved button](/assets/images/help/pull_requests/mark-as-resolved-button.png) -1. If you have more than one file with a conflict, select the next file you want to edit on the left side of the page under "conflicting files" and repeat steps four through seven until you've resolved all of your pull request's merge conflicts. - ![Select next conflicting file if applicable](/assets/images/help/pull_requests/resolve-merge-conflict-select-conflicting-file.png) -1. Once you've resolved all your merge conflicts, click **Commit merge**. This merges the entire base branch into your head branch. - ![Resolve merge conflicts button](/assets/images/help/pull_requests/merge-conflict-commit-changes.png){% if currentVersion ver_lt "enterprise-server@2.22" %} -1. If prompted, review the branch that you are committing to. If you want to commit to this branch, click **I understand, update _BRANCH_**. -![Merge conflict confirmation window](/assets/images/help/pull_requests/merge-conflict-confirmation.png){% else %} -1. If prompted, review the branch that you are committing to. + ![コンフリクトマーカー付きのマージコンフリクトの例を表示する](/assets/images/help/pull_requests/view-merge-conflict-with-markers.png) +1. ファイルに複数のマージ コンフリクトがある場合は、次の一連のコンフリクト マーカーまで下にスクロールし、ステップ 4 と 5 を繰り返してマージ コンフリクトを解決します。 +1. ファイル内のコンフリクトをすべて解決したら、[**Mark as resolved**] をクリックします。 ![[Mark as resolved] ボタンをクリックする](/assets/images/help/pull_requests/mark-as-resolved-button.png) +1. コンフリクトしているファイルが複数ある場合は、[conflicting files] の下のページの左側で編集する次のファイルを選択し、Pull Request のマージ コンフリクトをすべて解決するまでステップ 4 から 7 を繰り返します。 ![コンフリクトしている次のファイルを選択する（該当する場合）](/assets/images/help/pull_requests/resolve-merge-conflict-select-conflicting-file.png) +1. マージ コンフリクトをすべて解決したら、[**Commit merge**] をクリックします。 これにより、Base ブランチ全体が Head ブランチにマージされます。 ![Resolve merge conflicts button](/assets/images/help/pull_requests/merge-conflict-commit-changes.png){% if currentVersion ver_lt "enterprise-server@2.22" %} +1. プロンプトに従い、コミット先のブランチをレビューします。 このブランチにコミットする場合は [**I understand, update _BRANCH_**] をクリックします。 ![マージコンフリクト確認ウィンドウ](/assets/images/help/pull_requests/merge-conflict-confirmation.png){% else %} +1. プロンプトに従い、コミット先のブランチをレビューします。 - If the head branch is the default branch of the repository, you can choose either to update this branch with the changes you made to resolve the conflict, or to create a new branch and use this as the head branch of the pull request. - ![Prompt to review the branch that will be updated](/assets/images/help/pull_requests/conflict-resolution-merge-dialog-box.png) - - If you choose to create a new branch, enter a name for the branch. - - If the head branch of your pull request is protected you must create a new branch. You won't get the option to update the protected branch. - - Click **Create branch and update my pull request** or **I understand, continue updating _BRANCH_**. The button text corresponds to the action you are performing. + head ブランチがリポジトリのデフォルトブランチである場合、コンフリクトを解決するために加えた変更でこのブランチを更新するか、新しいブランチを作成してこれをプルリクエストのヘッドブランチとして使用するかを選択できます。 ![更新するブランチの確認を求める](/assets/images/help/pull_requests/conflict-resolution-merge-dialog-box.png) + + 新しいブランチを作成する場合は、ブランチの名前を入力します。 + + プルリクエストの head ブランチが保護されている場合は、新しいブランチを作成する必要があります。 保護されたブランチを更新するオプションはありません。 + + [**Create branch and update my pull request**] または [**I understand, continue updating _BRANCH_**] をクリックします。 ボタンテキストは、実行中のアクションに対応しています。 {% endif %} -1. To merge your pull request, click **Merge pull request**. For more information about other pull request merge options, see "[Merging a pull request](/articles/merging-a-pull-request/)." +1. Pull Request をマージするには、[**Merge pull request**] をクリックします。 Pull Request のマージ オプションの詳細については、「 [Pull Request をマージする](/articles/merging-a-pull-request/)」を参照してください。 -### Further reading +### 参考リンク -- "[About pull request merges](/articles/about-pull-request-merges)" +- [プルリクエストのマージについて](/articles/about-pull-request-merges) diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md index 295720604d..5ae5f6172d 100644 --- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md +++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md @@ -20,16 +20,16 @@ versions: > remote: Total 62 (delta 27), reused 44 (delta 9) > Unpacking objects: 100% (62/62), done. > From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY - > * [new branch] master -> upstream/master + > * [new branch] main -> upstream/main ``` -4. フォークのローカル `master` ブランチをチェックアウトします。 +4. Check out your fork's local `main` branch. ```shell - $ git checkout master - > Switched to branch 'master' + $ git checkout main + > Switched to branch 'main' ``` -5. `upstream/master` からローカル `master` ブランチに変更をマージします。 これによって、ローカルの変更を失うことなく、フォークの `master` ブランチを上流リポジトリと同期します。 +5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes. ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating a422352..5fdff0f > Fast-forward > README | 9 ------- @@ -39,7 +39,7 @@ versions: > create mode 100644 README.md ``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward": ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating 34e91da..16c56ad > Fast-forward > README.md | 5 +++-- diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index f84a7f9116..a61ea9653d 100644 --- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -29,7 +29,7 @@ versions: 言い換えれば、パブリックリポジトリのフォークは、親リポジトリが非公開にされた後も、独自の別のリポジトリネットワークで公開されたままになります。 これにより、フォークオーナーは作業を中断せずに作業を継続できます。 このようにパブリックフォークが別のネットワークに移動されなかった場合、それらのフォークのオーナーは適切な[アクセス許可](/articles/access-permissions-on-github)を取得してプルする必要があります。 以前はこれらのアクセス権が必要ではなかったとしても、(現在はプライベートになっている) 親リポジトリからの変更を取得して送信します。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} パブリックリポジトリで匿名の Git 読み取りアクセスが有効になっていて、そのリポジトリが非公開になっている場合、リポジトリのすべてのフォークは匿名の Git 読み取りアクセスを失い、デフォルトの無効設定に戻ります。 分岐したリポジトリが公開された場合、リポジトリ管理者は匿名の Git 読み取りアクセスを再度有効にすることができます。 詳細は「[リポジトリに対する匿名 Git 読み取りアクセスを有効化する](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)」を参照してください。 {% endif %} diff --git a/translations/ja-JP/content/github/committing-changes-to-your-project/changing-a-commit-message.md b/translations/ja-JP/content/github/committing-changes-to-your-project/changing-a-commit-message.md index a0e31b2609..92c98b362d 100644 --- a/translations/ja-JP/content/github/committing-changes-to-your-project/changing-a-commit-message.md +++ b/translations/ja-JP/content/github/committing-changes-to-your-project/changing-a-commit-message.md @@ -13,11 +13,11 @@ versions: `git commit --amend` コマンドで、直近のコミットメッセージを変更できます。 -Git では、コミットメッセージのテキストはコミットの一部として扱われます。 コミットメッセージを変更すると、コミット ID (コミットの SHA1 チェックサム) も変更されます。 実質的には、古いコミットに代わる新しいコミットを作成することになります。 +In Git, the text of the commit message is part of the commit. Changing the commit message will change the commit ID--i.e., the SHA1 checksum that names the commit. Effectively, you are creating a new commit that replaces the old one. -### オンラインにプッシュされていないコミット +### Commit has not been pushed online -コミットがローカルリポジトリにのみ存在し、{% data variables.product.product_location %}にプッシュされていない場合、`git commit --amend` コマンドでコミットメッセージを修正できます。 +If the commit only exists in your local repository and has not been pushed to {% data variables.product.product_location %}, you can amend the commit message with the `git commit --amend` command. 1. コマンドラインで、修正したいコミットのあるリポジトリに移動します。 2. `git commit --amend` と入力し、**Enter** を押します。 @@ -31,17 +31,17 @@ Git では、コミットメッセージのテキストはコミットの一部 {% tip %} -Git で使うデフォルトのテキストエディタは、`core.editor` の設定で変更できます。 詳しい情報については、Git のマニュアルにある「[基本クライアント設定](https://git-scm.com/book/en/Customizing-Git-Git-Configuration#_basic_client_configuration)」を参照してください。 +You can change the default text editor for Git by changing the `core.editor` setting. For more information, see "[Basic Client Configuration](https://git-scm.com/book/en/Customizing-Git-Git-Configuration#_basic_client_configuration)" in the Git manual. {% endtip %} -### 古いまたは複数のコミットメッセージの修正 +### Amending older or multiple commit messages -すでにコミットを {% data variables.product.product_location %}にプッシュしている場合、修正済みのメッセージでコミットをフォースプッシュする必要があります。 +If you have already pushed the commit to {% data variables.product.product_location %}, you will have to force push a commit with an amended message. {% warning %} -リポジトリの履歴が変更されるため、フォースプッシュは推奨されません。 フォースプッシュを行った場合、リポジトリをすでにクローンした人はローカルの履歴を手動で修正する必要があります。 詳しい情報については、Git のマニュアルにある「[上流リベースからのリカバリ](https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase)」を参照してください。 +We strongly discourage force pushing, since this changes the history of your repository. If you force push, people who have already cloned your repository will have to manually fix their local history. For more information, see "[Recovering from upstream rebase](https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase)" in the Git manual. {% endwarning %} @@ -55,7 +55,7 @@ Git で使うデフォルトのテキストエディタは、`core.editor` の **Changing the message of older or multiple commit messages** -複数のコミットまたは古いコミットの、メッセージを修正する必要がある場合は、インタラクティブなリベースを利用した後にフォースプッシュして、コミットの履歴を変更できます。 +If you need to amend the message for multiple commits or an older commit, you can use interactive rebase, then force push to change the commit history. 1. コマンドラインで、修正したいコミットのあるリポジトリに移動します。 2. `git rebase -i HEAD~n` コマンドで、デフォルトのテキストエディタに直近 `n` コミットの一覧を表示できます。 @@ -102,17 +102,17 @@ Git で使うデフォルトのテキストエディタは、`core.editor` の $ git push --force example-branch ``` -インタラクティブリベースに関する詳しい情報については、Git のマニュアルにある「[インタラクティブモード](https://git-scm.com/docs/git-rebase#_interactive_mode)」を参照してください。 +For more information on interactive rebase, see "[Interactive mode](https://git-scm.com/docs/git-rebase#_interactive_mode)" in the Git manual. {% tip %} -この方法でも、コミットメッセージを修正すると、ID が新しい新たなコミットメッセージが作成されます。 ただしこの方法では、修正したコミットに続く各コミットも新しい ID を取得します。各コミットには、親の ID が含まれているためです。 +As before, amending the commit message will result in a new commit with a new ID. However, in this case, every commit that follows the amended commit will also get a new ID because each commit also contains the id of its parent. {% endtip %} {% warning %} -修正したコミットをフォースプッシュしても元のコミットは {% data variables.product.product_name %}から削除されない場合がありますので、元のコミットメッセージに機密情報が含まれている場合は注意してください。 古いコミットは、以降のクローンには含まれませんが、{% data variables.product.product_name %}にキャッシュされ、コミット ID でアクセスできます。 リモートリポジトリから古いコミットメッセージをパージするには、古いコミット ID を添えて {% data variables.contact.contact_support %}にお問い合わせください。 +If you have included sensitive information in a commit message, force pushing a commit with an amended commit may not remove the original commit from {% data variables.product.product_name %}. The old commit will not be a part of a subsequent clone; however, it may still be cached on {% data variables.product.product_name %} and accessible via the commit ID. You must contact {% data variables.contact.contact_support %} with the old commit ID to have it purged from the remote repository. {% endwarning %} diff --git a/translations/ja-JP/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md b/translations/ja-JP/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md index 079e81663f..1542f5186c 100644 --- a/translations/ja-JP/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md +++ b/translations/ja-JP/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md @@ -1,6 +1,6 @@ --- -title: Creating a commit with multiple authors -intro: 'You can attribute a commit to more than one author by adding one or more `Co-authored-by` trailers to the commit''s message. Co-authored commits are visible on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} and can be included in the profile contributions graph and the repository''s statistics{% endif %}.' +title: 複数の作者を持つコミットを作成する +intro: 'コミットのメッセージに、1 つ以上の "Co-authored-by" トレーラーを追加することで、1 つのコミットに複数の作者を追加できます。 共作されたコミットは {% data variables.product.product_name %}{% if enterpriseServerVersions contains currentVersion %} で表示され、プロフィールコントリビューショングラフとリポジトリの統計に含めることができます。{% endif %}' redirect_from: - /articles/creating-a-commit-with-multiple-authors versions: @@ -8,41 +8,41 @@ versions: enterprise-server: '*' --- -### Required co-author information +### 必要な共作者情報 -Before you can add a co-author to a commit, you must know the appropriate email to use for each co-author. For the co-author's commit to count as a contribution, you must use the email associated with their {% data variables.product.product_name %} account. +コミットに共作者を追加する前に、各共作者に使う適切なメールアドレスを知っておく必要があります。 共作者のコミットがコントリビューションとしてカウントされるためには、{% data variables.product.product_name %} アカウントに関連付けられているメールアドレスを使う必要があります。 {% if currentVersion == "free-pro-team@latest" %} -If a person chooses to keep their email address private, you should use their {% data variables.product.product_name %}-provided `no-reply` email to protect their privacy. Otherwise, the co-author's email will be available to the public in the commit message. If you want to keep your email private, you can choose to use a {% data variables.product.product_name %}-provided `no-reply` email for Git operations and ask other co-authors to list your `no-reply` email in commit trailers. +メールアドレスをプライベートにしておきたい人がいる場合、その人のプライバシーを保護するために、{% data variables.product.product_name %} が提供する `no-reply` メールを使わなければなりません。 そうしない場合、コミットメッセージで共作者のメールアドレスが公開されます。 自分のメールアドレスをプライベートにしておきたい場合、Git の操作のために {% data variables.product.product_name %} が提供する `no-reply` メールアドレスを使い、他の共作者に、`no-reply` メールアドレスをコミットのトレーラーに載せるよう依頼できます。 -For more information, see "[Setting your commit email address](/articles/setting-your-commit-email-address)." +詳細は「[コミットメールアドレスを設定する](/articles/setting-your-commit-email-address)」を参照してください。 {% tip %} - **Tip:** You can help a co-author find their preferred email address by sharing this information: - - To find your {% data variables.product.product_name %}-provided `no-reply` email, navigate to your email settings page under "Keep my email address private." - - To find the email you used to configure Git on your computer, run `git config user.email` on the command line. + **ヒント:** 以下の情報を伝えることで、共作者が好みのメールアドレスを見つける手助けができます: + - {% data variables.product.product_name %} が提供する `no-reply` メールアドレスを表示するには、[Keep my email address private] のメールアドレス設定に移動します。 + - Git を設定するためのメールアドレスを手元のコンピュータで表示するには、コマンドラインで `git config user.email` を実行します。 {% endtip %} {% endif %} -### Creating co-authored commits using {% data variables.product.prodname_desktop %} +### {% data variables.product.prodname_desktop %} で co-authored コミットを作成する -You can use {% data variables.product.prodname_desktop %} to create a commit with a co-author. For more information, see "[Write a commit message and push your changes](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)" and [{% data variables.product.prodname_desktop %}](https://desktop.github.com). +{% data variables.product.prodname_desktop %} で、共作者を持つコミットを作成できます。 詳細は「[コミットメッセージの入力と変更のプッシュ](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)」および [{% data variables.product.prodname_desktop %}](https://desktop.github.com) を参照してください。 -![Add a co-author to the commit message](/assets/images/help/desktop/co-authors-demo-hq.gif) +![コミットメッセージに共作者を追加](/assets/images/help/desktop/co-authors-demo-hq.gif) -### Creating co-authored commits on the command line +### コマンドライン上で co-authored コミットを作成する {% data reusables.pull_requests.collect-co-author-commit-git-config-info %} {% data reusables.pull_requests.commit-message-with-trailer-beginning %} -3. On the next line of the commit message, type `Co-authored-by: name ` with specific information for each co-author. After the co-author information, add a closing quotation mark. +3. コミットメッセージの次の行に、各共作者の情報を `Co-authored-by: name ` という形式で入力します。 共同作者の情報の後に、閉じる引用符を追加します。 - If you're adding multiple co-authors, give each co-author their own line and `Co-authored-by:` commit trailer. + 複数の共作者を追加する場合は、共作者それぞれに 1 行をとり、`Co-authored-by:` コミットトレーラーを付けてください。 ```shell $ git commit -m "Refactor usability tests. > @@ -51,27 +51,26 @@ You can use {% data variables.product.prodname_desktop %} to create a commit wit Co-authored-by: another-name <another-name@example.com>" ``` -The new commit and message will appear on {% data variables.product.product_location %} the next time you push. For more information, see "[Pushing changes to a remote repository](/articles/pushing-commits-to-a-remote-repository/)." +次回のプッシュ時に、{% data variables.product.product_location %}に新たなコミットとメッセージが表示されます。 詳細は「[リモートリポジトリに変更をプッシュする](/articles/pushing-commits-to-a-remote-repository/)」を参照してください。 -### Creating co-authored commits on {% data variables.product.product_name %} +### {% data variables.product.product_name %} で co-authored コミットを作成する -After you've made changes in a file using the web editor on {% data variables.product.product_name %}, you can create a co-authored commit by adding a `Co-authored-by:` trailer to the commit's message. +{% data variables.product.product_name %} のウェブエディタでファイルを変更してから、コミットのメッセージに `Co-authored-by:` トレーラーを追加することで、co-authored コミットを作成できます。 {% data reusables.pull_requests.collect-co-author-commit-git-config-info %} -2. After making your changes together, at the bottom of the page, type a short, meaningful commit message that describes the changes you made. - ![Commit message for your change](/assets/images/help/repository/write-commit-message-quick-pull.png) -3. In the text box below your commit message, add `Co-authored-by: name ` with specific information for each co-author. If you're adding multiple co-authors, give each co-author their own line and `Co-authored-by:` commit trailer. +2. 共同で変更を行った後は、ページの下部に、変更について説明する、短くて意味のあるコミットメッセージを入力します。 ![変更のコミットメッセージ](/assets/images/help/repository/write-commit-message-quick-pull.png) +3. コミットメッセージの下にあるテキストボックスに、各共同作者の情報を `Co-authored-by: name ` という形式で入力します。 複数の共作者を追加する場合は、共作者それぞれに 1 行をとり、`Co-authored-by:` コミットトレーラーを付けてください。 - ![Commit message co-author trailer example in second commit message text box](/assets/images/help/repository/write-commit-message-co-author-trailer.png) -4. Click **Commit changes** or **Propose changes**. + ![2 つ目のコミットメッセージテキストボックスにある、コミットメッセージの共同作者トレーラー例](/assets/images/help/repository/write-commit-message-co-author-trailer.png) +4. [**Commit changes**] または [**Propose changes**] をクリックします。 -The new commit and message will appear on {% data variables.product.product_location %}. +{% data variables.product.product_location %} に新たなコミットとメッセージが表示されます。 -### Further reading -{% if currentVersion != "free-pro-team@latest" %} -- "[Viewing contributions on your profile](/articles/viewing-contributions-on-your-profile)" -- "[Why are my contributions not showing up on my profile?](/articles/why-are-my-contributions-not-showing-up-on-my-profile)"{% endif %} -- "[Viewing a summary of repository activity](/articles/viewing-a-summary-of-repository-activity)" -- "[Viewing a project's contributors](/articles/viewing-a-projects-contributors)" -- "[Changing a commit message](/articles/changing-a-commit-message)" -- "[Committing and reviewing changes to your project](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)" in the {% data variables.product.prodname_desktop %} documentation +### 参考リンク +{% if enterpriseServerVersions contains currentVersion %} +- [プロフィール上でのコントリビューションの表示](/articles/viewing-contributions-on-your-profile) +- [プロフィール上でコントリビューションが表示されない理由](/articles/why-are-my-contributions-not-showing-up-on-my-profile){% endif %} +- [リポジトリアクティビティの概要を表示する](/articles/viewing-a-summary-of-repository-activity) +- [プロジェクトのコントリビューターを表示する](/articles/viewing-a-projects-contributors) +- [コミットメッセージの変更](/articles/changing-a-commit-message) +- {% data variables.product.prodname_desktop %} ドキュメンテーションの「[プロジェクトへの変更をコミットまたはレビューする](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)」 diff --git a/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md b/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md index d8c3f2ea37..b13b08434e 100644 --- a/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md +++ b/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md @@ -1,35 +1,36 @@ --- -title: About repository visibility +title: リポジトリの可視性について intro: 'You can restrict who has access to a repository by choosing a repository''s visibility: {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}public, internal, or private{% else %} public or private{% endif %}.' versions: free-pro-team: '*' enterprise-server: '*' --- -### About repository visibility +### リポジトリの可視性について -When you create a repository, you can choose to make the repository public or private. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you're creating the repository in an organization{% if currentVersion == "free-pro-team@latest" %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %} +リポジトリを作成するときに、リポジトリをパブリックにするかプライベートにするかを選択できます。 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you're creating the repository in an organization{% if currentVersion == "free-pro-team@latest" %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %} -{% if currentVersion != "free-pro-team@latest" %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if currentVersion != "free-pro-team@latest" %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to {% if currentVersion == "free-pro-team@latest" %}members of your enterprise account{% else %}members of any organization on your instance{% endif %}. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} +{% if enterpriseServerVersions contains currentVersion %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if enterpriseServerVersions contains currentVersion %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to members of your enterprise. 詳しい情報については、「[内部リポジトリについて](#about-internal-repositories)」を参照してください。{% endif %} -Organization owners always have access to every repository created in an organization. For more information, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +Organization のオーナーは、Organization 内で作成されたすべてのリポジトリにいつでもアクセスできます。 詳細は「[Organization のリポジトリ権限レベル](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)」を参照してください。 -People with admin permissions for a repository can change an existing repository's visibility. For more information, see "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)." +リポジトリの管理者権限を持つユーザは、既存のリポジトリの可視性を変更できます。 詳細は「[リポジトリの可視性を設定する](/github/administering-a-repository/setting-repository-visibility)」を参照してください。 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -### About internal repositories +### インターナルリポジトリについて {% note %} -**Note:** {% data reusables.gated-features.internal-repos %} +**メモ:** {% data reusables.gated-features.internal-repos %} {% endnote %} -{% data reusables.repositories.about-internal-repos %} For more information on innersource, see {% data variables.product.prodname_dotcom %}'s whitepaper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." +{% data reusables.repositories.about-internal-repos %}インナーソースに関する詳しい情報については、{% data variables.product.prodname_dotcom %}のホワイトペーパー「[インナーソース入門](https://resources.github.com/whitepapers/introduction-to-innersource/)」を参照してください。 All {% if currentVersion == "free-pro-team@latest" %}enterprise members{% else %}organization members{% endif %} have read permissions to the internal repository, but internal repositories are not visible to people {% if currentVersion == "free-pro-team@latest" %}outside of the enterprise account{% else %}who are not members of an organization{% endif %}, including outside collaborators on organization repositories. For more information, see {% if currentVersion == "free-pro-team@latest" %}"[Roles for an enterprise account](/articles/roles-for-an-enterprise-account#enterprise-members)" and {% endif %}"[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)." {% data reusables.repositories.internal-repo-default %} +ユーザが -If a user is removed from {% if currentVersion == "free-pro-team@latest" %}an enterprise account{% else %}all organizations on the instance{% endif %}, that user's forks of internal repositories are removed automatically. +{% if currentVersion == "free-pro-team@latest" %}an enterprise account{% else %}all organizations on the instance{% endif %}, that user's forks of internal repositories are removed automatically. {% endif %} diff --git a/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md b/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md index 5364873fbe..5bc1d72cf7 100644 --- a/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md +++ b/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md @@ -1,41 +1,43 @@ --- -title: Backing up a repository -intro: 'You can use{% if currentVersion != "free-pro-team@latest" %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' +title: リポジトリのバックアップ +intro: 'You can use{% if enterpriseServerVersions contains currentVersion %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' redirect_from: - /articles/backing-up-a-repository versions: free-pro-team: '*' enterprise-server: '*' --- + {% if currentVersion == "free-pro-team@latest" %} -To download an archive of your repository, you can use the API for user or organization migrations. For more information, see "[Migrations](/v3/migrations/)." +リポジトリのアーカイブをダウンロードするには、ユーザあるいは Organization のマイグレーション用の API が利用できます。 詳しい情報については、「[移行](/v3/migrations/)」を参照してください。 {% else %} -You can download and back up your repositories manually: +リポジトリのダウンロードおよびバックアップを手動で実行できます。 -- To download a repository's Git data to your local machine, you'll need to clone the repository. For more information, see "[Cloning a repository](/articles/cloning-a-repository)." -- You can also download your repository's wiki. For more information, see "[Adding or editing wiki pages](/articles/adding-or-editing-wiki-pages)." +- リポジトリの Git データをローカルマシンにダウンロードするには、リポジトリをクローンする必要があります。 詳しい情報については[リポジトリのクローン](/articles/cloning-a-repository)を参照してください。 +- また、リポジトリの wiki をダウンロードすることもできます。 詳細は「[ウィキページを追加または編集する](/articles/adding-or-editing-wiki-pages)」を参照してください。 -When you clone a repository or wiki, only Git data, such as project files and commit history, is downloaded. You can use our API to export other elements of your {% data variables.product.product_name %} repository to your local machine: +リポジトリもしくは wiki をクローンすると、プロジェクトのファイルやコミット履歴などの Git のデータだけがダウンロードされます。 {% data variables.product.product_name %}リポジトリの他の要素をローカルマシンにエクスポートするには、弊社の API が利用できます。 -- [Issues](/v3/issues/#list-issues-for-a-repository) -- [Pull requests](/v3/pulls/#list-pull-requests) -- [Forks](/rest/reference/repos#list-forks) -- [Comments](/rest/reference/issues#list-issue-comments-for-a-repository) -- [Milestones](/rest/reference/issues#list-milestones) -- [Labels](/rest/reference/issues#list-labels-for-a-repository) -- [Watchers](/rest/reference/activity#list-watchers) -- [Stargazers](/rest/reference/activity#list-stargazers) -- [Projects](/v3/projects/#list-repository-projects) +- [問題](/v3/issues/#list-issues-for-a-repository) +- [プルリクエスト](/v3/pulls/#list-pull-requests) +- [フォーク](/rest/reference/repos#list-forks) +- [コメント](/rest/reference/issues#list-issue-comments-for-a-repository) +- [マイルストーン](/rest/reference/issues#list-milestones) +- [ラベル](/rest/reference/issues#list-labels-for-a-repository) +- [Watcher](/rest/reference/activity#list-watchers) +- [Starを付けたユーザ](/rest/reference/activity#list-stargazers) +- [プロジェクト](/v3/projects/#list-repository-projects) {% endif %} -Once you have {% if currentVersion != "free-pro-team@latest" %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). +{% if enterpriseServerVersions contains currentVersion %}バックアップしたいすべての内容のローカルバージョンができたなら、zipアーカイブを作成して{% else %}アーカイブがダウンロードできたなら{% endif %}外部ハードディスクにコピーするか、[Google Drive](https://www.google.com/drive/)あるいは[ Dropbox](https://www.dropbox.com/)などのクラウドベースのバックアップサービスにアップロードしてください。 {% if currentVersion == "free-pro-team@latest" %} -### Third-party backup tools +### サードパーティのバックアップツール -A number of self-service tools exist that automate backups of repositories. Unlike archival projects, which archive _all_ public repositories on {% data variables.product.product_name %} that have not opted out and make the data accessible to anyone, backup tools will download data from _specific_ repositories and organize it within a new branch or directory. For more information about archival projects, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)." +リポジトリのバックアップを自動化するセルフサービスのツールはたくさんあります。 オプトアウトしておらず、誰でもデータにアクセスできるようにする {% data variables.product.product_name %} 上の_すべての_パブリックリポジトリをアーカイブするアーカイブプロジェクトとは異なり、バックアップツールは_特定の_リポジトリからデータをダウンロードし、新しいブランチまたはディレクトリ内に整理します。 アーカイブプロジェクトの詳細については、「[{% data variables.product.prodname_dotcom %} のコンテンツとデータのアーカイブについて](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)」を参照してください。 +You can back up all of a repository's Git data (such as project files and commit history), as well as much data from -You can back up all of a repository's Git data (such as project files and commit history), as well as much data from {% data variables.product.product_name %} (such as issues and pull requests), with [BackHub](https://github.com/marketplace/backhub), which creates daily recurring backups of your repositories with snapshots up to 30 days back in time. BackHub is available in {% data variables.product.prodname_marketplace %}. +{% data variables.product.product_name %} (such as issues and pull requests), with [BackHub](https://github.com/marketplace/backhub), which creates daily recurring backups of your repositories with snapshots up to 30 days back in time. BackHub は {% data variables.product.prodname_marketplace %}から利用できます。 {% endif %} diff --git a/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md b/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md index 985918901d..a00c7f8782 100644 --- a/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md +++ b/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md @@ -1,6 +1,7 @@ --- -title: Creating a template repository +title: テンプレートリポジトリを作成する intro: 'You can make an existing repository a template, so you and others can generate new repositories with the same directory structure{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}, branches,{% endif %} and files.' +permissions: 'リポジトリに対する管理者権限があるユーザなら誰でも、リポジトリをテンプレート化できます。' redirect_from: - /articles/creating-a-template-repository versions: @@ -8,13 +9,16 @@ versions: enterprise-server: '*' --- -Anyone with admin permissions to a repository can make the repository a template. +{% note %} -To create a template repository, you must create a repository, then make the repository a template. For more information about creating a repository, see "[Creating a new repository](/articles/creating-a-new-repository)." +**Note**: Your template repository cannot include files stored using {% data variables.large_files.product_name_short %}. + +{% endnote %} + +テンプレートリポジトリを作成するには、リポジトリを作成して、そのリポジトリをテンプレート化する必要があります。 リポジトリの作成に関する詳細は「[新しいリポジトリの作成](/articles/creating-a-new-repository)」を参照してください。 After you make your repository a template, anyone with access to the repository can generate a new repository with the same directory structure and files as your default branch.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} They can also choose to include all the other branches in your repository.{% endif %} For more information, see "[Creating a repository from a template](/articles/creating-a-repository-from-a-template)." {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -3. Select **Template repository**. - ![Checkbox to make a repository a template](/assets/images/help/repository/template-repository-checkbox.png) +1. [**Template repository**] を選択します。 ![リポジトリをテンプレート化するチェックボックス](/assets/images/help/repository/template-repository-checkbox.png) diff --git a/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md b/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md index 6456ff9d86..f39f2c4e73 100644 --- a/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md +++ b/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md @@ -42,7 +42,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} 詳細は「[GitHub アカウントに新しい GPG キーを追加する](/articles/adding-a-new-gpg-key-to-your-github-account)」を参照してください。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### インスタンスがプライベートモードであるかを確認する diff --git a/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md b/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md index 17e6fd50bd..6d201646b6 100644 --- a/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md +++ b/translations/ja-JP/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md @@ -70,7 +70,7 @@ $ git remote -v {% tip %} -**ヒント**: リモートリポジトリを操作するときの毎回の認証情報の入力を省くには、[認証情報のキャッシュ](/github/using-git/caching-your-github-credentials-in-git)をオンにします。 +**ヒント**: リモートリポジトリを操作するときの毎回の認証情報の入力を省くには、[認証情報のキャッシュ](/github/using-git/caching-your-github-credentials-in-git)をオンにします。 If you are already using credential caching, please make sure that your computer has the correct credentials cached. Incorrect or out of date credentials will cause authentication to fail. {% endtip %} diff --git a/translations/ja-JP/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md b/translations/ja-JP/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md index 33eb38558c..9e9b899aec 100644 --- a/translations/ja-JP/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md +++ b/translations/ja-JP/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md @@ -10,7 +10,7 @@ versions: ### エディタツール -ワークフローをスムーズにするために、Atom、Unity、Visual Studioといったサードパーティのエディタツール内から {% data variables.product.product_name %} リポジトリに接続できます。 +You can connect to {% data variables.product.product_name %} repositories within third-party editor tools, such as Atom, Unity, and Visual Studio. #### {% data variables.product.product_name %} for Atom @@ -30,8 +30,12 @@ versions: ### プロジェクト管理ツール -ワークフローをスムーズにするために、{% data variables.product.product_name %} 個人アカウントや Organization を、Jira などのサードパーティーのプロジェクト管理ツールと統合できます。 +You can integrate your {% data variables.product.product_name %} personal account or organization with third-party project management tools, such as Jira or Slack. #### Jira Cloud と {% data variables.product.product_name %}.com の統合 -Jira Cloud を個人または Organization のアカウントに統合すると、コミットとプルリクエストをスキャンし、メンションされている JIRA の Issue で、関連するメタデータとハイパーリンクを作成できます。 +Jira Cloud を個人または Organization のアカウントに統合すると、コミットとプルリクエストをスキャンし、メンションされている JIRA の Issue で、関連するメタデータとハイパーリンクを作成できます。 For more information, visit the [Jira integration app](https://github.com/marketplace/jira-software-github) in the marketplace. + +#### Slack and {% data variables.product.product_name %} integration + +You can integrate Slack with your personal or organization account to subscribe for notifications, close or open issues, and provide rich references to issues and pull requests without leaving Slack. For more information, visit the [Slack integration app](https://github.com/marketplace/slack-github) in the marketplace. diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md index df5c583f1b..d99eca5f7e 100644 --- a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md @@ -22,5 +22,5 @@ You can use {% data variables.product.prodname_code_scanning %} webhooks to buil ### 参考リンク * "[About code scanning](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" -* "[Configuring code scanning in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning-in-your-ci-system)" +* "[Using {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} with your existing CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/using-codeql-code-scanning-with-your-existing-ci-system)" * "[SARIF support for code scanning](/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning)" diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md index af2300e7a3..0cc08d5b3c 100644 --- a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md @@ -48,7 +48,7 @@ By default, the {% data variables.product.prodname_codeql_workflow %} uses the ` #### Scanning pull requests -The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on the `HEAD` commit of a pull request against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} +The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on pull requests targeted against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} For more information about the `pull_request` event, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags)." @@ -150,8 +150,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - with: - fetch-depth: 2 - name: Set up Python uses: actions/setup-python@v2 with: @@ -165,8 +163,6 @@ jobs: # Set the `CODEQL-PYTHON` environment variable to the Python executable # that includes the dependencies echo "::set-env name=CODEQL_PYTHON::$(which python)" - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md index f4cabb2462..897fc3a74f 100644 --- a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md @@ -42,7 +42,7 @@ You decide how you generate {% data variables.product.prodname_code_scanning %} ![Choose where to commit](/assets/images/help/repository/start-commit-choose-where-to-commit.png) 8. Click **Commit new file** or **Propose new file**. -In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch or any protected branches. As a result, {% data variables.product.prodname_code_scanning %} will now commence. +In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch. As a result, {% data variables.product.prodname_code_scanning %} will now commence. ### Viewing the logging output from {% data variables.product.prodname_code_scanning %} @@ -90,7 +90,7 @@ After {% data variables.product.prodname_code_scanning %} has analyzed the code There are other situations where there may be no analysis for the latest commit to the base branch for a pull request. These include: -* The pull request has been raised against a branch other than the default branch or a protected branch, and this branch hasn't been analyzed. +* The pull request has been raised against a branch other than the default branch, and this branch hasn't been analyzed. To check whether a branch has been scanned, go to the {% data variables.product.prodname_code_scanning_capc %} page, click the **Branch** drop-down and select the relevant branch. diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md index fba325cc27..eaf6f35ba9 100644 --- a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md @@ -1,5 +1,6 @@ --- title: コード内のセキュリティの脆弱性とエラーを検出する +shortTitle: Finding vulnerabilities and coding errors product: '{% data reusables.gated-features.code-scanning %}' redirect_from: - /github/managing-security-vulnerabilities/finding-security-vulnerabilities-in-your-projects-code @@ -18,6 +19,7 @@ versions: {% link_in_list /configuring-code-scanning %} {% link_in_list /configuring-the-codeql-workflow-for-compiled-languages %} {% link_in_list /troubleshooting-the-codeql-workflow %} + {% link_in_list /running-codeql-code-scanning-in-a-container %} {% topic_link_in_list /managing-results-from-code-scanning %} {% link_in_list /about-integration-with-code-scanning %} {% link_in_list /uploading-a-sarif-file-to-github %} diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md index 258dcff05d..de667d0205 100644 --- a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md @@ -1,7 +1,7 @@ --- title: Managing code scanning alerts for your repository shortTitle: アラートを管理する -intro: 'プロジェクトのコードの潜在的な脆弱性またはエラーのアラートを表示、修正、およびクローズすることができます。' +intro: 'You can view, fix, {% if currentVersion == "enterprise-server@2.22" %}or close{% else %}dismiss, or delete{% endif %} alerts for potential vulnerabilities or errors in your project''s code.' product: '{% data reusables.gated-features.code-scanning %}' permissions: 'People with write permission to a repository can manage {% data variables.product.prodname_code_scanning %} alerts for the repository.' versions: @@ -37,25 +37,89 @@ Anyone with read permission for a repository can see {% data variables.product.p {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} -{% data reusables.code-scanning.click-alert-in-list %} -5. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. ![データフローアラートの例](/assets/images/help/repository/code-scanning-show-paths.png) +1. Under "{% data variables.product.prodname_code_scanning_capc %}," click the alert you'd like to explore. ![Summary of alerts](/assets/images/help/repository/code-scanning-click-alert.png) +1. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. ![The "Show paths" link on an alert](/assets/images/help/repository/code-scanning-show-paths.png) +1. Alerts from {% data variables.product.prodname_codeql %} analysis include a description of the problem. Click **Show more** for guidance on how to fix your code. ![Details for an alert](/assets/images/help/repository/code-scanning-alert-details.png) ### Fixing an alert Anyone with write permission for a repository can fix an alert by committing a correction to the code. If the repository has {% data variables.product.prodname_code_scanning %} scheduled to run on pull requests, it's best to raise a pull request with your correction. This will trigger {% data variables.product.prodname_code_scanning %} analysis of the changes and test that your fix doesn't introduce any new problems. For more information, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)" and "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)." +If you have write permission for a repository, you can view fixed alerts by viewing the summary of alerts and clicking **Closed**. For more information, see "[Viewing an alert](#viewing-an-alert)." The "Closed" list shows fixed alerts and alerts that users have {% if currentVersion == "enterprise-server@2.22" %}closed{% else %}dismissed{% endif %}. + +Alerts may be fixed in one branch but not in another. You can use the "Branch" drop-down menu, on the summary of alerts, to check whether an alert is fixed in a particular branch. + +![Filtering alerts by branch](/assets/images/help/repository/code-scanning-branch-filter.png) + +{% if currentVersion == "enterprise-server@2.22" %} + ### アラートを閉じる Closing an alert is a way to resolve an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} +{% else %} + +### Dismissing or deleting alerts + +There are two ways of closing an alert. You can fix the problem in the code, or you can dismiss the alert. Alternatively, if you have admin permissions for the repository, you can delete alerts. Deleting alerts is useful in situations where you have enabled a {% data variables.product.prodname_code_scanning %} tool and then decided to remove it, or where you have enabled {% data variables.product.prodname_codeql %} analysis with a larger set of queries than you want to continue using, and you've then removed some queries from the tool. In both cases, deleting alerts allows you to clean up your {% data variables.product.prodname_code_scanning %} results. You can delete alerts from the summary list within the **Security** tab. + +Dismissing an alert is a way of closing an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} You can dismiss alerts from {% data variables.product.prodname_code_scanning %} annotations in code, or from the summary list within the **Security** tab. + +When you dismiss an alert: + +- It's dismissed in all branches. +- The alert is removed from the number of current alerts for your project. +- The alert is moved to the "Closed" list in the summary of alerts, from where you can reopen it, if required. +- The reason why you closed the alert is recorded. +- Next time {% data variables.product.prodname_code_scanning %} runs, the same code won't generate an alert. + +When you delete an alert: + +- It's deleted in all branches. +- The alert is removed from the number of current alerts for your project. +- It is _not_ added to the "Closed" list in the summary of alerts. +- If the code that generated the alert stays the same, and the same {% data variables.product.prodname_code_scanning %} tool runs again without any configuration changes, the alert will be shown again in your analysis results. + +To dismiss or delete alerts: + +{% endif %} + {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} +{% if currentVersion == "enterprise-server@2.22" %} {% data reusables.code-scanning.click-alert-in-list %} -5. Select the Close drop-down menu and click a reason for closing the alert. ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) +1. Select the **Close** drop-down menu and click a reason for closing the alert. + ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) {% data reusables.code-scanning.false-positive-fix-codeql %} +{% else %} + +1. If you have admin permissions for the repository, and you want to delete alerts for this {% data variables.product.prodname_code_scanning %} tool, select some or all of the check boxes and click **Delete**. + + ![Deleting alerts](/assets/images/help/repository/code-scanning-delete-alerts.png) + + Optionally, you can use the filters to display a subset of alerts and then delete all matching alerts at once. For example, if you have removed a query from {% data variables.product.prodname_codeql %} analysis, you can use the "Rule" filter to list just the alerts for that query and then select and delete all of those alerts. + + ![Filter alerts by rule](/assets/images/help/repository/code-scanning-filter-by-rule.png) + +1. If you want to dismiss an alert, it's important to explore the alert first, so that you can choose the correct dismissal reason. Click the alert you'd like to explore. + + ![Open an alert from the summary list](/assets/images/help/repository/code-scanning-click-alert.png) + +1. Review the alert, then click **Dismiss** and choose a reason for closing the alert. ![Choosing a reason for dismissing an alert](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + + {% data reusables.code-scanning.choose-alert-dismissal-reason %} + + {% data reusables.code-scanning.false-positive-fix-codeql %} + +#### Dismissing multiple alerts at once + +If a project has multiple alerts that you want to dismiss for the same reason, you can bulk dismiss them from the summary of alerts. Typically, you'll want to filter the list and then dismiss all of the matching alerts. For example, you might want to dismiss all of the current alerts in the project that have been tagged for a particular Common Weakness Enumeration (CWE) vulnerability. + +{% endif %} + ### 参考リンク - "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)" diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md new file mode 100644 index 0000000000..ec7563654b --- /dev/null +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md @@ -0,0 +1,69 @@ +--- +title: Running CodeQL code scanning in a container +shortTitle: '{% data variables.product.prodname_code_scanning_capc %} in a container' +intro: 'You can run {% data variables.product.prodname_code_scanning %} in a container by ensuring that all processes run in the same container.' +product: '{% data reusables.gated-features.code-scanning %}' +versions: + free-pro-team: '*' + enterprise-server: '>=2.22' +--- + +{% data reusables.code-scanning.beta %} + +### About {% data variables.product.prodname_code_scanning %} with a containerized build + +If you're setting up {% data variables.product.prodname_code_scanning %} for a compiled language, and you're building the code in a containerized environment, the analysis may fail with the error message "No source code was seen during the build." This indicates that {% data variables.product.prodname_codeql %} was unable to monitor your code as it was compiled. + +You must run {% data variables.product.prodname_codeql %} in the same container in which you build your code. This applies whether you are using the {% data variables.product.prodname_codeql_runner %}, or {% data variables.product.prodname_actions %}. If you're using the {% data variables.product.prodname_codeql_runner %}, run it in the container where your code builds. For more information about the {% data variables.product.prodname_codeql_runner %}, see "[Running {% data variables.product.prodname_codeql %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-code-scanning-in-your-ci-system)." If you're using {% data variables.product.prodname_actions %}, configure your workflow to run all the actions in the same container. For more information, see "[Example workflow](#example-workflow)." + +### 依存関係 + +You may have difficulty running {% data variables.product.prodname_code_scanning %} if the container you're using is missing certain dependencies (for example, Git must be installed and added to the PATH variable). If you encounter dependency issues, review the list of software typically included on {% data variables.product.prodname_dotcom %}'s virtual environments. For more information, see the version-specific `readme` files in these locations: + +* Linux: https://github.com/actions/virtual-environments/tree/main/images/linux +* MacOS: https://github.com/actions/virtual-environments/tree/main/images/macos +* Windows: https://github.com/actions/virtual-environments/tree/main/images/win + +### Example workflow + +This sample workflow uses {% data variables.product.prodname_actions %} to run {% data variables.product.prodname_codeql %} analysis in a containerized environment. The value of `container.image` identifies the container to use. In this example the image is named `codeql-container`, with a tag of `f0f91db`. 詳しい情報については、「[{% data variables.product.prodname_actions %} のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)」を参照してください。 + +``` yaml +name: "{% data variables.product.prodname_codeql %}" + +on: + push: + branches: [main] + pull_request: + branches: [main] + schedule: + - cron: '0 0 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: [java] + + # Specify the container in which actions will run + container: + image: codeql-container:f0f91db + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Initialize {% data variables.product.prodname_codeql %} + uses: github/codeql-action/init@v1 + with: + languages: {% raw %}${{ matrix.language }}{% endraw %} + - name: Build + run: | + ./configure + make + - name: Perform {% data variables.product.prodname_codeql %} Analysis + uses: github/codeql-action/analyze@v1 +``` diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md index 5b7faf0e62..78adfe31ce 100644 --- a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md @@ -10,6 +10,8 @@ versions: enterprise-server: '>=2.22' --- + + {% data reusables.code-scanning.beta-codeql-runner %} {% data reusables.code-scanning.beta %} {% data reusables.code-scanning.enterprise-enable-code-scanning %} @@ -18,7 +20,7 @@ versions: If you use a continuous integration or continuous delivery/deployment (CI/CD) system other than {% data variables.product.prodname_actions %}, you can use your existing system to run {% data variables.product.prodname_dotcom %}'s {% data variables.product.prodname_codeql %} analysis and upload the results to {% data variables.product.prodname_dotcom %}. To do this, use the {% data variables.product.prodname_codeql_runner %}. -### About the {% data variables.product.prodname_codeql_runner %} +### {% data variables.product.prodname_codeql_runner %} について {% data reusables.code-scanning.about-code-scanning %} For information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)." @@ -38,7 +40,7 @@ On Linux: chmod +x codeql-runner-linux ``` -On MacOS: +macOSの場合: ```shell chmod +x codeql-runner-macos @@ -49,7 +51,7 @@ On Windows, the `codeql-runner-win.exe` file usually requires no change to permi ### Adding the {% data variables.product.prodname_codeql_runner %} to your CI system -Once you have downloaded the {% data variables.product.prodname_codeql_runner %} and verified that it can be executed, you should make the runner available to each CI server that you intend to use for {% data variables.product.prodname_code_scanning %}. It is important to notice that each CI server that you intend to use for {% data variables.product.prodname_code_scanning %} needs to have the {% data variables.product.prodname_codeql_runner %}. You might configure each server to copy the runner from a central, internal location, or you could use the REST API to get the runner direct from GitHub, for example: +Once you have downloaded the {% data variables.product.prodname_codeql_runner %} and verified that it can be executed, you should make the runner available to each CI server that you intend to use for {% data variables.product.prodname_code_scanning %}. It is important to notice that each CI server that you intend to use for {% data variables.product.prodname_code_scanning %} needs to have the {% data variables.product.prodname_codeql_runner %}. You might configure each server to copy the runner from a central, internal location, or you could use the REST API to get the runner direct from GitHub, for example: ```shell wget https://github.com/github/codeql-action/releases/download/codeql-bundle-20200826/codeql-runner-linux @@ -64,8 +66,9 @@ In addition to this, each CI server also needs: The options for providing access to the {% data variables.product.prodname_codeql %} bundle are: 1. Allow the CI servers access to {% data variables.product.prodname_dotcom_the_website %} so that the {% data variables.product.prodname_codeql_runner %} can download the bundle automatically. -1. Manually download/extract the bundle, store it with other central resources, and use the `--codeql-path` flag to specify the location of the bundle in calls to initialize the {% data variables.product.prodname_codeql_runner %}. -{% if currentVersion != "free-pro-team@latest" %} +1. Manually download/extract the bundle, store it with other central resources, and use the `--codeql-path` flag to specify the location of the bundle in calls to initialize the +{% data variables.product.prodname_codeql_runner %}. +{% if enterpriseServerVersions contains currentVersion %} 1. You can mirror the `github/codeql-action` repository on {% data variables.product.product_location %}. Unless you specify the `--codeql-path` flag, the runner automatically checks for the bundle in this location and on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} ### Calling the {% data variables.product.prodname_codeql_runner %} @@ -75,7 +78,7 @@ You should call the {% data variables.product.prodname_codeql_runner %} from the 1. `init` required to initialize the runner and create a {% data variables.product.prodname_codeql %} database for each language to be analyzed. These databases are populated and analyzed by subsequent commands. 1. `analyze` required to populate the {% data variables.product.prodname_codeql %} databases, analyze them, and upload results to {% data variables.product.product_location %}. -For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}. +For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if enterpriseServerVersions contains currentVersion %} or mirrored on {% data variables.product.product_location %}{% endif %}. You can configure where the {% data variables.product.prodname_codeql_runner %} stores the CodeQL bundle for future analysis on a server using the `--tools-dir` flag and where it stores temporary files during analysis using `--temp-dir`. @@ -109,7 +112,7 @@ This example runs {% data variables.product.prodname_codeql %} analysis on a Lin > Successfully uploaded results ``` -The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if enterpriseServerVersions contains currentVersion %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." #### Compiled language example @@ -155,7 +158,7 @@ This example is similar to the previous example, however this time the repositor {% endnote %} -### Further reading +### 参考リンク - "[Configuring {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-codeql-code-scanning-in-your-ci-system)" - "[Troubleshooting {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system)" diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md index 270e23be65..023a599822 100644 --- a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md @@ -36,6 +36,8 @@ If you upload a SARIF file without fingerprint data using the `/code-scanning/sa ### Validating your SARIF file + + You can check a SARIF file is compatible with {% data variables.product.prodname_code_scanning %} by testing it against the {% data variables.product.prodname_dotcom %} ingestion rules. For more information, visit the [Microsoft SARIF validator](https://sarifweb.azurewebsites.net/). ### サポートされている SARIF 出力ファイルのプロパティ diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md index 931419d501..ea1297c8d9 100644 --- a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md @@ -13,11 +13,11 @@ versions: ### About {% data variables.product.prodname_code_scanning %} results on pull requests -In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch or protected branches, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." -If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch, and the repository owner has configured required status checks, then you must either fix or close any error alerts before the pull request can be merged. For more information, see "[About required status checks](/github/administering-a-repository/about-required-status-checks)." +If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch that has been enabled for {% data variables.product.prodname_code_scanning %}, and the repository owner has configured required status checks, then you must either fix or {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} all error alerts before the pull request can be merged. For more information, see "[About required status checks](/github/administering-a-repository/about-required-status-checks)." -![Example pull request check status with {% data variables.product.prodname_code_scanning %} alert](/assets/images/help/repository/code-scanning-check-failure.png) +![Failed {% data variables.product.prodname_code_scanning %} check on a pull request](/assets/images/help/repository/code-scanning-check-failure.png) ### About {% data variables.product.prodname_code_scanning %} as a pull request check @@ -29,20 +29,38 @@ If the repository uses the {% data variables.product.prodname_codeql_workflow %} When you look at the **Files changed** tab for a pull request, you see annotations for any lines of code that triggered the alert. -![Example {% data variables.product.prodname_code_scanning %} alert shown as an annotation in the "Files changed" view of a pull request](/assets/images/help/repository/code-scanning-pr-annotation.png) +![Alert annotation within a pull request diff](/assets/images/help/repository/code-scanning-pr-annotation.png) Some annotations contain links with extra context for the alert. In the example above, from {% data variables.product.prodname_codeql %} analysis, you can click **user-provided value** to see where the untrusted data enters the data flow (this is referred to as the source). In this case you can view the full path from the source to the code that uses the data (the sink) by clicking **Show paths**. This makes it easy to check whether the data is untrusted or if the analysis failed to recognize a data sanitization step between the source and the sink. For information about analyzing data flow using {% data variables.product.prodname_codeql %}, see "[About data flow analysis](https://help.semmle.com/QL/learn-ql/intro-to-data-flow.html)." For more information about an alert, click **Show more details** on the annotation. This allows you to see all of the context and metadata provided by the tool in an alert view. In the example below, you can see tags showing the severity, type, and relevant common weakness enumerations (CWEs) for the problem. The view also shows which commit introduced the problem. -Alerts from some tools, like {% data variables.product.prodname_codeql %}, also include a description and a **Show more** link for guidance on how to fix the problem in the code. +In the detailed view for an alert, some {% data variables.product.prodname_code_scanning %} tools, like {% data variables.product.prodname_codeql %} analysis, also include a description of the problem and a **Show more** link for guidance on how to fix your code. -![Example of "Show more details" for a {% data variables.product.prodname_code_scanning %} alert in a pull request](/assets/images/help/repository/code-scanning-pr-alert.png) +![Alert description and link to show more information](/assets/images/help/repository/code-scanning-pr-alert.png) -### Resolving an alert on your pull request +### {% if currentVersion == "enterprise-server@2.22" %}Resolving{% else %}Fixing{% endif %} an alert on your pull request -Anyone with write permission for a repository can resolve alerts on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is resolved and the annotation removed. +Anyone with write permission for a repository can fix a {% data variables.product.prodname_code_scanning %} alert that's identified on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is closed and the annotation removed. + +{% if currentVersion == "enterprise-server@2.22" %} If you don't think that an alert needs to be fixed, you can close the alert manually. {% data reusables.code-scanning.close-alert-examples %} The **Close** button is available in annotations and in the alerts view if you have write permission for the repository. {% data reusables.code-scanning.false-positive-fix-codeql %} + +{% else %} + +### Dismissing an alert on your pull request + +An alternative way of closing an alert is to dismiss it. You can dismiss an alert if you don't think it needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} If you have write permission for the repository, the **Dismiss** button is available in code annotations and in the alerts summary. When you click **Dismiss** you will be prompted to choose a reason for closing the alert. + +![Choosing a reason for dismissing an alert](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + +{% data reusables.code-scanning.choose-alert-dismissal-reason %} + +{% data reusables.code-scanning.false-positive-fix-codeql %} + +For more information about dismissing alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#dismissing-or-deleting-alerts)." + +{% endif %} \ No newline at end of file diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md index de07f81768..4b0e0ffff8 100644 --- a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md @@ -49,4 +49,4 @@ If the `analyze` command for the {% data variables.product.prodname_codeql_runne {% endnote %} -1. The code is built in a container or on a separate machine. If you use a containerized build or if you outsource the build to another machine, make sure to run the {% data variables.product.prodname_codeql_runner %} in the container or on the machine where your build task takes place. +1. The code is built in a container or on a separate machine. If you use a containerized build or if you outsource the build to another machine, make sure to run the {% data variables.product.prodname_codeql_runner %} in the container or on the machine where your build task takes place. For more information, see "[Running CodeQL code scanning in a container](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)." diff --git a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md index f42dbb3db6..17adbfc067 100644 --- a/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md +++ b/translations/ja-JP/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md @@ -12,13 +12,13 @@ versions: {% data reusables.code-scanning.beta %} -### Automatic build for a compiled language fails +### コンパイル言語の自動ビルドの失敗 -If an automatic build of code for a compiled language within your project fails, try the following troubleshooting steps. +プロジェクト内のコンパイル言語のコードの自動ビルドが失敗した場合は、次のトラブルシューティングのステップを試してください。 -- Remove the `autobuild` step from your {% data variables.product.prodname_code_scanning %} workflow and add specific build steps. For information about editing the workflow, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#editing-a-code-scanning-workflow)." For more information about replacing the `autobuild` step, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." +- {% data variables.product.prodname_code_scanning %} ワークフローから `autobuild` ステップを削除し、特定のビルドステップを追加します。 ワークフローの編集に関する詳しい情報は、「[{% data variables.product.prodname_code_scanning %} を設定する](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#editing-a-code-scanning-workflow)」を参照してください。 For more information about replacing the `autobuild` step, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." -- If your workflow doesn't explicitly specify the languages to analyze, {% data variables.product.prodname_codeql %} implicitly detects the supported languages in your code base. In this configuration, out of the compiled languages C/C++, C#, and Java, {% data variables.product.prodname_codeql %} only analyzes the language with the most source files. Edit the workflow and add a build matrix specifying the languages you want to analyze. The default CodeQL analysis workflow uses such a matrix. +- If your workflow doesn't explicitly specify the languages to analyze, {% data variables.product.prodname_codeql %} implicitly detects the supported languages in your code base. In this configuration, out of the compiled languages C/C++, C#, and Java, {% data variables.product.prodname_codeql %} only analyzes the language with the most source files. Edit the workflow and add a build matrix specifying the languages you want to analyze. The default CodeQL analysis workflow uses such a matrix. The following extracts from a workflow show how you can use a matrix within the job strategy to specify languages, and then reference each language within the "Initialize {% data variables.product.prodname_codeql %}" step: @@ -38,14 +38,14 @@ If an automatic build of code for a compiled language within your project fails, with: languages: {% raw %}${{ matrix.language }}{% endraw %} ``` - + For more information about editing the workflow, see "[Configuring code scanning](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)." -### No code found during the build +### ビルド中にコードが見つからない -If your workflow fails with an error `No source code was seen during the build` or `The process '/opt/hostedtoolcache/CodeQL/0.0.0-20200630/x64/codeql/codeql' failed with exit code 32`, this indicates that {% data variables.product.prodname_codeql %} was unable to monitor your code. Several reasons can explain such a failure: +If your workflow fails with an error `No source code was seen during the build` or `The process '/opt/hostedtoolcache/CodeQL/0.0.0-20200630/x64/codeql/codeql' failed with exit code 32`, this indicates that {% data variables.product.prodname_codeql %} was unable to monitor your code. このようなエラーが発生する理由として、次のようなものがあります。 -1. Automatic language detection identified a supported language, but there is no analyzable code of that language in the repository. A typical example is when our language detection service finds a file associated with a particular programming language like a `.h`, or `.gyp` file, but no corresponding executable code is present in the repository. To solve the problem, you can manually define the languages you want to analyze by updating the list of languages in the `language` matrix. For example, the following configuration will analyze only Go, and JavaScript. +1. 自動言語検出により、サポートされている言語が特定されたが、リポジトリにその言語の分析可能なコードがない。 一般的な例としては、言語検出サービスが `.h` や `.gyp` ファイルなどの特定のプログラミング言語に関連付けられたファイルを見つけたが、対応する実行可能コードがリポジトリに存在しない場合です。 To solve the problem, you can manually define the languages you want to analyze by updating the list of languages in the `language` matrix. たとえば、次の設定では Go と JavaScript のみを分析します。 ```yaml strategy: @@ -57,13 +57,17 @@ If your workflow fails with an error `No source code was seen during the build` language: ['go', 'javascript'] ``` For more information, see the workflow extract in "[Automatic build for a compiled language fails](#automatic-build-for-a-compiled-language-fails)" above. -1. Your {% data variables.product.prodname_code_scanning %} workflow is analyzing a compiled language (C, C++, C#, or Java), but the code was not compiled. By default, the {% data variables.product.prodname_codeql %} analysis workflow contains an `autobuild` step, however, this step represents a best effort process, and may not succeed in building your code, depending on your specific build environment. Compilation may also fail if you have removed the `autobuild` step and did not include build steps manually. For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." -1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but portions of your build are cached to improve performance (most likely to occur with build systems like Gradle or Bazel). Since {% data variables.product.prodname_codeql %} observes the activity of the compiler to understand the data flows in a repository, {% data variables.product.prodname_codeql %} requires a complete build to take place in order to perform analysis. -1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but compilation does not occur between the `init` and `analyze` steps in the workflow. {% data variables.product.prodname_codeql %} requires that your build happens in between these two steps in order to observe the activity of the compiler and perform analysis. -1. Your compiled code (in C, C++, C#, or Java) was compiled successfully, but {% data variables.product.prodname_codeql %} was unable to detect the compiler invocations. The most common causes are certain configuration options like running your build process in a container, if you're building using a distributed build system external to {% data variables.product.prodname_actions %} using a daemon process, or if {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. +1. {% data variables.product.prodname_code_scanning %} ワークフローはコンパイルされた言語（C、C++、C#、または Java）を分析しているが、コードはコンパイルされていない。 デフォルトでは、{% data variables.product.prodname_codeql %} 分析ワークフローには `autobuild` ステップが含まれていますが、このステップはベスト エフォートプロセスを表しており、特定のビルド環境によっては、コードのビルドに失敗する可能性があります。 `autobuild` ステップを削除し、ビルドステップを手動で含めない場合も、コンパイルが失敗する可能性があります。 For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." +1. ワークフローはコンパイルされた言語（C、C++、C#、または Java）を分析しているが、パフォーマンスを向上させるためにビルドの一部がキャッシュされている（Gradle や Bazel などのビルドシステムで発生する可能性が最も高い）。 {% data variables.product.prodname_codeql %} はコンパイラのアクティビティを監視してリポジトリ内のデータフローを理解するため、{% data variables.product.prodname_codeql %} は分析を実行するために完全なビルドを実行する必要があります。 +1. ワークフローはコンパイルされた言語（C、C++、C＃、または Java）を分析しているが、ワークフローの `init` ステップと `analyze` ステップの間でコンパイルが行われていない。 {% data variables.product.prodname_codeql %} では、コンパイラのアクティビティを監視して分析を実行するために、これらの 2 つのステップ間でビルドを行う必要があります。 +1. コンパイルされたコード（C、C++、C#、または Java）は正常にコンパイルされたが、{% data variables.product.prodname_codeql %} がコンパイラの呼び出しを検出できない。 The most common causes are: + + * Running your build process in a separate container to {% data variables.product.prodname_codeql %}. For more information, see "[Running CodeQL code scanning in a container](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)." + * Building using a distributed build system external to GitHub Actions, using a daemon process. + * {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. + + .NET Core 2 をターゲットとする `dotnet build` または `msbuild` を使用する C# プロジェクトでは、コードをビルドするときに、ワークフローの `run` ステップで `/p:UseSharedCompilation=false` を指定する必要があります。 .NET Core 3.0 以降では、`UseSharedCompilation` フラグは必要ありません。 - For C# projects using either `dotnet build` or `msbuild` which target .NET Core 2, you should specify `/p:UseSharedCompilation=false` in your workflow's `run` step, when you build your code. The `UseSharedCompilation` flag isn't necessary for .NET Core 3.0 and later. - For example, the following configuration for C# will pass the flag during the first build step. ``` yaml @@ -71,49 +75,50 @@ For more information, see the workflow extract in "[Automatic build for a compil dotnet build /p:UseSharedCompilation=false ``` - If you encounter another problem with your specific compiler or configuration, contact {% data variables.contact.contact_support %}. + 特定のコンパイラまたは設定で別の問題が発生した場合は、{% data variables.contact.contact_support %} までお問い合わせください。 -For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." +For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." -### Portions of my repository were not analyzed using `autobuild` +### リポジトリの一部が `autobuild` を使用して分析されない -The {% data variables.product.prodname_codeql %} `autobuild` feature uses heuristics to build the code in a repository, however, sometimes this approach results in incomplete analysis of a repository. For example, when multiple `build.sh` commands exist in a single repository, the analysis may not complete since the `autobuild` step will only execute one of the commands. The solution is to replace the `autobuild` step with build steps which build all of the source code which you wish to analyze. For more information, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." +{% data variables.product.prodname_codeql %} の `autobuild` 機能は、ヒューリスティックスを使用してリポジトリにコードをビルドしますが、このアプローチでは、リポジトリの分析が不完全になることがあります。 たとえば、単一のリポジトリに複数の `build.sh` コマンドが存在する場合、`autobuild` ステップはコマンドの 1 つしか実行しないため、分析が完了しない場合があります。 これを解決するには、`autobuild` ステップを、分析するすべてのソースコードをビルドするビルドステップに置き換えます。 For more information, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." -### Error: "Server error" +### エラー: 「サーバーエラー」 -If the run of a workflow for {% data variables.product.prodname_code_scanning %} fails due to a server error, try running the workflow again. If the problem persists, contact {% data variables.contact.contact_support %}. +サーバーエラーにより {% data variables.product.prodname_code_scanning %} のワークフローが実行できない場合は、ワークフローを再実行してください。 問題が解決しない場合は、{% data variables.contact.contact_support %} にお問い合わせください。 -### Error: "Out of disk" or "Out of memory" +### エラー:「ディスク不足」または「メモリ不足」 +On very large projects, -On very large projects, {% data variables.product.prodname_codeql %} may run out of disk or memory on the runner. +{% data variables.product.prodname_codeql %} may run out of disk or memory on the runner. {% if currentVersion == "free-pro-team@latest" %}If you encounter this issue on a hosted {% data variables.product.prodname_actions %} runner, contact {% data variables.contact.contact_support %} so that we can investigate the problem. {% else %}If you encounter this issue, try increasing the memory on the runner.{% endif %} -### The build takes too long +### ビルドに時間がかかりすぎる -If your build with {% data variables.product.prodname_codeql %} analysis takes too long to run, there are several approaches you can try to reduce the build time. +{% data variables.product.prodname_codeql %} 分析でのビルドの実行に時間がかかりすぎる場合は、ビルド時間を短縮するための方法がいくつかあります。 #### Increase the memory or cores If you use self-hosted runners to run {% data variables.product.prodname_codeql %} analysis, you can increase the memory or the number of cores on those runners. -#### Use matrix builds to parallelize the analysis +#### マトリックスビルドを使用して分析を並列化する The default {% data variables.product.prodname_codeql_workflow %} uses a build matrix of languages, which causes the analysis of each language to run in parallel. If you have specified the languages you want to analyze directly in the "Initialize CodeQL" step, analysis of each language will happen sequentially. To speed up analysis of multiple languages, modify your workflow to use a matrix. For more information, see the workflow extract in "[Automatic build for a compiled language fails](#automatic-build-for-a-compiled-language-fails)" above. -#### Reduce the amount of code being analyzed in a single workflow +#### 1 つのワークフローで分析されるコードの量を減らす -Analysis time is typically proportional to the amount of code being analyzed. You can reduce the analysis time by reducing the amount of code being analyzed at once, for example, by excluding test code, or breaking analysis into multiple workflows that analyze only a subset of your code at a time. +一般的に、分析時間は分析されるコードの量に比例します。 たとえば、テストコードを除外したり、一度にコードのサブセットのみを分析する複数のワークフローに分析を分割したりするなど、一度に分析されるコードの量を減らすことで、分析時間を短縮できます。 -For compiled languages like Java, C, C++, and C#, {% data variables.product.prodname_codeql %} analyzes all of the code which was built during the workflow run. To limit the amount of code being analyzed, build only the code which you wish to analyze by specifying your own build steps in a `run` block. You can combine specifying your own build steps with using the `paths` or `paths-ignore` filters on the `pull_request` and `push` events to ensure that your workflow only runs when specific code is changed. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestpaths)." +Java、C、C++、C# などのコンパイルされた言語の場合、{% data variables.product.prodname_codeql %} はワークフローの実行中に作成されたすべてのコードを分析します。 分析するコードの量を制限するには、`run` ブロックで独自のビルドステップを指定して、分析するコードのみをビルドします。 独自のビルドステップの指定と、`pull_request` および `push` イベントの `paths` または `paths-ignore` フィルタの使用を組み合わせて、特定のコードが変更されたときにのみワークフローが実行されるようにすることができます。 詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestpaths)」を参照してください。 -For interpreted languages like Go, JavaScript, Python, and TypeScript, that {% data variables.product.prodname_codeql %} analyzes without a specific build, you can specify additional configuration options to limit the amount of code to analyze. For more information, see "[Specifying directories to scan](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#specifying-directories-to-scan)." +指定のビルドなしで {% data variables.product.prodname_codeql %} が分析する Go、JavaScript、Python、TypeScript などのインタプリタ言語の場合、追加の設定オプションを指定して分析するコードの量を制限できます。 詳しい情報については、「[スキャンするディレクトリを指定する](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#specifying-directories-to-scan)」を参照してください。 -If you split your analysis into multiple workflows as described above, we still recommend that you have at least one workflow which runs on a `schedule` which analyzes all of the code in your repository. Because {% data variables.product.prodname_codeql %} analyzes data flows between components, some complex security behaviors may only be detected on a complete build. +上記のように分析を複数のワークフローに分割する場合でも、リポジトリ内のすべてのコードを分析する `schedule` で実行されるワークフローを少なくとも 1 つ用意することをお勧めします。 {% data variables.product.prodname_codeql %} はコンポーネント間のデータフローを分析するため、一部の複雑なセキュリティ動作は完全なビルドでのみ検出される場合があります。 -#### Run only during a `schedule` event +#### `schedule` イベント中にのみ実行する -If your analysis is still too slow to be run during `push` or `pull_request` events, then you may want to only trigger analysis on the `schedule` event. For more information, see "[Events](/actions/learn-github-actions/introduction-to-github-actions#events)." +それでも分析が遅すぎるために、`push` または `pull_request` イベント中に実行できない場合は、`schedule` イベントでのみ分析をトリガーすることをお勧めします。 For more information, see "[Events](/actions/learn-github-actions/introduction-to-github-actions#events)." {% if currentVersion == "free-pro-team@latest" %} ### Results differ between analysis platforms @@ -122,4 +127,4 @@ If you are analyzing code written in Python, you may see different results depen On GitHub-hosted runners that use Linux, the {% data variables.product.prodname_codeql_workflow %} tries to install and analyze Python dependencies, which could lead to more results. To disable the auto-install, add `setup-python-dependencies: false` to the "Initialize CodeQL" step of the workflow. For more information about configuring the analysis of Python dependencies, see "[Analyzing Python dependencies](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#analyzing-python-dependencies)." -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/ja-JP/content/github/getting-started-with-github/githubs-products.md b/translations/ja-JP/content/github/getting-started-with-github/githubs-products.md index da82abc933..01f7e677e5 100644 --- a/translations/ja-JP/content/github/getting-started-with-github/githubs-products.md +++ b/translations/ja-JP/content/github/getting-started-with-github/githubs-products.md @@ -96,7 +96,7 @@ Organizationの{% data variables.product.prodname_free_team %}で利用できる - {% data variables.contact.github_support %} {% data variables.product.premium_plus_support_plan %} - {% data variables.product.prodname_insights %} -- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} +- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} - [Organization の {% data variables.product.prodname_learning %}](https://lab.github.com/organizations) {% data variables.product.prodname_ghe_one %} へのサインアップの詳細については、[{% data variables.product.product_name %} の販売チーム](https://enterprise.github.com/contact)にお問い合わせください。 diff --git a/translations/ja-JP/content/github/getting-started-with-github/saving-repositories-with-stars.md b/translations/ja-JP/content/github/getting-started-with-github/saving-repositories-with-stars.md index 55186f77b4..f15e9f02f3 100644 --- a/translations/ja-JP/content/github/getting-started-with-github/saving-repositories-with-stars.md +++ b/translations/ja-JP/content/github/getting-started-with-github/saving-repositories-with-stars.md @@ -20,7 +20,7 @@ Star を付けることで、リポジトリやトピックが後で見つけや {% if currentVersion == "free-pro-team@latest" %} You can star repositories and topics to discover similar projects on -{% data variables.product.product_name %}. リポジトリあるいはトピックに Star を付けると、{% data variables.product.product_name %} はニュースフィードの discovery ビューで関連するコンテンツを推薦することがあります。 詳しい情報については、「[{% data variables.product.prodname_dotcom %} でオープンソースにコントリビュートする方法を見つける](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)」を参照してください。 +{% data variables.product.product_name %} の Enterprise 設定を使用してアナウンスバナーを設定することもできます。 リポジトリあるいはトピックに Star を付けると、{% data variables.product.product_name %} はニュースフィードの discovery ビューで関連するコンテンツを推薦することがあります。 詳しい情報については、「[{% data variables.product.prodname_dotcom %} でオープンソースにコントリビュートする方法を見つける](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)」を参照してください。 {% endif %} リポジトリに Star を付けるということは、リポジトリメンテナに対してその作業についての感謝を示すことでもあります。 {% data variables.product.prodname_dotcom %} のリポジトリランキングの多くは、リポジトリに付けられた Star の数を考慮しています。 また、[Explore](https://github.com/explore) は、リポジトリに付けられた Star の数に基づいて、人気のあるリポジトリを表示しています。 diff --git a/translations/ja-JP/content/github/getting-started-with-github/supported-browsers.md b/translations/ja-JP/content/github/getting-started-with-github/supported-browsers.md index 396e8ab441..571d32d5f2 100644 --- a/translations/ja-JP/content/github/getting-started-with-github/supported-browsers.md +++ b/translations/ja-JP/content/github/getting-started-with-github/supported-browsers.md @@ -4,7 +4,7 @@ redirect_from: - /articles/why-doesn-t-graphs-work-with-ie-8/ - /articles/why-don-t-graphs-work-with-ie8/ - /articles/supported-browsers -intro: '{% data variables.product.product_name %} は、最新の Web ブラウザをサポートするよう設計されています。 We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.16" %}Internet Explorer 11, {% endif %}and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' +intro: '{% data variables.product.product_name %} は、最新の Web ブラウザをサポートするよう設計されています。 We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' versions: free-pro-team: '*' enterprise-server: '*' diff --git a/translations/ja-JP/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md b/translations/ja-JP/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md index d06ec5e279..2eedfc15aa 100644 --- a/translations/ja-JP/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md +++ b/translations/ja-JP/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md @@ -29,7 +29,7 @@ versions: 3. ワーキングディレクトリをローカルプロジェクトに変更します。 4. ローカルディレクトリを Git リポジトリとして初期化します。 ```shell - $ git init + $ git init -b main ``` 5. ファイルを新しいローカルリポジトリに追加します。 これで、それらのファイルが最初のコミットに備えてステージングされます。 ```shell @@ -67,7 +67,7 @@ versions: 3. ワーキングディレクトリをローカルプロジェクトに変更します。 4. ローカルディレクトリを Git リポジトリとして初期化します。 ```shell - $ git init + $ git init -b main ``` 5. ファイルを新しいローカルリポジトリに追加します。 これで、それらのファイルが最初のコミットに備えてステージングされます。 ```shell @@ -105,7 +105,7 @@ versions: 3. ワーキングディレクトリをローカルプロジェクトに変更します。 4. ローカルディレクトリを Git リポジトリとして初期化します。 ```shell - $ git init + $ git init -b main ``` 5. ファイルを新しいローカルリポジトリに追加します。 これで、それらのファイルが最初のコミットに備えてステージングされます。 ```shell diff --git a/translations/ja-JP/content/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git.md b/translations/ja-JP/content/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git.md index e9bb672fcb..64239a6cdd 100644 --- a/translations/ja-JP/content/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git.md +++ b/translations/ja-JP/content/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git.md @@ -35,9 +35,9 @@ Git プロジェクトも、単一のディレクトリに保管されます。 Git のワークフローは以下のようになります: * Git リポジトリは、ブランチおよびタグのすべての履歴を、*.git* ディレクトリ内に保管します。 -* 最新の安定したリリースは、`master` ブランチ内に含まれます。 +* The latest stable release is contained within the default branch. * アクティブな feature は、別のブランチで開発されます。 -* feature が完了したとき、フィーチャブランチは `master` にマージされ消去されます。 +* When a feature is finished, the feature branch is merged into the default branch and deleted. Git はディレクトリ構造は同じままですが、SVN とは違い、ファイルの変更内容はブランチベースです。 diff --git a/translations/ja-JP/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md b/translations/ja-JP/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md index ee76304b38..0da7007478 100644 --- a/translations/ja-JP/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md +++ b/translations/ja-JP/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md @@ -19,7 +19,7 @@ versions: {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. リポジトリ名の下で [**Upload files**] をクリックします。 ![ファイルのアップロードボタン](/assets/images/help/repository/upload-files-button.png) {% else %} 2. ファイルリストの上にある [**Add file**] プルダウンを使用して、[**Upload files**] をクリックします。 ![[Add file] ドロップダウンの [Upload files]](/assets/images/help/repository/upload-files-button.png) diff --git a/translations/ja-JP/content/github/managing-files-in-a-repository/navigating-code-on-github.md b/translations/ja-JP/content/github/managing-files-in-a-repository/navigating-code-on-github.md index 8dc8b64c2b..5643f5d2d3 100644 --- a/translations/ja-JP/content/github/managing-files-in-a-repository/navigating-code-on-github.md +++ b/translations/ja-JP/content/github/managing-files-in-a-repository/navigating-code-on-github.md @@ -10,6 +10,7 @@ versions: ### {% data variables.product.prodname_dotcom %} のナビゲーションコードについて コードナビゲーションの機能は、オープンソースの ライブラリ[`semantic`](https://github.com/github/semantic)を使用しています。 以下の言語がサポートされています: +- C# - CodeQL - Go - Java diff --git a/translations/ja-JP/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md b/translations/ja-JP/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md index 9538a574e1..ff5af29f6f 100644 --- a/translations/ja-JP/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md +++ b/translations/ja-JP/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md @@ -9,9 +9,9 @@ versions: --- -カスタム JavaScript プロットなど、Notebook のインタラクティブ機能は、{% data variables.product.product_location %} のリポジトリでは機能しません。 例については、[*リンキングおよび Interactions.ipynb*](https://github.com/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb) を参照してください。 +カスタム JavaScript プロットなど、Notebook のインタラクティブ機能は、{% data variables.product.product_location %} のリポジトリでは機能しません。 For an example, see [*Linking and Interactions.ipynb*](https://github.com/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb). -レンダリングした JavaScript コンテンツで Jupyter notebook を表示する、または、notebook ファイルを他のユーザーと共有する場合、[nbviewer](https://nbviewer.jupyter.org/) を使用できます。 例については、[*nbviewerでレンダリングされたリンキングおよびInteractions.ipynb*](https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb) を参照してください。 +レンダリングした JavaScript コンテンツで Jupyter notebook を表示する、または、notebook ファイルを他のユーザーと共有する場合、[nbviewer](https://nbviewer.jupyter.org/) を使用できます。 For an example, see [*Linking and Interactions.ipynb*](https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb) rendered on nbviewer. Jupyter notebook の完全にインタラクティブなバージョンを表示するには、notebook サーバーをローカルに設定します。 詳細は [Jupyter の公式ドキュメント](http://jupyter.readthedocs.io/en/latest/index.html)を参照してください。 diff --git a/translations/ja-JP/content/github/managing-large-files/about-git-large-file-storage.md b/translations/ja-JP/content/github/managing-large-files/about-git-large-file-storage.md index 7b335afec6..ec89d57815 100644 --- a/translations/ja-JP/content/github/managing-large-files/about-git-large-file-storage.md +++ b/translations/ja-JP/content/github/managing-large-files/about-git-large-file-storage.md @@ -41,11 +41,13 @@ size 84977953 これは、使用している{% data variables.large_files.product_name_short %}の`version`を追跡し、その後にファイルのユニークな識別子（`oid`）が続きます。 また、最終のファイルの`size` も保存します。 -{% tip %} +{% note %} -**Tip：**{% data variables.large_files.product_name_short %}は{% data variables.product.prodname_pages %}サイトと使うことはできません。 +設定ファイルでクエリスイートを指定すると、{% data variables.product.prodname_codeql %} 分析エンジンは、デフォルトのクエリセットに加えて、スイートに含まれるクエリを実行します。 +- {% data variables.large_files.product_name_short %} cannot be used with {% data variables.product.prodname_pages %} sites. +- {% data variables.large_files.product_name_short %} cannot be used with template repositories. -{% endtip %} +{% endnote %} ### 参考リンク diff --git a/translations/ja-JP/content/github/managing-large-files/conditions-for-large-files.md b/translations/ja-JP/content/github/managing-large-files/conditions-for-large-files.md index 69dffb106f..3c085be5b8 100644 --- a/translations/ja-JP/content/github/managing-large-files/conditions-for-large-files.md +++ b/translations/ja-JP/content/github/managing-large-files/conditions-for-large-files.md @@ -16,4 +16,4 @@ versions: ### 大きなファイルのブロックされたプッシュ -{% if currentVersion != "free-pro-team@latest" %}By default, {% endif %}{% data variables.product.product_name %} blocks pushes that exceed {% data variables.large_files.max_github_size %}. {% if currentVersion != "free-pro-team@latest" %}However, a site administrator can configure a different limit for your {% data variables.product.prodname_ghe_server %} instance. 詳しい情報については 、「[Git のプッシュ制限を設定する](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits)」を参照してください。{% endif %} +{% if enterpriseServerVersions contains currentVersion %}デフォルトでは、{% endif %}{% data variables.product.product_name %}は{% data variables.large_files.max_github_size %}以上のプッシュをブロックします。 {% if enterpriseServerVersions contains currentVersion %}ただし、サイト管理者は、{% data variables.product.prodname_ghe_server %}インスタンスに別の制限を構成できます。 詳しい情報については 、「[Git のプッシュ制限を設定する](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits)」を参照してください。{% endif %} diff --git a/translations/ja-JP/content/github/managing-large-files/configuring-git-large-file-storage.md b/translations/ja-JP/content/github/managing-large-files/configuring-git-large-file-storage.md index 75c91d5c1a..4616b84913 100644 --- a/translations/ja-JP/content/github/managing-large-files/configuring-git-large-file-storage.md +++ b/translations/ja-JP/content/github/managing-large-files/configuring-git-large-file-storage.md @@ -13,7 +13,7 @@ versions: {% data reusables.large_files.resolving-upload-failures %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} diff --git a/translations/ja-JP/content/github/managing-large-files/removing-files-from-git-large-file-storage.md b/translations/ja-JP/content/github/managing-large-files/removing-files-from-git-large-file-storage.md index 9290d04394..d670a79b52 100644 --- a/translations/ja-JP/content/github/managing-large-files/removing-files-from-git-large-file-storage.md +++ b/translations/ja-JP/content/github/managing-large-files/removing-files-from-git-large-file-storage.md @@ -1,6 +1,6 @@ --- -title: Removing files from Git Large File Storage -intro: 'If you''ve set up {% data variables.large_files.product_name_short %} for your repository, you can remove all files or a subset of files from {% data variables.large_files.product_name_short %}.' +title: ファイルを Git Large File Storage から削除する +intro: 'リポジトリに {% data variables.large_files.product_name_short %} をセットアップしてあれば、{% data variables.large_files.product_name_short %} からは、すべてのファイルを削除することも、ファイルのサブセットを削除することもできます。' redirect_from: - /articles/removing-files-from-git-large-file-storage versions: @@ -8,45 +8,45 @@ versions: enterprise-server: '*' --- -### Removing a single file +### 1 つのファイルを削除する -1. Remove the file from the repository's Git history using either the `filter-branch` command or BFG Repo-Cleaner. For detailed information on using these, see "[Removing sensitive data from a repository](/articles/removing-sensitive-data-from-a-repository)." -2. Navigate to your *.gitattributes* file. +1. `filter-branch` コマンドか BFG Repo-Cleaner を使用して、リポジトリの Git 履歴からファイルを削除します。 これらを使用する詳しい情報については、「[機密データをリポジトリから削除する](/articles/removing-sensitive-data-from-a-repository)」を参照してください。 +2. *.gitattributes* ファイルに移動します。 {% note %} - **Note:** Your *.gitattributes* file is generally saved within your local repository. In some cases, you may have created a global *.gitattributes* file that contains all of your {% data variables.large_files.product_name_short %} associations. + **メモ:** *.gitattributes* ファイルは通常、ローカルリポジトリ内に保存されます。 場合によっては、{% data variables.large_files.product_name_short %} 関連をすべて含むグローバル *.gitattributes* ファイルが作成されている可能性があります。 {% endnote %} -3. Find and remove the associated {% data variables.large_files.product_name_short %} tracking rule within the *.gitattributes* file. -4. Save and exit the *.gitattributes* file. +3. *.gitattributes* ファイル内で、関連付けられている {% data variables.large_files.product_name_short %} 追跡ルールを検索して削除します。 +4. *.gitattributes* ファイルを保存して終了します。 -### Removing all files within a {% data variables.large_files.product_name_short %} repository +### {% data variables.large_files.product_name_short %} リポジトリ内にあるすべてのファイルを削除する -1. Remove the files from the repository's Git history using either the `filter-branch` command or BFG Repo-Cleaner. For detailed information on using these, see "[Removing sensitive data from a repository](/articles/removing-sensitive-data-from-a-repository)." -2. Optionally, to uninstall {% data variables.large_files.product_name_short %} in the repository, run: +1. `filter-branch` コマンドか BFG Repo-Cleaner のいずれかを使用して、リポジトリの Git 履歴から ファイルを削除します。 これらを使用する詳しい情報については、「[機密データをリポジトリから削除する](/articles/removing-sensitive-data-from-a-repository)」を参照してください。 +2. オプションで、リポジトリにある {% data variables.large_files.product_name_short %} をアンインストールするには、次を実行します: ```shell $ git lfs uninstall ``` - For {% data variables.large_files.product_name_short %} versions below 1.1.0, run: + バージョンが 1.1.0 より前の {% data variables.large_files.product_name_short %} については、次を実行します: ```shell $ git lfs uninit ``` -### {% data variables.large_files.product_name_short %} objects in your repository +### リポジトリにある {% data variables.large_files.product_name_short %}オブジェクト After you remove files from {% data variables.large_files.product_name_short %}, the {% data variables.large_files.product_name_short %} objects still exist on the remote storage{% if currentVersion == "free-pro-team@latest" %} and will continue to count toward your {% data variables.large_files.product_name_short %} storage quota{% endif %}. -To remove {% data variables.large_files.product_name_short %} objects from a repository, {% if currentVersion == "free-pro-team@latest" %}delete and recreate the repository. When you delete a repository, any associated issues, stars, and forks are also deleted. For more information, see "[Deleting a repository](/github/administering-a-repository/deleting-a-repository)."{% else %}contact your {% data variables.product.prodname_enterprise %} administrator to archive the objects. Archived objects are purged after three months.{% endif %} +To remove {% data variables.large_files.product_name_short %} objects from a repository, {% if currentVersion == "free-pro-team@latest" %}delete and recreate the repository. リポジトリを削除すると、関連する Issue、Star、フォークもすべて削除されます。 詳しい情報については、「[リポジトリを削除する](/github/administering-a-repository/deleting-a-repository)」を参照するか、{% else %}{% data variables.product.prodname_enterprise %} 管理者に連絡してオブジェクトをアーカイブします。 アーカイブ化されたオブジェクトは、3 か月後にパージされます。{% endif %} {% note %} -**Note:** If you removed a single file and have other {% data variables.large_files.product_name_short %} objects that you'd like to keep in your repository, after deleting and recreating your repository, reconfigure your {% data variables.large_files.product_name_short %}-associated files. For more information, see "[Removing a single file](#removing-a-single-file)" and "[Configuring {% data variables.large_files.product_name_long %}](/github/managing-large-files/configuring-git-large-file-storage)." +**注釈:** ファイルを 1 つ削除しても、それ以外の {% data variables.large_files.product_name_short %} オブジェクトはリポジトリに保持する場合は、リポジトリを削除して再作成してから、{% data variables.large_files.product_name_short %} に関連付けられたファイルを再設定してください。 詳しい情報については、「[1 つのファイルを削除する](#removing-a-single-file)」および「[{% data variables.large_files.product_name_long %}を設定する](/github/managing-large-files/configuring-git-large-file-storage)」を参照してください。 {% endnote %} -### Further reading +### 参考リンク -- "[About {% data variables.large_files.product_name_long %}](/articles/about-git-large-file-storage)" -- "[Collaboration with {% data variables.large_files.product_name_long %}](/articles/collaboration-with-git-large-file-storage/)" -- "[Installing {% data variables.large_files.product_name_long %}](/articles/installing-git-large-file-storage)" +- [{% data variables.large_files.product_name_long %}について](/articles/about-git-large-file-storage) +- [{% data variables.large_files.product_name_long %} でのコラボレーション](/articles/collaboration-with-git-large-file-storage/) +- 「[{% data variables.large_files.product_name_long %}をインストールする](/articles/installing-git-large-file-storage)」 diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index 0ce617f2fd..b6e48cbaec 100644 --- a/translations/ja-JP/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -49,10 +49,10 @@ You can also enable or disable {% data variables.product.prodname_dependabot %} {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert also contains a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."{% endif %} +When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert will also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a security alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% endif %} @@ -70,42 +70,15 @@ You can see all of the alerts that affect a particular project{% if currentVersi We send {% data variables.product.prodname_dependabot_short %} alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository.{% if currentVersion == "free-pro-team@latest" %} You can also enable {% data variables.product.prodname_dependabot_short %} alerts for additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} We send security alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. {% endif %} -### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} - -{% if currentVersion == "free-pro-team@latest" %} -By default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive {% data variables.product.prodname_dependabot_alerts %} by email. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#security-alert-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Choosing the delivery method for your notifications -](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.20" % %} - -{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} For more information, see "[Choosing the delivery method for your notifications](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)."{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."{% endif %} {% if currentVersion == "free-pro-team@latest" %} ### Further reading -- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" +- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" - "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Understanding how {% data variables.product.product_name %} uses and protects your data](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %} diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md new file mode 100644 index 0000000000..cf4664c91e --- /dev/null +++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md @@ -0,0 +1,33 @@ +--- +title: About GitHub Dependabot security updates +intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.' +shortTitle: About Dependabot security updates +versions: + free-pro-team: '*' +--- + +### {% data variables.product.prodname_dependabot_security_updates %} について + +{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot_short %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot_short %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + +{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot_short %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." + +{% note %} + +**注釈** + +The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. You will see a {% data variables.product.prodname_dependabot_short %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot_short %} is unable to update an indirect or transitive dependency that is not explicitly defined. 詳しい情報については、「[依存関係グラフについて](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)」を参照してください。 + +{% endnote %} + +### About pull requests for security updates + +Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. これには、リリースノート、変更ログエントリ、コミットの詳細などの脆弱性に関する情報が含まれます。 プルリクエストが解決する脆弱性の詳細は、リポジトリの {% data variables.product.prodname_dependabot_short %} アラートにアクセスできないユーザには表示されません。 + +When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot_short %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot_short %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)." + +{% data reusables.dependabot.automated-tests-note %} + +### 互換性スコアについて + +{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency. diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md index bb08cb6864..4962fa7285 100644 --- a/translations/ja-JP/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md +++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md @@ -1,6 +1,7 @@ --- title: GitHub Advisory Database のセキュリティ脆弱性を参照する intro: '{% data variables.product.prodname_advisory_database %} を使用すると、{% data variables.product.company_short %} のオープンソースプロジェクトに影響を与える脆弱性を参照または検索できます。' +shortTitle: Browsing the Advisory Database versions: free-pro-team: '*' --- diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md index dc1d9f3c0c..11be5e4a76 100644 --- a/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md +++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md @@ -5,30 +5,16 @@ redirect_from: - /articles/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-updates +shortTitle: Configuring Dependabot security updates versions: free-pro-team: '*' --- -### {% data variables.product.prodname_dependabot_security_updates %} について +### About configuring {% data variables.product.prodname_dependabot_security_updates %} -{% data variables.product.prodname_dependabot_short %} は {% data variables.product.prodname_advisory_database %} や [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database) などのセキュリティアドバイザリを監視し、リポジトリの依存関係グラフで新たに脆弱性のある依存関係を検出すると、プルリクエストを自動的にトリガーします。 {% data variables.product.prodname_advisory_database %} の詳細については、「[{% data variables.product.prodname_advisory_database %} について](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database#about-the-github-advisory-database)」を参照してください。 +{% data variables.product.prodname_dependabot_short %} アラートと依存関係グラフを使用する任意のリポジトリで {% data variables.product.prodname_dependabot_security_updates %} を有効にすることができます。 詳しい情報については、「[{% data variables.product.prodname_dependabot_security_updates %} について](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)」を参照してください。 -{% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} - -{% data variables.product.prodname_dependabot_short %} は、脆弱性のある依存関係のアラートにプルリクエストへのリンクを含めます。 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」および「[依存関係グラフについて](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)」を参照してください。 - -各セキュリティアップデートには、提案された修正を迅速かつ安全に確認してプロジェクトにマージするために必要なすべてのものが含まれています。 これには、リリースノート、変更ログエントリ、コミットの詳細などの脆弱性に関する情報が含まれます。 プルリクエストが解決する脆弱性の詳細は、リポジトリの {% data variables.product.prodname_dependabot_short %} アラートにアクセスできないユーザには表示されません。 - -セキュリティアップデートを含むプルリクエストをマージすると、対応するアラートがリポジトリに対して解決済みとしてマークされます。 - -{% note %} - -**注釈** -{% data variables.product.prodname_dependabot_security_updates %} only resolve security vulnerabilities in the dependencies tracked by your dependency graph. セキュリティアップデートは、プライベートリポジトリでホストされているプライベートレジストリまたはパッケージの脆弱性を解決するために作成されていません。 ただし、間接的または推移的な依存関係は、ロックファイルなどで明示的に定義されている場合に含まれます。 詳しい情報については、「[依存関係グラフについて](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)」を参照してください。 さらに、依存関係が脆弱であると検出された場合、{% data variables.product.prodname_dependabot_security_updates %} がロックファイルへの修正案を含むプルリクエストを自動的に作成することを強調することが重要です。 - -{% endnote %} - -{% data variables.product.prodname_dependabot_short %} アラートと依存関係グラフを使用する任意のリポジトリで {% data variables.product.prodname_dependabot_security_updates %} を有効にすることができます。 個々のリポジトリ、またはユーザアカウントまたは Organization が所有するすべてのリポジトリに対して {% data variables.product.prodname_dependabot_security_updates %} を無効にすることができます。 詳しい情報については、以下の「[リポジトリの {% data variables.product.prodname_dependabot_security_updates %} を管理する](#managing-github-dependabot-security-updates-for-your-repositories)」を参照してください。 +個々のリポジトリ、またはユーザアカウントまたは Organization が所有するすべてのリポジトリに対して {% data variables.product.prodname_dependabot_security_updates %} を無効にすることができます。 詳しい情報については、以下の「[リポジトリの {% data variables.product.prodname_dependabot_security_updates %} を管理する](#managing-github-dependabot-security-updates-for-your-repositories)」を参照してください。 {% data reusables.dependabot.dependabot-tos %} @@ -53,10 +39,6 @@ versions: リポジトリでセキュリティアップデートが有効になっておらず、理由が不明の場合は、まず以下の手順のセクションに記載されている指示に従って有効にしてみてください。 それでもセキュリティアップデートが機能しない場合は、[サポートにお問い合わせください](https://support.github.com/contact)。 -### 互換性スコアについて - -{% data variables.product.prodname_dependabot_security_updates %} には、互換性スコアも含まれています。これは、脆弱性を更新することでプロジェクトに重大な変更が発生する可能性があるかどうかを知らせるものです。 弊社では、アップデートによりテストが失敗するかどうかを確認するため、既存のセキュリティアップデートを生成したパブリックリポジトリから、以前にパスした CI テストを調べます。 更新の互換性スコアは、依存関係に関するバージョンの更新前後で、実行した CI がパスした割合です。 - ### リポジトリの {% data variables.product.prodname_dependabot_security_updates %} を管理する 個別のリポジトリに対して {% data variables.product.prodname_dependabot_security_updates %} を有効または無効にできます。 diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md new file mode 100644 index 0000000000..b1b06e227f --- /dev/null +++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md @@ -0,0 +1,58 @@ +--- +title: Configuring notifications for vulnerable dependencies +shortTitle: 通知を設定する +intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts.' +versions: + free-pro-team: '*' + enterprise-server: '>=2.21' +--- + +### About notifications for vulnerable dependencies + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we send you {% data variables.product.prodname_dependabot_short %} alerts.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. +{% endif %} + +{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)." +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %} +Your site administrator needs to enable security alerts for vulnerable dependencies for +{% data variables.product.product_location_enterprise %} before you can use the feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.20" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive +{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} by email.{% endif %} + +{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} + +You can configure notification settings for yourself or your organization from the Manage notifications drop-down {% octicon "bell" aria-label="The notifications bell" %} shown at the top of each page. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#choosing-your-notification-settings)." + +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} + ![{% data variables.product.prodname_dependabot_short %} アラートオプション](/assets/images/help/notifications-v2/dependabot-alerts-options.png) +{% else %} + ![Security alerts options](/assets/images/help/notifications-v2/security-alerts-options.png) +{% endif %} + +{% note %} + +**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. 詳しい情報については「[インボックスからの通知の管理](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)」を参照してください。 + +{% endnote %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} + +### How to reduce the noise from notifications for vulnerable dependencies + +If you are concerned about receiving too many notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, we recommend you opt into the weekly email digest, or turn off notifications while keeping {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} enabled. You can still navigate to see your {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} in your repository's Security tab.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %} + +### 参考リンク + +- [通知を設定する](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications) +- "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-is-queries)" diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/index.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/index.md index b2e976d166..73b4a8ea29 100644 --- a/translations/ja-JP/content/github/managing-security-vulnerabilities/index.md +++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/index.md @@ -28,8 +28,11 @@ versions: {% link_in_list /browsing-security-vulnerabilities-in-the-github-advisory-database %} {% link_in_list /about-alerts-for-vulnerable-dependencies %} + {% link_in_list /configuring-notifications-for-vulnerable-dependencies %} + {% link_in_list /about-github-dependabot-security-updates %} {% link_in_list /configuring-github-dependabot-security-updates %} {% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %} {% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %} + {% link_in_list /troubleshooting-github-dependabot-errors %} diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md new file mode 100644 index 0000000000..aa3e67fd3a --- /dev/null +++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md @@ -0,0 +1,82 @@ +--- +title: Troubleshooting GitHub Dependabot errors +intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot_short %}.' +shortTitle: エラーのトラブルシューティング +versions: + free-pro-team: '*' +--- + +{% data reusables.dependabot.beta-note %} + +### About {% data variables.product.prodname_dependabot %} errors + +{% data reusables.dependabot.pull-request-introduction %} + +If anything prevents {% data variables.product.prodname_dependabot_short %} from raising a pull request, this is reported as an error. + +### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot_short %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_short %} alerts view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_short %} alerts** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request. + +![{% data variables.product.prodname_dependabot_short %} alerts view showing a pull request link](/assets/images/help/dependabot/dependabot-alert-pr-link.png) + +There are three reasons why an alert may have no pull request link: + +1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository. +1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file. +1. An error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request. + +If an error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request, you can display details of the error by clicking the alert. + +![{% data variables.product.prodname_dependabot_short %} alert showing the error that blocked the creation of a pull request](/assets/images/help/dependabot/dependabot-security-update-error.png) + +### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot_short %} are listed on the {% data variables.product.prodname_dependabot_short %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot_short %}** tab. + +![{% data variables.product.prodname_dependabot_short %} view showing an error](/assets/images/help/dependabot/dependabot-tab-view-error-beta.png) + +To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed. + +![{% data variables.product.prodname_dependabot_short %} version update error and log ](/assets/images/help/dependabot/dependabot-version-update-error-beta.png) + +### Understanding {% data variables.product.prodname_dependabot_short %} errors + +Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot_short %} configuration files. Consequently, some errors are specific to one type of update. + +#### {% data variables.product.prodname_dependabot_short %} cannot update DEPENDENCY to a non-vulnerable version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository. + +Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem. + +The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。 + +#### {% data variables.product.prodname_dependabot_short %} cannot update to the required version as there is already an open pull request for the latest version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version. + +There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +#### {% data variables.product.prodname_dependabot_short %} timed out during its update + +{% data variables.product.prodname_dependabot_short %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out. + +This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot_short %} to review the version update and generate the pull request in the time available. + +If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。 + +#### {% data variables.product.prodname_dependabot_short %} cannot open any more pull requests + +There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot_short %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests. + +There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. 詳しい情報については、「[依存関係の更新の設定オプション](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit) 」を参照してください。 + +The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +### Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually + +If you unblock {% data variables.product.prodname_dependabot_short %}, you can manually trigger a fresh attempt to create a pull request. + +- **Security updates**—display the {% data variables.product.prodname_dependabot_short %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot_short %} security update**. +- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**. diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md index 108ae346f7..be6f18eeb9 100644 --- a/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md +++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md @@ -1,6 +1,7 @@ --- title: Troubleshooting the detection of vulnerable dependencies intro: 'If the dependency information reported by {% data variables.product.product_name %} is not what you expected, there are a number of points to consider, and various things you can check.' +shortTitle: Troubleshooting detection versions: free-pro-team: '*' --- @@ -14,9 +15,9 @@ The results of dependency detection reported by {% data variables.product.produc * {% data variables.product.prodname_advisory_database %} is one of the data sources that {% data variables.product.prodname_dotcom %} uses to identify vulnerable dependencies. It's a free, curated database of vulnerability information for common package ecosystems on {% data variables.product.prodname_dotcom %}. It includes both data reported directly to {% data variables.product.prodname_dotcom %} from {% data variables.product.prodname_security_advisories %}, as well as official feeds and community sources. This data is reviewed and curated by {% data variables.product.prodname_dotcom %} to ensure that false or unactionable information is not shared with the development community. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)" and "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." * The dependency graph parses all known package manifest files in a user’s repository. For example, for npm it will parse the _package-lock.json_ file. It constructs a graph of all of the repository’s dependencies and public dependents. This happens when you enable the dependency graph and when anyone pushes to the default branch, and it includes commits that makes changes to a supported manifest format. 詳しい情報については、「[依存関係グラフについて](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)」を参照してください。 * {% data variables.product.prodname_dependabot_short %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_short %} alerts are aggregated at the repository level, rather than creating one alert per vulnerability. 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」を参照してください。 -* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive a security alert about a vulnerable dependency in your repository. {% data variables.product.prodname_dotcom %} automatically creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. 詳しい情報については、「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」を参照してください。 +* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." - {% data variables.product.prodname_dependabot_short %} doesn't scan repositories on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database. + {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database. ### Why don't I get vulnerability alerts for some ecosystems? @@ -97,3 +98,4 @@ When you click to display the alert details, you can see how many vulnerabilitie - 「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」 - [リポジトリ内の脆弱な依存関係を表示・更新する](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository) - "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index ce32d5d083..9b81bd50e8 100644 --- a/translations/ja-JP/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -4,17 +4,18 @@ intro: '{% data variables.product.product_name %} がプロジェクト内の脆 redirect_from: - /articles/viewing-and-updating-vulnerable-dependencies-in-your-repository permissions: リポジトリ管理者と Organization のオーナーは、依存関係を表示および更新できます。 +shortTitle: 脆弱性のある依存関係を表示して更新する versions: free-pro-team: '*' --- リポジトリの {% data variables.product.prodname_dependabot %} アラートタブには、オープンおよびクローズしている {% data variables.product.prodname_dependabot_alerts %}、および対応する {% data variables.product.prodname_dependabot_security_updates %} がすべて一覧表示されます。 ドロップダウンメニューを使用してアラートのリストを並べ替えることができます。また、特定のアラートをクリックしてその詳細を表示することもできます。 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」を参照してください。 -{% data variables.product.prodname_dependabot_alerts %} と依存関係グラフを使用するリポジトリの自動セキュリティ更新を有効にすることができます。 詳しい情報については、「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」を参照してください。 +{% data variables.product.prodname_dependabot_alerts %} と依存関係グラフを使用するリポジトリの自動セキュリティ更新を有効にすることができます。 詳しい情報については、「[{% data variables.product.prodname_dependabot_security_updates %} について](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)」を参照してください。 ### リポジトリ内の脆弱性のある依存関係の更新について -リポジトリに影響を与える脆弱性を検出すると、{% data variables.product.product_name %} は {% data variables.product.prodname_dependabot_alerts %} を送信します。 {% data variables.product.prodname_dependabot_security_updates %} が有効になっているリポジトリで {% data variables.product.product_name %} が脆弱性のある依存関係を検出すると、{% data variables.product.prodname_dependabot_short %} はプルリクエストを作成して修正します。 {% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} +リポジトリに影響を与える脆弱性を検出すると、{% data variables.product.product_name %} は {% data variables.product.prodname_dependabot_alerts %} を送信します。 {% data variables.product.prodname_dependabot_security_updates %} が有効になっているリポジトリで {% data variables.product.product_name %} が脆弱性のある依存関係を検出すると、{% data variables.product.prodname_dependabot_short %} はプルリクエストを作成して修正します。 プルリクエストは、脆弱性を回避するために必要最低限の安全なバージョンに依存関係をアップグレードします。 ### 脆弱性のある依存関係を表示して更新する @@ -33,3 +34,4 @@ versions: - 「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」 - "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" - "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md index 67b15b0e07..010b674d44 100644 --- a/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md +++ b/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md @@ -163,25 +163,10 @@ If you are a member of more than one organization, you can configure each one to ### Security alert options {% endif %} -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}Choose how you want to receive {% data variables.product.prodname_dependabot_alerts %} for repositories that you are watching. {% if page.version == 'dotcom' %}{% data variables.product.prodname_dependabot_alerts %}{% else %}セキュリティアラート{% endif %}は、インボックス、{% data variables.product.product_name %} のバナー、コマンドライン、メール、またはこれらのオプションの組み合わせで受信できます。 +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} -If you want to receive {% data variables.product.prodname_dependabot_alerts %} by email, choose whether you want a weekly email summary of vulnerabilities for up 10 repositories or a new email each time a vulnerability is detected. 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」を参照してください。 {% endif %} - -{% if currentVersion == "enterprise-server@2.21" %}Choose how you want to receive security alerts for repositories that you are watching. You can receive security alerts in your inbox, as a banner on {% data variables.product.product_name %}, on the command line, through email, or some combination of these options. - -If you want to receive security alerts by email, choose whether you want a weekly email summary of vulnerabilities for up 10 repositories or a new email each time a vulnerability is detected. 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」を参照してください。 {% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} - ![{% data variables.product.prodname_dependabot_short %} アラートオプション](/assets/images/help/notifications-v2/dependabot-alerts-options.png) -{% else %} - ![Security alerts options](/assets/images/help/notifications-v2/security-alerts-options.png) -{% endif %} - -{% note %} - -If you are a member of more than one organization, you can configure each one to send notifications to any of{% if currentVersion == "free-pro-team@latest" %} your verified email addresses{% else %} the email addressed you've added to your {% data variables.product.product_name %} account{% endif %}. 詳しい情報については「[インボックスからの通知の管理](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)」を参照してください。 - -{% endnote %} +For more information about the notification delivery methods available to you, and advice on optimizing your notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} diff --git a/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md index 4a2aeb95a6..f4b77c734c 100644 --- a/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md +++ b/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md @@ -124,6 +124,8 @@ To filter notifications by why you've received an update, you can use the `reaso - `is:repository-advisory` - `is:team-discussion` +For information about reducing noise from notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." + You can also use the `is:` query to describe how the notification was triaged. - `is:saved` diff --git a/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md b/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md index dfad6716fd..b2e7da2ec9 100644 --- a/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md +++ b/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md @@ -38,7 +38,7 @@ When you unsubscribe from notifications in your inbox, they will automatically d {% data reusables.notifications.access_notifications %} 1. 通知インボックスから、サブスクライブ解除する通知を選択します。 -2. **選択した** {% octicon "triangle-down" aria-label="The down triangle icon" %} ドロップダウンを使用して、[**Unsubscribe**] をクリックします。 ![メインインボックスからの [Unsubcribe] オプション](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) +2. Use the **selected** {% octicon "triangle-down" aria-label="The down triangle icon" %} drop-down to click **Unsubscribe.** ![メインインボックスからの [Unsubcribe] オプション](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) ### サブスクリプションページで通知をサブスクライブ解除する diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters.md b/translations/ja-JP/content/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters.md index 01c24fac4a..b5abea0c0a 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters.md @@ -22,15 +22,15 @@ versions: ### サポートされているクエリパラメータ -| クエリパラメータ | サンプル | -| ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `body` | `https://github.com/octo-org/octo-repo/compare/main...pull-request-test?quick_pull=1&body=Fixes+the+problem.` creates a pull request, comparing the branches `main` and `pull-request-test`, with the comment "Fixes the problem" in the pull request body. | -| `title` | `https://github.com/octo-org/octo-repo/issues/new?labels=bug&title=New+bug+report` は、"bug" というラベルと "New bug report" というタイトルを付けて Issue を作成します。 | -| `labels` | `https://github.com/octo-org/octo-repo/compare/main...pull-request-test?quick_pull=1&labels=bug` creates a pull request, comparing the branches `main` and `pull-request-test`, with the label "bug." | -| `template` | `https://github.com/octo-org/octo-repo/issues/new?template=issue_template.md` は、ボディにテンプレートを付けて Issue を作成します。 | -| `マイルストーン` | `https://github.com/octo-org/octo-repo/issues/new?milestone=testing+milestones` は、"testing milestones" というマイルストーンを持たせて Issue を作成します。 | -| `assignees` | `https://github.com/octo-org/octo-repo/issues/new?assignees=octocat` は、Issue を作成して @octocat に割り当てます。 | -| `projects` | `https://github.com/octo-org/octo-repo/issues/new?title=Bug+fix&projects=octo-org/1` は、"Bug fix" というタイトルを付けて Issue を作成し、それを Organization のプロジェクトボード 1 に追加します。 | +| クエリパラメータ | サンプル | +| ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `body` | `https://github.com/octo-org/octo-repo/compare/master...pull-request-test?quick_pull=1&body=Fixes+the+problem.` は、`master` と `pull-request-test` のブランチを比較して、ボディに "Fixes the problem" というコメントを付けてプルリクエストを作成します。 | +| `title` | `https://github.com/octo-org/octo-repo/issues/new?labels=bug&title=New+bug+report` は、"bug" というラベルと "New bug report" というタイトルを付けて Issue を作成します。 | +| `labels` | `https://github.com/octo-org/octo-repo/compare/master...pull-request-test?quick_pull=1&labels=bug` は、`master` ブランチと `pull-request-test` ブランチを比較して、"bug" というラベルを付けてプルリクエストを作成します。 | +| `template` | `https://github.com/octo-org/octo-repo/issues/new?template=issue_template.md` は、ボディにテンプレートを付けて Issue を作成します。 | +| `milestone` | `https://github.com/octo-org/octo-repo/issues/new?milestone=testing+milestones` は、"testing milestones" というマイルストーンを持たせて Issue を作成します。 | +| `assignees` | `https://github.com/octo-org/octo-repo/issues/new?assignees=octocat` は、Issue を作成して @octocat に割り当てます。 | +| `projects` | `https://github.com/octo-org/octo-repo/issues/new?title=Bug+fix&projects=octo-org/1` は、"Bug fix" というタイトルを付けて Issue を作成し、それを Organization のプロジェクトボード 1 に追加します。 | ### カスタムテンプレートでIssueやプルリクエストを記入する diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/about-automation-for-project-boards.md b/translations/ja-JP/content/github/managing-your-work-on-github/about-automation-for-project-boards.md index e340630a4f..2f91f649c4 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/about-automation-for-project-boards.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/about-automation-for-project-boards.md @@ -29,9 +29,12 @@ versions: | 完了 |
    • クローズされたすべてのIssueをここに移動させる
    • マージされたすべてのプルリクエストをここに移動させる
    • マージされずにクローズされたすべてのプルリクエストをここに移動させる
    | ### プロジェクトの進捗の追跡 -プロジェクトボードの自動化によって、デフォルトで進捗を追跡できるようになります。 "To do"、"In progress"、"Done" がプリセットされた列内のカードは、プロジェクト全体の進捗に対してカウントされます。 {% data reusables.project-management.project-progress-locations %} + +You can track the progress on your project board. Cards in the "To do", "In progress", or "Done" columns count toward the overall project progress. {% data reusables.project-management.project-progress-locations %} + +For more information, see "[Tracking progress on your project board](/github/managing-your-work-on-github/tracking-progress-on-your-project-board)." ### 参考リンク -- "[Configuring automation for project boards](/articles/configuring-automation-for-project-boards)"{% if currentVersion == "free-pro-team@latest" %} +- [プロジェクトボードの自動化を設定する](/articles/configuring-automation-for-project-boards){% if currentVersion == "free-pro-team@latest" %} - [プロジェクトボードのコピー](/articles/copying-a-project-board) {% endif %} diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/about-labels.md b/translations/ja-JP/content/github/managing-your-work-on-github/about-labels.md index 402bddaa11..0fb6e08390 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/about-labels.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/about-labels.md @@ -16,17 +16,17 @@ versions: {% data variables.product.product_name %} は、すべての新しいリポジトリにデフォルトのラベルを提供します。 これらのデフォルトのラベルを使って、リポジトリの標準的なワークフローを作成しやすくできます。 -| ラベル | 説明 | -| ------------------ | --------------------------------------------------------------- | -| `bug` | Indicates an unexpected problem or unintended behavior | -| `documentation` | Indicates a need for improvements or additions to documentation | -| `duplicate` | 同様の Issue あるいはプルリクエストを示します | -| `enhancement` | 新しい機能のリクエストを示します | -| `good first issue` | 初回のコントリビューターに適した Issue を示します | -| `help wanted` | メンテナーが Issue もしくはプルリクエストに助けを求めていることを示します | -| `invalid` | Issue あるいはプルリクエストに関連性がなくなったことを示します | -| `question` | Issue あるいはプルリクエストにさらなる情報が必要なことを示します | -| `wontfix` | Issue あるいはプルリクエストの作業が継続されないことを示します | +| ラベル | 説明 | +| ------------------ | ---------------------------------------- | +| `bug` | 予想外の問題あるいは意図しない振る舞いを示します | +| `documentation` | ドキュメンテーションに改善や追加が必要であることを示します | +| `duplicate` | 同様の Issue あるいはプルリクエストを示します | +| `enhancement` | 新しい機能のリクエストを示します | +| `good first issue` | 初回のコントリビューターに適した Issue を示します | +| `help wanted` | メンテナーが Issue もしくはプルリクエストに助けを求めていることを示します | +| `invalid` | Issue あるいはプルリクエストに関連性がなくなったことを示します | +| `question` | Issue あるいはプルリクエストにさらなる情報が必要なことを示します | +| `wontfix` | Issue あるいはプルリクエストの作業が継続されないことを示します | リポジトリの作成時に、すべての新しいリポジトリにデフォルトのラベルが含められますが、後でそのラベルを編集または削除できます。 詳細は「[ラベルの削除](/articles/deleting-a-label/)」を参照してください。 diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/about-project-boards.md b/translations/ja-JP/content/github/managing-your-work-on-github/about-project-boards.md index 8f48e0f0ce..43322d29ff 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/about-project-boards.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/about-project-boards.md @@ -59,7 +59,7 @@ Organization が所有するプロジェクトボードに、あなたが表示 ### 参考リンク - [プロジェクトボードの作成](/articles/creating-a-project-board) -- "[Editing a project board](/articles/editing-a-project-board)"{% if currentVersion == "free-pro-team@latest" %} +- [プロジェクトボードの自動化を設定する](/articles/editing-a-project-board){% if currentVersion == "free-pro-team@latest" %} - [プロジェクトボードのコピー](/articles/copying-a-project-board) {% endif %} - [プロジェクトボードへの Issue およびプルリクエストの追加](/articles/adding-issues-and-pull-requests-to-a-project-board) diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/adding-issues-and-pull-requests-to-a-project-board.md b/translations/ja-JP/content/github/managing-your-work-on-github/adding-issues-and-pull-requests-to-a-project-board.md index 87b433edf9..f6572a44e9 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/adding-issues-and-pull-requests-to-a-project-board.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/adding-issues-and-pull-requests-to-a-project-board.md @@ -54,7 +54,7 @@ versions: 1. Issue あるいはプルリクエストの右側で、[**Projects {% octicon "gear" aria-label="The Gear icon" %}**] をクリックします。 ![サイドバーのプロジェクトボードボタン](/assets/images/help/projects/sidebar-project.png) 2. 追加したいプロジェクトボードの [**Recent**]、[**Repository**]、[**User**]、[**Organization**] タブをクリックします。 ![Recent、Repository、Organization タブ](/assets/images/help/projects/sidebar-project-tabs.png) 3. [**Filter projects**] フィールドにプロジェクト名を入力します。 ![プロジェクトボードの検索ボックス](/assets/images/help/projects/sidebar-search-project.png) -4. Select one or more project boards where you want to add the issue or pull request. ![選択されたプロジェクトボード](/assets/images/help/projects/sidebar-select-project.png) +4. Issueまたはプルリクエストを追加する1つ以上のプロジェクトボードを選択します。 ![選択されたプロジェクトボード](/assets/images/help/projects/sidebar-select-project.png) 5. {% octicon "triangle-down" aria-label="The down triangle icon" %} をクリックし、Issueまたはプルリクエストが必要な列をクリックします。 カードが、選択したプロジェクトボードの列の下部に移動します。 ![[Move card to column] メニュー](/assets/images/help/projects/sidebar-select-project-board-column-menu.png) ### 参考リンク diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/applying-labels-to-issues-and-pull-requests.md b/translations/ja-JP/content/github/managing-your-work-on-github/applying-labels-to-issues-and-pull-requests.md index 4e2610a436..3545fc96d6 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/applying-labels-to-issues-and-pull-requests.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/applying-labels-to-issues-and-pull-requests.md @@ -18,7 +18,7 @@ versions: {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-issue-pr %} {% data reusables.repositories.select-items-in-issue-or-pr-list %} -4. 右上で [**Label**] をクリックし、続けて既存のラベル名を入力してください。 ラベルの名前をクリックして、選択されたアイテムに関連付けてください。 You can also apply a label in the Labels drop-down menu within an issue or pull request. ![Issue のマイルストーン割り当てドロップダウンメニュー](/assets/images/help/issues/issues_applying_labels_dropdown.png) +4. 右上で [**Label**] をクリックし、続けて既存のラベル名を入力してください。 ラベルの名前をクリックして、選択されたアイテムに関連付けてください。 ヒント: ラベルは Issue あるいはプルリクエストの Labels (ラベル) ドロップダウンメニューからも適用できます。 ![Issue のマイルストーン割り当てドロップダウンメニュー](/assets/images/help/issues/issues_applying_labels_dropdown.png) ### 参考リンク diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/assigning-issues-and-pull-requests-to-other-github-users.md b/translations/ja-JP/content/github/managing-your-work-on-github/assigning-issues-and-pull-requests-to-other-github-users.md index d783f1cf16..e185922bb7 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/assigning-issues-and-pull-requests-to-other-github-users.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/assigning-issues-and-pull-requests-to-other-github-users.md @@ -10,7 +10,7 @@ versions: リポジトリへの書き込み権限があるユーザなら誰でもIssue およびプルリクエストをアサインできます。 -You can assign up to 10 people to each issue or pull request, including yourself, anyone who has commented on the issue or pull request, anyone with write permissions to the repository, and organization members with read permissions to the repository. 詳細は「[{% data variables.product.prodname_dotcom %} 上のアクセス権限](/articles/access-permissions-on-github)」を参照してください。 +自身、該当する Issue またはプルリクエストにコメントした任意の人、リポジトリへの書き込み権限がある任意の人、およびリポジトリの読み取り権限がある Organization メンバーを含めて、最大 10 人まで各 Issue またはプルリクエストにアサインできます。 詳細は「[{% data variables.product.prodname_dotcom %} 上のアクセス権限](/articles/access-permissions-on-github)」を参照してください。 {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-issue-pr %} diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/creating-a-label.md b/translations/ja-JP/content/github/managing-your-work-on-github/creating-a-label.md index 98a5fb69b5..8e5466affa 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/creating-a-label.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/creating-a-label.md @@ -29,6 +29,6 @@ versions: - [ラベルについて](/articles/about-labels) - "[Issue およびプルリクエストにラベルを適用する](/articles/applying-labels-to-issues-and-pull-requests)" - "[ラベルの編集](/articles/editing-a-label)" -- "[Filtering issues and pull requests by labels](/articles/filtering-issues-and-pull-requests-by-labels)"{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} +- [Issue およびプルリクエストをラベルでフィルタリングする](/articles/filtering-issues-and-pull-requests-by-labels){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} - [Organization 内のリポジトリのためのデフォルトラベルを管理する](/articles/managing-default-labels-for-repositories-in-your-organization) {% endif %} diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/creating-a-project-board.md b/translations/ja-JP/content/github/managing-your-work-on-github/creating-a-project-board.md index 893ce7abcb..d4b7a1de40 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/creating-a-project-board.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/creating-a-project-board.md @@ -82,7 +82,7 @@ versions: ### 参考リンク - "[プロジェクトボードについて](/articles/about-project-boards)" -- "[Editing a project board](/articles/editing-a-project-board)"{% if currentVersion == "free-pro-team@latest" %} +- [プロジェクトボードの自動化を設定する](/articles/editing-a-project-board){% if currentVersion == "free-pro-team@latest" %} - [プロジェクトボードのコピー](/articles/copying-a-project-board) {% endif %} - "[プロジェクトボードをクローズする](/articles/closing-a-project-board)" diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/deleting-a-label.md b/translations/ja-JP/content/github/managing-your-work-on-github/deleting-a-label.md index 6d29eaa2cd..8873b39902 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/deleting-a-label.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/deleting-a-label.md @@ -18,6 +18,6 @@ versions: ### 参考リンク - "[Issue およびプルリクエストにラベルを適用する](/articles/applying-labels-to-issues-and-pull-requests)" -- "[Filtering issues and pull requests by labels](/articles/filtering-issues-and-pull-requests-by-labels)"{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} +- [Issue およびプルリクエストをラベルでフィルタリングする](/articles/filtering-issues-and-pull-requests-by-labels){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} - [Organization 内のリポジトリのためのデフォルトラベルを管理する](/articles/managing-default-labels-for-repositories-in-your-organization) {% endif %} diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/disabling-issues.md b/translations/ja-JP/content/github/managing-your-work-on-github/disabling-issues.md index a29fb29f5c..3819a92b93 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/disabling-issues.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/disabling-issues.md @@ -17,9 +17,9 @@ versions: {% if currentVersion == "free-pro-team@latest" %} {% tip %} -Please contact +お問い合わせください。 -{% data variables.contact.contact_support %} if you want to turn off issues because of abuse from strangers. +他者による悪用を防ぐため Issues をオフにしたい場合は、{% data variables.contact.contact_support %} までご連絡ください。 {% data reusables.policies.abuse %} {% endtip %} diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/editing-a-label.md b/translations/ja-JP/content/github/managing-your-work-on-github/editing-a-label.md index ea61011ad5..ab6183e2b8 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/editing-a-label.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/editing-a-label.md @@ -23,6 +23,6 @@ versions: - "[ラベルの作成](/articles/creating-a-label)" - "[ラベルの削除](/articles/deleting-a-label)" - "[Issue およびプルリクエストにラベルを適用する](/articles/applying-labels-to-issues-and-pull-requests)" -- "[Filtering issues and pull requests by labels](/articles/filtering-issues-and-pull-requests-by-labels)"{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} +- [Issue およびプルリクエストをラベルでフィルタリングする](/articles/filtering-issues-and-pull-requests-by-labels){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} - [Organization 内のリポジトリのためのデフォルトラベルを管理する](/articles/managing-default-labels-for-repositories-in-your-organization) {% endif %} diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md b/translations/ja-JP/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md index 53a67879b0..944b396ada 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md @@ -1,6 +1,6 @@ --- -title: File attachments on issues and pull requests -intro: 'When you open issue or update a pull request, you can use issue attachments to upload images of proposed features or screenshots of bugs.' +title: Issue およびプルリクエストのファイル添付 +intro: 'Issue を開いたりプルリクエストを更新したりする際に、Issue の添付を使用して機能の提案やバグのスクリーンショットの画像をアップロードできます。' redirect_from: - /articles/issue-attachments/ - /articles/file-attachments-on-issues-and-pull-requests @@ -8,33 +8,34 @@ versions: free-pro-team: '*' enterprise-server: '*' --- + {% warning %} -**Warning:** If you add an image to a pull request or issue comment, anyone can view the anonymized image URL without authentication, even if the pull request is in a private repository{% if currentVersion != "free-pro-team@latest" %}, or if private mode is enabled{% endif %}. To keep sensitive images private, serve them from a private network or server that requires authentication. {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} +**警告:**Pull Request や Issue へのコメントに画像添付を追加した場合、その Pull Request がプライベートリポジトリのものである場合、{% if enterpriseServerVersions contains currentVersion %}またはプライベートモードが有効化されている場合も、{% endif %}匿名化した画像 URL は認証なしに誰もが見ることができます。 機密の画像をプライベートにしておきたい場合は、それらを認証が必要なプライベートなネットワークあるいはサーバーから提供するようにしてください。 {% if currentVersion == "free-pro-team@latest" %}匿名化した URL の詳細については、「[匿名化された画像 URL について](/articles/about-anonymized-image-urls)」を参照してください。{% endif %} {% endwarning %} -To attach a file to an issue or pull request conversation, drag and drop it into the comment box. Alternatively, you can click the bar at the bottom of the comment box to browse, select, and add a file from your computer. +Issue やプルリクエストの会話にファイルを添付するには、コメントボックスにファイルをドラッグアンドドロップします。 または、コメントボックスの下部にあるバーをクリックしてコンピュータからファイルを参照、選択、追加することもできます。 -![Select attachments from computer](/assets/images/help/pull_requests/select-bar.png) +![コンピュータから添付ファイルを選択する](/assets/images/help/pull_requests/select-bar.png) {% tip %} -**Tip:** If you're using Chrome, you can also copy-and-paste images directly into the box. +**Tip:** In many browsers, you can copy-and-paste images directly into the box. {% endtip %} -The maximum size for files is 25MB and the maximum size for images is 10MB. +ファイルの最大サイズは 25MB で、画像の最大サイズは 10MB です。 -We support these files: +以下のファイルがサポートされています: * PNG (*.png*) * GIF (*.gif*) * JPEG (*.jpg*) -* Log files (*.log*) -* Microsoft Word (*.docx*), Powerpoint (*.pptx*), and Excel (*.xlsx*) documents -* Text files (*.txt*) -* PDFs (*.pdf*) +* ログファイル (*.log*) +* Microsoft Word (*.docx*)、Powerpoint (*.pptx*)、および Excel (*.xlsx*) 文書 +* テキストファイル (*.txt*) +* PDF (*.pdf*) * ZIP (*.zip*, *.gz*) -![Attachments animated GIF](/assets/images/help/pull_requests/dragging_images.gif) +![添付アニメーション GIF](/assets/images/help/pull_requests/dragging_images.gif) diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/filtering-cards-on-a-project-board.md b/translations/ja-JP/content/github/managing-your-work-on-github/filtering-cards-on-a-project-board.md index ab7b8f17e3..9928b289d0 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/filtering-cards-on-a-project-board.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/filtering-cards-on-a-project-board.md @@ -8,20 +8,20 @@ versions: enterprise-server: '*' --- -On a card, you can click any assignee, milestone, or label to filter the project board by that qualifier. To clear the search, you can click the same assignee, milestone, or label again. +カードでは、任意のアサインされた人、マイルストーン、またはラベルをクリックして、その修飾子でプロジェクトをフィルタリングできます。 検索をクリアするには、同じアサインされた人、マイルストーン、またはラベルを再度クリックします。 また、各プロジェクトボードの上部にある [Filter cards] 検索バーを使用して、カードを検索することも可能です。 以下の検索修飾子をさまざまに組み合わせて使用したり、検索したいテキストを入力したりすることで、カードをフィルタリングできます。 - `author:USERNAME` を使用してカードを作者でフィルタする - `assignee:USERNAME` または `no:assignee` を使用して、カードをアサインされた人でフィルタリングする -- Filter cards by label using `label:LABEL`, `label:"MULTI-WORD LABEL NAME"`, or `no:label` +- `label:LABEL`、`label:"MULTI-WORD LABEL NAME"`、または `no:label` を使用して、カードをラベルでフィルタリングする - `milestone:MY-MILESTONE` を使用して、カードをマイルストーンでフィルタリングする - `state:open`、`state:closed`、または `state:merged` を使用して、カードを状態でフィルタリングする - `review:none`、`review:required`、`review:approved`、または `review:changes_requested` を使用して、カードをレビューステータスでフィルタリングする - `status:pending`、`status:success`、または `status:failure` を使用して、カードをチェックステータスでフィルタリングする - `type:issue`、`type:pr`、または `type:note` を使用して、カードをタイプでフィルタリングする - `is:open`、`is:closed`、または `is:merged`と、`is:issue`、`is:pr`、または `is:note` とを使用して、カードをステータスとタイプでフィルタリングする -- Filter cards by issues that are linked to a pull request by a closing reference using `linked:pr`{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} +- `linked:pr`を使用してクローズしているリファレンスによってプルリクエストにリンクされている Issue でカードをフィルタリングする{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} - `repo:ORGANIZATION/REPOSITORY` を使用して、Organization 全体のプロジェクトボード内のリポジトリでカードをフィルタリングする{% endif %} 1. フィルタリングしたいカードが含まれるプロジェクトボードに移動します。 diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/filtering-issues-and-pull-requests-by-milestone.md b/translations/ja-JP/content/github/managing-your-work-on-github/filtering-issues-and-pull-requests-by-milestone.md index c599e789ad..53c5258a6c 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/filtering-issues-and-pull-requests-by-milestone.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/filtering-issues-and-pull-requests-by-milestone.md @@ -14,7 +14,7 @@ versions: - 検索バーを使用して Issue とプルリクエストをフィルタリングしたい場合は、マイルストーンの検索構文を使用できます。 My Milestone という名前のマイルストーンであれば、検索構文は `milestone:"My Milestone"` となります。 - フィルタの選択をクリアするには、[**Clear current search query, filters, and sorts**] をクリックします。 -- {% data variables.product.prodname_cli %} を使用して Issue またはプルリクエストをフィルタすることもできます。 For more information, see "[`gh issue list`](https://cli.github.com/manual/gh_issue_list)" or "[`gh pr list`](https://cli.github.com/manual/gh_pr_list)" in the {% data variables.product.prodname_cli %} documentation. +- {% data variables.product.prodname_cli %} を使用して Issue またはプルリクエストをフィルタすることもできます。 詳しい情報については、ドキュメントの「[`gh issue list`](https://cli.github.com/manual/gh_issue_list)」または「[`gh pr list`](https://cli.github.com/manual/gh_pr_list)」{% data variables.product.prodname_cli %} を参照してください。 {% endtip %} diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue.md b/translations/ja-JP/content/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue.md index 532599ac64..10b845cf75 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue.md @@ -1,6 +1,6 @@ --- title: プルリクエストをIssueにリンクする -intro: 'You can link a pull request to an issue to{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.18" %} show that a fix is in progress and to{% endif %} automatically close the issue when the pull request is merged.' +intro: 'プルリクエストをIssueにリンクして、{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.18" %}修正が進行中であることを示し、{% endif %} プルリクエストがマージされるときIssueを自動的にクローズすることができます。' redirect_from: - /articles/closing-issues-via-commit-message/ - /articles/closing-issues-via-commit-messages/ @@ -13,17 +13,17 @@ versions: {% note %} -**Note:** The special keywords in a pull request description are interpreted when the pull request targets the repository's *default* branch. However, if the PR's base is *any other branch*, then these keywords are ignored, no links are created and merging the PR has no effect on the issues. **If you want to link a pull request to an issue using a keyword, the PR must be on the default branch.** +**注釈:** プルリクエストにおける特別なキーワードは、プルリクエストがリポジトリの*デフォルト* ブランチをターゲットするときに解釈されます。 ただし、PRのベースが*それ以外のブランチ*である場合、それらのキーワードは無視され、リンクは作成されません。PRのマージはこのIssueに対して何の効果も持ちません。 **キーワードの1つを使用してプルリクエストをIssueにリンクしたい場合は、PRがデフォルトブランチ上になければなりません。** {% endnote %} ### リンクされたIssueとプルリクエストについて -You can link an issue to a pull request {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}manually or {% endif %}using a supported keyword in the pull request description. +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}手動で、または{% endif %}プルリクエストの説明でサポートされているキーワードを使用して、Issueをプルリクエストにリンクすることができます。 -プルリクエストが対処するIssueにそのプルリクエストにリンクすると、コラボレータは、誰かがそのIssueに取り組んでいることを確認できます。 {% if currentVersion ver_lt "enterprise-server@2.21" %}If the pull request and the issue are in different repositories, {% data variables.product.product_name %} will display the link after the pull request is merged, if the person who merges the pull request also has permission to close the issue.{% endif %} +プルリクエストが対処するIssueにそのプルリクエストにリンクすると、コラボレータは、誰かがそのIssueに取り組んでいることを確認できます。 {% if currentVersion ver_lt "enterprise-server@2.21" %}プルリクエストとIssueが別のリポジトリにある場合は、プルリクエストをマージするユーザーにIssueをクローズする権限もあれば、そのマージが実行された後で{% data variables.product.product_name %}にリンクが表示されます。{% endif %} -リンクされたプルリクエストをリポジトリのデフォルトブランチにマージすると、それにリンクされているIssueは自動的にクローズされます。 For more information about the default branch, see "[Changing the default branch](/github/administering-a-repository/changing-the-default-branch)." +リンクされたプルリクエストをリポジトリのデフォルトブランチにマージすると、それにリンクされているIssueは自動的にクローズされます。 デフォルトブランチの詳細については、「[デフォルトブランチを変更する](/github/administering-a-repository/changing-the-default-branch)」を参照してください。 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} ### 手動でプルリクエストをIssueにリンクする @@ -41,7 +41,7 @@ You can link an issue to a pull request {% if currentVersion == "free-pro-team@l ### キーワードを使用してプルリクエストをIssueにリンクする -You can link a pull request to an issue by using a supported keyword in the pull request's description or in a commit message (please note that the pull request must be on the default branch). +プルリクエストの説明で、またはコミットメッセージで、サポートされているキーワードを使用してプルリクエストにIssueにリンクすることができます (プルリクエストはデフォルトブランチになければなりません)。 * close * closes @@ -61,9 +61,9 @@ You can link a pull request to an issue by using a supported keyword in the pull | Issueが別のリポジトリにある | *KEYWORD* *OWNER*/*REPOSITORY*#*ISSUE-NUMBER* | `Fixes octo-org/octo-repo#100` | | 複数の Issue | Issueごとに完全な構文を使用 | `Resolves #10, resolves #123, resolves octo-org/octo-repo#100` | -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}Only manually linked pull requests can be manually unlinked. キーワードを使用してリンクしたIssueのリンクを解除するには、プルリクエストの説明を編集してそのキーワードを削除する必要があります。{% endif %} +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}手動でリンクを解除できるのは、手動でリンクされたプルリクエストだけです。 キーワードを使用してリンクしたIssueのリンクを解除するには、プルリクエストの説明を編集してそのキーワードを削除する必要があります。{% endif %} -クローズするキーワードは、コミットメッセージでも使用できます。 The issue will be closed when you merge the commit into the default branch, but the pull request that contains the commit will not be listed as a linked pull request. +クローズするキーワードは、コミットメッセージでも使用できます。 デフォルトブランチにコミットをマージするとIssueはクローズされますが、そのコミットを含むプルリクエストは、リンクされたプルリクエストとしてリストされません。 ### 参考リンク diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md b/translations/ja-JP/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md index b1c9945efb..6d13409008 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md @@ -8,6 +8,12 @@ versions: enterprise-server: '*' --- +{% note %} + +**注釈:** 自分の Organization またはユーザ所有のプロジェクトボードにリポジトリをリンクするには、リポジトリで Issue が有効になっている必要があります。 リポジトリに対して Issue が有効かどうかを確認する方法にいては、「[Issue を無効化する](/github/managing-your-work-on-github/disabling-issues)」を参照してください。 + +{% endnote %} + プロジェクトボードへの書き込み権限があれば誰でも、その Organization またはユーザアカウントが所有するリポジトリをプロジェクトボードにリンクできます。 詳細は「[Organization のプロジェクトボード権限](/articles/project-board-permissions-for-an-organization/)」または「[ユーザ所有のプロジェクトボードの権限レベル](/articles/permission-levels-for-user-owned-project-boards/)」を参照してください。 {% data reusables.project-management.link-repos-to-project-board %}Issue またはプルリクエストの URL をカードに入力すると、リンクされていないリポジトリから Issue またはプルリクエストを追加できます。 詳しい情報については、「[プロジェクトボードに Issue およびプルリクエストを追加する](/articles/adding-issues-and-pull-requests-to-a-project-board)」を参照してください。 diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md b/translations/ja-JP/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md index f79ccb901d..15cd40c36c 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md @@ -1,6 +1,6 @@ --- title: プロジェクトボードで進捗を追跡する -intro: 'デフォルトでは、プロジェクトボードの自動化を有効化すると、プロジェクト全体の進捗がプログレスバーで追跡されます。' +intro: 'You can see the overall progress of your project in a progress bar.' redirect_from: - /articles/tracking-progress-on-your-project-board versions: @@ -10,7 +10,7 @@ versions: {% data reusables.project-management.project-progress-locations %} -1. プロジェクトの進捗の追跡を無効にするプロジェクトボードに移動します。 +1. Navigate to the project board where you want to enable or disable project progress tracking. {% data reusables.project-management.click-menu %} -{% data reusables.project-management.access-collaboration-settings %} -4. [**Track project progress**] の選択を解除します。 +{% data reusables.project-management.click-edit-sidebar-menu-project-board %} +4. Select or deselect **Track project progress**. diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/transferring-an-issue-to-another-repository.md b/translations/ja-JP/content/github/managing-your-work-on-github/transferring-an-issue-to-another-repository.md index 53b08d733a..927fdb5fd0 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/transferring-an-issue-to-another-repository.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/transferring-an-issue-to-another-repository.md @@ -12,7 +12,7 @@ versions: 同じユーザまたは Organization アカウントが所有するリポジトリ間においてのみ、Issue を移譲できます。 プライベートリポジトリからパブリックリポジトリへは、Issue を移譲できません。 -Issueを委譲する場合、コメントとアサインされた人は保持されます。 The issue's labels and milestones are not retained. This issue will stay on any user-owned or organization-wide project boards and be removed from any repository project boards. 詳細は「[プロジェクトボードについて](/articles/about-project-boards)」を参照してください。 +Issueを委譲する場合、コメントとアサインされた人は保持されます。 Issue のラベルとマイルストーンは保持されません。 このIssueは、ユーザー所有または組織全体のプロジェクトボードにとどまり、リポジトリのプロジェクトボードから削除されます。 詳細は「[プロジェクトボードについて](/articles/about-project-boards)」を参照してください。 Issue でメンションされた人や Team は、Issue が新しいリポジトリに移譲されたことを知らせる通知を受け取ります。 当初の URL は、新しい Issue の URL にリダイレクトします。 新しいリポジトリの読み取り権限がない人には、アクセスできない新しいリポジトリに Issue が移譲されたことを知らせるバナーが表示されます。 diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/using-search-to-filter-issues-and-pull-requests.md b/translations/ja-JP/content/github/managing-your-work-on-github/using-search-to-filter-issues-and-pull-requests.md index 02a03e315e..4ba7768cf3 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/using-search-to-filter-issues-and-pull-requests.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/using-search-to-filter-issues-and-pull-requests.md @@ -39,7 +39,7 @@ Issueについては、以下も検索に利用できます。 - レビュー担当者が変更を要求したプルリクエストのフィルタリング: `state:open type:pr review:changes_requested` - [レビュー担当者](/articles/about-pull-request-reviews/)によるプルリクエストのフィルタリング: `state:open type:pr reviewed-by:octocat` - [レビューを要求された](/articles/requesting-a-pull-request-review)特定のユーザーによるプルリクエストのフィルタリング: `state:open type:pr review-requested:octocat` -- Filter pull requests by the team requested for review: `state:open type:pr team-review-requested:github/atom`{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} +- レビューを要求されたチームによるプルリクエストのフィルタリング: `state:open type:pr team-review-requested:github/atom`{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} - プルリクエストでクローズできるIssueにリンクされているプルリクエストのフィルタリング: `linked:issue`{% endif %} ### 参考リンク diff --git a/translations/ja-JP/content/github/managing-your-work-on-github/viewing-all-of-your-issues-and-pull-requests.md b/translations/ja-JP/content/github/managing-your-work-on-github/viewing-all-of-your-issues-and-pull-requests.md index a3d0493710..abfc7ec81e 100644 --- a/translations/ja-JP/content/github/managing-your-work-on-github/viewing-all-of-your-issues-and-pull-requests.md +++ b/translations/ja-JP/content/github/managing-your-work-on-github/viewing-all-of-your-issues-and-pull-requests.md @@ -15,4 +15,4 @@ Issue およびプルリクエストダッシュボードは、すべてのペ ### 参考リンク -- {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}”[Viewing your subscriptions](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions#reviewing-repositories-that-youre-watching){% else %}”[Listing the repositories you're watching](/github/receiving-notifications-about-activity-on-github/listing-the-repositories-youre-watching){% endif %}" +- {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}[サブスクリプションを表示する](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions#reviewing-repositories-that-youre-watching){% else %}[Watch しているリポジトリのリスト](/github/receiving-notifications-about-activity-on-github/listing-the-repositories-youre-watching){% endif %} diff --git a/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/about-notifications.md b/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/about-notifications.md index abff2b0dd0..1ce94154e2 100644 --- a/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/about-notifications.md +++ b/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/about-notifications.md @@ -33,7 +33,7 @@ versions: #### Watch 対象の通知 -{% data variables.product.product_name %} は、あなたが Watch しているリポジトリあるいは Team のディスカッションに更新があった場合、*Watch* 通知を送信します。 {% data reusables.notifications.auto-watch %}For more information, see "[Watching and unwatching repositories](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories)." +{% data variables.product.product_name %} は、あなたが Watch しているリポジトリあるいは Team のディスカッションに更新があった場合、*Watch* 通知を送信します。 {% data reusables.notifications.auto-watch %} 詳細は、「[リポジトリの Watch と Watch 解除](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories)」を参照してください。 通知は以下の場合に送られます: - Issue がオープンされた場合。 - コミットがオープンな Issue に追加された場合。 diff --git a/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/about-web-notifications.md b/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/about-web-notifications.md index 667e7a35be..8bb312aa70 100644 --- a/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/about-web-notifications.md +++ b/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/about-web-notifications.md @@ -7,7 +7,7 @@ versions: *参加*と *Watch* 対象との通知の違いについては、「[通知について](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/about-notifications)」を参照してください。 -アカウントで Web 通知が有効化したなら、通知ページ上のアイテムをクリックすると通知が参照している会話へリダイレクトされます。 For more information on enabling web notifications, see "[Choosing the delivery method for your notifications](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)." Web 通知の有効化に関する詳しい情報については「[通知の配信方法を選択する](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)」を参照してください。 +アカウントで Web 通知が有効化したなら、通知ページ上のアイテムをクリックすると通知が参照している会話へリダイレクトされます。 Web 通知の有効化に関する詳しい情報については「[通知の配信方法を選択する](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)」を参照してください。 Web 通知の有効化に関する詳しい情報については「[通知の配信方法を選択する](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)」を参照してください。 {% data reusables.notifications.shared_state %} diff --git a/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/subscribing-to-and-unsubscribing-from-notifications.md b/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/subscribing-to-and-unsubscribing-from-notifications.md index 679cbf4bd0..7b209b8150 100644 --- a/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/subscribing-to-and-unsubscribing-from-notifications.md +++ b/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/subscribing-to-and-unsubscribing-from-notifications.md @@ -12,7 +12,7 @@ versions: 3. サブスクライブの設定を行う Issue またはプルリクエストを選択します。 4. 右サイドバーで [**Subscribe**] または [**Unsubscribe**] をクリックします。 ![Conversation サブスクライブボタン](/assets/images/help/notifications/subscribe_button_with_gear.png) 5. 通知をカスタマイズするには {% octicon "gear" aria-label="The gear icon" %} をクリックします。 ![Conversation サブスクライブの隣にある歯車ボタン](/assets/images/help/notifications/subscribe_button_with_gear_chosen.png) -6. この Conversation で受信したいタイプの通知を選択して、[**Save**] をクリックします。 ![Conversation Subscribe options list](/assets/images/help/notifications/subscribe_options.png) You can see a list of all the issues and pull requests you're subscribed to. 詳細は「[サブスクライブしている Issue とプルリクエストをリストする](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/listing-the-issues-and-pull-requests-youre-subscribed-to)」を参照してください。 +6. この Conversation で受信したいタイプの通知を選択して、[**Save**] をクリックします。 ![Conversation Subscribe options list](/assets/images/help/notifications/subscribe_options.png) サブスクライブしている Issue およびプルリクエストの一覧を表示できます。 詳細は「[サブスクライブしている Issue とプルリクエストをリストする](/enterprise/{{ currentVersion }}/user/github/receiving-notifications-about-activity-on-github/listing-the-issues-and-pull-requests-youre-subscribed-to)」を参照してください。 ### Team ディスカッションをサブスクライブする diff --git a/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md b/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md index 738aef725c..91c391c1a7 100644 --- a/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md +++ b/translations/ja-JP/content/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories.md @@ -33,7 +33,7 @@ versions: {% note %} -**メモ:** リポジトリを無視することもできます。 リポジトリを無視した場合、通知は届きません。 あなたが @メンションされても通知されなくなるため、リポジトリを無視することはおすすめしません。 {% if currentVersion == "free-pro-team@latest" %}If you experiencing abuse and want to ignore a repository, please [contact support](/contact) so we can help. {% data reusables.policies.abuse %}{% endif %} +**メモ:** リポジトリを無視することもできます。 リポジトリを無視した場合、通知は届きません。 あなたが @メンションされても通知されなくなるため、リポジトリを無視することはおすすめしません。 {% if currentVersion == "free-pro-team@latest" %}乱用を経験し、Team を無視したい場合は、私たちがサポートしますので、[サポートに連絡してください](/contact)。 {% data reusables.policies.abuse %}{% endif %} {% endnote %} diff --git a/translations/ja-JP/content/github/searching-for-information-on-github/about-searching-on-github.md b/translations/ja-JP/content/github/searching-for-information-on-github/about-searching-on-github.md index 6ed39dcf9a..65a600dd1c 100644 --- a/translations/ja-JP/content/github/searching-for-information-on-github/about-searching-on-github.md +++ b/translations/ja-JP/content/github/searching-for-information-on-github/about-searching-on-github.md @@ -1,6 +1,6 @@ --- title: GitHub での検索について -intro: 'Our integrated search covers the many repositories, users, and lines of code on {% data variables.product.product_name %}.' +intro: 'GitHub の統合検索機能は、{% data variables.product.product_name %}上の多くのリポジトリ、ユーザ、コードの行が対象です。' redirect_from: - /articles/using-the-command-bar/ - /articles/github-search-basics/ @@ -24,8 +24,8 @@ versions: - {% data reusables.search.required_login %} - {% data variables.product.prodname_pages %}サイトは、{% data variables.product.product_name %}上では検索できません。 ただし、コンテンツのソースがリポジトリのデフォルトブランチにある場合は、コード検索を使って検索できます。 詳しい情報については[コードの検索](/articles/searching-code)を参照してください。 {% data variables.product.prodname_pages %}に関する詳しい情報については、[GitHub Pages とは何ですか？ ](/articles/what-is-github-pages/)を参照してください。 -- Currently our search doesn't support exact matching. -- Whenever you are searching in code files, only the first two results in each file will be returned. +- 現在、GitHub の検索は完全一致をサポートしていません。 +- コードファイルのどこを検索しても、返されるのは各ファイルで最初の 2 つの結果のみです。 {% endnote %} @@ -42,7 +42,7 @@ versions: - [Issue およびプルリクエスト](/articles/searching-issues-and-pull-requests) - [コード](/articles/searching-code) - [コミット](/articles/searching-commits) -- [Users](/articles/searching-users){% if currentVersion == "free-pro-team@latest" %} +- [ユーザ](/articles/searching-users){% if currentVersion == "free-pro-team@latest" %} - [パッケージ](/github/searching-for-information-on-github/searching-for-packages){% endif %} - [Wiki](/articles/searching-wikis) diff --git a/translations/ja-JP/content/github/searching-for-information-on-github/finding-files-on-github.md b/translations/ja-JP/content/github/searching-for-information-on-github/finding-files-on-github.md index 71de0fda8e..775b18a842 100644 --- a/translations/ja-JP/content/github/searching-for-information-on-github/finding-files-on-github.md +++ b/translations/ja-JP/content/github/searching-for-information-on-github/finding-files-on-github.md @@ -18,7 +18,7 @@ versions: {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. リポジトリ名の下で、[**Find file**] をクリックします。 ![[Find file] ボタン](/assets/images/help/search/find-file-button.png) {% else %} 2. ファイルの一覧の上にある [**Go to file**] をクリックします。 ![[Find file] ボタン](/assets/images/help/search/find-file-button.png) diff --git a/translations/ja-JP/content/github/searching-for-information-on-github/searching-code.md b/translations/ja-JP/content/github/searching-for-information-on-github/searching-code.md index 8607346483..178ab2838e 100644 --- a/translations/ja-JP/content/github/searching-for-information-on-github/searching-code.md +++ b/translations/ja-JP/content/github/searching-for-information-on-github/searching-code.md @@ -22,7 +22,7 @@ versions: - {% data reusables.search.required_login %} - [フォーク](/articles/about-forks)のコードは、親リポジトリより Star が多い場合に限って検索可能です。 親リポジトリより Star が少ないフォークは、コード検索ではインデックス**されません。** 親リポジトリより Star が多いフォークを検索結果に含めるためには、クエリに `fork:true` または `fork:only` を追加する必要があります。 詳細は「[フォーク内で検索する](/articles/searching-in-forks)」を参照してください。 -- Only the _default branch_ is indexed for code search.{% if currentVersion == "free-pro-team@latest" %} +- コード検索では、_デフォルトブランチ_のみインデックスされます。{% if currentVersion == "free-pro-team@latest" %} - 384 KB より小さいファイルのみ検索可能です。{% else %}* 5 MB より小さいファイルのみ検索可能です。 - 各ファイルの最初の 500 KB のみ検索可能です。{% endif %} - 500,000 より少ないファイル数のリポジトリのみ検索可能です。 @@ -101,5 +101,5 @@ versions: ### 参考リンク - 「[検索結果をソートする](/articles/sorting-search-results/)」 -- "[Searching in forks](/articles/searching-in-forks)"{% if currentVersion == "free-pro-team@latest" %} +- [フォーク内を検索する](/articles/searching-in-forks){% if currentVersion == "free-pro-team@latest" %} - "[ {% data variables.product.prodname_dotcom %} 上のコード間を移動する](/github/managing-files-in-a-repository/navigating-code-on-github)"{% endif %} diff --git a/translations/ja-JP/content/github/searching-for-information-on-github/searching-for-packages.md b/translations/ja-JP/content/github/searching-for-information-on-github/searching-for-packages.md index 39167bd6fc..7491f8bdb1 100644 --- a/translations/ja-JP/content/github/searching-for-information-on-github/searching-for-packages.md +++ b/translations/ja-JP/content/github/searching-for-information-on-github/searching-for-packages.md @@ -14,9 +14,9 @@ versions: {% data variables.product.product_name %} 全体にわたってグローバルにパッケージを検索できます。あるいは、特定の Organization のみのパッケージの検索もできます。 詳細は「[{% data variables.product.prodname_dotcom %} での検索について](/articles/about-searching-on-github)」を参照してください。 -{% if currentVersion != "free-pro-team@latest" %} -You can only search for packages on -{% data variables.product.product_location_enterprise %}, not {% data variables.product.prodname_dotcom_the_website %}, even if {% data variables.product.prodname_github_connect %} is enabled. +{% if enterpriseServerVersions contains currentVersion %} +パッケージを検索できるのは +{% data variables.product.product_location_enterprise %} だけで、たとえ {% data variables.product.prodname_github_connect %} 有効にしていても{% data variables.product.prodname_dotcom_the_website %} では検索できません。 {% endif %} {% data reusables.search.syntax_tips %} diff --git a/translations/ja-JP/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md b/translations/ja-JP/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md index 255293e25d..85dcbe032e 100644 --- a/translations/ja-JP/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md +++ b/translations/ja-JP/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md @@ -13,7 +13,7 @@ versions: {% tip %} -**Tips:**{% if currentVersion != "free-pro-team@latest" %} +**ヒント:**{% if enterpriseServerVersions contains currentVersion %} - この記事には、{% data variables.product.prodname_dotcom %}.com のウェブサイトでの検索例が含まれています。ですが、同じ検索フィルターを {% data variables.product.product_location_enterprise %} で使えます。{% endif %} - 検索結果を改良する検索修飾子を追加できる検索構文のリストについては、「[検索構文を理解する](/articles/understanding-the-search-syntax)」を参照してください。 - 複数単語の検索用語は引用符で囲みます。 たとえば "In progress" というラベルを持つ Issue を検索したい場合は、`label:"in progress"` とします。 検索では、大文字と小文字は区別されません。 @@ -229,11 +229,11 @@ versions: ### ドラフトプルリクエストを検索 ドラフトプルリクエストをフィルタリングすることができます。 詳しい情報については[プルリクエストについて](/articles/about-pull-requests#draft-pull-requests)を参照してください。 -| Qualifier | Example | ------------- | -------------{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} | `draft:true` | [**draft:true**](https://github.com/search?q=draft%3Atrue) matches draft pull requests. | `draft:false` | [**draft:false**](https://github.com/search?q=draft%3Afalse) は、レビューの準備ができたプルリクエストに一致します。{% else %} | `is:draft` | [**is:draft**](https://github.com/search?q=is%3Adraft) はドラフトプルリクエストに一致します。{% endif %} +| Qualifier | Example | ------------- | -------------{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} | `draft:true` | [**draft:true**](https://github.com/search?q=draft%3Atrue) はドラフトプルリクエストに一致します。 | `draft:false` | [**draft:false**](https://github.com/search?q=draft%3Afalse) は、レビューの準備ができたプルリクエストに一致します。{% else %} | `is:draft` | [**is:draft**](https://github.com/search?q=is%3Adraft) はドラフトプルリクエストに一致します。{% endif %} ### プルリクエストレビューのステータスおよびレビュー担当者で検索 -You can filter pull requests based on their [review status](/articles/about-pull-request-reviews) (_none_, _required_, _approved_, or _changes requested_), by reviewer, and by requested reviewer. +レビュー担当者およびレビューリクエストを受けた人で、[レビューステータス](/articles/about-pull-request-reviews) (_none_、_required_、_approved_、または _changes requested_) でプルリクエストをフィルタリングできます。 | 修飾子 | サンプル | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | @@ -253,10 +253,10 @@ You can filter pull requests based on their [review status](/articles/about-pull {% data reusables.search.date_gt_lt %} -| 修飾子 | サンプル | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| created:YYYY-MM-DD | [**language:c# created:<2011-01-01 state:open**](https://github.com/search?q=language%3Ac%23+created%3A%3C2011-01-01+state%3Aopen&type=Issues) matches open issues that were created before 2011 in repositories written in C#. | -| updated:YYYY-MM-DD | [**weird in:body updated:>=2013-02-01**](https://github.com/search?q=weird+in%3Abody+updated%3A%3E%3D2013-02-01&type=Issues) matches issues with the word "weird" in the body that were updated after February 2013. | +| 修飾子 | サンプル | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| created:YYYY-MM-DD | [**language:c# created:<2011-01-01 state:open**](https://github.com/search?q=language%3Ac%23+created%3A%3C2011-01-01+state%3Aopen&type=Issues) は、C# で記述されたリポジトリの 2011 年より前に作成されたオープンな Issue にマッチします。 | +| updated:YYYY-MM-DD | [**weird in:body updated:>=2013-02-01**](https://github.com/search?q=weird+in%3Abody+updated%3A%3E%3D2013-02-01&type=Issues) は、2013 年 2 月以降に更新された、本文に「weird」という単語を含む Issue にマッチします。 | ### Issue やプルリクエストがクローズされた時期で検索 @@ -266,10 +266,10 @@ You can filter pull requests based on their [review status](/articles/about-pull {% data reusables.search.date_gt_lt %} -| 修飾子 | サンプル | -| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| closed:YYYY-MM-DD | [**language:swift closed:>2014-06-11**](https://github.com/search?q=language%3Aswift+closed%3A%3E2014-06-11&type=Issues) matches issues and pull requests in Swift that were closed after June 11, 2014. | -| | [**data in:body closed:<2012-10-01**](https://github.com/search?utf8=%E2%9C%93&q=data+in%3Abody+closed%3A%3C2012-10-01+&type=Issues) matches issues and pull requests with the word "data" in the body that were closed before October 2012. | +| 修飾子 | サンプル | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| closed:YYYY-MM-DD | [**language:swift closed:>2014-06-11**](https://github.com/search?q=language%3Aswift+closed%3A%3E2014-06-11&type=Issues) は、2014 年 6 月 11 日より後にクローズした Swift の Issue およびプルリクエストにマッチします。 | +| | [**data in:body closed:<2012-10-01**](https://github.com/search?utf8=%E2%9C%93&q=data+in%3Abody+closed%3A%3C2012-10-01+&type=Issues) は、2012 年 10 月より前にクローズされた、body に「data」という単語がある Issue およびプルリクエストにマッチします。 | ### プルリクエストがマージされた時期で検索 @@ -279,10 +279,10 @@ You can filter pull requests based on their [review status](/articles/about-pull {% data reusables.search.date_gt_lt %} -| 修飾子 | サンプル | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| merged:YYYY-MM-DD | [**language:javascript merged:<2011-01-01**](https://github.com/search?q=language%3Ajavascript+merged%3A%3C2011-01-01+&type=Issues) matches pull requests in JavaScript repositories that were merged before 2011. | -| | [**fast in:title language:ruby merged:>=2014-05-01**](https://github.com/search?q=fast+in%3Atitle+language%3Aruby+merged%3A%3E%3D2014-05-01+&type=Issues) matches pull requests in Ruby with the word "fast" in the title that were merged after May 2014. | +| 修飾子 | サンプル | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| merged:YYYY-MM-DD | [**language:javascript merged:<2011-01-01**](https://github.com/search?q=language%3Ajavascript+merged%3A%3C2011-01-01+&type=Issues) は、2011 年より前にマージされた JavaScript のリポジトリにあるプルリクエストにマッチします。 | +| | [**fast in:title language:ruby merged:>=2014-05-01**](https://github.com/search?q=fast+in%3Atitle+language%3Aruby+merged%3A%3E%3D2014-05-01+&type=Issues)は、2014 年 5 月以降にマージされた、タイトルに「fast」という単語がある Ruby のプルリクエストにマッチします。 | ### プルリクエストがマージされているかどうかで検索 diff --git a/translations/ja-JP/content/github/searching-for-information-on-github/understanding-the-search-syntax.md b/translations/ja-JP/content/github/searching-for-information-on-github/understanding-the-search-syntax.md index 73e3897c6c..830b029af6 100644 --- a/translations/ja-JP/content/github/searching-for-information-on-github/understanding-the-search-syntax.md +++ b/translations/ja-JP/content/github/searching-for-information-on-github/understanding-the-search-syntax.md @@ -51,10 +51,10 @@ versions: {% data reusables.time_date.time_format %} -| クエリ | サンプル | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| YYYY-MM-DDTHH:MM:SS+00:00 | **[cats created:2017-01-01T01:00:00+07:00..2017-03-01T15:30:15+07:00](https://github.com/search?utf8=%E2%9C%93&q=cats+created%3A2017-01-01T01%3A00%3A00%2B07%3A00..2017-03-01T15%3A30%3A15%2B07%3A00&type=Issues)** 2017 年 1 月 1 日午前 1 時（世界協定時`+7時間`）と 2017 年 3 月 1 日午後 3 時（世界協定時 `+7時間`）の間に作成された Issue にマッチします。 with a UTC offset of `07:00` and March 1, 2017 at 3 p.m. with a UTC offset of `07:00`. | -| YYYY-MM-DDTHH:MM:SSZ | **[cats created:2016-03-21T14:11:00Z..2016-04-07T20:45:00Z](https://github.com/search?utf8=%E2%9C%93&q=cats+created%3A2016-03-21T14%3A11%3A00Z..2016-04-07T20%3A45%3A00Z&type=Issues)** は、2016 年 3 月 21 日午後 2 時 11 分と 2016 年 4 月 7 日 8 時 45 分の間に作成された Issue にマッチします。 | +| クエリ | サンプル | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| YYYY-MM-DDTHH:MM:SS+00:00 | **[cats created:2017-01-01T01:00:00+07:00..2017-03-01T15:30:15+07:00](https://github.com/search?utf8=%E2%9C%93&q=cats+created%3A2017-01-01T01%3A00%3A00%2B07%3A00..2017-03-01T15%3A30%3A15%2B07%3A00&type=Issues)** 2017 年 1 月 1 日午前 1 時（世界協定時`+7時間`）と 2017 年 3 月 1 日午後 3 時（世界協定時 `+7時間`）の間に作成された Issue にマッチします。 （世界協定時`+7時間`）と 2017 年 3 月 1 日午後 3 時 （世界協定時 `+7時間`）の間に作成された Issue にマッチします。 | +| YYYY-MM-DDTHH:MM:SSZ | **[cats created:2016-03-21T14:11:00Z..2016-04-07T20:45:00Z](https://github.com/search?utf8=%E2%9C%93&q=cats+created%3A2016-03-21T14%3A11%3A00Z..2016-04-07T20%3A45%3A00Z&type=Issues)** は、2016 年 3 月 21 日午後 2 時 11 分と 2016 年 4 月 7 日 8 時 45 分の間に作成された Issue にマッチします。 | ### 一定の検索結果の除外 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md index 0162793b23..ba9d067f18 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md @@ -44,14 +44,14 @@ versions: | macOS | $0.08 | | Windows | $0.016 | -アカウントもしくはOrganization内のすべてのリポジトリにわたって同時に実行できるジョブ数は、あなたのGitHubのプランによります。 For more information, see "[Usage limits and billing](/actions/reference/usage-limits-billing-and-administration)" for {% data variables.product.prodname_dotcom %}-hosted runners and "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)" for self-hosted runner usage limits. +アカウントもしくはOrganization内のすべてのリポジトリにわたって同時に実行できるジョブ数は、あなたのGitHubのプランによります。 詳細については、{% data variables.product.prodname_dotcom %} ホストランナーの「[使用制限と支払い](/actions/reference/usage-limits-billing-and-administration)」、およびセルフホストランナーの使用制限については「[セルフホストランナーについて](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)」を参照してください。 ### 利用時間 (分) とストレージ消費量の計算 月末に、{% data variables.product.prodname_dotcom %}はアカウントに含まれている量に対して使用された分とストレージのコストを計算します。 たとえば、Organizationが{% data variables.product.prodname_team %}を使用しており、使用量に制限をしていない場合、15,000分を使用すればジョブを実行しているオペレーティングシステムによって、合計でストレージと分は56ドルの超過コストになるかもしれません。 - 5,000 (3,000 Linux と 2,000 Windows) 分 = $56 ($24 + $32)。 - - 単価$0.008で3,000 Linux分 = $24。 + - 3,000 Linux minutes at $0.008 per minute = $24. - 単価$0.016で2,000 Windows分 = $32。 月末に、{% data variables.product.prodname_dotcom %}はデータ転送を最も近いGBに丸めます。 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client.md b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client.md index a710b78f54..0d4546e988 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client.md @@ -36,7 +36,7 @@ versions: {% data reusables.organizations.organization-name %} 5. [Contact email] で、クライアントの連絡先メールアドレスを入力します。 ![[Contact email] フィールド](/assets/images/help/organizations/contact-email-field.png) {% data reusables.dotcom_billing.owned_by_business %} -8. Click **Next**. +8. [**Next**] をクリックします。 ### ステップ 3: Organization を年次支払いプランへ アップグレードする diff --git a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions.md b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions.md index 3626bda64a..6a3d5ba722 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions.md @@ -10,7 +10,7 @@ versions: {% data reusables.github-actions.actions-billing %} {% data reusables.github-actions.actions-spending-limit %} -設定する利用上限を引き上げたり、一部のアカウントについて無制限に設定することができます。 OrganizationまたはEnterprise アカウントの分を請求書で支払っている場合、超過分を前払いして、利用上限を引き上げることができます。 The spending limit applies to your combined overages for {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %}. For more information about pricing for {% data variables.product.prodname_actions %} usage, see "[About billing for {% data variables.product.prodname_actions %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions)." +設定する利用上限を引き上げたり、一部のアカウントについて無制限に設定することができます。 OrganizationまたはEnterprise アカウントの分を請求書で支払っている場合、超過分を前払いして、利用上限を引き上げることができます。 利用上限は、{% data variables.product.prodname_actions %} と {% data variables.product.prodname_registry %} を組み合わせた範囲に適用されます。 {% data variables.product.prodname_actions %}の価格に関する詳細な情報については、「[{% data variables.product.prodname_actions %}の支払いについて](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions)」を参照してください。 利用上限を$0より高く設定すると、過去に発生した超過分についても請求が生じます。 たとえば、Organizationで {% data variables.product.prodname_team %} を使用していて超過を許可しておらず、月あたりのストレージ使用量が1.9GBから2.1GBに増えるワークフローアーティファクトを作成した場合、ストレージは製品に含まれる2GBをわずかに超えることになります。 @@ -42,15 +42,15 @@ Organizationアカウントに対して請求書での支払いをしている ### Enterprise アカウントの {% data variables.product.prodname_actions %} に対する利用上限を管理する -Enterprise owners and billing managers can manage the spending limit for {% data variables.product.prodname_actions %} for an enterprise account. +Enterprise アカウントの {% data variables.product.prodname_actions %} については、Enterprise オーナーと支払いマネージャーが利用上限を管理できます。 {% data reusables.github-actions.spending-limit-enterprise-account %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} -1. Under " -{% data variables.product.prodname_actions %} and Packages monthly usage", click **Cost management**. +1. [ +[{% data variables.product.prodname_actions %} and Packages monthly usage] で、[**Cost management**] をクリックします。 ![コスト管理タブ](/assets/images/help/settings/cost-management-tab-enterprise.png) {% data reusables.dotcom_billing.monthly-spending-limit %} {% data reusables.dotcom_billing.update-spending-limit %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages.md b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages.md index ff0952c0c4..8d107d7eaa 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages.md @@ -10,7 +10,7 @@ versions: {% data reusables.package_registry.packages-billing %} -設定する利用上限を引き上げたり、一部のアカウントについて無制限に設定することができます。 OrganizationまたはEnterprise アカウントの分を請求書で支払っている場合、超過分を前払いして、利用上限を引き上げることができます。 The spending limit applies to your combined overages for {% data variables.product.prodname_registry %} and {% data variables.product.prodname_actions %}. For more information about pricing for {% data variables.product.prodname_registry %} usage, see "[About billing for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages)." +設定する利用上限を引き上げたり、一部のアカウントについて無制限に設定することができます。 OrganizationまたはEnterprise アカウントの分を請求書で支払っている場合、超過分を前払いして、利用上限を引き上げることができます。 利用上限は、{% data variables.product.prodname_registry %} と {% data variables.product.prodname_actions %} を組み合わせた範囲に適用されます。 {% data variables.product.prodname_registry %}の価格に関する詳細な情報については、「[{% data variables.product.prodname_registry %}の支払いについて](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages)」を参照してください。 利用上限を$0より高く設定すると、過去に発生した超過分についても請求が生じます。 たとえば、Organizationで {% data variables.product.prodname_team %} を使用していて超過を許可しておらず、月あたりのストレージ使用量が1.9GBから2.1GBに増えるプライベートパッケージの新しいバージョンを発行した場合、ストレージは製品に含まれる2GBをわずかに超えることになります。 @@ -42,15 +42,15 @@ Organizationアカウントに対して請求書での支払いをしている ### Enterprise アカウントの {% data variables.product.prodname_registry %} に対する利用上限を管理する -Enterprise owners and billing managers can manage the spending limit for {% data variables.product.prodname_registry %} for an enterprise account. +Enterprise アカウントの {% data variables.product.prodname_registry %} については、Enterprise オーナーと支払いマネージャーが利用上限を管理できます。 {% data reusables.package_registry.spending-limit-enterprise-account %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} -1. Under " -{% data variables.product.prodname_actions %} and Packages monthly usage", click **Cost management**. +1. [ +[{% data variables.product.prodname_actions %} and Packages monthly usage] で、[**Cost management**] をクリックします。 ![コスト管理タブ](/assets/images/help/settings/cost-management-tab-enterprise.png) {% data reusables.dotcom_billing.monthly-spending-limit %} {% data reusables.dotcom_billing.update-spending-limit %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md index dbf0e6a316..680d62de21 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md @@ -28,8 +28,8 @@ versions: {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.billing %} {% data reusables.user_settings.subscriptions-tab %} -4. Next to " -{% data variables.product.prodname_free_user %}", click **Upgrade**. +4. [ +{% data variables.product.prodname_free_user %}] の隣で、[**Upgrade**] をクリックします。 ![アップグレードボタン](/assets/images/help/billing/settings_billing_user_upgrade.png) {% data reusables.dotcom_billing.choose-monthly-or-yearly-billing %} {% data reusables.dotcom_billing.show-plan-details %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage.md b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage.md index b0a10f689c..6807814f88 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage.md @@ -6,7 +6,7 @@ versions: free-pro-team: '*' --- -個々のワークフロー実行について、請求可能なジョブ実行の時間（分）を確認することもできます。 For more information, see "[Viewing job execution time](/actions/managing-workflow-runs/viewing-job-execution-time)." +個々のワークフロー実行について、請求可能なジョブ実行の時間（分）を確認することもできます。 詳しい情報については、「[ジョブの実行時間を表示する](/actions/managing-workflow-runs/viewing-job-execution-time)」を参照してください。 ### ユーザアカウントの {% data variables.product.prodname_actions %} の使用状況を表示する @@ -32,7 +32,7 @@ Organization については、Organization のオーナーと支払いマネー ### Enterprise アカウントの {% data variables.product.prodname_actions %} の使用状況を表示する -Enterprise owners and billing managers can view {% data variables.product.prodname_actions %} usage for an enterprise account. +Enterprise アカウントについては、Enterprise オーナーと支払いマネージャーが {% data variables.product.prodname_actions %} の使用状況を確認できます。 {% note %} @@ -43,8 +43,8 @@ Enterprise owners and billing managers can view {% data variables.product.prodna {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} -1. Under " -{% data variables.product.prodname_actions %}", view details of usage of data transfer by each organization in your enterprise account. +1. [ +[{% data variables.product.prodname_actions %}] で、Enterprise アカウントの Organization ごとにデータ転送の使用状況の詳細を表示します。 ![利用時間 (分) の詳細](/assets/images/help/billing/actions-minutes-enterprise.png) {% data reusables.dotcom_billing.actions-packages-storage-enterprise-account %} {% data reusables.enterprise-accounts.actions-packages-report-download-enterprise-accounts %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-packages-usage.md b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-packages-usage.md index 3b5e067c26..2d848874e7 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-packages-usage.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-packages-usage.md @@ -30,7 +30,7 @@ Organization については、Organization のオーナーと支払いマネー ### Enterprise アカウントの {% data variables.product.prodname_registry %} の使用状況を表示する -Enterprise owners and billing managers can view {% data variables.product.prodname_registry %} usage for an enterprise account. +Enterprise アカウントについては、Enterprise オーナーと支払いマネージャーが {% data variables.product.prodname_registry %} の使用状況を確認できます。 {% note %} @@ -41,8 +41,8 @@ Enterprise owners and billing managers can view {% data variables.product.prodna {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} -1. Under " -{% data variables.product.prodname_registry %}", view details of usage of data transfer by each organization in your enterprise account. +1. [ +[{% data variables.product.prodname_registry %}] で、Enterprise アカウントの Organization ごとにデータ転送の使用状況の詳細を表示します。 ![データ転送の利用状況の詳細](/assets/images/help/billing/packages-data-enterprise.png) {% data reusables.dotcom_billing.actions-packages-storage-enterprise-account %} {% data reusables.enterprise-accounts.actions-packages-report-download-enterprise-accounts %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities.md index c205dc90e8..3fc5864e30 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities.md @@ -11,7 +11,7 @@ versions: SSH証明書とは、1つのSSHキーでもうひとつのSSHキーに署名する仕組みです。 SSH認証局 (CA) を利用して、Organizationのメンバーに署名済みのSSH証明書を提供すると、EnterpriseアカウントまたはOrganizationにCAを追加できるため、Organizationのメンバーはそれぞれの証明書を使用してOrganizationのリソースにアクセスできるようになります。 詳細については、「[OrganizationのSSH認証局を管理する](/articles/managing-your-organizations-ssh-certificate-authorities)」を参照してください。 -SSH CAをOrganizationまたはEnterpriseアカウントに追加すると、そのCAを利用して、OrganizationメンバーのクライアントSSH証明書に署名できるようになります。 Organizationのメンバーは、署名済みの証明書を使用して、GitでOrganizationのリポジトリにアクセスできます (ただし、自分のOrganizationのリポジトリに限る)。 You can require that members use SSH certificates to access organization resources.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Enforcing security settings in your enterprise account](/articles/enforcing-security-settings-in-your-enterprise-account#managing-your-enterprise-accounts-ssh-certificate-authorities)."{% endif %} +SSH CAをOrganizationまたはEnterpriseアカウントに追加すると、そのCAを利用して、OrganizationメンバーのクライアントSSH証明書に署名できるようになります。 Organizationのメンバーは、署名済みの証明書を使用して、GitでOrganizationのリポジトリにアクセスできます (ただし、自分のOrganizationのリポジトリに限る)。 メンバーがOrganizationのリソースにアクセスするときに、SSH証明書の使用を必須にすることができます。.{% if currentVersion == "free-pro-team@latest" %}詳細については、「[Enterprise アカウントでセキュリティ設定を強制する](/articles/enforcing-security-settings-in-your-enterprise-account#managing-your-enterprise-accounts-ssh-certificate-authorities)」を参照してください。{% endif %} たとえば、毎朝新しい証明書を開発者に発行する内部システムなども構築できます。 各開発者は、その日の証明書を使用して、{% data variables.product.product_name %}でOrganizationのリポジトリを扱うことができます。 1日の最後になると証明書は自動的に失効するので、証明書が侵害されることがあっても、リポジトリは保護されます。 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md index 981908df46..a7619ed2ac 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md @@ -19,7 +19,7 @@ Organization のオーナーとチームメンテナは、Team に対して、Or ![Team のメンションの画像](/assets/images/help/teams/team-mention.png) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} また、LDAP Sync を使って {% data variables.product.product_location_enterprise %}の Team メンバーと Team ロールを、既成の LDAP グループと同期させることができます。 そうすることで、{% data variables.product.product_location_enterprise %}内で手動で行う代わりに、LDAP サーバーのユーザのロールベースアクセス制御を確立できます。 詳しい情報については[LDAP Syncの有効化](/enterprise/{{ page.version }}/admin/guides/user-management/using-ldap#enabling-ldap-sync)を参照してください。 @@ -55,7 +55,7 @@ Organization のメンバーは、Team 内のディスカッションを作成 Team を作るときには親を選択できます。あるいは、作成済みの Team を Organization の階層の中で移動させることもできます。 詳しい情報については[Organization 階層内での Team の移動](/articles/moving-a-team-in-your-organization-s-hierarchy)を参照してください。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.enterprise_user_management.ldap-sync-nested-teams %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md index d4ea442dfd..51b5ce3f9a 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md @@ -28,7 +28,7 @@ versions: ニュースフィードの [All activity] セクションでは、Organization 内の他の Team やリポジトリからの更新情報を見ることができます。 -\[All activity] セクションは、Organization 内のすべての最近のアクティビティを表示します。これにはあなたがサブスクライブしていないリポジトリでのアクティビティや、フォローしていない人々のアクティビティも含まれます。 For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"About notifications\](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." +[All activity] セクションは、Organization 内のすべての最近のアクティビティを表示します。これにはあなたがサブスクライブしていないリポジトリでのアクティビティや、フォローしていない人々のアクティビティも含まれます。 詳細は、{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}「[通知について](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}」[リポジトリの Watch と Watch 解除](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}」および「[人をフォローする](/articles/following-people)」を参照してください。 たとえば Organization のニュースフィードは Organization 内の誰かが以下のようなことをしたときに 更新情報を知らせます: - 新しいブランチを作成する diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed.md index d87c2f2bc2..d70ba0dde7 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed.md @@ -17,5 +17,5 @@ Organization のニュースフィードは、その Organization が所有し 1. 自分の {% data variables.product.product_name %}アカウントに {% data variables.product.signin_link %}します。 2. 自分の {% data reusables.user_settings.personal_dashboard %}を開きます。 3. ページの左上隅にあるアカウントコンテキストスイッチャーをクリックします。 ![Enterprise のコンテキストスイッチャーボタン](/assets/images/help/organizations/account_context_switcher.png) -4. Select an organization from the drop-down menu.{% if currentVersion == "free-pro-team@latest" %} ![Context switcher menu in dotcom](/assets/images/help/organizations/account-context-switcher-selected-dotcom.png){% else %} +4. ドロップダウンメニューから Organization を選択します。{% if currentVersion == "free-pro-team@latest" %} ![Context switcher menu in dotcom](/assets/images/help/organizations/account-context-switcher-selected-dotcom.png){% else %} ![Context switcher menu in Enterprise](/assets/images/help/organizations/account_context_switcher.png){% endif %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable.md index 66ec05b664..72fa10ae3e 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable.md @@ -18,7 +18,7 @@ Organization の管理者は、シングルサインオンをバイパスする 1. シングルサインオンをバイパスするには、シングルサインオンダイアログの下部で、[**Use a recovery code**] をクリックします。 ![リカバリコードを入力するためのリンク](/assets/images/help/saml/saml_use_recovery_code.png) 2. [Recovery Code] フィールドにリカバリコードを入力します。 ![リカバリコードを入力するフィールド](/assets/images/help/saml/saml_recovery_code_entry.png) -3. Click **Verify**. ![リカバリコードを検証するボタン](/assets/images/help/saml/saml_verify_recovery_codes.png) +3. [**Verify**] をクリックします。 ![リカバリコードを検証するボタン](/assets/images/help/saml/saml_verify_recovery_codes.png) 一度使用したリカバリコードは二度と使用できないということを覚えておいてください。 リカバリコードは再利用できません。 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md index eadb3343dc..4228d584bf 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md @@ -17,8 +17,8 @@ versions: {% data reusables.project-management.click-menu %} {% data reusables.project-management.access-collaboration-settings %} {% data reusables.project-management.collaborator-option %} -9. Under "Search by username, full name or email address", type the outside collaborator's name, username, or -{% data variables.product.prodname_dotcom %} email. +9. \[Search by username, full name or email address\] (ユーザ名、フルネーム、メールアドレスでの検索) の下で、外部のコラボレータの名前、ユーザ名、 +{% data variables.product.prodname_dotcom %}メールを入力してください。 ![Octocat のユーザ名が検索フィールドに入力されているコラボレーターセクション](/assets/images/help/projects/org-project-collaborators-find-name.png) {% data reusables.project-management.add-collaborator %} {% data reusables.project-management.collaborator-permissions %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization.md index b8c14ae644..ea820dc950 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization.md @@ -24,8 +24,8 @@ versions: {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.github-apps-settings-sidebar %} -1. Under " -{% data variables.product.prodname_github_app %}s", click on the avatar of the app you'd like to add a {% data variables.product.prodname_github_app %} manager for. +1. [ +[{% data variables.product.prodname_github_app %}s] で、{% data variables.product.prodname_github_app %} マネージャーを追加したいアプリケーションのアバターをクリックします。 ![{% data variables.product.prodname_github_app %} を選択](/assets/images/help/organizations/select-github-app.png) {% data reusables.organizations.app-managers-settings-sidebar %} 1. [App managers] の下で、そのアプリケーションの GitHub App マネージャーとして指名したい人物のユーザ名を入力し、[**Grant**] をクリックしてください。 ![特定のアプリケーションに {% data variables.product.prodname_github_app %} マネージャーを追加](/assets/images/help/organizations/add-github-app-manager-for-app.png) diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md index 6b112565b6..b013aa32d6 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md @@ -1,6 +1,6 @@ --- -title: Adding organization members to a team -intro: 'People with owner or team maintainer permissions can add organization members to teams. People with owner permissions can also {% if currentVersion == "free-pro-team@latest" %}invite non-members to join{% else %}add non-members to{% endif %} a team and the organization.' +title: Team への Organization メンバーの追加 +intro: 'オーナーあるいはチームメンテナ権限を持っている人は、Organization のメンバーを Team に加えることができます。 オーナー権限を持っている人は、{% if currentVersion == "free-pro-team@latest" %}メンバーではない人を Team および Organization に参加するよう招待{% else %}メンバーではない人を Team および Organization に追加{% endif %}することもできます。' redirect_from: - /articles/adding-organization-members-to-a-team-early-access-program/ - /articles/adding-organization-members-to-a-team @@ -15,14 +15,13 @@ versions: {% data reusables.profile.access_org %} {% data reusables.organizations.specific_team %} {% data reusables.organizations.team_members_tab %} -6. Above the list of team members, click **Add a member**. -![Add member button](/assets/images/help/teams/add-member-button.png) +6. Team メンバーのリストの上部で、[**Add a member**] をクリックします。 ![[Add member] ボタン](/assets/images/help/teams/add-member-button.png) {% data reusables.organizations.invite_to_team %} {% data reusables.organizations.review-team-repository-access %} {% if currentVersion == "free-pro-team@latest" %}{% data reusables.organizations.cancel_org_invite %}{% endif %} -### Further reading +### 参考リンク -- "[About teams](/articles/about-teams)" -- "[Managing team access to an organization repository](/articles/managing-team-access-to-an-organization-repository)" +- [Team について](/articles/about-teams) +- [OrganizationのリポジトリへのTeamのアクセスの管理](/articles/managing-team-access-to-an-organization-repository) diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md index 5934c07381..45dcd03330 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md @@ -1,6 +1,6 @@ --- -title: Configuring the retention period for GitHub Actions artifacts and logs in your organization -intro: 'You can configure the retention period for {% data variables.product.prodname_actions %} artifacts and logs in your organization.' +title: Organization 内の GitHub Actions アーティファクトとログの保持期間を設定する +intro: 'Organization 内の {% data variables.product.prodname_actions %} アーティファクトとログの保持期間を設定することができます。' versions: free-pro-team: '*' enterprise-server: '>=2.23' @@ -8,7 +8,7 @@ versions: {% data reusables.actions.about-artifact-log-retention %} -## Setting the retention period for an organization +## Organization の保持期間を設定する {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator.md index fc35b7d829..10893b210c 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator.md @@ -23,7 +23,7 @@ Organization のメンバーが外部コラボレーターに変換された後 アクセスが期待通りであることを確実にするために、Organization メンバーの、リポジトリへのアクセスを確認することをおすすめします。 詳細は、「[Organization のリポジトリへの個人のアクセスを管理する](/articles/managing-an-individual-s-access-to-an-organization-repository)」を参照してください。 -When you convert an organization member to an outside collaborator, their privileges as organization members are saved for three months so that you can restore their membership privileges if you{% if currentVersion == "free-pro-team@latest" %} invite them to rejoin{% else %} add them back to{% endif %} your organization within that time frame. 詳しい情報については、「[Organization の以前のメンバーを回復する](/articles/reinstating-a-former-member-of-your-organization)」を参照してください。 +Organization のメンバーを外部コラボレーターに変換する際、Organization メンバーとしての権限は 3 か月保存されるので、この期間内に、そのユーザを Organization に{% if currentVersion == "free-pro-team@latest" %}再参加するよう招待{% else %}再追加{% endif %}すれば、メンバーとしての権限を回復できます。 詳しい情報については、「[Organization の以前のメンバーを回復する](/articles/reinstating-a-former-member-of-your-organization)」を参照してください。 {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md index be985f9279..774807f08d 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md @@ -1,6 +1,6 @@ --- -title: Converting an outside collaborator to an organization member -intro: 'If you would like to give an outside collaborator on your organization''s repositories broader permissions within your organization, you can {% if currentVersion == "free-pro-team@latest" %}invite them to become a member of{% else %}make them a member of{% endif %} the organization.' +title: 外部コラボレーターを Organization メンバーに変換する +intro: 'Organization のリポジトリ上の外部コラボレーターに、Organization 内において、より幅広い権限を与えたい場合、Organization のメンバーとして{% if currentVersion == "free-pro-team@latest" %}ユーザーを招待{% else %}ユーザーを追加{% endif %}することができます。' redirect_from: - /articles/converting-an-outside-collaborator-to-an-organization-member versions: @@ -11,9 +11,9 @@ versions: {% tip %} **Tips**: -- Only organization owners can {% if currentVersion == "free-pro-team@latest" %}invite users to join{% else %}add users to{% endif %} an organization. For more information, see "[Permission levels for an organization](/articles/permission-levels-for-an-organization)."{% if currentVersion == "free-pro-team@latest" %} -- If your organization is on a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %}{% endif %} -- If your organization [requires members to use two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization), users {% if currentVersion == "free-pro-team@latest" %}you invite must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before they can accept the invitation.{% else %}must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before you can add them to the organization.{% endif %} +- Organization オーナーのみが、Organization に{% if currentVersion == "free-pro-team@latest" %ユーザーを招待{% else %}ユーザーを追加{% endif %}できます。 詳しい情報については「[Organization の権限レベル](/articles/permission-levels-for-an-organization)」を参照してください。{% if currentVersion == "free-pro-team@latest" %} +- Organization がユーザ単位の有料プランである場合、新しいメンバーを招待して参加させる、または Organization の以前のメンバーを復帰させる前に、そのためのライセンスが用意されている必要があります。 詳細は「[ユーザごとの価格付けについて](/articles/about-per-user-pricing)」を参照してください。 {% data reusables.organizations.org-invite-expiration %}{% endif %} +- Organization が[メンバーに 2 要素認証を使うことを要求](/articles/requiring-two-factor-authentication-in-your-organization)している場合、 {% if currentVersion == "free-pro-team@latest" %}招待されるユーザは招待を受諾する前に手元で [2 要素認証を有効化](/articles/securing-your-account-with-two-factor-authentication-2fa)しておく必要があります。{% else %}ユーザを Organization に追加する前にそのユーザは手元で [2 要素認証を有効化](/articles/securing-your-account-with-two-factor-authentication-2fa)しておく必要があります。{% endif %} {% endtip %} @@ -22,9 +22,10 @@ versions: {% data reusables.organizations.people %} {% data reusables.organizations.people_tab_outside_collaborators %} {% if currentVersion == "free-pro-team@latest" %} -5. To the right of the name of the outside collaborator you want to become a member, use the {% octicon "gear" aria-label="The gear icon" %} drop-down menu and click **Invite to organization**.![Invite outside collaborators to organization](/assets/images/help/organizations/invite_outside_collaborator_to_organization.png) +5. メンバーにしたい外部のコラボレーターの名前の右側で、 +{% octicon "gear" aria-label="The gear icon" %} ドロップダウンメニューを使用して [**Invite to organization**] をクリックします。![外部のコラボレーターを Organization に招待](/assets/images/help/organizations/invite_outside_collaborator_to_organization.png) {% else %} -5. To the right of the name of the outside collaborator you want to become a member, click **Invite to organization**.![Invite outside collaborators to organization](/assets/images/enterprise/orgs-and-teams/invite_outside_collabs_to_org.png) +5. メンバーにしたい外部のコラボレーターの名前の右側で、[**Invite to organization**] をクリックします。![外部のコラボレーターを Organization に招待](/assets/images/enterprise/orgs-and-teams/invite_outside_collabs_to_org.png) {% endif %} {% data reusables.organizations.choose-to-restore-privileges %} {% data reusables.organizations.choose-user-role-send-invitation %} @@ -32,6 +33,6 @@ versions: {% data reusables.organizations.user_must_accept_invite_email %} {% data reusables.organizations.cancel_org_invite %} {% endif %} -### Further reading +### 参考リンク -- "[Converting an organization member to an outside collaborator](/articles/converting-an-organization-member-to-an-outside-collaborator)" +- [Organizatin のメンバーを外部のコラボレータに変換する](/articles/converting-an-organization-member-to-an-outside-collaborator) diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch.md index 61f81d562e..dd656a9a17 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch.md @@ -13,7 +13,7 @@ versions: {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.organizations %} {% data reusables.organizations.new-organization %} -4. プロンプトに従って Organization を作成します。 {% if currentVersion == "free-pro-team@latest" %}For more information about the plans available for your team, see "[{% data variables.product.prodname_dotcom %}'s products](/articles/githubs-products)."{% endif %} +4. プロンプトに従って Organization を作成します。 {% if currentVersion == "free-pro-team@latest" %}Team で利用できるプランに関する詳しい情報については、「[{% data variables.product.prodname_dotcom %} の製品](/articles/githubs-products)」を参照してください。{% endif %} ### 参考リンク diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account.md index 5ca02df735..7de6c89b6d 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account.md @@ -1,6 +1,6 @@ --- title: Organization アカウントの削除 -intro: 'Organization を削除すると、リポジトリ、プライベートリポジトリのフォーク、ウィキ、Issue、プルリクエスト、プロジェクトページや Organization ページもすべて削除されます。 {% if currentVersion == "free-pro-team@latest" %}The organization name becomes available for use on a new user or organization account, and your billing will end.{% endif %}' +intro: 'Organization を削除すると、リポジトリ、プライベートリポジトリのフォーク、ウィキ、Issue、プルリクエスト、プロジェクトページや Organization ページもすべて削除されます。 {% if currentVersion == "free-pro-team@latest" %}Organization 名は新しいユーザや Organization のアカウントで使用できるようになり、支払いは終了します。{% endif %}' redirect_from: - /articles/deleting-an-organization-account versions: diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md index a978773450..6fb6c1f9b4 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md @@ -17,7 +17,7 @@ Organization のすべてのリポジトリについて {% data variables.produc あるいは、Organization のすべてのリポジトリについて {% data variables.product.prodname_actions %} を有効化したうえで、ワークフローで実行できるアクションを制限することができます。 {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### Organization の {% data variables.product.prodname_actions %} 権限の管理 @@ -34,13 +34,13 @@ Organization のすべてのリポジトリについて {% data variables.produc ### Organization の {% data variables.product.prodname_actions %} 権限の管理 -You can disable all workflows for an organization or set a policy that configures which actions can be used in an organization. +Organization のワークフローをすべて無効にすることも、Organization でどのアクションを使用できるかを設定するポリシーを設定することもできます。 {% data reusables.actions.actions-use-policy-settings %} {% note %} -**Note:** You might not be able to manage these settings if your organization is managed by an enterprise that has overriding policy. For more information, {% if currentVersion == "free-pro-team@latest" %}"[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account)."{% else %}"[Enforcing {% data variables.product.prodname_actions %} policies for your enterprise](/enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise)."{% endif %} +**注釈:** Organizationが、優先ポリシーのある Enterprise アカウントによって管理されている場合、これらの設定を管理できない場合があります。 詳しい情報については、 {% if currentVersion == "free-pro-team@latest" %}「[Enterprise アカウントで {% data variables.product.prodname_actions %} のポリシーを施行する](/github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account)」{% else %}"[Enterprise で{% data variables.product.prodname_actions %} のポリシーを施行する](/enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise)」{% endif %}を参照してください。 {% endnote %} @@ -48,7 +48,7 @@ You can disable all workflows for an organization or set a policy that configure {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.settings-sidebar-actions %} -1. Under **Policies**, select an option. ![Set actions policy for this organization](/assets/images/help/organizations/actions-policy.png) +1. [**Policies**] でオプションを選択します。 ![Set actions policy for this organization](/assets/images/help/organizations/actions-policy.png) 1. [**Save**] をクリックします。 ### Allowing specific actions to run @@ -59,7 +59,7 @@ You can disable all workflows for an organization or set a policy that configure {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.settings-sidebar-actions %} -1. Under **Policies**, select **Allow specific actions** and add your required actions to the list. ![Add actions to allow list](/assets/images/help/organizations/actions-policy-allow-list.png) +1. [**Policies**] で [**Allow specific actions**] を選択し、必要なアクションをリストに追加します。 ![Add actions to allow list](/assets/images/help/organizations/actions-policy-allow-list.png) 1. [**Save**] をクリックします。 {% endif %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md index f3231626ad..eb0aaf562c 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md @@ -1,28 +1,26 @@ --- -title: Disabling publication of GitHub Pages sites for your organization -intro: 'You can prevent members of your organization from publishing {% data variables.product.prodname_pages %} sites from repositories in the organization.' -permissions: 'Organization owners can disable publication of {% data variables.product.prodname_pages %} sites from repositories in the organization.' +title: Organization の GitHub Pages サイトの公開を無効化する +intro: 'Organization のメンバーが Organization のリポジトリから {% data variables.product.prodname_pages %} サイトを公開できないようにすることができます。' +permissions: 'Organization のオーナーは、Organization のリポジトリからの {% data variables.product.prodname_pages %} サイトの公開を無効化できます。' product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' enterprise-server: '>2.22' --- -### About restrictions on publication of {% data variables.product.prodname_pages %} sites +### {% data variables.product.prodname_pages %} サイトの公開に関する制限について -You can control whether members of your organization can publish websites from repositories in your organization using {% data variables.product.prodname_pages %}. For more information about {% data variables.product.prodname_pages %}, see "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages)." +{% data variables.product.prodname_pages %} を使用して Organization のメンバーが Organization のリポジトリから Web サイトを公開できるかどうかを制御できます。 {% data variables.product.prodname_pages %} の詳細については、「[{% data variables.product.prodname_pages %} について](/github/working-with-github-pages/about-github-pages)」を参照してください。 -{% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." +{% if enterpriseServerVersions contains currentVersion %}サイト管理者がPublic Pagesを有効化している場合、{% endif %}サイトのリポジトリがプライベート{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}または内部{% endif %}の場合でも、{% data variables.product.prodname_pages %}サイトはインターネット上でパブリックにアクセスできるようになります。 詳しい情報については{% if enterpriseServerVersions contains currentVersion %}「[アプライアンス上での{% data variables.product.prodname_pages %}の設定](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)」及び{% endif %}「[リポジトリの可視性について](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)」を参照してください。 -### Disabling publication of {% data variables.product.prodname_pages %} sites +### {% data variables.product.prodname_pages %} サイトの公開を無効化する -After you disable publication of {% data variables.product.prodname_pages %} sites, any published site will remain published. You can manually unpublish the site. For more information, see "[Unpublishing a {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/unpublishing-a-github-pages-site)." +{% data variables.product.prodname_pages %} サイトの公開を無効化した後でも、すでに公開されているサイトは公開されたままになります。 そのサイトは手動で取り下げることができます。 詳細は「[{% data variables.product.prodname_pages %}サイトの取り下げ](/github/working-with-github-pages/unpublishing-a-github-pages-site)」を参照してください。 {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.member-privileges %} -1. Under "Pages creation", unselect **Allow members to publish sites**. - ![Unselected checkbox for "Allow members to publish sites" option](/assets/images/help/organizations/org-settings-pages-disable-publication-checkbox.png) -1. Click **Save**. - !["Save" button for "Allow members to publish sites" option](/assets/images/help/organizations/org-settings-pages-disable-publication-save-button.png) +1. [Pages creation] で、[**Allow members to publish sites**] の選択を解除します。 ![[Allow members to publish sites] オプションの [Unselected] チェックボックス](/assets/images/help/organizations/org-settings-pages-disable-publication-checkbox.png) +1. [**Save**] をクリックします。 ![[Allow members to publish sites] オプションの [Save] ボタン](/assets/images/help/organizations/org-settings-pages-disable-publication-save-button.png) diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/index.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/index.md index a703af9e27..2e545325e6 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/index.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/index.md @@ -127,7 +127,7 @@ versions: {% link_in_list /disabling-publication-of-github-pages-sites-for-your-organization %} {% link_in_list /deleting-an-organization-account %} {% link_in_list /converting-an-organization-into-a-user %} - + {% link_in_list /integrating-jira-with-your-organization-project-board %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md index 4e9cde7e40..25a6de5f2f 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md @@ -1,7 +1,7 @@ --- title: Organization に参加するようユーザを招待する intro: 'Organization のメンバーとして追加したい人がいれば、その人の {% data variables.product.product_name %} ユーザ名またはメール アドレスを使用して招待することができます。' -permissions: Organization owners can invite users to join an organization. +permissions: Organization オーナーは Organization に参加するようユーザを招待できます。 redirect_from: - /articles/adding-or-inviting-members-to-a-team-in-an-organization/ - /articles/inviting-users-to-join-your-organization @@ -13,7 +13,7 @@ versions: **Tips**: - Organization がユーザ単位の有料プランである場合、新しいメンバーを招待して参加させる、または Organization の以前のメンバーを復帰させる前に、そのためのライセンスが用意されている必要があります。 詳細は「[ユーザごとの価格付けについて](/articles/about-per-user-pricing)」を参照してください。 {% data reusables.organizations.org-invite-expiration %} -- If your organization requires members to use two-factor authentication, users that you invite must enable two-factor authentication before accepting the invitation. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)" and "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)." +- Organization がメンバーに 2 要素認証を使うことを要求している場合、招待するユーザは招待を受ける前に 2 要素認証を有効化する必要があります。 詳細については、「[Organization で 2 要素認証を要求する](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)」と「[2要素認証 (2FA) でアカウントをセキュアにする](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)」を参照してください。 {% endtip %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board.md index e0a85b5c2d..9bca979ea1 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board.md @@ -24,8 +24,8 @@ versions: {% data reusables.project-management.click-menu %} {% data reusables.project-management.access-collaboration-settings %} {% data reusables.project-management.collaborator-option %} -9. Under "Search by username, full name or email address", type the collaborator's name, username, or -{% data variables.product.prodname_dotcom %} email. +9. \[Search by username, full name or email address\] (ユーザ名、フルネーム、メールアドレスでの検索) の下で、コラボレータの名前、ユーザ名、または +{% data variables.product.prodname_dotcom %}メールを入力してください。 ![Octocat のユーザ名が検索フィールドに入力されているコラボレーターセクション](/assets/images/help/projects/org-project-collaborators-find-name.png) {% data reusables.project-management.add-collaborator %} {% data reusables.project-management.collaborator-permissions %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository.md index 3dac4e9993..7d52c69a18 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository.md @@ -30,5 +30,5 @@ Organization のリポジトリからコラボレーターを削除すると、 ### 参考リンク -{% if currentVersion == "free-pro-team@latest" %}- "[Limiting interactions with your repository](/articles/limiting-interactions-with-your-repository)"{% endif %} +{% if currentVersion == "free-pro-team@latest" %}- [リポジトリ内での操作を制限する](/articles/limiting-interactions-with-your-repository){% endif %} - [Organization のリポジトリ権限レベル](/articles/repository-permission-levels-for-an-organization) diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization.md index ba0d4a656c..7aef968e64 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization.md @@ -1,6 +1,6 @@ --- title: Organization でメンバーシップを管理する -intro: 'After you create your organization, you can {% if currentVersion == "free-pro-team@latest" %}invite people to become{% else %}add people as{% endif %} members of the organization. メンバーの削除や、元のメンバーの復帰も可能です。' +intro: 'Organization を作成すると、Organization のメンバーとして{% if currentVersion == "free-pro-team@latest" %}ユーザを招待{% else %}ユーザを追加{% endif %}することができます。 メンバーの削除や、元のメンバーの復帰も可能です。' redirect_from: - /articles/removing-a-user-from-your-organization/ - /articles/managing-membership-in-your-organization diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md index f673987645..ce254beaa8 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md @@ -35,7 +35,7 @@ versions: ### 参考リンク -{% if currentVersion == "free-pro-team@latest" %}- "[About securing your repository](/github/administering-a-repository/about-securing-your-repository)" +{% if currentVersion == "free-pro-team@latest" %}- [リポジトリのセキュリティ保護について](/github/administering-a-repository/about-securing-your-repository) - [シークレットスキャンニングについて](/github/administering-a-repository/about-secret-scanning) - [依存関係を自動的に更新する](/github/administering-a-repository/keeping-your-dependencies-updated-automatically) {% endif %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization.md index ed5818f342..6f617d4011 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization.md @@ -9,7 +9,7 @@ versions: ### デフォルトブランチ名について -When a member of your organization creates a new repository in your organization, the repository contains one branch, which is the default branch. Organization のメンバーが新しいリポジトリを作成するとき、{% data variables.product.prodname_dotcom %} はブランチを 1 つ作成し、それをリポジトリのデフォルトブランチに設定します。 For more information about the default branch, see "[About branches](/github/collaborating-with-issues-and-pull-requests/about-branches#about-the-default-branch)." +Organization のメンバーが Organization で新しいリポジトリを作成するとき、リポジトリにはブランチが 1 つ含まれます。これがデフォルトブランチです。 Organization のメンバーが新しいリポジトリを作成するとき、{% data variables.product.prodname_dotcom %} はブランチを 1 つ作成し、それをリポジトリのデフォルトブランチに設定します。 デフォルトブランチの詳細については、「[ブランチについて](/github/collaborating-with-issues-and-pull-requests/about-branches#about-the-default-branch)」を参照してください。 {% data reusables.branches.set-default-branch %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization.md index 915986401c..cfb013fb80 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization.md @@ -1,6 +1,6 @@ --- title: Organization のフォークポリシーを管理する -intro: 'You can can allow or prevent the forking of any private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} and internal{% endif %} repositories owned by your organization.' +intro: 'Organization が所有するプライベート{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}および内部{% endif %}リポジトリのフォークを許可または禁止できます。' redirect_from: - /articles/allowing-people-to-fork-private-repositories-in-your-organization - /github/setting-up-and-managing-organizations-and-teams/allowing-people-to-fork-private-repositories-in-your-organization @@ -10,9 +10,9 @@ versions: enterprise-server: '*' --- -By default, new organizations are configured to disallow the forking of private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} and internal{% endif %} repositories. +デフォルトでは、新しい Organization はプライベート{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} および内部{% endif %}リポジトリのフォークを禁止するように設定されます。 -If you allow forking of private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} and internal{% endif %} repositories at the organization level, you can also configure the ability to fork a specific private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %} repository. 詳細は「[リポジトリのフォークポリシーを管理する](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)」を参照してください。 +Organization レベルでプライベート{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}および内部{% endif %}リポジトリのフォークを許可する場合は、特定のプライベート{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}または内部{% endif %}リポジトリをフォークする機能も設定することができます。 詳細は「[リポジトリのフォークポリシーを管理する](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)」を参照してください。 {% data reusables.organizations.internal-repos-enterprise %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities.md index 3c53fae9b5..cc3fcae1b7 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities.md @@ -11,7 +11,7 @@ versions: Organizationのオーナーは、OrganizationのSSH認証局 (CAN) を管理できます。 -SSH CAをOrganizationに追加すると、メンバーはあなたが提供したSSH証明書を使用してOrganizationにアクセスできるようになります。 {% data reusables.organizations.can-require-ssh-cert %}詳細については、「[SSS認証局について](/articles/about-ssh-certificate-authorities)」を参照してください。 +SSH CAをOrganizationに追加すると、メンバーはあなたが提供したSSH証明書を使用してOrganizationにアクセスできるようになります。 {% data reusables.organizations.can-require-ssh-cert %}詳細については、「[SSH認証局について](/articles/about-ssh-certificate-authorities)」を参照してください。 ### SSH 認証局を追加する diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md index fd8450304d..7e963300f6 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md @@ -11,7 +11,7 @@ versions: ### Organization の権限レベル -Organization members can have *owner*{% if currentVersion == "free-pro-team@latest" %}, *billing manager*,{% endif %} or *member* roles: +Organization のメンバーは、*owner (オーナー)*{% if currentVersion == "free-pro-team@latest" %}、*billing manager (支払いマネージャー)*、{% endif %}あるいは *member (メンバー)* ロールを持つことができます。 - **オーナー**は、Organization について完全な管理アクセスを持ちます。 このロールは制限する必要がありますが、Organization で少なくとも 2 人は指定する必要があります。 詳細は、「[Organization の所有権の継続性を管理する](/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization)」を参照してください。 {% if currentVersion == "free-pro-team@latest" %} @@ -22,103 +22,103 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late {% if currentVersion == "free-pro-team@latest" %} -| Organization のアクション | オーナー | メンバー | 支払いマネージャー | -|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:-----:|:--------------------------------------------------:| -| リポジトリの作成 (詳細については「[Organization 内でリポジトリの作成を制限する](/articles/restricting-repository-creation-in-your-organization)」を参照) | **X** | **X** | | -| 支払い情報を表示および編集する | **X** | | **X** | -| Organization に参加するようユーザを招待する | **X** | | | -| Organization に参加する招待を編集およびキャンセルする | **X** | | | -| Organization からメンバーを削除する | **X** | | | -| 以前のメンバーを Oraganization に復帰させる | **X** | | | -| **すべての Team** に対してユーザーを追加および削除する | **X** | | | -| Organization メンバーを*チームメンテナ*に昇格させる | **X** | | | -| コードレビューの割り当てを設定する ([「Team のコードレビューの割り当てを管理する」](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)を参照) | **X** | | | -| スケジュールされたリマインダーを設定する (「[プルリクエストのスケジュールされたリマインダーを管理する](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests)」を参照) | **X** | | | -| **すべてのリポジトリに**コラボレーターを追加する | **X** | | | -| Organization 参加ログにアクセスする | **X** | | | -| Organization のプロフィールページを変更する (詳細は「[Organization のプロフィールについて](/articles/about-your-organization-s-profile)」を参照) | **X** | | | -| Organization のドメインを検証する (詳細は「[Organization のドメインを検証する](/articles/verifying-your-organization-s-domain)」を参照) | **X** | | | -| **すべての Team** を削除する | **X** | | | -| すべてのリポジトリを含めて Organization のアカウントを削除する | **X** | | | -| Team を作成する (詳細は「[Organization のチーム作成権限を設定する](/articles/setting-team-creation-permissions-in-your-organization)」を参照) | **X** | **X** | | -| [Organization の階層で Team を移動する](/articles/moving-a-team-in-your-organization-s-hierarchy) | **X** | | | -| プロジェクトボードを作成する (詳細は「[Organization のプロジェクトボード権限](/articles/project-board-permissions-for-an-oganization)」を参照) | **X** | **X** | | -| Organization の全メンバーおよび Team の表示 | **X** | **X** | | -| 参照可能なチームへの @メンション | **X** | **X** | | -| *チームメンテナ*に指定できる | **X** | **X** | | -| Organization のインサイトを表示する (詳細は「[Organization のインサイトを表示する](/articles/viewing-insights-for-your-organization)」を参照) | **X** | **X** | | -| パブリック Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/articles/about-team-discussions)」を参照) | **X** | **X** | | -| プライベート Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/articles/about-team-discussions)」を参照) | **X** | | | -| **すべての Team** で Team ディスカッションを編集および削除する (詳細は「[混乱を生むコメントを管理する](/articles/managing-disruptive-comments)」を参照) | **X** | | | -| コミット、プルリクエスト、Issue についてコメントを非表示にする (詳細は「[混乱を生むコメントを管理する](/articles/managing-disruptive-comments)」を参照) | **X** | **X** | | -| Organization の Team ディスカッションを無効にする (詳細は「[Organization の Team ディスカッションを無効化する](/articles/disabling-team-discussions-for-your-organization)」を参照) | **X** | | |{% if currentVersion == "free-pro-team@latest" %} -| Organization dependency insights の可視性を管理する (詳細は「[Organization dependency insights の可視性を変更する](/articles/changing-the-visibility-of-your-organizations-dependency-insights)」を参照) | **X** | | |{% endif %} -| **すべての Team** で Team プロフィール画像を設定する (詳細は「[Team のプロフィール画像を設定する](/articles/setting-your-team-s-profile-picture)」を参照) | **X** | | | -| Disable publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[Disabling publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization)" for details) | **X** | | | -| Organization のセキュリティおよび分析設定を管理する (詳細は「[Organization のセキュリティおよび分析設定を管理する](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)」を参照) | **X** | | | -| [SAML シングルサインオン](/articles/about-identity-and-access-management-with-saml-single-sign-on)を有効にして強制する | **X** | | | -| [組織へのユーザーの SAML アクセスを管理する](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization) | **X** | | | -| Organization の SSH 認証局を管理する (詳細は「[Organization の SSH 認証局を管理する](/articles/managing-your-organizations-ssh-certificate-authorities)」を参照) | **X** | | | -| リポジトリを移譲する | **X** | | | -| {% data variables.product.prodname_marketplace %} アプリケーションを購入、インストール、支払い管理、キャンセルする | **X** | | | -| {% data variables.product.prodname_marketplace %} のアプリケーションをリストする | **X** | | | -| Organization のリポジトリすべてについて、脆弱な依存関係についての [{% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) アラートを受け取る | **X** | | | -| {% data variables.product.prodname_dependabot_security_updates %} の管理 (「[{% data variables.product.prodname_dependabot_security_updates %} の設定](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」を参照) | **X** | | | -| [フォークポリシーの管理](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | | -| [Organization のパブリックリポジトリでのアクティビティを制限する](/articles/limiting-interactions-in-your-organization) | **X** | | | -| Organization にある*すべてのリポジトリ*のプル (読み取り)、プッシュ (書き込み)、クローン作成 (コピー) | **X** | | | -| Organization メンバーの[外部コラボレーター](#outside-collaborators)への変換 | **X** | | | -| [Organization リポジトリへのアクセス権がある人を表示する](/articles/viewing-people-with-access-to-your-repository) | **X** | | | -| [Organization リポジトリへのアクセス権がある人のリストをエクスポートする](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | | -| Manage the default branch name (see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)") | **X** | | | -| デフォルトラベルの管理 (「[Organization 内のリポジトリのためのデフォルトラベルを管理する](/articles/managing-default-labels-for-repositories-in-your-organization)」を参照) | **X** | | | -| Team の同期を有効化する (「[Organization の Team 同期を管理する](/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization)」を参照) | **X** | | | +| Organization のアクション | オーナー | メンバー | 支払いマネージャー | +|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |:-----:|:-----:|:--------------------------------------------------:| +| リポジトリの作成 (詳細については「[Organization 内でリポジトリの作成を制限する](/articles/restricting-repository-creation-in-your-organization)」を参照) | **X** | **X** | | +| 支払い情報を表示および編集する | **X** | | **X** | +| Organization に参加するようユーザを招待する | **X** | | | +| Organization に参加する招待を編集およびキャンセルする | **X** | | | +| Organization からメンバーを削除する | **X** | | | +| 以前のメンバーを Oraganization に復帰させる | **X** | | | +| **すべての Team** に対してユーザーを追加および削除する | **X** | | | +| Organization メンバーを*チームメンテナ*に昇格させる | **X** | | | +| コードレビューの割り当てを設定する ([「Team のコードレビューの割り当てを管理する」](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)を参照) | **X** | | | +| スケジュールされたリマインダーを設定する (「[プルリクエストのスケジュールされたリマインダーを管理する](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests)」を参照) | **X** | | | +| **すべてのリポジトリに**コラボレーターを追加する | **X** | | | +| Organization 参加ログにアクセスする | **X** | | | +| Organization のプロフィールページを変更する (詳細は「[Organization のプロフィールについて](/articles/about-your-organization-s-profile)」を参照) | **X** | | | +| Organization のドメインを検証する (詳細は「[Organization のドメインを検証する](/articles/verifying-your-organization-s-domain)」を参照) | **X** | | | +| **すべての Team** を削除する | **X** | | | +| すべてのリポジトリを含めて Organization のアカウントを削除する | **X** | | | +| Team を作成する (詳細は「[Organization のチーム作成権限を設定する](/articles/setting-team-creation-permissions-in-your-organization)」を参照) | **X** | **X** | | +| [Organization の階層で Team を移動する](/articles/moving-a-team-in-your-organization-s-hierarchy) | **X** | | | +| プロジェクトボードを作成する (詳細は「[Organization のプロジェクトボード権限](/articles/project-board-permissions-for-an-oganization)」を参照) | **X** | **X** | | +| Organization の全メンバーおよび Team の表示 | **X** | **X** | | +| 参照可能なチームへの @メンション | **X** | **X** | | +| *チームメンテナ*に指定できる | **X** | **X** | | +| Organization のインサイトを表示する (詳細は「[Organization のインサイトを表示する](/articles/viewing-insights-for-your-organization)」を参照) | **X** | **X** | | +| パブリック Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/articles/about-team-discussions)」を参照) | **X** | **X** | | +| プライベート Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/articles/about-team-discussions)」を参照) | **X** | | | +| **すべての Team** で Team ディスカッションを編集および削除する (詳細は「[混乱を生むコメントを管理する](/articles/managing-disruptive-comments)」を参照) | **X** | | | +| コミット、プルリクエスト、Issue についてコメントを非表示にする (詳細は「[混乱を生むコメントを管理する](/articles/managing-disruptive-comments)」を参照) | **X** | **X** | | +| Organization の Team ディスカッションを無効にする (詳細は「[Organization の Team ディスカッションを無効化する](/articles/disabling-team-discussions-for-your-organization)」を参照) | **X** | | |{% if currentVersion == "free-pro-team@latest" %} +| Organization dependency insights の可視性を管理する (詳細は「[Organization dependency insights の可視性を変更する](/articles/changing-the-visibility-of-your-organizations-dependency-insights)」を参照) | **X** | | |{% endif %} +| **すべての Team** で Team プロフィール画像を設定する (詳細は「[Team のプロフィール画像を設定する](/articles/setting-your-team-s-profile-picture)」を参照) | **X** | | | +| Organization のリポジトリから {% data variables.product.prodname_pages %} サイトを公開するのを無効にする (詳細、「[Organization の {% data variables.product.prodname_pages %} サイトの公開を無効化する](/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization)」を参照) | **X** | | | +| Organization のセキュリティおよび分析設定を管理する (詳細は「[Organization のセキュリティおよび分析設定を管理する](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)」を参照) | **X** | | | +| [SAML シングルサインオン](/articles/about-identity-and-access-management-with-saml-single-sign-on)を有効にして強制する | **X** | | | +| [組織へのユーザーの SAML アクセスを管理する](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization) | **X** | | | +| Organization の SSH 認証局を管理する (詳細は「[Organization の SSH 認証局を管理する](/articles/managing-your-organizations-ssh-certificate-authorities)」を参照) | **X** | | | +| リポジトリを移譲する | **X** | | | +| {% data variables.product.prodname_marketplace %} アプリケーションを購入、インストール、支払い管理、キャンセルする | **X** | | | +| {% data variables.product.prodname_marketplace %} のアプリケーションをリストする | **X** | | | +| Organization のリポジトリすべてについて、脆弱な依存関係についての [{% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) アラートを受け取る | **X** | | | +| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | | +| [フォークポリシーの管理](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | | +| [Organization のパブリックリポジトリでのアクティビティを制限する](/articles/limiting-interactions-in-your-organization) | **X** | | | +| Organization にある*すべてのリポジトリ*のプル (読み取り)、プッシュ (書き込み)、クローン作成 (コピー) | **X** | | | +| Organization メンバーの[外部コラボレーター](#outside-collaborators)への変換 | **X** | | | +| [Organization リポジトリへのアクセス権がある人を表示する](/articles/viewing-people-with-access-to-your-repository) | **X** | | | +| [Organization リポジトリへのアクセス権がある人のリストをエクスポートする](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | | +| デフォルブランチ名を管理する (「[Organization のリポジトリのデフォルブランチ名を管理する](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)」を参照) | **X** | | | +| デフォルトラベルの管理 (「[Organization 内のリポジトリのためのデフォルトラベルを管理する](/articles/managing-default-labels-for-repositories-in-your-organization)」を参照) | **X** | | | +| Team の同期を有効化する (「[Organization の Team 同期を管理する](/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization)」を参照) | **X** | | | {% else %} -| Organization のアクション | オーナー | メンバー | -|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:-----------------------------------------------------------:| -| Organization に参加するようユーザを招待する | **X** | | -| Organization に参加する招待を編集およびキャンセルする | **X** | | -| Organization からメンバーを削除する | **X** | | | -| 以前のメンバーを Oraganization に復帰させる | **X** | | | -| **すべての Team** に対してユーザーを追加および削除する | **X** | | -| Organization メンバーを*チームメンテナ*に昇格させる | **X** | |{% if currentVersion ver_gt "enterprise-server@2.19" %} -| コードレビューの割り当てを設定する ([「Team のコードレビューの割り当てを管理する」](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)を参照) | **X** | |{% endif %} -| **すべてのリポジトリに**コラボレーターを追加する | **X** | | -| Organization 参加ログにアクセスする | **X** | | -| Organization のプロフィールページを変更する (詳細は「[Organization のプロフィールについて](/articles/about-your-organization-s-profile)」を参照) | **X** | | | -| **すべての Team** を削除する | **X** | | -| すべてのリポジトリを含めて Organization のアカウントを削除する | **X** | | -| Team を作成する (詳細は「[Organization のチーム作成権限を設定する](/articles/setting-team-creation-permissions-in-your-organization)」を参照) | **X** | **X** | -| Organization の全メンバーおよび Team の表示 | **X** | **X** | -| 参照可能なチームへの @メンション | **X** | **X** | -| *チームメンテナ*に指定できる | **X** | **X** | -| リポジトリを移譲する | **X** | | -| Organization の SSH 認証局を管理する (詳細は「[Organization の SSH 認証局を管理する](/articles/managing-your-organizations-ssh-certificate-authorities)」を参照) | **X** | | -| プロジェクトボードを作成する (詳細は「[Organization のプロジェクトボード権限](/articles/project-board-permissions-for-an-oganization)」を参照) | **X** | **X** | | -| パブリック Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/articles/about-team-discussions)」を参照) | **X** | **X** | | -| プライベート Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/articles/about-team-discussions)」を参照) | **X** | | | -| **すべての Team** で Team ディスカッションを編集および削除する (「[混乱を生むコメントを管理する](/articles/managing-disruptive-comments)」を参照) | **X** | | | -| コミット、プルリクエスト、Issue についてコメントを非表示にする (詳細は「[混乱を生むコメントを管理する](/articles/managing-disruptive-comments)」を参照) | **X** | **X** | **X** | -| Organization の Team ディスカッションを無効にする (詳細は「[Organization の Team ディスカッションを無効化する](/articles/disabling-team-discussions-for-your-organization)」を参照) | **X** | | | -| **すべての Team** で Team プロフィール画像を設定する (詳細は「[Team のプロフィール画像を設定する](/articles/setting-your-team-s-profile-picture)」を参照) | **X** | | |{% if currentVersion ver_gt "enterprise-server@2.22" %} -| Disable publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[Disabling publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization)" for details) | **X** | | |{% endif %} -| [Organization の階層で Team を移動する](/articles/moving-a-team-in-your-organization-s-hierarchy) | **X** | | | -| Organization にある*すべてのリポジトリ*のプル (読み取り)、プッシュ (書き込み)、クローン作成 (コピー) | **X** | | -| Organization メンバーの[外部コラボレーター](#outside-collaborators)への変換 | **X** | | -| [Organization リポジトリへのアクセス権がある人を表示する](/articles/viewing-people-with-access-to-your-repository) | **X** | | -| [Organization リポジトリへのアクセス権がある人のリストをエクスポートする](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | |{% if currentVersion ver_gt "enterprise-server@2.19" %} -| デフォルトラベルの管理 (「[Organization 内のリポジトリのためのデフォルトラベルを管理する](/articles/managing-default-labels-for-repositories-in-your-organization)」を参照) | **X** | |{% endif %} +| Organization のアクション | オーナー | メンバー | +|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |:-----:|:-----------------------------------------------------------:| +| Organization に参加するようユーザを招待する | **X** | | +| Organization に参加する招待を編集およびキャンセルする | **X** | | +| Organization からメンバーを削除する | **X** | | | +| 以前のメンバーを Oraganization に復帰させる | **X** | | | +| **すべての Team** に対してユーザーを追加および削除する | **X** | | +| Organization メンバーを*チームメンテナ*に昇格させる | **X** | |{% if currentVersion ver_gt "enterprise-server@2.19" %} +| コードレビューの割り当てを設定する ([「Team のコードレビューの割り当てを管理する」](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)を参照) | **X** | |{% endif %} +| **すべてのリポジトリに**コラボレーターを追加する | **X** | | +| Organization 参加ログにアクセスする | **X** | | +| Organization のプロフィールページを変更する (詳細は「[Organization のプロフィールについて](/articles/about-your-organization-s-profile)」を参照) | **X** | | | +| **すべての Team** を削除する | **X** | | +| すべてのリポジトリを含めて Organization のアカウントを削除する | **X** | | +| Team を作成する (詳細は「[Organization のチーム作成権限を設定する](/articles/setting-team-creation-permissions-in-your-organization)」を参照) | **X** | **X** | +| Organization の全メンバーおよび Team の表示 | **X** | **X** | +| 参照可能なチームへの @メンション | **X** | **X** | +| *チームメンテナ*に指定できる | **X** | **X** | +| リポジトリを移譲する | **X** | | +| Organization の SSH 認証局を管理する (詳細は「[Organization の SSH 認証局を管理する](/articles/managing-your-organizations-ssh-certificate-authorities)」を参照) | **X** | | +| プロジェクトボードを作成する (詳細は「[Organization のプロジェクトボード権限](/articles/project-board-permissions-for-an-oganization)」を参照) | **X** | **X** | | +| パブリック Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/articles/about-team-discussions)」を参照) | **X** | **X** | | +| プライベート Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/articles/about-team-discussions)」を参照) | **X** | | | +| **すべての Team** で Team ディスカッションを編集および削除する (「[混乱を生むコメントを管理する](/articles/managing-disruptive-comments)」を参照) | **X** | | | +| コミット、プルリクエスト、Issue についてコメントを非表示にする (詳細は「[混乱を生むコメントを管理する](/articles/managing-disruptive-comments)」を参照) | **X** | **X** | **X** | +| Organization の Team ディスカッションを無効にする (詳細は「[Organization の Team ディスカッションを無効化する](/articles/disabling-team-discussions-for-your-organization)」を参照) | **X** | | | +| **すべての Team** で Team プロフィール画像を設定する (詳細は「[Team のプロフィール画像を設定する](/articles/setting-your-team-s-profile-picture)」を参照) | **X** | | |{% if currentVersion ver_gt "enterprise-server@2.22" %} +| Organization のリポジトリから {% data variables.product.prodname_pages %} サイトを公開するのを無効にする (詳細、「[Organization の {% data variables.product.prodname_pages %} サイトの公開を無効化する](/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization)」を参照) | **X** | | |{% endif %} +| [Organization の階層で Team を移動する](/articles/moving-a-team-in-your-organization-s-hierarchy) | **X** | | | +| Organization にある*すべてのリポジトリ*のプル (読み取り)、プッシュ (書き込み)、クローン作成 (コピー) | **X** | | +| Organization メンバーの[外部コラボレーター](#outside-collaborators)への変換 | **X** | | +| [Organization リポジトリへのアクセス権がある人を表示する](/articles/viewing-people-with-access-to-your-repository) | **X** | | +| [Organization リポジトリへのアクセス権がある人のリストをエクスポートする](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | |{% if currentVersion ver_gt "enterprise-server@2.19" %} +| デフォルトラベルの管理 (「[Organization 内のリポジトリのためのデフォルトラベルを管理する](/articles/managing-default-labels-for-repositories-in-your-organization)」を参照) | **X** | |{% endif %} {% endif %} ### {% data variables.product.prodname_github_app %} マネージャー -By default, only organization owners can manage the settings of {% data variables.product.prodname_github_app %}s owned by an organization. To allow additional users to manage {% data variables.product.prodname_github_app %}s owned by an organization, an owner can grant them {% data variables.product.prodname_github_app %} manager permissions. +デフォルトでは、Organization によって所有されている {% data variables.product.prodname_github_app %} の設定を管理できるのは Organization のオーナーだけです。 Organization によって所有されている {% data variables.product.prodname_github_app %} の管理を追加のユーザーに許可するために、オーナーは {% data variables.product.prodname_github_app %} マネージャーに権限を付与する必要があります。 -When you designate a user as a {% data variables.product.prodname_github_app %} manager in your organization, you can grant them access to manage the settings of some or all {% data variables.product.prodname_github_app %}s owned by the organization. 詳しい情報については、以下を参照してください。 +ユーザーを Organization の {% data variables.product.prodname_github_app %} マネージャーとして指定すると、Organization によって所有されている一部またはすべての {% data variables.product.prodname_github_app %} の設定を管理するアクセス権を付与できます。 詳しい情報については、以下を参照してください。 - [GitHub App マネージャーを Organization に追加する](/articles/adding-github-app-managers-in-your-organization) - [GitHub App マネージャーを Organization から削除する](/articles/removing-github-app-managers-from-your-organization) diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization.md index 170da0c08d..d7c022ea67 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization.md @@ -8,7 +8,7 @@ versions: enterprise-server: '*' --- -We recommend that you notify {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} at least one week before you require 2FA in your organization. +Organization で 2 要素認証を義務付ける 1 週間以上前に、{% if currentVersion == "free-pro-team@latest" %}Organization のメンバー、外部コラボレーター、支払いマネージャー {% else %}Organization のメンバーと外部コラボレーター{% endif %}に通知することをおすすめします。 Organization で 2 要素認証を必須にすると、2 要素認証を使わないメンバー、外部コラボレーター、および支払いマネージャー (ボットアカウントを含む) は Organization から削除され、そのリポジトリにアクセスできなくなります。 Organization のプライベートリポジトリのフォークへのアクセスも失います。 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization.md index 09502c756c..664174138d 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization.md @@ -1,6 +1,6 @@ --- title: Oraganization の以前のメンバーを復帰させる -intro: 'Organization owners can {% if currentVersion == "free-pro-team@latest" %}invite former organization members to rejoin{% else %}add former members to{% endif%} your organization, and choose whether to restore the person''s former role, access permissions, forks, and settings.' +intro: 'Organizationのオーナーは {% if currentVersion == "free-pro-team@latest" %}Oraganization の以前のメンバーを招待して Oraganization に復帰させて{% else %}以前のメンバーを Oraganization に追加して{% endif%}、その個人の以前のロール、アクセス権、フォーク、設定をリストアするかどうかを選択することができます。' redirect_from: - /articles/reinstating-a-former-member-of-your-organization versions: @@ -8,7 +8,7 @@ versions: enterprise-server: '*' --- -[ユーザを Organization から削除する](/articles/removing-a-member-from-your-organization)場合、[Organization のメンバーを外部のコラボレータに変換する](/articles/converting-an-organization-member-to-an-outside-collaborator)場合、または[メンバーと外部のコラボレータに 2要素認証（2FA）を有効化するよう要求](/articles/requiring-two-factor-authentication-in-your-organization)したためにユーザが Organization から削除される場合、そのユーザのアクセス権限と設定は 3 か月間保存されます。 You can restore the user's privileges if you {% if currentVersion =="free-pro-team@latest" %}invite{% else %}add{% endif %} them back to the organization within that time frame. +[ユーザを Organization から削除する](/articles/removing-a-member-from-your-organization)場合、[Organization のメンバーを外部のコラボレータに変換する](/articles/converting-an-organization-member-to-an-outside-collaborator)場合、または[メンバーと外部のコラボレータに 2要素認証（2FA）を有効化するよう要求](/articles/requiring-two-factor-authentication-in-your-organization)したためにユーザが Organization から削除される場合、そのユーザのアクセス権限と設定は 3 か月間保存されます。 そのタイムフレーム内にユーザを Organization へ再度{% if currentVersion =="free-pro-team@latest" %}招待{% else %}追加{% endif %}した場合、そのユーザの権限をリストアできます。 {% data reusables.two_fa.send-invite-to-reinstate-user-before-2fa-is-enabled %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md index 90f63f350b..56cdb57f01 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md @@ -1,6 +1,6 @@ --- -title: Reinstating a former outside collaborator's access to your organization -intro: 'If you required two-factor authentication in your organization and an outside collaborator was removed from the organization for not having 2FA enabled, you can reinstate a former outside collaborator''s access permissions for organization repositories, forks, and settings.' +title: 以前の外部のコラボレータの Organization へのアクセスを復帰させる +intro: 'Organization で 2 要素認証を要求しており、外部コラボレーターが 2 要素認証を有効化していないために Organization から削除された場合、以前の外部コラボレーターの Organization リポジトリへのアクセス権、フォーク、設定を復帰させることができます。' redirect_from: - /articles/reinstating-a-former-outside-collaborator-s-access-to-your-organization - /articles/reinstating-a-former-outside-collaborators-access-to-your-organization @@ -9,25 +9,25 @@ versions: enterprise-server: '*' --- -If an outside collaborator's access to your organization's private repositories is removed because you've [required members and outside collaborators to enable two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization), the user's access privileges and settings are saved for three months. You can restore the user's privileges if you {% if currentVersion == "free-pro-team@latest" %}invite{% else %}add{% endif %} them back to the organization within that time frame. +[メンバーと外部コラボレーターに 2 要素認証を有効化するよう要求](/articles/requiring-two-factor-authentication-in-your-organization)したために Organization のプライベートリポジトリへの 外部コラボレーターのアクセスが削除される場合、そのユーザのアクセス権限と設定は 3 か月間保存されます。 そのタイムフレーム内にユーザを Organization へ再度{% if currentVersion == "free-pro-team@latest" %}招待{% else %}追加{% endif %}した場合、そのユーザの権限をリストアできます。 {% data reusables.two_fa.send-invite-to-reinstate-user-before-2fa-is-enabled %} -When you reinstate a former outside collaborator, you can restore: - - The user's former access to organization repositories - - Any private forks of repositories owned by the organization - - Membership in the organization's teams - - Previous access and permissions for the organization's repositories - - Stars for organization repositories - - Issue assignments in the organization - - Repository subscriptions (notification settings for watching, not watching, or ignoring a repository's activity) +以前の外部コラボレーターを復帰させると、次のことがリストアできます: + - ユーザの Organization リポジトリへの以前のアクセス + - Organization が所有しているリポジトリのあらゆるプライベートフォーク + - Organization のチームでのメンバーシップ + - Organization のリポジトリへの以前のアクセスと権限 + - Organization リポジトリでの Star + - Organization での Issue 割り当て + - リポジトリプラン (リポジトリのアクティビティを Watch するか Watch しないか無視するかについての通知設定) {% tip %} **Tips**: - - Only organization owners can reinstate outside collaborators' access to an organization. For more information, see "[Permission levels for an organization](/articles/permission-levels-for-an-organization)." - - The reinstating a member flow on {% data variables.product.product_location %} may use the term "member" to describe reinstating an outside collaborator but if you reinstate this person and keep their previous privileges, they will only have their previous [outside collaborator permissions](/articles/permission-levels-for-an-organization/#outside-collaborators).{% if currentVersion == "free-pro-team@latest" %} - - If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)."{% endif %} + - 外部コラボレーターの Organization へのアクセスを復帰させることができるのは、Organization のオーナーだけです。 詳細は「[Organization の権限レベル](/articles/permission-levels-for-an-organization)」を参照してください。 + - {% data variables.product.product_location %} のメンバー復帰フローでは、外部コラボレーターの復帰を説明するために「メンバー」という用語を使用することがありますが、この個人を復帰させて以前の権限を保持しても、付与されるのはその[外部コラボレーターの以前の権限](/articles/permission-levels-for-an-organization/#outside-collaborators)のみです。{% if currentVersion == "free-pro-team@latest" %} + - Organization がユーザ単位の有料プランである場合、新しいメンバーを招待して参加させる、または Organization の以前のメンバーを復帰させる前に、そのためのライセンスが用意されている必要があります。 詳しい情報については、「[ユーザごとの価格付けについて](/articles/about-per-user-pricing)」を参照してください。{% endif %} {% endtip %} @@ -37,37 +37,35 @@ When you reinstate a former outside collaborator, you can restore: {% data reusables.organizations.invite_member_from_people_tab %} {% data reusables.organizations.reinstate-user-type-username %} {% if currentVersion == "free-pro-team@latest" %} -6. Choose to restore the outside collaborator's previous privileges in the organization by clicking **Invite and reinstate** or choose to clear their previous privileges and set new access permissions by clicking **Invite and start fresh**. +6. [**Invite and reinstate**] をクリックして外部コラボレーターの Organization での以前の権限をリストアすることを選択するか、[**Invite and start fresh**] をクリックして以前の権限をクリアして新たにアクセス権を設定することを選択します。 {% warning %} - **Warning:** If you want to upgrade the outside collaborator to a member of your organization, then choose **Invite and start fresh** and choose a new role for this person. Note, however, that this person's private forks of your organization's repositories will be lost if you choose to start fresh. To make the former outside collaborator a member of your organization *and* keep their private forks, choose **Invite and reinstate** instead. Once this person accepts the invitation, you can convert them to an organization member by [inviting them to join the organization as a member](/articles/converting-an-outside-collaborator-to-an-organization-member). + **警告:** 外部コラボレーターを Organization のメンバーにアップグレードする場合は、[**Invite and start fresh**] を選択して、その個人の新しいロールを選択します。 ただし、[start fresh] を選択する場合、その個人のプライベートフォークは Organization のリポジトリから失われますので、注意が必要です。 以前の外部コラボレーターを Organization のメンバーにし、*かつ*そのコラボレーターのプライベートフォークを保持するには、代わりに [**Invite and reinstate**] を選択します。 その個人が招待を承認したら、[Organization にメンバーとして参加するよう招待する](/articles/converting-an-outside-collaborator-to-an-organization-member)ことにより、その個人を Organization メンバーに変換できます。 {% endwarning %} - ![Choose to restore settings or not](/assets/images/help/organizations/choose_whether_to_restore_org_member_info.png) + ![設定をリストアするか否かの選択](/assets/images/help/organizations/choose_whether_to_restore_org_member_info.png) {% else %} -6. Choose to restore the outside collaborator's previous privileges in the organization by clicking **Add and reinstate** or choose to clear their previous privileges and set new access permissions by clicking **Add and start fresh**. +6. [**Add and reinstate**] をクリックして外部のコラボレータの Organization での以前の権限をリストアすることを選択するか、[**Add and start fresh**] をクリックして以前の権限をクリアして新たにアクセス権を設定することを選択します。 {% warning %} - **Warning:** If you want to upgrade the outside collaborator to a member of your organization, then choose **Add and start fresh** and choose a new role for this person. Note, however, that this person's private forks of your organization's repositories will be lost if you choose to start fresh. To make the former outside collaborator a member of your organization *and* keep their private forks, choose **Add and reinstate** instead. Then, you can convert them to an organization member by [adding them to the organization as a member](/articles/converting-an-outside-collaborator-to-an-organization-member). + **警告:** 外部コラボレーターを Organization メンバーにアップグレードする場合は、[**Add and start fresh**] を選択して、その個人に新しいロールを選択してください。 ただし、[start fresh] を選択する場合、その個人のプライベートフォークは Organization のリポジトリから失われますので、注意が必要です。 以前の外部コラボレーターを Organization のメンバーにして、*かつ*そのプライベートフォークを保持するには、代わりに [**Add and reinstate**] を選択します。 それから、[Organization にメンバーとして追加する](/articles/converting-an-outside-collaborator-to-an-organization-member)ことにより、その個人を Organization メンバーに変換できます。 {% endwarning %} - ![Choose to restore settings or not](/assets/images/help/organizations/choose_whether_to_restore_org_member_info_ghe.png) + ![設定をリストアするか否かの選択](/assets/images/help/organizations/choose_whether_to_restore_org_member_info_ghe.png) {% endif %} {% if currentVersion == "free-pro-team@latest" %} -7. If you cleared the previous privileges for a former outside collaborator, choose a role for the user and optionally add them to some teams, then click **Send invitation**. - ![Role and team options and send invitation button](/assets/images/help/organizations/add-role-send-invitation.png) +7. 以前の外部コラボレーターの以前の権限をクリアした場合は、そのユーザのロールを選択し、オプションでいくつかのチームに追加してから、[**Send invitation**] をクリックします。 ![ロールとTeamオプションと招待の送信ボタン](/assets/images/help/organizations/add-role-send-invitation.png) {% else %} -7. If you cleared the previous privileges for a former outside collaborator, choose a role for the user and optionally add them to some teams, then click **Add member**. - ![Role and team options and add member button](/assets/images/help/organizations/add-role-add-member.png) +7. 以前の外部コラボレーターの以前の権限をクリアした場合は、そのユーザのロールを選択し、オプションでいくつかのチームに追加してから、[**Add member**] をクリックします。 ![ロールと Team のオプションと [add member] ボタン](/assets/images/help/organizations/add-role-add-member.png) {% endif %} {% if currentVersion == "free-pro-team@latest" %} -8. The invited person will receive an email inviting them to the organization. They will need to accept the invitation before becoming an outside collaborator in the organization. {% data reusables.organizations.cancel_org_invite %} +8. 招待された人物は、Organizationへの招待メールを受け取ります。 Organization で 外部コラボレーターになるには、招待を受諾する必要があります。 {% data reusables.organizations.cancel_org_invite %} {% endif %} -### Further Reading +### 参考リンク -- "[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)" +- [Organization のリポジトリ権限レベル](/articles/repository-permission-levels-for-an-organization) diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization.md index 9da956c1aa..d4343fdab4 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization.md @@ -24,8 +24,8 @@ versions: {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.github-apps-settings-sidebar %} -1. Under " -{% data variables.product.prodname_github_app %}s", click on the avatar of the app you'd like to remove a {% data variables.product.prodname_github_app %} manager from. +1. [ +[{% data variables.product.prodname_github_app %}] で、{% data variables.product.prodname_github_app %} マネージャーを削除するアプリケーションのアバターをクリックします。 ![{% data variables.product.prodname_github_app %} を選択](/assets/images/help/organizations/select-github-app.png) {% data reusables.organizations.app-managers-settings-sidebar %} 1. [App managers] の下で、{% data variables.product.prodname_github_app %} マネージャー権限を削除する個人のユーザ名を探し、 [**Revoke**] をクリックします。 ![{% data variables.product.prodname_github_app %} マネージャー権限の削除](/assets/images/help/organizations/github-app-manager-revoke-permissions-individual-app.png) diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/renaming-an-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/renaming-an-organization.md index 7b136409d4..0a3ac4d141 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/renaming-an-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/renaming-an-organization.md @@ -28,7 +28,7 @@ Organization の名前を変更したら、古い Organization 名は他の個 #### 自動ではない変更 Organization の名前を変更したら、次のようになります: -- 以前の Organization プロフィールページ (`https://{% data variables.command_line.backticks %}/previousorgname` など) にリンクすると、404 エラーが返されます。 We recommend you update links to your organization from other sites{% if currentVersion == "free-pro-team@latest" %}, such as your LinkedIn or Twitter profiles{% endif %}. +- 以前の Organization プロフィールページ (`https://{% data variables.command_line.backticks %}/previousorgname` など) にリンクすると、404 エラーが返されます。 他のサイト{% if currentVersion == "free-pro-team@latest" %} (LinkedIn や Twitter のプロフィールなど) {% endif %}からの Organization へのリンクを更新するよう推奨します。 - 古い Organization 名を使用する API リクエストでは、404 エラーが返されます。 API リクエストにある古い Organization 名を更新するようおすすめします。 - 古い Organization 名を使用する Team へは、自動での [@mention](/articles/basic-writing-and-formatting-syntax/#mentioning-people-and-teams) リダイレクトはありません。 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md index b6a7b126d9..7f47b3be3d 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md @@ -42,74 +42,74 @@ Organization レベルの設定を管理することに加え、Organization の ### 各権限レベルが可能なリポジトリへのアクセス -| リポジトリアクション | Read | Triage | Write | Maintain | Admin | -|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:------:|:-----:|:--------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| -| 個人または Team の割り当てリポジトリからのプル | **X** | **X** | **X** | **X** | **X** | -| 個人または Team の割り当てリポジトリのフォーク | **X** | **X** | **X** | **X** | **X** | -| 自分のコメントの編集および削除 | **X** | **X** | **X** | **X** | **X** | -| Issue のオープン | **X** | **X** | **X** | **X** | **X** | -| 自分でオープンした Issue のクローズ | **X** | **X** | **X** | **X** | **X** | -| 自分でクローズした Issue を再オープン | **X** | **X** | **X** | **X** | **X** | -| 自分に割り当てられた Issue の取得 | **X** | **X** | **X** | **X** | **X** | -| Team の割り当てリポジトリのフォークからのプルリクエストの送信 | **X** | **X** | **X** | **X** | **X** | -| プルリクエストについてのレビューのサブミット | **X** | **X** | **X** | **X** | **X** | -| 公開済みリリースの表示 | **X** | **X** | **X** | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %} -| [[GitHub Actions workflow runs](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run)] の表示 | **X** | **X** | **X** | **X** | **X** |{% endif %} -| wiki の編集 | **X** | **X** | **X** | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %} -| [悪用あるいはスパムの可能性があるコンテンツのレポート](/articles/reporting-abuse-or-spam) | **X** | **X** | **X** | **X** | **X** |{% endif %} -| ラベルの適用 | | **X** | **X** | **X** | **X** | -| すべての Issue およびプルリクエストのクローズ、再オープン、割り当て | | **X** | **X** | **X** | **X** | -| マイルストーンの適用 | | **X** | **X** | **X** | **X** | -| [重複した Issue とプルリクエスト](/articles/about-duplicate-issues-and-pull-requests)のマーク付け | | **X** | **X** | **X** | **X** | -| [プルリクエストのレビュー](/articles/requesting-a-pull-request-review)の要求 | | **X** | **X** | **X** | **X** | -| 個人または Team の割り当てリポジトリへのプッシュ (書き込み) | | | **X** | **X** | **X** | -| コミット、プルリクエスト、Issue についての他者によるコメントの編集と削除 | | | **X** | **X** | **X** | -| [他者によるコメントの非表示](/articles/managing-disruptive-comments) | | | **X** | **X** | **X** | -| [会話のロック](/articles/locking-conversations) | | | **X** | **X** | **X** | -| Issue の移譲 (詳細は「[他のリポジトリへ Issue を移譲する](/articles/transferring-an-issue-to-another-repository)」を参照) | | | **X** | **X** | **X** | -| [リポジトリに指定されたコードオーナーとしてのアクション](/articles/about-code-owners) | | | **X** | **X** | **X** | -| [プルリクエストのドラフトに、レビューの準備ができたことを示すマークを付ける](/articles/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} -| [プルリクエストをドラフトに変換する](/articles/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** |{% endif %} -| プルリクエストのマージ可能性に影響するレビューのサブミット | | | **X** | **X** | **X** | -| プルリクエストに[提案された変更を適用する](/articles/incorporating-feedback-in-your-pull-request) | | | **X** | **X** | **X** | -| [ステータスチェック](/articles/about-status-checks)の作成 | | | **X** | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %} -| Create, edit, run, re-run, and cancel [GitHub Actions workflows](/actions/automating-your-workflow-with-github-actions/) | | | **X** | **X** | **X** |{% endif %} -| リリースの作成と編集 | | | **X** | **X** | **X** | -| ドラフトリリースの表示 | | | **X** | **X** | **X** | -| リポジトリの説明の編集 | | | | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %} -| [View and install packages](/packages/publishing-and-managing-packages) | **X** | **X** | **X** | **X** | **X** | -| [Publish packages](/packages/publishing-and-managing-packages/publishing-a-package) | | | **X** | **X** | **X** | -| [Delete packages](/packages/publishing-and-managing-packages/deleting-a-package) | | | | | **X** |{% endif %} -| [Topics](/articles/classifying-your-repository-with-topics) の管理 | | | | **X** | **X** | -| Wiki の有効化および Wiki 編集者の制限 | | | | **X** | **X** | -| プロジェクトボードの有効化 | | | | **X** | **X** | -| [プルリクエストのマージ](/articles/configuring-pull-request-merges)の設定 | | | | **X** | **X** | -| [{% data variables.product.prodname_pages %} の公開ソース](/articles/configuring-a-publishing-source-for-github-pages)の設定 | | | | **X** | **X** | -| [保護されたブランチへのプッシュ](/articles/about-protected-branches) | | | | **X** | **X** | -| [リポジトリソーシャルカードの作成と編集](/articles/customizing-your-repositorys-social-media-preview) | | | | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %} -| [リポジトリでのインタラクション](/github/building-a-strong-community/limiting-interactions-in-your-repository)を制限する | | | | **X** | **X** |{% endif %} -| Issue の削除 (「[Issue を削除する](/articles/deleting-an-issue)」を参照) | | | | | **X** | -| 保護されたブランチでのプルリクエストのマージ（レビューの承認がなくても） | | | | | **X** | -| [リポジトリのコードオーナーの定義](/articles/about-code-owners) | | | | | **X** | -| リポジトリを Team に追加する (詳細は「[Organization リポジトリへの Team のアクセスを管理する](/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)」を参照) | | | | | **X** | -| [外部のコラボレータのリポジトリへのアクセスの管理](/articles/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** | -| [リポジトリの可視性の変更](/articles/restricting-repository-visibility-changes-in-your-organization) | | | | | **X** | -| リポジトリのテンプレート化 (「[テンプレートリポジトリを作成する](/articles/creating-a-template-repository)」を参照) | | | | | **X** | -| リポジトリ設定の変更 | | | | | **X** | -| Team およびコラボレータのリポジトリへのアクセス管理 | | | | | **X** | -| リポジトリのデフォルトブランチ編集 | | | | | **X** | -| Webhookおよびデプロイキーの管理 | | | | | **X** |{% if currentVersion == "free-pro-team@latest" %} -| プライベートリポジトリの[依存関係グラフの有効化](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository) | | | | | **X** | -| リポジトリでの[脆弱性のある依存関係に対する{% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)を受信 | | | | | **X** | -| [{% data variables.product.prodname_dependabot_alerts %} を閉じる](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository) | | | | | **X** | -| 脆弱な依存関係についての[{% data variables.product.prodname_dependabot_alerts %}を受信する個人または Team の追加指定](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository) | | | | | **X** | -| [プライベートリポジトリ用のデータ利用設定を管理する](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository) | | | | | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" %}| Create [security advisories](/github/managing-security-vulnerabilities/about-github-security-advisories) | | | | | **X** |{% endif %} -| [リポジトリのフォークポリシーを管理する](/github/administering-a-repository/managing-the-forking-policy-for-your-repository) | | | | | **X** | -| [リポジトリの Organization への移譲](/articles/restricting-repository-creation-in-your-organization) | | | | | **X** | -| [リポジトリの削除または Organization 外への移譲](/articles/setting-permissions-for-deleting-or-transferring-repositories) | | | | | **X** | -| [リポジトリのアーカイブ](/articles/about-archiving-repositories) | | | | | **X** |{% if currentVersion == "free-pro-team@latest" %} -| スポンサーボタンの表示 (「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照) | | | | | **X** |{% endif %} -| JIRA や Zendesk などの外部リソースに対する自動リンク参照を作成します (「[外部リソースを参照する自動リンクの設定](/articles/configuring-autolinks-to-reference-external-resources)」を参照)。 | | | | | **X** | +| リポジトリアクション | Read | Triage | Write | Maintain | Admin | +|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:------:|:-----:|:--------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| +| 個人または Team の割り当てリポジトリからのプル | **X** | **X** | **X** | **X** | **X** | +| 個人または Team の割り当てリポジトリのフォーク | **X** | **X** | **X** | **X** | **X** | +| 自分のコメントの編集および削除 | **X** | **X** | **X** | **X** | **X** | +| Issue のオープン | **X** | **X** | **X** | **X** | **X** | +| 自分でオープンした Issue のクローズ | **X** | **X** | **X** | **X** | **X** | +| 自分でクローズした Issue を再オープン | **X** | **X** | **X** | **X** | **X** | +| 自分に割り当てられた Issue の取得 | **X** | **X** | **X** | **X** | **X** | +| Team の割り当てリポジトリのフォークからのプルリクエストの送信 | **X** | **X** | **X** | **X** | **X** | +| プルリクエストについてのレビューのサブミット | **X** | **X** | **X** | **X** | **X** | +| 公開済みリリースの表示 | **X** | **X** | **X** | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %} +| [[GitHub Actions workflow runs](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run)] の表示 | **X** | **X** | **X** | **X** | **X** |{% endif %} +| wiki の編集 | **X** | **X** | **X** | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %} +| [悪用あるいはスパムの可能性があるコンテンツのレポート](/articles/reporting-abuse-or-spam) | **X** | **X** | **X** | **X** | **X** |{% endif %} +| ラベルの適用 | | **X** | **X** | **X** | **X** | +| すべての Issue およびプルリクエストのクローズ、再オープン、割り当て | | **X** | **X** | **X** | **X** | +| マイルストーンの適用 | | **X** | **X** | **X** | **X** | +| [重複した Issue とプルリクエスト](/articles/about-duplicate-issues-and-pull-requests)のマーク付け | | **X** | **X** | **X** | **X** | +| [プルリクエストのレビュー](/articles/requesting-a-pull-request-review)の要求 | | **X** | **X** | **X** | **X** | +| 個人または Team の割り当てリポジトリへのプッシュ (書き込み) | | | **X** | **X** | **X** | +| コミット、プルリクエスト、Issue についての他者によるコメントの編集と削除 | | | **X** | **X** | **X** | +| [他者によるコメントの非表示](/articles/managing-disruptive-comments) | | | **X** | **X** | **X** | +| [会話のロック](/articles/locking-conversations) | | | **X** | **X** | **X** | +| Issue の移譲 (詳細は「[他のリポジトリへ Issue を移譲する](/articles/transferring-an-issue-to-another-repository)」を参照) | | | **X** | **X** | **X** | +| [リポジトリに指定されたコードオーナーとしてのアクション](/articles/about-code-owners) | | | **X** | **X** | **X** | +| [プルリクエストのドラフトに、レビューの準備ができたことを示すマークを付ける](/articles/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} +| [プルリクエストをドラフトに変換する](/articles/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** |{% endif %} +| プルリクエストのマージ可能性に影響するレビューのサブミット | | | **X** | **X** | **X** | +| プルリクエストに[提案された変更を適用する](/articles/incorporating-feedback-in-your-pull-request) | | | **X** | **X** | **X** | +| [ステータスチェック](/articles/about-status-checks)の作成 | | | **X** | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %} +| [GitHub Actions ワークフロー](/actions/automating-your-workflow-with-github-actions/) の作成、編集、実行、再実行、キャンセル | | | **X** | **X** | **X** |{% endif %} +| リリースの作成と編集 | | | **X** | **X** | **X** | +| ドラフトリリースの表示 | | | **X** | **X** | **X** | +| リポジトリの説明の編集 | | | | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %} +| [パッケージの表示とインストール](/packages/publishing-and-managing-packages) | **X** | **X** | **X** | **X** | **X** | +| [パッケージの公開](/packages/publishing-and-managing-packages/publishing-a-package) | | | **X** | **X** | **X** | +| [パッケージの削除](/packages/publishing-and-managing-packages/deleting-a-package) | | | | | **X** |{% endif %} +| [Topics](/articles/classifying-your-repository-with-topics) の管理 | | | | **X** | **X** | +| Wiki の有効化および Wiki 編集者の制限 | | | | **X** | **X** | +| プロジェクトボードの有効化 | | | | **X** | **X** | +| [プルリクエストのマージ](/articles/configuring-pull-request-merges)の設定 | | | | **X** | **X** | +| [{% data variables.product.prodname_pages %} の公開ソース](/articles/configuring-a-publishing-source-for-github-pages)の設定 | | | | **X** | **X** | +| [保護されたブランチへのプッシュ](/articles/about-protected-branches) | | | | **X** | **X** | +| [リポジトリソーシャルカードの作成と編集](/articles/customizing-your-repositorys-social-media-preview) | | | | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %} +| [リポジトリでのインタラクション](/github/building-a-strong-community/limiting-interactions-in-your-repository)を制限する | | | | **X** | **X** |{% endif %} +| Issue の削除 (「[Issue を削除する](/articles/deleting-an-issue)」を参照) | | | | | **X** | +| 保護されたブランチでのプルリクエストのマージ（レビューの承認がなくても） | | | | | **X** | +| [リポジトリのコードオーナーの定義](/articles/about-code-owners) | | | | | **X** | +| リポジトリを Team に追加する (詳細は「[Organization リポジトリへの Team のアクセスを管理する](/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)」を参照) | | | | | **X** | +| [外部のコラボレータのリポジトリへのアクセスの管理](/articles/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** | +| [リポジトリの可視性の変更](/articles/restricting-repository-visibility-changes-in-your-organization) | | | | | **X** | +| リポジトリのテンプレート化 (「[テンプレートリポジトリを作成する](/articles/creating-a-template-repository)」を参照) | | | | | **X** | +| リポジトリ設定の変更 | | | | | **X** | +| Team およびコラボレータのリポジトリへのアクセス管理 | | | | | **X** | +| リポジトリのデフォルトブランチ編集 | | | | | **X** | +| Webhookおよびデプロイキーの管理 | | | | | **X** |{% if currentVersion == "free-pro-team@latest" %} +| プライベートリポジトリの[依存関係グラフの有効化](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository) | | | | | **X** | +| リポジトリでの[脆弱性のある依存関係に対する{% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)を受信 | | | | | **X** | +| [{% data variables.product.prodname_dependabot_alerts %} を閉じる](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository) | | | | | **X** | +| 脆弱な依存関係についての[{% data variables.product.prodname_dependabot_alerts %}を受信する個人または Team の追加指定](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository) | | | | | **X** | +| [プライベートリポジトリ用のデータ利用設定を管理する](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository) | | | | | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" %}| [セキュリティアドバイザリ](/github/managing-security-vulnerabilities/about-github-security-advisories)の作成 | | | | | **X** |{% endif %} +| [リポジトリのフォークポリシーを管理する](/github/administering-a-repository/managing-the-forking-policy-for-your-repository) | | | | | **X** | +| [リポジトリの Organization への移譲](/articles/restricting-repository-creation-in-your-organization) | | | | | **X** | +| [リポジトリの削除または Organization 外への移譲](/articles/setting-permissions-for-deleting-or-transferring-repositories) | | | | | **X** | +| [リポジトリのアーカイブ](/articles/about-archiving-repositories) | | | | | **X** |{% if currentVersion == "free-pro-team@latest" %} +| スポンサーボタンの表示 (「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照) | | | | | **X** |{% endif %} +| JIRA や Zendesk などの外部リソースに対する自動リンク参照を作成します (「[外部リソースを参照する自動リンクの設定](/articles/configuring-autolinks-to-reference-external-resources)」を参照)。 | | | | | **X** | ### 参考リンク diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md index 5474ce5cbb..4c2e88732c 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md @@ -1,6 +1,6 @@ --- title: Organization で 2 要素認証を要求する -intro: 'Organization owners can require {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} to enable two-factor authentication for their personal accounts, making it harder for malicious actors to access an organization''s repositories and settings.' +intro: 'Organization のオーナーは、{% if currentVersion == "free-pro-team@latest" %}Organization のメンバー、外部コラボレーター、支払いマネージャー {% else %}Organization のメンバーおよび外部のコラボレーター{% endif %}に、それぞれの個人アカウントに対する 2 要素認証を有効にするように義務付けることで、悪意のある行為者が Organization のリポジトリや設定にアクセスしにくくすることができます。' redirect_from: - /articles/requiring-two-factor-authentication-in-your-organization versions: @@ -8,13 +8,13 @@ versions: enterprise-server: '*' --- -### About two-factor authentication for organizations +### Organization の2 要素認証について -{% data reusables.two_fa.about-2fa %} You can require all {% if currentVersion == "free-pro-team@latest" %}members, outside collaborators, and billing managers{% else %}members and outside collaborators{% endif %} in your organization to enable two-factor authentication on {% data variables.product.product_name %}. For more information about two-factor authentication, see "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)." +{% data reusables.two_fa.about-2fa %} Organization のすべての{% if currentVersion == "free-pro-team@latest" %}メンバー、外部コラボレーター、支払いマネージャー{% else %}メンバーおよび外部コラボレーター{% endif %}に、{% data variables.product.product_name %} で 2 要素認証を有効にすることを義務付けることができます。 2 要素認証の詳細は「[2 要素認証 (2FA) でアカウントを保護する](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)」を参照してください。 {% if currentVersion == "free-pro-team@latest" %} -You can also require two-factor authentication for organizations in an enterprise. 詳細は、「[Enterprise アカウントでセキュリティ設定を強制する](/github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account#requiring-two-factor-authentication-for-organizations-in-your-enterprise-account)」を参照してください。 +Enterprise で Organization の 2 要素認証を必須にすることもできます。 詳細は、「[Enterprise アカウントでセキュリティ設定を強制する](/github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account#requiring-two-factor-authentication-for-organizations-in-your-enterprise-account)」を参照してください。 {% endif %} @@ -22,8 +22,8 @@ You can also require two-factor authentication for organizations in an enterpris **警告:** -- When you require use of two-factor authentication for your organization, {% if currentVersion == "free-pro-team@latest" %}members, outside collaborators, and billing managers{% else %}members and outside collaborators{% endif %} (including bot accounts) who do not use 2FA will be removed from the organization and lose access to its repositories. Organization のプライベートリポジトリのフォークへのアクセスも失います。 Organization から削除されてから 3 か月以内に、個人アカウントに対して 2 要素認証を有効にすれば、[それらのアカウントが持っていたアクセス特権と設定を復元](/articles/reinstating-a-former-member-of-your-organization)できます。 -- If an organization owner, member,{% if currentVersion == "free-pro-team@latest" %} billing manager,{% endif %} or outside collaborator disables 2FA for their personal account after you've enabled required two-factor authentication, they will automatically be removed from the organization. +- Organization に対して 2 要素認証の使用を義務付ける場合、2FA を使用しない{% if currentVersion == "free-pro-team@latest" %}メンバー、外部コラボレーター、支払いマネージャー {% else %}メンバーおよび外部コラボレーター{% endif %} (ボット アカウントを含む) は Organization から削除され、そのリポジトリへのアクセス権が失われます。 Organization のプライベートリポジトリのフォークへのアクセスも失います。 Organization から削除されてから 3 か月以内に、個人アカウントに対して 2 要素認証を有効にすれば、[それらのアカウントが持っていたアクセス特権と設定を復元](/articles/reinstating-a-former-member-of-your-organization)できます。 +- 義務付けられた 2 要素認証を有効にした後に、Organization のオーナー、メンバー、{% if currentVersion == "free-pro-team@latest" %}支払いマネージャー、{% endif %} または外部コラボレーターがそれぞれの個人アカウントで 2 要素認証を無効にすると、それらは Organization から自動的に削除されます。 - あなたが、2 要素認証を義務付けている Organization の唯一のオーナーである場合、その Organization での 2 要素認証義務を無効にしなければ、あなたの個人アカウントの 2 要素認証を無効にすることはできません。 {% endwarning %} @@ -32,9 +32,9 @@ You can also require two-factor authentication for organizations in an enterpris ### 必要な環境 -Before you can require {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} to use two-factor authentication, you must enable two-factor authentication for your account on {% data variables.product.product_name %}. 詳細は「[2 要素認証 (2FA) でアカウントを保護する](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)」を参照してください。 +{% if currentVersion == "free-pro-team@latest" %}Organization のメンバー、外部コラボレーター、支払いマネージャー {% else %}Organization のメンバーおよび外部コラボレーター{% endif %}に、 2 要素認証を使用することを義務付けるには、まず{% data variables.product.product_name %} の自分自身の個人アカウントで 2 要素認証を有効にする必要があります。 詳細は「[2 要素認証 (2FA) でアカウントを保護する](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)」を参照してください。 -Before you require use of two-factor authentication, we recommend notifying {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} and asking them to set up 2FA for their accounts. You can see if members and outside collaborators already use 2FA. 詳細は「[Organization 内のユーザが 2 要素認証を有効にしているか確認する](/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled)」を参照してください。 +2 要素認証の使用を義務付ける前に、{% if currentVersion == "free-pro-team@latest" %}Organization のメンバー、外部コラボレーター、支払いマネージャー {% else %}Organization のメンバーおよび外部コラボレータ{% endif %}に通知して、それぞれのアカウントで 2 要素認証をセットアップするように依頼することをおすすめします。 メンバーと外部のコラボレーターがすでに 2 要素認証を使用しているかどうかを確認できます。 詳細は「[Organization 内のユーザが 2 要素認証を有効にしているか確認する](/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled)」を参照してください。 ### Organization で 2 要素認証を要求する @@ -59,7 +59,7 @@ Before you require use of two-factor authentication, we recommend notifying {% i {% data reusables.audit_log.audit_log_sidebar_for_org_admins %} 4. 検索クエリを入力します。 以下のように検索します: - 削除された Organization のメンバーを検索するには、検索クエリで `action:org.remove_member` を使用します - - Outside collaborators removed, use `action:org.remove_outside_collaborator` in your search query{% if currentVersion == "free-pro-team@latest" %} + - 削除された外部コラボレーターを検索するには、検索クエリで `action:org.remove_outside_collaborator` を使用します{% if currentVersion == "free-pro-team@latest" %} - 削除された支払いマネージャーを検索するには、検索クエリで `action:org.remove_billing_manager` を使用します{% endif %} また、検索で[時間枠](/articles/reviewing-the-audit-log-for-your-organization/#search-based-on-time-of-action)を使用すれば、Organization から削除された人々を表示できます。 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization.md index 4b5f4b8b5f..68d9b73084 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization.md @@ -8,11 +8,11 @@ versions: enterprise-server: '*' --- -メンバーが Organization でリポジトリを作成できるかどうかを選択できます。 If you allow members to create repositories, you can choose which types of repositories members can create.{% if currentVersion == "free-pro-team@latest" %} To allow members to create private repositories only, your organization must use {% data variables.product.prodname_ghe_cloud %}.{% endif %} For more information, see "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." +メンバーが Organization でリポジトリを作成できるかどうかを選択できます。 メンバーにリポジトリの作成を許可する場合、メンバーが作成できるリポジトリの種類を選択できます。{% if currentVersion == "free-pro-team@latest" %}メンバーがプライベートリポジトリのみを作成することを許可する場合、Organization は {% data variables.product.prodname_ghe_cloud %} を使用する必要があります。{% endif %} 詳細は「[リポジトリの可視性について](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)」を参照してください。 Organization のオーナーは、いつでもどんなタイプの Team でも作成できます。 -{% if currentVersion == "free-pro-team@latest" %}Enterprise owners{% else %}Site administrators{% endif %} can restrict the options you have available for your organization's repository creation policy. For more information, see {% if currentVersion == "free-pro-team@latest" %}"[Enforcing repository management policies in your enterprise account](/github/setting-up-and-managing-your-enterprise-account/enforcing-repository-management-policies-in-your-enterprise-account)."{% else %}"[Restricting repository creation in your instance](/enterprise/admin/user-management/restricting-repository-creation-in-your-instance)."{% endif %} +{% if currentVersion == "free-pro-team@latest" %}Enterprise オーナー{% else %}サイト管理者{% endif %}は、Organization のリポジトリ作成ポリシーで使用できるオプションを制限できます。 詳細は、{% if currentVersion == "free-pro-team@latest" %}"「[Enterprise アカウントでリポジトリ管理ポリシーを施行する](/github/setting-up-and-managing-your-enterprise-account/enforcing-repository-management-policies-in-your-enterprise-account)」{% else %}"[インスタンス内でのリポジトリの作成を制限する](/enterprise/admin/user-management/restricting-repository-creation-in-your-instance)」{% endif %}を参照してください。 {% warning %} @@ -26,5 +26,5 @@ Organization のオーナーは、いつでもどんなタイプの Team でも {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.member-privileges %} -5. Under "Repository creation", select one or more options. ![リポジトリ作成のオプション](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png) +5. [Repository creation] で、1 つ以上のオプションを選択します。 ![リポジトリ作成のオプション](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png) 6. [**Save**] をクリックします。 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md index b0029b8eea..1dab2420a7 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md @@ -1,6 +1,6 @@ --- -title: Reviewing the audit log for your organization -intro: 'The audit log allows organization admins to quickly review the actions performed by members of your organization. It includes details such as who performed the action, what the action was, and when it was performed.' +title: Organization の Audit log をレビューする +intro: 'Audit log により、Organization の管理者は Organization のメンバーによって行われたアクションをすばやくレビューできます。 これには、誰がいつ何のアクションを実行したかなどの詳細が残されます。' redirect_from: - /articles/reviewing-the-audit-log-for-your-organization versions: @@ -8,418 +8,434 @@ versions: enterprise-server: '*' --- -### Accessing the audit log +### Audit log にアクセスする -The audit log lists actions performed within the last 90 days. Only owners can access an organization's audit log. +Audit log には、過去 90 日間に行われた行動が一覧表示されます。 Organization の Audit log にアクセスできるのはオーナーのみです。 {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.audit_log.audit_log_sidebar_for_org_admins %} -### Searching the audit log +### Audit log を検索する {% data reusables.audit_log.audit-log-search %} -#### Search based on the action performed +#### 実行されたアクションに基づく検索 -To search for specific events, use the `action` qualifier in your query. Actions listed in the audit log are grouped within the following categories: +特定のイベントを検索するには、クエリで `action` 修飾子を使用します。 Audit log に一覧表示されるアクションは以下のカテゴリに分類されます。 -| Category Name | Description -|------------------|-------------------{% if currentVersion == "free-pro-team@latest" %} -| `account` | Contains all activities related to your organization account.{% endif %}{% if currentVersion == "free-pro-team@latest" %} -| `billing` | Contains all activities related to your organization's billing.{% endif %} -| `discussion_post` | Contains all activities related to discussions posted to a team page. -| `discussion_post_reply` | Contains all activities related to replies to discussions posted to a team page. -| `hook` | Contains all activities related to webhooks. -| `integration_installation_request` | Contains all activities related to organization member requests for owners to approve integrations for use in the organization. |{% if currentVersion == "free-pro-team@latest" %} -| `marketplace_agreement_signature` | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. -| `marketplace_listing` | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -| `members_can_create_pages` | Contains all activities related to disabling the publication of {% data variables.product.prodname_pages %} sites for repositories in the organization. For more information, see "[Restricting publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization)." | {% endif %} -| `org` | Contains all activities related to organization membership{% if currentVersion == "free-pro-team@latest" %} -| `org_credential_authorization` | Contains all activities related to authorizing credentials for use with SAML single sign-on.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -| `organization_label` | Contains all activities related to default labels for repositories in your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" %} -| `payment_method` | Contains all activities related to how your organization pays for GitHub.{% endif %} -| `profile_picture` | Contains all activities related to your organization's profile picture. -| `project` | Contains all activities related to project boards. -| `protected_branch` | Contains all activities related to protected branches. -| `repo` | Contains all activities related to the repositories owned by your organization.{% if currentVersion == "free-pro-team@latest" %} -| `repository_content_analysis` | Contains all activities related to [enabling or disabling data use for a private repository](/articles/about-github-s-use-of-your-data). -| `repository_dependency_graph` | Contains all activities related to [enabling or disabling the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository).{% endif %} -| `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} -| `team` | Contains all activities related to teams in your organization.{% endif %} -| `team_discussions` | Contains activities related to managing team discussions for an organization. +| カテゴリー名 | 説明 | +| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |{% if currentVersion == "free-pro-team@latest" %} +| `アカウント` | Organization アカウントに関連するすべてのアクティビティが対象です。{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| `支払い` | Organization の支払いに関連するすべてのアクティビティが対象です。{% endif %} +| `discussion_post` | Team ページに投稿されたディスカッションに関連するすべてのアクティビティが対象です。 | +| `discussion_post_reply` | Team ページに投稿されたディスカッションへの返答に関連するすべてのアクティビティが対象です。 | +| `フック` | webhookに関連するすべてのアクティビティを含みます。 | +| `integration_installation_request` | Organization 内で使用するインテグレーションをオーナーが承認するよう求める、 Organization メンバーからのリクエストに関連するすべてのアクティビティが対象です。 |{% if currentVersion == "free-pro-team@latest" %} +| `marketplace_agreement_signature` | {% data variables.product.prodname_marketplace %} Developer Agreement の署名に関連するすべての活動が対象です。 | +| `marketplace_listing` | {% data variables.product.prodname_marketplace %}.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} でのアプリのリストに関連するすべてのアクティビティが対象です。 | +| `members_can_create_pages` | Organization のリポジトリについて {% data variables.product.prodname_pages %} サイトの公開を無効化することに関連するすべてのアクティビティが対象です。 詳細については、「[Organization について {% data variables.product.prodname_pages %} サイトの公開を制限する](/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization)」を参照してください。 |{% endif %} +| `org` | Organization メンバーシップに関連するすべてのアクティビティが対象です。{% if currentVersion == "free-pro-team@latest" %} +| `org_credential_authorization` | SAML シングルサインオンで使用する認証情報の認可に関連するすべてのアクティビティが対象です。{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} +| `organization_label` | Organization のリポジトリのデフォルトラベルに関連するすべてのアクティビティが対象です。{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| `payment_method` | Organization の GitHub への支払い方法に関連するすべてのアクティビティが対象です。{% endif %} +| `profile_picture` | Organization のプロフィール画像に関連するすべてのアクティビティが対象です。 | +| `project` | プロジェクト ボードに関連するすべての活動が対象です。 | +| `protected_branch` | 保護されたブランチ関連するすべてのアクティビティが対象です。 | +| `repo` | Organization によって所有されていリポジトリに関連するすべてのアクティビティが対象です。{% if currentVersion == "free-pro-team@latest" %} +| `repository_content_analysis` | [プライベート リポジトリに対するデータの使用を有効または無効にする](/articles/about-github-s-use-of-your-data)に関連するすべての活動が対象です。 | +| `repository_dependency_graph` | [プライベート リポジトリに対して依存関係グラフを有効または無効にする](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository)ことに関連するすべてのアクティビティが対象です。{% endif %} +| `repository_vulnerability_alert` | 脆弱な依存関係についての[{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートすべてが対象です](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)。{% if currentVersion == "free-pro-team@latest" %} +| `sponsors` | スポンサーボタンに関連するすべてのアクティビティが対象です (「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照){% endif %}{% if enterpriseServerVersions contains currentVersion %} +| `Team` | Organization の Team に関連するすべてのアクティビティが対処です。{% endif %} +| `team_discussions` | Organization の Team ディスカッションに関連するすべてのアクティビティが対象です。 | -You can search for specific sets of actions using these terms. For example: +次の用語を使用すれば、特定の一連の行動を検索できます。 例: - * `action:team` finds all events grouped within the team category. - * `-action:hook` excludes all events in the webhook category. + * `action:team`はteamカテゴリ内でグループ化されたすべてのイベントを検索します。 + * `-action:hook` は webhook カテゴリ内のすべてのイベントを除外します。 -Each category has a set of associated events that you can filter on. For example: +各カテゴリには、フィルタリングできる一連の関連イベントがあります。 例: - * `action:team.create` finds all events where a team was created. - * `-action:hook.events_changed` excludes all events where the events on a webhook have been altered. + * `action:team.create`はTeamが作成されたすべてのイベントを検索します。 + * `-action:hook.events_changed` は webhook の変更されたすべてのイベントを除外します。 -This list describes the available categories and associated events: +以下リストで、使用できるカテゴリと関連するイベントを説明します。 -{% if currentVersion == "free-pro-team@latest" %}- [The `account` category](#the-account-category) -- [The `billing` category](#the-billing-category){% endif %} -- [The `discussion_post` category](#the-discussion_post-category) -- [The `discussion_post_reply` category](#the-discussion_post_reply-category) -- [The `hook` category](#the-hook-category) -- [The `integration_installation_request` category](#the-integration_installation_request-category) -- [The `issue` category](#the-issue-category){% if currentVersion == "free-pro-team@latest" %} -- [The `marketplace_agreement_signature` category](#the-marketplace_agreement_signature-category) -- [The `marketplace_listing` category](#the-marketplace_listing-category){% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -- [The `members_can_create_pages` category](#the-members_can_create_pages-category){% endif %} -- [The `org` category](#the-org-category){% if currentVersion == "free-pro-team@latest" %} -- [The `org_credential_authorization` category](#the-org_credential_authorization-category){% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -- [The `organization_label` category](#the-organization_label-category){% endif %} -- [The `oauth_application` category](#the-oauth_application-category){% if currentVersion == "free-pro-team@latest" %} -- [The `payment_method` category](#the-payment_method-category){% endif %} -- [The `profile_picture` category](#the-profile_picture-category) -- [The `project` category](#the-project-category) -- [The `protected_branch` category](#the-protected_branch-category) -- [The `repo` category](#the-repo-category){% if currentVersion == "free-pro-team@latest" %} -- [The `repository_content_analysis` category](#the-repository_content_analysis-category) -- [The `repository_dependency_graph` category](#the-repository_dependency_graph-category){% endif %} -- [The `repository_vulnerability_alert` category](#the-repository_vulnerability_alert-category){% if currentVersion == "free-pro-team@latest" %} -- [The `sponsors` category](#the-sponsors-category){% endif %}{% if currentVersion != "free-pro-team@latest" %} -- [The `team` category](#the-team-category){% endif %} -- [The `team_discussions` category](#the-team_discussions-category) +{% if currentVersion == "free-pro-team@latest" %}- [`account` カテゴリ](#the-account-category) +- [`billing` カテゴリ](#the-billing-category){% endif %} +- [`discussion_post` カテゴリ](#the-discussion_post-category) +- [`discussion_post_reply` カテゴリ](#the-discussion_post_reply-category) +- [`hook` カテゴリ](#the-hook-category) +- [`integration_installation_request` カテゴリ](#the-integration_installation_request-category) +- [`issue` カテゴリ](#the-issue-category){% if currentVersion == "free-pro-team@latest" %} +- [`marketplace_agreement_signature` カテゴリ](#the-marketplace_agreement_signature-category) +- [ `marketplace_listing` カテゴリ](#the-marketplace_listing-category){% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +- [`members_can_create_pages` カテゴリ](#the-members_can_create_pages-category){% endif %} +- [`org` カテゴリ](#the-org-category){% if currentVersion == "free-pro-team@latest" %} +- [`org_credential_authorization` カテゴリ](#the-org_credential_authorization-category){% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} +- [`organization_label` カテゴリ](#the-organization_label-category){% endif %} +- [`oauth_application` カテゴリ](#the-oauth_application-category){% if currentVersion == "free-pro-team@latest" %} +- [`payment_method` カテゴリ](#the-payment_method-category){% endif %} +- [`profile_picture` カテゴリ](#the-profile_picture-category) +- [`project` カテゴリ](#the-project-category) +- [`protected_branch` カテゴリ](#the-protected_branch-category) +- [`repo` カテゴリ](#the-repo-category){% if currentVersion == "free-pro-team@latest" %} +- [`repository_content_analysis` カテゴリ](#the-repository_content_analysis-category) +- [`repository_dependency_graph` カテゴリ](#the-repository_dependency_graph-category){% endif %} +- [`repository_vulnerability_alert` カテゴリ](#the-repository_vulnerability_alert-category){% if currentVersion == "free-pro-team@latest" %} +- [`sponsors` カテゴリ](#the-sponsors-category){% endif %}{% if enterpriseServerVersions contains currentVersion %} +- [`team` カテゴリ](#the-team-category){% endif %} +- [`team_discussions` カテゴリ](#the-team_discussions-category) {% if currentVersion == "free-pro-team@latest" %} -##### The `account` category +##### `account` カテゴリ -| Action | Description -|------------------|------------------- -| `billing_plan_change` | Triggered when an organization's [billing cycle](/articles/changing-the-duration-of-your-billing-cycle) changes. -| `plan_change` | Triggered when an organization's [subscription](/articles/about-billing-for-github-accounts) changes. -| `pending_plan_change` | Triggered when an organization owner or billing manager [cancels or downgrades a paid subscription](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process/). -| `pending_subscription_change` | Triggered when a [{% data variables.product.prodname_marketplace %} free trial starts or expires](/articles/about-billing-for-github-marketplace/). +| アクション | 説明 | +| ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `billing_plan_change` | Organization の[支払いサイクル](/articles/changing-the-duration-of-your-billing-cycle)が変わるときにトリガーされます。 | +| `plan_change` | Organization の[プラン](/articles/about-billing-for-github-accounts)が変わるときにトリガーされます。 | +| `pending_plan_change` | Organization のオーナーまたは支払いマネージャーが[支払い済みサブスクリプションをキャンセルまたはダウングレードする](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process/)ときにトリガーされます。 | +| `pending_subscription_change` | [{% data variables.product.prodname_marketplace %} の無料トライアルが始まるか期限切れになる](/articles/about-billing-for-github-marketplace/)ときにトリガーされます。 | -##### The `billing` category +##### `billing` カテゴリ -| Action | Description -|------------------|------------------- -| `change_billing_type` | Triggered when your organization [changes how it pays for {% data variables.product.prodname_dotcom %}](/articles/adding-or-editing-a-payment-method). -| `change_email` | Triggered when your organization's [billing email address](/articles/setting-your-billing-email) changes. +| アクション | 説明 | +| --------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | +| `change_billing_type` | Organization が[{% data variables.product.prodname_dotcom %} の支払い方法を変更する](/articles/adding-or-editing-a-payment-method)ときにトリガーされます。 | +| `change_email` | Organization の[支払い請求先メール アドレス](/articles/setting-your-billing-email)が変わるときにトリガーされます。 | {% endif %} -##### The `discussion_post` category +##### `discussion_post` カテゴリ -| Action | Description -|------------------|------------------- -| `update` | Triggered when [a team discussion post is edited](/articles/managing-disruptive-comments/#editing-a-comment). -| `destroy` | Triggered when [a team discussion post is deleted](/articles/managing-disruptive-comments/#deleting-a-comment). +| アクション | 説明 | +| --------- | ------------------------------------------------------------------------------------------------ | +| `update` | [Team ディスカッションの投稿が編集される](/articles/managing-disruptive-comments/#editing-a-comment)ときにトリガーされます。 | +| `destroy` | [Team ディスカッションの投稿が削除される](/articles/managing-disruptive-comments/#deleting-a-comment)ときにトリガーされます。 | -##### The `discussion_post_reply` category +##### `discussion_post_reply` カテゴリ -| Action | Description -|------------------|------------------- -| `update` | Triggered when [a reply to a team discussion post is edited](/articles/managing-disruptive-comments/#editing-a-comment). -| `destroy` | Triggered when [a reply to a team discussion post is deleted](/articles/managing-disruptive-comments/#deleting-a-comment). +| アクション | 説明 | +| --------- | ---------------------------------------------------------------------------------------------------- | +| `update` | [Team ディスカッションの投稿への返答が編集される](/articles/managing-disruptive-comments/#editing-a-comment)ときにトリガーされます。 | +| `destroy` | [Team ディスカッションの投稿への返答が削除される](/articles/managing-disruptive-comments/#deleting-a-comment)ときにトリガーされます。 | -##### The `hook` category +##### `hook` カテゴリ -| Action | Description -|------------------|------------------- -| `create` | Triggered when [a new hook was added](/articles/creating-webhooks) to a repository owned by your organization. -| `config_changed` | Triggered when an existing hook has its configuration altered. -| `destroy` | Triggered when an existing hook was removed from a repository. -| `events_changed` | Triggered when the events on a hook have been altered. +| アクション | 説明 | +| ---------------- | ------------------------------------------------------------------------------- | +| `create` | Organization が所有するリポジトリに[新たなフックが追加された](/articles/creating-webhooks)ときにトリガーされます。 | +| `config_changed` | 既存のフックに変更された設定がある場合にトリガーされます。 | +| `destroy` | 既存のフックがリポジトリから削除されたときにトリガーされます。 | +| `events_changed` | フックでのイベントが変更された場合にトリガーされます。 | -##### The `integration_installation_request` category +##### `integration_installation_request` カテゴリ -| Action | Description -|------------------|------------------- -| `create` | Triggered when an organization member requests that an organization owner install an integration for use in the organization. -| `close` | Triggered when a request to install an integration for use in an organization is either approved or denied by an organization owner, or canceled by the organization member who opened the request. +| アクション | 説明 | +| -------- | ---------------------------------------------------------------------------------------------------------------------------------- | +| `create` | Organization のメンバーが、Organization 内で使用するために、Organization のオーナーにインテグレーションをインストールすることを要求するときにトリガーされます。 | +| `close` | Organization 内で使用するためにインテグレーションをインストールする要求が、Organization のオーナーにより承認または拒否されるか、あるいは要求を公開した Organization のメンバーによりキャンセルされるときにトリガーされます。 | -##### The `issue` category +##### `issue` カテゴリ -| Action | Description -|------------------|------------------- -| `destroy` | Triggered when an organization owner or someone with admin permissions in a repository deletes an issue from an organization-owned repository. +| アクション | 説明 | +| --------- | -------------------------------------------------------------------------------------- | +| `destroy` | リポジトリで管理者権限を所有する Organization のオーナーまたは誰かが、Organization が所有するリポジトリから問題を削除するときにトリガーされます。 | {% if currentVersion == "free-pro-team@latest" %} -##### The `marketplace_agreement_signature` category +##### `marketplace_agreement_signature` カテゴリ -| Action | Description -|------------------|------------------- -| `create` | Triggered when you sign the {% data variables.product.prodname_marketplace %} Developer Agreement. +| アクション | 説明 | +| -------- | --------------------------------------------------------------------------------------- | +| `create` | {% data variables.product.prodname_marketplace %} Developer Agreement に署名するときにトリガーされます。 | -##### The `marketplace_listing` category +##### `marketplace_listing` カテゴリ -| Action | Description -|------------------|------------------- -| `approve` | Triggered when your listing is approved for inclusion in {% data variables.product.prodname_marketplace %}. -| `create` | Triggered when you create a listing for your app in {% data variables.product.prodname_marketplace %}. -| `delist` | Triggered when your listing is removed from {% data variables.product.prodname_marketplace %}. -| `redraft` | Triggered when your listing is sent back to draft state. -| `reject` | Triggered when your listing is not accepted for inclusion in {% data variables.product.prodname_marketplace %}. +| アクション | 説明 | +| --------- | ----------------------------------------------------------------------------------- | +| `承認` | 一覧表を {% data variables.product.prodname_marketplace %}に掲載することが承認されるときにトリガーされます。 | +| `create` | {% data variables.product.prodname_marketplace %} で自分のアプリケーションの一覧表を作成するときにトリガーされます。 | +| `delist` | 一覧表が {% data variables.product.prodname_marketplace %} から削除されるときにトリガーされます。 | +| `redraft` | 一覧表がドラフト状態に戻されるときにトリガーされます。 | +| `reject` | 一覧表が {% data variables.product.prodname_marketplace %} に掲載することを認められないときにトリガーされます。 | {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -##### The `members_can_create_pages` category +##### `members_can_create_pages` カテゴリ -For more information, see "[Restricting publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization)." +詳細については、「[Organization について {% data variables.product.prodname_pages %} サイトの公開を制限する](/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization)」を参照してください。 -| Action | Description | -| :- | :- | -| `enable` | Triggered when an organization owner enables publication of {% data variables.product.prodname_pages %} sites for repositories in the organization. | -| `disable` | Triggered when an organization owner disables publication of {% data variables.product.prodname_pages %} sites for repositories in the organization. | +| アクション | 説明 | +|:--------- |:-------------------------------------------------------------------------------------------------------------- | +| `enable` | Organizationのオーナーが Organization のリポジトリについて {% data variables.product.prodname_pages %} サイトの公開を有効化するときトリガーされます。 | +| `disable` | Organizationのオーナーが Organization のリポジトリについて {% data variables.product.prodname_pages %} サイトの公開を無効化するときトリガーされます。 | {% endif %} -##### The `org` category +##### `org` カテゴリ -| Action | Description -|------------------|-------------------{% if currentVersion == "free-pro-team@latest"%} -| `audit_log_export` | Triggered when an organization admin [creates an export of the organization audit log](#exporting-the-audit-log). If the export included a query, the log will list the query used and the number of audit log entries matching that query. -| `block_user` | Triggered when an organization owner [blocks a user from accessing the organization's repositories](/articles/blocking-a-user-from-your-organization). -| `cancel_invitation` | Triggered when an organization invitation has been revoked. -| `disable_oauth_app_restrictions` | Triggered when an owner [disables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/disabling-oauth-app-access-restrictions-for-your-organization) for your organization. -| `disable_saml` | Triggered when an organization admin disables SAML single sign-on for an organization.{% endif %} -| `disable_member_team_creation_permission` | Triggered when an organization owner limits team creation to owners. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | -| `disable_two_factor_requirement` | Triggered when an owner disables a two-factor authentication requirement for all members{% if currentVersion == "free-pro-team@latest" %}, billing managers,{% endif %} and outside collaborators in an organization.{% if currentVersion == "free-pro-team@latest" %} -| `enable_oauth_app_restrictions` | Triggered when an owner [enables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/enabling-oauth-app-access-restrictions-for-your-organization) for your organization. -| `enable_saml` | Triggered when an organization admin [enables SAML single sign-on](/articles/enabling-and-testing-saml-single-sign-on-for-your-organization) for an organization.{% endif %} -| `enable_member_team_creation_permission` | Triggered when an organization owner allows members to create teams. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | -| `enable_two_factor_requirement` | Triggered when an owner requires two-factor authentication for all members{% if currentVersion == "free-pro-team@latest" %}, billing managers,{% endif %} and outside collaborators in an organization. -| `invite_member` | Triggered when [a new user was invited to join your organization](/articles/adding-organization-members-to-a-team).{% if currentVersion == "free-pro-team@latest" %} -| `oauth_app_access_approved` | Triggered when an owner [grants organization access to an {% data variables.product.prodname_oauth_app %}](/articles/approving-oauth-apps-for-your-organization/). -| `oauth_app_access_denied` | Triggered when an owner [disables a previously approved {% data variables.product.prodname_oauth_app %}'s access](/articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization) to your organization. -| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" %} -| `remove_billing_manager` | Triggered when an [owner removes a billing manager from an organization](/articles/removing-a-billing-manager-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and a billing manager doesn't use 2FA or disables 2FA. |{% endif %} -| `remove_member` | Triggered when an [owner removes a member from an organization](/articles/removing-a-member-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an organization member doesn't use 2FA or disables 2FA. Also triggered when an [organization member removes themselves](/articles/removing-yourself-from-an-organization/) from an organization.| -| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" %} -| `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." -| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." -| `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/articles/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -| `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} -| `update_default_repository_permission` | Triggered when an owner changes the default repository permission level for organization members. -| `update_member` | Triggered when an owner changes a person's role from owner to member or member to owner. -| `update_member_repository_creation_permission` | Triggered when an owner changes the create repository permission for organization members.{% if currentVersion == "free-pro-team@latest" %} -| `update_saml_provider_settings` | Triggered when an organization's SAML provider settings are updated. -| `update_terms_of_service` | Triggered when an organization changes between the Standard Terms of Service and the Corporate Terms of Service. For more information, see "[Upgrading to the Corporate Terms of Service](/articles/upgrading-to-the-corporate-terms-of-service)."{% endif %} +| アクション | 説明 | +| -------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest"%} +| `audit_log_export` | Organization の管理者が [Organization の Audit log のエクスポートを作成する](#exporting-the-audit-log)ときにトリガーされます。 エクスポートにクエリが含まれていた場合、ログには使用されたクエリとそのクエリに一致する Audit log エントリの数が一覧表示されます。 | +| `block_user` | Organization のオーナーが[Organization のリポジトリにユーザーがアクセスするのをブロックする](/articles/blocking-a-user-from-your-organization)ときにトリガーされます。 | +| `cancel_invitation` | Organization の招待が取り消されている場合にトリガーされます。 |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization).{% endif %} |{% if currentVersion == "free-pro-team@latest"%} +| `disable_oauth_app_restrictions` | オーナーが Organization に対して[{% data variables.product.prodname_oauth_app %} のアクセス制限を無効にする](/articles/disabling-oauth-app-access-restrictions-for-your-organization)ときにトリガーされます。 | +| `disable_saml` | Organization の管理者が Organization に対して SML シングルサインオンを無効にするときにトリガーされます。{% endif %} +| `disable_member_team_creation_permission` | Organization のオーナーがオーナーに Team 作成を制限するときにトリガーされます。 詳細は「[Organization のチーム作成権限を設定する](/articles/setting-team-creation-permissions-in-your-organization)」を参照してください。 | +| `disable_two_factor_requirement` | Organization のすべてのメンバー{% if currentVersion == "free-pro-team@latest" %}、支払いマネージャー、{% endif %}および外部のコラボレータに対してオーナーが 2 要素認証を無効化するときにトリガーされます。{% if currentVersion == "free-pro-team@latest" %} +| `enable_oauth_app_restrictions` | オーナーが Organization に対して[{% data variables.product.prodname_oauth_app %} のアクセス制限を有効にする](/articles/enabling-oauth-app-access-restrictions-for-your-organization)ときにトリガーされます。 | +| `enable_saml` | Organization の管理者が Organization に対して [SAML シングルサインオン を有効にする](/articles/enabling-and-testing-saml-single-sign-on-for-your-organization)ときにトリガーされます。{% endif %} +| `enable_member_team_creation_permission` | メンバーが Team を作成するのを Organizationのオーナーが許可するときにトリガーされます。 詳細は「[Organization のチーム作成権限を設定する](/articles/setting-team-creation-permissions-in-your-organization)」を参照してください。 | +| `enable_two_factor_requirement` | Organization のすべてのメンバー{% if currentVersion == "free-pro-team@latest" %}、支払いマネージャー、{% endif %}および外部のコラボレータに対してオーナーが 2 要素認証を有効化するときにトリガーされます。 | +| `invite_member` | [新しいユーザーがOrganization に参加するよう招待](/articles/adding-organization-members-to-a-team)されたにトリガーされます。{% if currentVersion == "free-pro-team@latest" %} +| `oauth_app_access_approved` | オーナーが [{% data variables.product.prodname_oauth_app %} へのアクセスを許可する](/articles/approving-oauth-apps-for-your-organization/)ときにトリガーされます。 | +| `oauth_app_access_denied` | オーナーが Organization への[以前に承認した {% data variables.product.prodname_oauth_app %} のアクセス権を無効にする](/articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization)ときにトリガーされます。 | +| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). | +| `remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest"%} +| `remove_billing_manager` | [オーナーが Organization から支払いマネージャーを削除する](/articles/removing-a-billing-manager-from-your-organization/)とき、または [Organization で 2 要素認証が義務付けられている](/articles/requiring-two-factor-authentication-in-your-organization)が、支払いマネージャーが 2 要素認証を使用しないか 2 要素認証を無効にしているときにトリガーされます。 |{% endif %} +| `remove_member` | [オーナーが Organization からメンバーを削除する](/articles/removing-a-member-from-your-organization/)とき、または [Organization で 2 要素認証が義務付けられている](/articles/requiring-two-factor-authentication-in-your-organization)が、Organization のメンバーが 2 要素認証を使用しないか 2 要素認証を無効にしているときにトリガーされます。 Organization から [Organization のメンバーが自身を削除](/articles/removing-yourself-from-an-organization/)するときにもトリガーされます。 | +| `remove_outside_collaborator` | オーナーが Organization から外部のコラボレータを削除するとき、または [Organization で 2 要素認証が義務付けられている](/articles/requiring-two-factor-authentication-in-your-organization)が、外部のコラボレータが 2 要素認証を使用しないか 2 要素認証を無効にしているときにトリガーされます。 |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). |{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| `revoke_external_identity` | Organization のオーナーがメンバーのリンクされたアイデンティティを取り消すときにトリガーされます。 詳細は、「[組織へのメンバーの SAML アクセスの表示と管理](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)」を参照してください。 | +| `revoke_sso_session` | Organization のオーナーがメンバーの SAML セッションを取り消すときにトリガーされます。 詳細は、「[組織へのメンバーの SAML アクセスの表示と管理](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)」を参照してください。 |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). | +| `runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. | +| `runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. | +| `runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). | +| `runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. |{% endif %}{% if currentVersion == "free-pro-team@latest"%} +| `unblock_user` | Organizationのオーナーが[ Organization からユーザりブロックを解除](/articles/unblocking-a-user-from-your-organization)するときにトリガーされます。{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +| `update_new_repository_default_branch_setting` | オーナーが Organization の新しいリポジトリのデフォルトブランチの名前を変更するときにトリガーされます。 詳しい情報については、「[Organization のリポジトリのデフォルブランチ名を管理する](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)」を参照してください。{% endif %} +| `update_default_repository_permission` | オーナーが Organization のメンバーのデフォルトリポジトリの権限レベルを変更するときにトリガーされます。 | +| `update_member` | オーナーがユーザーのロールをオーナーからメンバーに、またはメンバーからオーナーに変更するときにトリガーされます。 | +| `update_member_repository_creation_permission` | オーナーが Organization のメンバーのリポジトリ作成権限を変更するときにトリガーされます。{% if currentVersion == "free-pro-team@latest" %} +| `update_saml_provider_settings` | Organization の SAML プロバイダ設定が更新されるときにトリガーされます。 | +| `update_terms_of_service` | Organization が標準利用規約と企業向け利用規約を切り替えるときにトリガーされます。 詳細は「[企業利用規約にアップグレードする](/articles/upgrading-to-the-corporate-terms-of-service)」を参照してください。{% endif %} {% if currentVersion == "free-pro-team@latest" %} -##### The `org_credential_authorization` category +##### `org_credential_authorization` カテゴリ -| Action | Description -|------------------|------------------- -| `grant` | Triggered when a member [authorizes credentials for use with SAML single sign-on](/github/authenticating-to-github/authenticating-with-saml-single-sign-on). -| `deauthorized` | Triggered when a member [deauthorizes credentials for use with SAML single sign-on](/github/authenticating-to-github/authenticating-with-saml-single-sign-on). -| `revoke` | Triggered when an owner [revokes authorized credentials](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization). +| アクション | 説明 | +| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `grant` | [SAML シングルサインオンに使用するクレデンシャルをメンバーが認可する](/github/authenticating-to-github/authenticating-with-saml-single-sign-on)ときにトリガーされます。 | +| `deauthorized` | [SAML シングルサインオンに使用するクレデンシャルの認可をメンバーが取り消す](/github/authenticating-to-github/authenticating-with-saml-single-sign-on)ときにトリガーされます。 | +| `revoke` | オーナーが[認可されたクレデンシャルを取り消す](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization)ときにトリガーされます。 | {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -##### The `organization_label` category +##### `organization_label` カテゴリ -| Action | Description -|------------------|------------------- -| `create` | Triggered when a default label is created. -| `update` | Triggered when a default label is edited. -| `destroy` | Triggered when a default label is deleted. +| アクション | 説明 | +| --------- | -------------------------- | +| `create` | デフォルトラベルが作成されるときにトリガーされます。 | +| `update` | デフォルトラベルが編集されるときにトリガーされます。 | +| `destroy` | デフォルトラベルが削除されるときにトリガーされます。 | {% endif %} -##### The `oauth_application` category +##### `oauth_application` カテゴリ -| Action | Description -|------------------|------------------- -| `create` | Triggered when a new {% data variables.product.prodname_oauth_app %} is created. -| `destroy` | Triggered when an existing {% data variables.product.prodname_oauth_app %} is deleted. -| `reset_secret` | Triggered when an {% data variables.product.prodname_oauth_app %}'s client secret is reset. -| `revoke_tokens` | Triggered when an {% data variables.product.prodname_oauth_app %}'s user tokens are revoked. -| `transfer` | Triggered when an existing {% data variables.product.prodname_oauth_app %} is transferred to a new organization. +| アクション | 説明 | +| --------------- | ------------------------------------------------------------------------------------------ | +| `create` | 新たな {% data variables.product.prodname_oauth_app %} が作成されるときにトリガーされます。 | +| `destroy` | 既存の {% data variables.product.prodname_oauth_app %} が削除されるときにトリガーされます。 | +| `reset_secret` | {% data variables.product.prodname_oauth_app %} のクライアント シークレットがリセットされるときにトリガーされます。 | +| `revoke_tokens` | {% data variables.product.prodname_oauth_app %} のユーザートークンが取り消されるときにトリガーされます。 | +| `移譲` | 既存の {% data variables.product.prodname_oauth_app %} が新しい Organization に移譲されるときにトリガーされます。 | {% if currentVersion == "free-pro-team@latest" %} -##### The `payment_method` category +##### `payment_method` カテゴリ -| Action | Description -|------------------|------------------- -| `clear` | Triggered when a payment method on file is [removed](/articles/removing-a-payment-method). -| `create` | Triggered when a new payment method is added, such as a new credit card or PayPal account. -| `update` | Triggered when an existing payment method is updated. +| アクション | 説明 | +| -------- | -------------------------------------------------------------------- | +| `clear` | ファイル上の支払い方法が[削除される](/articles/removing-a-payment-method)ときにトリガーされます。 | +| `create` | 新しいクレジット カードや PayPal アカウントなど、新たな支払い方法が追加されるときにトリガーされます。 | +| `update` | 既存の支払い方法が更新されるときにトリガーされます。 | {% endif %} -##### The `profile_picture` category -| Action | Description -|------------------|------------------- -| update | Triggered when you set or update your organization's profile picture. +##### `profile_picture` カテゴリ +| アクション | 説明 | +| ------ | -------------------------------------------- | +| update | Organization のプロファイル写真を設定または更新するときにトリガーされます。 | -##### The `project` category +##### `project` カテゴリ -| Action | Description -|--------------------|--------------------- -| `create` | Triggered when a project board is created. -| `link` | Triggered when a repository is linked to a project board. -| `rename` | Triggered when a project board is renamed. -| `update` | Triggered when a project board is updated. -| `delete` | Triggered when a project board is deleted. -| `unlink` | Triggered when a repository is unlinked from a project board. -| `update_org_permission` | Triggered when the base-level permission for all organization members is changed or removed. | -| `update_team_permission` | Triggered when a team's project board permission level is changed or when a team is added or removed from a project board. | -| `update_user_permission` | Triggered when an organization member or outside collaborator is added to or removed from a project board or has their permission level changed.| +| アクション | 説明 | +| ------------------------ | -------------------------------------------------------------------------------------- | +| `create` | プロジェクト ボードが作成されるときにトリガーされます。 | +| `link` | リポジトリがプロジェクト ボードにリンクされるときにトリガーされます。 | +| `rename` | プロジェクトボードの名前が変更されるときにトリガーされます。 | +| `update` | プロジェクト ボードが更新されるときにトリガーされます。 | +| `delete` | プロジェクトボードが削除されるときにトリガーされます。 | +| `unlink` | リポジトリがプロジェクトボードからリンク解除されるときにトリガーされます。 | +| `update_org_permission` | Organization のすべてのメンバーに対して、基本レベルの権限が変更または削除されるときにトリガーされます。 | +| `update_team_permission` | Team のプロジェクト ボードの権限レベルが変更されるとき、または Team がプロジェクト ボードに追加または削除されるときにトリガーされます。 | +| `update_user_permission` | Organization のメンバーまたは外部コラボレーターがプロジェクト ボードに追加または削除されるとき、または彼らの権限レベルが変更されている場合にトリガーされます。 | -##### The `protected_branch` category +##### `protected_branch` カテゴリ -| Action | Description -|--------------------|--------------------- -| `create ` | Triggered when branch protection is enabled on a branch. -| `destroy` | Triggered when branch protection is disabled on a branch. -| `update_admin_enforced ` | Triggered when branch protection is enforced for repository administrators. -| `update_require_code_owner_review ` | Triggered when enforcement of required Code Owner review is updated on a branch. -| `dismiss_stale_reviews ` | Triggered when enforcement of dismissing stale pull requests is updated on a branch. -| `update_signature_requirement_enforcement_level ` | Triggered when enforcement of required commit signing is updated on a branch. -| `update_pull_request_reviews_enforcement_level ` | Triggered when enforcement of required pull request reviews is updated on a branch. -| `update_required_status_checks_enforcement_level ` | Triggered when enforcement of required status checks is updated on a branch. -| `update_strict_required_status_checks_policy` | Triggered when the requirement for a branch to be up to date before merging is changed. -| `rejected_ref_update ` | Triggered when a branch update attempt is rejected. -| `policy_override ` | Triggered when a branch protection requirement is overridden by a repository administrator.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -| `update_allow_force_pushes_enforcement_level ` | Triggered when force pushes are enabled or disabled for a protected branch. -| `update_allow_deletions_enforcement_level ` | Triggered when branch deletion is enabled or disabled for a protected branch. -| `update_linear_history_requirement_enforcement_level ` | Triggered when required linear commit history is enabled or disabled for a protected branch. +| アクション | 説明 | +| ----------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | +| `create` | ブランチでブランチの保護が有効になるときにトリガーされます。 | +| `destroy` | ブランチでブランチの保護が無効になるときにトリガーされます。 | +| `update_admin_enforced` | リポジトリの管理者に対してブランチの保護が実施されるときにトリガーされます。 | +| `update_require_code_owner_review` | 必須コードオーナーレビューの実施がブランチで更新されるときにトリガーされます。 | +| `dismiss_stale_reviews` | 古い Pull Request の却下の実施がブランチで更新されるときにトリガーされます。 | +| `update_signature_requirement_enforcement_level` | 必須コミット署名の実施がブランチで更新されるときにトリガーされます。 | +| `update_pull_request_reviews_enforcement_level` | 必須 Pull Request レビューの実施がブランチで更新されるときにトリガーされます。 | +| `update_required_status_checks_enforcement_level` | 必須ステータスチェックの実施がブランチで更新されるときにトリガーされます。 | +| `update_strict_required_status_checks_policy` | マージする前に最新にする必要があるブランチの要件が変更されるときにトリガーされます。 | +| `rejected_ref_update` | ブランチ更新の試行が拒否されるときにトリガーされます。 | +| `policy_override` | ブランチ保護の要件がリポジトリ管理者によってオーバーライドされるときにトリガーされます。{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} +| `update_allow_force_pushes_enforcement_level` | 保護されたブランチについて、フォースプッシュが有効化または無効化されるときにトリガーされます。 | +| `update_allow_deletions_enforcement_level` | 保護されたブランチについて、ブランチ削除が有効化または無効化されるときにトリガーされます。 | +| `update_linear_history_requirement_enforcement_level` | 保護されたブランチについて、必須の直線状のコミット履歴が有効化または無効化されるときにトリガーされます。 | {% endif %} -##### The `repo` category +##### `repo` カテゴリ -| Action | Description -|------------------|------------------- -| `access` | Triggered when a repository owned by an organization is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). -| `add_member` | Triggered when a user accepts an [invitation to have collaboration access to a repository](/articles/inviting-collaborators-to-a-personal-repository). -| `add_topic` | Triggered when a repository admin [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. -| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} -| `config.disable_anonymous_git_access` | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. -| `config.enable_anonymous_git_access` | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. -| `config.lock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). -| `config.unlock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is unlocked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access).{% endif %} -| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository). -| `destroy` | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} -| `disable` | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %} -| `enable` | Triggered when a repository is reenabled. -| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository). -| `remove_topic` | Triggered when a repository admin removes a topic from a repository. -| `rename` | Triggered when [a repository is renamed](/articles/renaming-a-repository). -| `transfer` | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). -| `transfer_start` | Triggered when a repository transfer is about to occur. -| `unarchived` | Triggered when a repository admin unarchives a repository. +| アクション | 説明 | +| ------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `access` | Organization が所有するリポジトリが["プライベート" から "パブリック" に切り替えられる](/articles/making-a-private-repository-public) (またはその逆) ときにトリガーされます。 | +| `add_member` | ユーザーが[リポジトリへのコラボレーションアクセスへの招待](/articles/inviting-collaborators-to-a-personal-repository)を受諾するときにトリガーされます。 | +| `add_topic` | リポジトリの管理者がリポジトリに[トピックを追加する](/articles/classifying-your-repository-with-topics)ときにトリガーされます。 | +| `archived` | リポジトリの管理者が[リポジトリをアーカイブする](/articles/about-archiving-repositories)ときにトリガーされます。{% if enterpriseServerVersions contains currentVersion %} +| `config.disable_anonymous_git_access` | 公開リポジトリで[匿名の Git 読み取りアクセスが無効になる](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)ときにトリガーされます。 | +| `config.enable_anonymous_git_access` | 公開リポジトリで[匿名の Git 読み取りアクセスが有効になる](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)ときにトリガーされます。 | +| `config.lock_anonymous_git_access` | リポジトリの[匿名の Git 読み取りアクセス設定がロックされる](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access)ときにトリガーされます。 | +| `config.unlock_anonymous_git_access` | リポジトリの[匿名の Git 読み取りアクセス設定がロック解除される](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access)ときにトリガーされます。{% endif %} +| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository).{% endif %} +| `destroy` | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} +| `disable` | リポジトリが無効になるときにトリガーされます ([残高不足](/articles/unlocking-a-locked-account)などの場合)。{% endif %} +| `enable` | Triggered when a repository is reenabled.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret.{% endif %} +| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). | +| `remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). |{% endif %} +| `remove_topic` | リポジトリの管理者がリポジトリからトピックを削除するときにトリガーされます。 | +| `rename` | [リポジトリの名前が変更される](/articles/renaming-a-repository)ときにトリガーされます。 | +| `移譲` | [リポジトリが移譲される](/articles/how-to-transfer-a-repository)ときにトリガーされます。 | +| `transfer_start` | リポジトリの移譲が行われようとしているときにトリガーされます。 | +| `unarchived` | Triggered when a repository admin unarchives a repository.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret.{% endif %} {% if currentVersion == "free-pro-team@latest" %} -##### The `repository_content_analysis` category +##### `repository_content_analysis` カテゴリ -| Action | Description -|------------------|------------------- -| `enable` | Triggered when an organization owner or person with admin access to the repository [enables data use settings for a private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository). -| `disable` | Triggered when an organization owner or person with admin access to the repository [disables data use settings for a private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository). +| アクション | 説明 | +| --------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `enable` | Organization のオーナーまたはリポジトリへの管理者アクセス権を所有する人が[プライベート リポジトリに対してデータ使用設定を有効にする](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)ときにトリガーされます。 | +| `disable` | Organization のオーナーまたはリポジトリへの管理者アクセス権を所有する人が[プライベート リポジトリに対してデータ使用設定を無効にする](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)ときにトリガーされます。 | -##### The `repository_dependency_graph` category +##### `repository_dependency_graph` カテゴリ -| Action | Description -|------------------|------------------- -| `enable` | Triggered when a repository owner or person with admin access to the repository [enables the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository). -| `disable` | Triggered when a repository owner or person with admin access to the repository [disables the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository). +| アクション | 説明 | +| --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `enable` | リポジトリのオーナーまたはリポジトリへの管理者アクセス権を所有する人が[プライベート リポジトリに対して依存グラフを有効にする](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository)ときにトリガーされます。 | +| `disable` | リポジトリのオーナーまたはリポジトリへの管理者アクセス権を所有する人が[プライベート リポジトリに対して依存グラフを無効にする](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository)ときにトリガーされます。 | {% endif %} -##### The `repository_vulnerability_alert` category +##### `repository_vulnerability_alert` カテゴリ -| Action | Description -|------------------|------------------- -| `create` | Triggered when {% data variables.product.product_name %} creates a [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alert for a vulnerable dependency](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a particular repository. -| `resolve` | Triggered when someone with write access to a repository [pushes changes to update and resolve a vulnerability](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a project dependency. -| `dismiss` | Triggered when an organization owner or person with admin access to the repository dismisses a {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alert about a vulnerable dependency.{% if currentVersion == "free-pro-team@latest" %} -| `authorized_users_teams` | Triggered when an organization owner or a member with admin permissions to the repository [updates the list of people or teams authorized to receive {% data variables.product.prodname_dependabot_short %} alerts](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts) for vulnerable dependencies in the repository.{% endif %} +| アクション | 説明 | +| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `create` | {% data variables.product.product_name %} が特定のリポジトリで[脆弱な依存性に対する{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラート](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)を作成するときにトリガーされます。 | +| `解決` | リポジトリへの書き込みアクセス権を所有する人が、プロジェクトの依存関係で、[脆弱性を更新して解決するために変更をプッシュする](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)ときにトリガーされます。 | +| `却下` | Organization のオーナーまたはリポジトリへの管理者アクセス権を所有する人は | +| 脆弱な依存関係についての {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートを却下するときにトリガーされます。{% if currentVersion == "free-pro-team@latest" %} | | +| `authorized_users_teams` | Organization のオーナーまたはリポジトリへの管理者権限を所有するメンバーが、リポジトリ内の脆弱な依存関係に対する[{% data variables.product.prodname_dependabot_short %}{% endif %}アラートを受信する権限が与えられた人または Team のリストを更新する](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)ときにトリガーされます。 | {% if currentVersion == "free-pro-team@latest" %} -##### The `sponsors` category +##### `sponsors` カテゴリ -| Action | Description -|------------------|------------------- -| repo_funding_link_button_toggle | Triggered when you enable or disable a sponsor button in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") -| repo_funding_links_file_action | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") +| アクション | 説明 | +| ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | +| repo_funding_link_button_toggle | リポジトリでスポンサーボタンの表示を有効化または無効化したときにトリガーされます (「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照) | +| repo_funding_links_file_action | リポジトリで FUNDING ファイルを変更したときにトリガーされます (「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照) | {% endif %} -{% if currentVersion != "free-pro-team@latest" %} -##### The `team` category +{% if enterpriseServerVersions contains currentVersion %} +##### `team` カテゴリ -| Action | Description -|------------------|------------------- -| `add_member` | Triggered when a member of an organization is [added to a team](/articles/adding-organization-members-to-a-team). -| `add_repository` | Triggered when a team is given control of a repository. -| `change_parent_team` | Triggered when a child team is created or [a child team's parent is changed](/articles/moving-a-team-in-your-organization-s-hierarchy). -| `change_privacy` | Triggered when a team's privacy level is changed. -| `create` | Triggered when a new team is created. -| `destroy` | Triggered when a team is deleted from the organization. -| `remove_member` | Triggered when a member of an organization is [removed from a team](/articles/removing-organization-members-from-a-team). -| `remove_repository` | Triggered when a repository is no longer under a team's control. +| アクション | 説明 | +| -------------------- | ---------------------------------------------------------------------------------------------------- | +| `add_member` | Organization のメンバーが[Team に追加される](/articles/adding-organization-members-to-a-team)ときにトリガーされます。 | +| `add_repository` | リポジトリの管理が Team に任せられるときにトリガーされます。 | +| `change_parent_team` | 子チームが作成されるとき、または[子チームの親が変更される](/articles/moving-a-team-in-your-organization-s-hierarchy)ときにトリガーされます。 | +| `change_privacy` | Team のプライバシー レベルが変更されるときにトリガーされます。 | +| `create` | 新たな Team が作成されるときにトリガーされます。 | +| `destroy` | Team が Organization から削除されるときにトリガーされます。 | +| `remove_member` | Organization のメンバーが[Team から削除される](/articles/removing-organization-members-from-a-team)ときにトリガーされます。 | +| `remove_repository` | リポジトリが Team の管理下でなくなるときにトリガーされます。 | {% endif %} -##### The `team_discussions` category +##### `team_discussions` カテゴリ -| Action | Description -|---|---| -| `disable` | Triggered when an organization owner disables team discussions for an organization. For more information, see "[Disabling team discussions for your organization](/articles/disabling-team-discussions-for-your-organization)." -| `enable` | Triggered when an organization owner enables team discussions for an organization. +| アクション | 説明 | +| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `disable` | Organization のオーナーが Organization の Team ディスカッションを無効にするときにトリガーされます。 詳しい情報については [Organization の Team ディスカッションの無効化](/articles/disabling-team-discussions-for-your-organization)を参照してください。 | +| `enable` | Organization のオーナーが Organization の Team ディスカッションを有効にするときにトリガーされます。 | -#### Search based on time of action +#### アクション時間に基づく検索 -Use the `created` qualifier to filter actions in the audit log based on when they occurred. {% data reusables.time_date.date_format %} {% data reusables.time_date.time_format %} +`created` 修飾子を使用して、行われた日時に基づいて Audit log 内の行動をフィルタリングします。 {% data reusables.time_date.date_format %} {% data reusables.time_date.time_format %} -{% data reusables.search.date_gt_lt %} For example: +{% data reusables.search.date_gt_lt %} 例: - * `created:2014-07-08` finds all events that occurred on July 8th, 2014. - * `created:>=2014-07-08` finds all events that occurred on or after July 8th, 2014. - * `created:<=2014-07-08` finds all events that occurred on or before July 8th, 2014. - * `created:2014-07-01..2014-07-31` finds all events that occurred in the month of July 2014. + * `created:2014-07-08` は、2014 年 7 月 8 日に発生したイベントをすべて検索します。 + * `created:>=2014-07-08` は、2014 年 7 月 8 日かそれ以降に生じたすべてのイベントを検索します。 + * `created:<=2014-07-08`は、2014 年 7 月 8 日かそれ以前に生じたすべてのイベントを検索します。 + * `created:2014-07-01..2014-07-31`は、2014 年 7 月に起きたすべてのイベントを検索します。 -The audit log contains data for the past 90 days, but you can use the `created` qualifier to search for events earlier than that. +Audit log には過去 90 日間のデータが存在しますが、`created` 修飾子を使用すればそれより前のイベントを検索できます。 -#### Search based on location +#### 場所に基づく検索 -Using the qualifier `country`, you can filter actions in the audit log based on the originating country. You can use a country's two-letter short code or its full name. Keep in mind that countries with spaces in their name will need to be wrapped in quotation marks. For example: +修飾子 `country` を使用すれば、発信元の国に基づいて Audit log 内の行動をフィルタリングできます。 国の 2 文字のショートコードまたはフル ネームを使用できます。 名前に空白がある国は引用符で囲む必要があることに注意してください。 例: - * `country:de` finds all events that occurred in Germany. - * `country:Mexico` finds all events that occurred in Mexico. - * `country:"United States"` all finds events that occurred in the United States. + * `country:de` は、ドイツで発生したイベントをすべて検索します。 + * `country:Mexico` はメキシコで発生したすべてのイベントを検索します。 + * `country:"United States"` はアメリカ合衆国で発生したすべてのイベントを検索します。 {% if currentVersion == "free-pro-team@latest" %} -### Exporting the audit log +### Audit log をエクスポートする {% data reusables.audit_log.export-log %} {% data reusables.audit_log.exported-log-keys-and-values %} {% endif %} -### Using the Audit log API +### Audit log API を使用する {% note %} -**Note**: The Audit log API is available for organizations using {% data variables.product.prodname_enterprise %}. {% data reusables.gated-features.more-info-org-products %} +**メモ**: Audit log API は、{% data variables.product.prodname_enterprise %} を使用している Organization が利用できます。 {% data reusables.gated-features.more-info-org-products %} {% endnote %} -To ensure a secure IP and maintain compliance for your organization, you can use the Audit log API to keep copies of your audit log data and monitor: -* Access to your organization or repository settings. -* Changes in permissions. -* Added or removed users in an organization, repository, or team. -* Users being promoted to admin. -* Changes to permissions of a GitHub App. +IP の安全性を保ち、Organization のコンプライアンスを守るため、Audit log API を使って、Audit log データのコピーを保存し、モニタリングできます。 +* Organization またはリポジトリの設定へのアクセス +* 権限の変更 +* Organization、リポジトリ、または Team におけるユーザの追加や削除 +* 管理者に昇格しているユーザ +* GitHub App の権限の変更 -The GraphQL response can include data for up to 90 to 120 days. +GraphQL のレスポンスには、90 日から 120 日までのデータを含めることができます。 -For example, you can make a GraphQL request to see all the new organization members added to your organization. For more information, see the "[GraphQL API Audit Log](/graphql/reference/interfaces#auditentry/)." +たとえば、GraphQL にリクエストして、Organization に新しく追加された Organization メンバー全員を表示できます。 詳細は「[GraphQL API Audit Log](/graphql/reference/interfaces#auditentry/)」を参照してください。 -### Further reading +### 参考リンク -- "[Keeping your organization secure](/articles/keeping-your-organization-secure)" +- "[Organization を安全に保つ](/articles/keeping-your-organization-secure)" diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md index 83bcbe3dd4..d4d14b9212 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md @@ -1,6 +1,6 @@ --- -title: Reviewing your organization's installed integrations -intro: You can review the permission levels for your organization's installed integrations and configure each integration's access to organization repositories. +title: Organization のインストール済みインテグレーションをレビューする +intro: Organization のインストール済みインテグレーションの権限レベルをレビューして、各インテグレーションの Organization リポジトリへのアクセス権を設定できます。 redirect_from: - /articles/reviewing-your-organization-s-installed-integrations - /articles/reviewing-your-organizations-installed-integrations @@ -12,12 +12,9 @@ versions: {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} -4. In the left sidebar, click **Installed {% data variables.product.prodname_github_app %}s**. - ![Installed {% data variables.product.prodname_github_app %}s tab in the organization settings sidebar](/assets/images/help/organizations/org-settings-installed-github-apps.png) -5. Next to the {% data variables.product.prodname_github_app %} you'd like to review, click **Configure**. - ![Configure button](/assets/images/help/organizations/configure-installed-integration-button.png) -6. Review the {% data variables.product.prodname_github_app %}'s permissions and repository access. - ![Option to give the {% data variables.product.prodname_github_app %} access to all repositories or specific repositories](/assets/images/help/organizations/toggle-integration-repo-access.png) - - To give the {% data variables.product.prodname_github_app %} access to all of your organization's repositories, select **All repositories**. - - To choose specific repositories to give the application access to, select **Only select repositories**, then type a repository name. -7. Click **Save**. +4. 左サイドバーで [**Installed {% data variables.product.prodname_github_app %}s**] をクリックします。 ![Organization の Settings サイドバーでの [Installed {% data variables.product.prodname_github_app %}s] タブ](/assets/images/help/organizations/org-settings-installed-github-apps.png) +5. レビューする {% data variables.product.prodname_github_app %}の横にある [**Configure**] をクリックします。 ![[Configure] ボタン](/assets/images/help/organizations/configure-installed-integration-button.png) +6. {% data variables.product.prodname_github_app %} の権限とリポジトリのアクセス権をレビューします。 ![{% data variables.product.prodname_github_app %} にすべてのリポジトリまたは特定のリポジトリへのアクセス権を付与するためのオプション](/assets/images/help/organizations/toggle-integration-repo-access.png) + - {% data variables.product.prodname_github_app %} に Organization のすべてのリポジトリへのアクセス権を付与するには、[**All repositories**] をクリックします。 + - アプリケーションにアクセス権を付与する特定のリポジトリを選択するには、[**Only select repositories**] を選択し、続いてリポジトリ名を入力します。 +7. [**Save**] をクリックします。 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization.md index 0a344b6edf..eb43c57b20 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization.md @@ -11,7 +11,7 @@ versions: Organization のリポジトリにアクセスするとき Organization の全メンバーに適用される基本レベルの権限を設定できます。 基本レベルの権限は、外部のコラボレーターには適用されません。 -{% if currentVersion == "free-pro-team@latest" %}By default, members of an organization will have **Read** permissions to the organization's repositories.{% endif %} +{% if currentVersion == "free-pro-team@latest" %}デフォルトでは、Organization のメンバーは Organization のリポジトリに対する**読み取り**権限を付与されます。{% endif %} Organization のリポジトリに対する管理者権限があるユーザが、リポジトリに対してそれより高いレベルの権限を付与すると、基本レベルの権限は、付与された高い権限によってオーバーライドされます。 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md index 9f038f84ec..a01c1491a4 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md @@ -1,6 +1,6 @@ --- -title: Setting permissions for adding outside collaborators -intro: 'To protect your organization''s data and the number of paid licenses used in your organization, you can allow only owners to invite outside collaborators to organization repositories.' +title: 外部のコラボレーターを追加するための権限を設定する +intro: 'Organization のデータを保護し、Organization 内で使用されている有料ライセンスの数が無駄遣いされないようにするために、外部コラボレーターを Organization のリポジトリに招待することをオーナーのみに許可できます。' product: '{% data reusables.gated-features.restict-add-collaborator %}' redirect_from: - /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories/ @@ -10,7 +10,7 @@ versions: enterprise-server: '*' --- -Organization owners, and members with admin privileges for a repository, can invite outside collaborators to work on the repository. You can also restrict outside collaborator invite permissions to only organization owners. +リポジトリに対する管理者権限を持つ Organization のオーナーとメンバーは、リポジトリで作業するように外部のコラボレーターを招待できます。 外部のコラボレーターの招待権限を、Organization のオーナーに制限することもできます。 {% data reusables.organizations.outside-collaborators-use-seats %} @@ -18,7 +18,6 @@ Organization owners, and members with admin privileges for a repository, can inv {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.member-privileges %} -5. Under "Repository invitations", select **Allow members to invite outside collaborators to repositories for this organization**.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} - ![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox-updated.png){% else %} - ![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox.png){% endif %} -6. Click **Save**. +5. [Repository invitations] で、[**Allow members to invite outside collaborators to repositories for this organization**] を選択します。.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} ![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox-updated.png){% else %} +![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox.png){% endif %} +6. [**Save**] をクリックします。 diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership.md index 975bf1e762..76b86e8f54 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership.md @@ -3,7 +3,7 @@ title: Organization の所有権を移譲する redirect_from: - /articles/needs-polish-how-do-i-give-ownership-to-an-organization-to-someone-else/ - /articles/transferring-organization-ownership -intro: 'To make someone else the owner of an organization account, you must add a new owner{% if currentVersion == "free-pro-team@latest" %}, ensure that the billing information is updated,{% endif %} and then remove yourself from the account.' +intro: '他の誰かを Organization アカウントのオーナーにするには、新しいオーナーを追加し、{% if currentVersion == "free-pro-team@latest" %}請求情報が更新されることを確認し、{% endif %}アカウントから自分を削除します。' versions: free-pro-team: '*' enterprise-server: '*' diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service.md index 9d74557780..a1fa805d47 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service.md @@ -11,7 +11,7 @@ versions: 1. お問い合わせ -{% data variables.contact.contact_support %} to request an upgrade to the Corporate Terms of Service. 彼らは、Organization のダッシュボード上のバナーを有効にします。それにより、企業利用規約を受け入れることができます。 +企業利用規約へのアップグレードをリクエストするには、{% data variables.contact.contact_support %} にお問い合わせください。 彼らは、Organization のダッシュボード上のバナーを有効にします。それにより、企業利用規約を受け入れることができます。 {% data reusables.dashboard.access-org-dashboard %} 3. ページ上部の利用規約バナーの右側にある [**Sign now**] をクリックします。 ![[Sign now] ボタン](/assets/images/help/organizations/sign-now-button.png) 4. 企業利用規約に関する情報を読み、[**Yes, I want to sign these terms on behalf of my business.**] を選択します。 ![会社を代表して署名するためのチェックボックス](/assets/images/help/organizations/sign-on-behalf-business.png) diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled.md index 66b0ed9db4..56a6cf235e 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled.md @@ -10,7 +10,7 @@ versions: {% note %} -**Note:** You can require that all members{% if currentVersion == "free-pro-team@latest" %}, including, owners, billing managers and{% else %} and{% endif %} outside collaborators in your organization have two-factor authentication enabled. 詳しい情報については [Organization で 2 要素認証を要求する](/articles/requiring-two-factor-authentication-in-your-organization)を参照してください。 +**注釈:** {% if currentVersion == "free-pro-team@latest" %}オーナー、支払いマネージャーおよび{% else %}{% endif %}外部コラボレーターを含むすべてのメンバーに、2 要素認証を有効にするよう要求できます。 詳しい情報については [Organization で 2 要素認証を要求する](/articles/requiring-two-factor-authentication-in-your-organization)を参照してください。 {% endnote %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md index feb229a238..9a42591730 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md @@ -27,6 +27,8 @@ Enterprise アカウントでは、複数の {% data variables.product.prodname_ GraphQL APIを利用したEnterpriseアカウントの管理に関する詳しい情報については、「[Enterprise アカウント](/v4/guides/managing-enterprise-accounts)」を参照してください。 +{% if currentVersion == "free-pro-team@latest" %} + ### Enterprise アカウントにリンクされた Organization を管理する Organization は、多くの人がいくつものプロジェクトにわたって同時にコラボレーションできる共有アカウントです。 オーナーは、Organization のデータとプロジェクトへのメンバーのアクセスを、洗練されたセキュリティおよび管理機能で管理できます。 詳細は「[Organization について](/articles/about-organizations)」を参照してください。 @@ -35,6 +37,8 @@ Enterprise のオーナーは、Organization を作成して Enterprise にリ 詳細は「[Enterprise アカウントで Organization を管理する](/articles/managing-organizations-in-your-enterprise-account)」および「[Enterprise アカウント内の Organization に対するポリシーを設定する](/articles/setting-policies-for-organizations-in-your-enterprise-account)」を参照してください。 +{% endif %} + ### Enterprise アカウントにリンクされている {% data variables.product.prodname_ghe_server %} ライセンスの管理 {% data reusables.enterprise-accounts.admin-managing-licenses %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account.md index 83c4d8d650..6de29a397a 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account.md @@ -32,7 +32,7 @@ You can disable all workflows for an enterprise or set a policy that configures {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} {% data reusables.enterprise-accounts.actions-tab %} -1. Under **Policies**, select **Allow specific actions** and add your required actions to the list. ![Add actions to allow list](/assets/images/help/organizations/enterprise-actions-policy-allow-list.png) +1. [**Policies**] で [**Allow specific actions**] を選択し、必要なアクションをリストに追加します。 ![Add actions to allow list](/assets/images/help/organizations/enterprise-actions-policy-allow-list.png) ### プライベートリポジトリのフォークのワークフローを有効にする diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account.md index 4f0648f37f..06c1b000ed 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account.md @@ -182,7 +182,7 @@ Enterprise アカウントに対して Team の同期を有効化する前提条 Enterprise オーナーは、Enterprise アカウントの SSH 認証局 (CA) を追加および削除できます。 -Enterprise アカウントに SSH CA を追加することにより、その Enterprise アカウントが所有する Organization のメンバー誰でも、その Enterprise アカウントが提供する SSH 認証を使用して Organization のリポジトリにアクセスできるようになります。 {% data reusables.organizations.can-require-ssh-cert %}詳細については、「[SSS認証局について](/articles/about-ssh-certificate-authorities)」を参照してください。 +Enterprise アカウントに SSH CA を追加することにより、その Enterprise アカウントが所有する Organization のメンバー誰でも、その Enterprise アカウントが提供する SSH 認証を使用して Organization のリポジトリにアクセスできるようになります。 {% data reusables.organizations.can-require-ssh-cert %}詳細については、「[SSH認証局について](/articles/about-ssh-certificate-authorities)」を参照してください。 #### SSH 認証局を追加する diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/index.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/index.md index edcdfe6119..53a3af3c75 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/index.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/index.md @@ -6,6 +6,7 @@ redirect_from: - /categories/setting-up-and-managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md index 9c6c4a9185..9cf197f078 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/managing-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md index 2b374cd647..6215470f5b 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md @@ -6,5 +6,6 @@ redirect_from: - /articles/managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md index 439803fea8..75b5828289 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/setting-policies-for-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md index 0ff8b6cff9..fd2d5f2715 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md @@ -18,6 +18,9 @@ versions: {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} -4. [User licenses] の下に、合計ライセンス数、消費ライセンス数、プランの有効期限が表示されます。 ![Enterprise 支払い設定のライセンスおよびプラン情報](/assets/images/help/business-accounts/billing-license-info.png) -5. 現在使用中のユーザライセンスについての詳細を表示するには、[**View details**] をクリックします。 +{% data reusables.enterprise-accounts.license-tab %} +4. Under "User +{% if currentVersion == "free-pro-team@latest" %}Licenses{% else %}licenses{% endif %}", view your total licenses, number of consumed licenses, and your subscription expiration date. + {% if currentVersion == "free-pro-team@latest" %}![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png){% else %} + ![Enterprise 支払い設定のライセンスおよびプラン情報](/assets/images/enterprise/enterprises/enterprise-server-billing-license-info.png){% endif %} +5. To view details of the user licenses currently in use, click **View {% if currentVersion == "free-pro-team@latest" %}details{% else %}users{% endif %}**. diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md b/translations/ja-JP/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md index 1f84ad87d4..afd29d4879 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md @@ -25,7 +25,7 @@ versions: - リポジトリのデフォルトブランチまたは `gh-pages` ブランチにコミットすること - Issue を開くこと - プルリクエストを提案すること -- Submitting a pull request review{% if currentVersion != "free-pro-team@latest" %} +- プルリクエストレビューのサブミット{% if enterpriseServerVersions contains currentVersion %} - リポジトリのデフォルトのブランチまたは `gh-pages` ブランチでコミットを共作{% endif %} {% data reusables.pull_requests.pull_request_merges_and_contributions %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md b/translations/ja-JP/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md index d741099718..8239b3de9b 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md @@ -29,10 +29,10 @@ Issue とプルリクエストは、フォークではなく、スタンドア - リポジトリをフォークしたこと。 - リポジトリでプルリクエストまたは Issue を開いていること。 - リポジトリに Star を付けたこと。 -{% if currentVersion != "free-pro-team@latest" %} + ### コントリビューションがカウントされない一般的な理由 -{% data reusables.pull_requests.pull_request_merges_and_contributions %}{% endif %} +{% data reusables.pull_requests.pull_request_merges_and_contributions %} #### コミットしてからまだ 24 時間経過していない @@ -67,7 +67,7 @@ Subject: [PATCH] より良いウェルカムメッセージのためのインデ コミットがデフォルト以外または `gh-pages` 以外のブランチにあり、コントリビューションにカウントする場合は、以下のうち 1 つを行う必要があります: - 変更をデフォルトのブランチまたは `gh-pages` ブランチにマージするには、[プルリクエストを開きます](/articles/creating-a-pull-request)。 -- リポジトリの[デフォルトブランチを変更します](/github/administering-a-repository/changing-the-default-branch)。 +- [Change the default branch](/github/administering-a-repository/changing-the-default-branch) of the repository. {% warning %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md index 8140f49101..d6aada49b0 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md @@ -1,6 +1,6 @@ --- -title: Changing your GitHub username -intro: 'You can change your {% data variables.product.product_name %} username at any time.' +title: GitHub ユーザ名の変更 +intro: '{% data variables.product.product_name %}ユーザ名はいつでも変更できます。' redirect_from: - /articles/how-to-change-your-username/ - /articles/changing-your-github-user-name/ @@ -12,50 +12,46 @@ versions: enterprise-server: '*' --- -### About username changes +### ユーザ名の変更について You can change your username to another username that is not currently in use.{% if currentVersion == "free-pro-team@latest" %} If the username you want is not available, you'll see information about whether you can request the username to be released when you type in the desired username. -If the username is not eligible for release and you don't hold a trademark for the username, you can choose another username or keep your current username. {% data variables.contact.github_support %} cannot release the unavailable username for you. For more information, see "[Changing your username](#changing-your-username)."{% endif %} +ユーザ名がリリースできず、かつそのユーザ名の商標を持っていない場合、別のユーザ名を選択するか、現在のユーザ名をそのまま使うことができます。 {% data variables.contact.github_support %} では、利用できないユーザ名をリリースできません。 詳細は「[ユーザ名を変更する](#changing-your-username)」を参照してください。{% endif %} -After changing your username, your old username becomes available for anyone else to claim. Most references to your repositories under the old username automatically change to the new username. However, some links to your profile won't automatically redirect. +ユーザ名を変更すると、変更前のユーザ名は誰でも取得できるようになります。 古いユーザ名の下にあるリポジトリへの参照のほとんどが、自動で新しいユーザ名に変わります。 ただし、プロフィールへのリンクによっては、自動的にリダイレクトされません。 -{% data variables.product.product_name %} cannot set up redirects for: -- [@mentions](/articles/basic-writing-and-formatting-syntax/#mentioning-people-and-teams) using your old username -- Links to [gists](/articles/creating-gists) that include your old username +{% data variables.product.product_name %} は、次のリダイレクトを設定できません: +- 古いユーザ名を使用する [@メンション](/articles/basic-writing-and-formatting-syntax/#mentioning-people-and-teams) +- 古いユーザ名を含む [Gist](/articles/creating-gists) にリンクする -### Repository references +### リポジトリ参照 -After you change your username, {% data variables.product.product_name %} will automatically redirect references to your repositories. -- Web links to your existing repositories will continue to work. This can take a few minutes to complete after you make the change. -- Command line pushes from your local repository clones to the old remote tracking URLs will continue to work. +ユーザ名を変更した後、{% data variables.product.product_name %} は自動的にあなたのリポジトリへの参照をリダイレクトします。 +- 既存のリポジトリへの Web リンクは引き続き機能します。 変更を加えてから完了するまでに数分かかることがあります。 +- ローカルリポジトリのクローンから古いリモートトラッキング URL へのコマンドラインプッシュは引き続き機能します。 -If the new owner of your old username creates a repository with the same name as your repository, that will override the redirect entry and your redirect will stop working. Because of this possibility, we recommend you update all existing remote repository URLs after changing your username. For more information, see "[Changing a remote's URL](/articles/changing-a-remote-s-url)." +古いユーザ名の新しい所有者が、あなたのリポジトリと同じ名前のリポジトリを作成すると、リダイレクトエントリが上書きされ、リダイレクトは機能しなくなります。 こうしたことが起こることを防ぐため、ユーザ名を変更したら、既存のすべてのリモートリポジトリ URL を更新することをお勧めします。 詳しい情報については、「[リモートの URL を変更する](/articles/changing-a-remote-s-url)」を参照してください。 -### Links to your previous profile page +### 前のプロフィールページにリンクする -After changing your username, links to your previous profile page, such as `https://{% data variables.command_line.backticks %}/previoususername`, will return a 404 error. We recommend updating any links to your {% data variables.product.product_name %} account from elsewhere{% if currentVersion == "free-pro-team@latest" %}, such as your LinkedIn or Twitter profile{% endif %}. +ユーザ名を変更した後、`https://{% data variables.command_line.backticks %}/previoususername` のように前のプロフィールページにリンクすると 404 エラーが返されます。 We recommend updating any links to your {% data variables.product.product_name %} account from elsewhere{% if currentVersion == "free-pro-team@latest" %}, such as your LinkedIn or Twitter profile{% endif %}. -### Your Git commits +### Git コミット -{% if currentVersion == "free-pro-team@latest"%}Git commits that were associated with your {% data variables.product.product_name %}-provided `noreply` email address won't be attributed to your new username and won't appear in your contributions graph.{% endif %} If your Git commits are associated with another email address you've [added to your GitHub account](/articles/adding-an-email-address-to-your-github-account), {% if currentVersion == "free-pro-team@latest"%}including the ID-based {% data variables.product.product_name %}-provided `noreply` email address, {% endif %}they'll continue to be attributed to you and appear in your contributions graph after you've changed your username. For more information on setting your email address, see "[Setting your commit email address](/articles/setting-your-commit-email-address)." +{% if currentVersion == "free-pro-team@latest"%}Git commits that were associated with your {% data variables.product.product_name %}-provided `noreply` email address won't be attributed to your new username and won't appear in your contributions graph.{% endif %} If your Git commits are associated with another email address you've [added to your GitHub account](/articles/adding-an-email-address-to-your-github-account), {% if currentVersion == "free-pro-team@latest"%}including the ID-based {% data variables.product.product_name %}-provided `noreply` email address, {% endif %}they'll continue to be attributed to you and appear in your contributions graph after you've changed your username. メールアドレスの設定に関する詳細は「[コミットメールアドレスを設定する](/articles/setting-your-commit-email-address)」を参照してください。 -### Changing your username +### ユーザ名を変更する {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.account_settings %} -3. In the "Change username" section, click **Change username**. - ![Change Username button](/assets/images/help/settings/settings-change-username.png){% if currentVersion == "free-pro-team@latest" %} -4. Read the warnings about changing your username. If you still want to change your username, click **I understand, let's change my username**. - ![Change Username warning button](/assets/images/help/settings/settings-change-username-warning-button.png) -5. Type a new username. - ![New username field](/assets/images/help/settings/settings-change-username-enter-new-username.png) -6. If the username you've chosen is available, click **Change my username**. If the username you've chosen is unavailable, you can try a different username or one of the suggestions you see. - ![Change Username warning button](/assets/images/help/settings/settings-change-my-username-button.png) +3. [Change username] セクションで [**Change username**] をクリックします。 ![Change Username button](/assets/images/help/settings/settings-change-username.png){% if currentVersion == "free-pro-team@latest" %} +4. ユーザ名を変更することに関する警告を読みます。 ユーザ名を変更したい場合は、[**I understand, let's change my username**] をクリックします。 ![[Change Username] 警告ボタン](/assets/images/help/settings/settings-change-username-warning-button.png) +5. 新しいユーザ名を入力します。 ![新しいユーザ名のフィールド](/assets/images/help/settings/settings-change-username-enter-new-username.png) +6. 選択したユーザ名が利用できる場合、[**Change my username**] をクリックします。 選択したユーザ名が利用できない場合、別のユーザ名を入力するか、提案されたユーザ名を利用できます。 ![[Change Username] 警告ボタン](/assets/images/help/settings/settings-change-my-username-button.png) {% endif %} -### Further reading +### 参考リンク -- "[Changing a remote's URL](/articles/changing-a-remote-s-url)" +- 「[リモートの URL を変更する](/articles/changing-a-remote-s-url)」 - "[Why are my commits linked to the wrong user?](/articles/why-are-my-commits-linked-to-the-wrong-user)"{% if currentVersion == "free-pro-team@latest" %} -- "[{% data variables.product.prodname_dotcom %} Username Policy](/articles/github-username-policy)"{% endif %} +- 「[{% data variables.product.prodname_dotcom %} ユーザ名に関するポリシー](/articles/github-username-policy)"{% endif %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/index.md b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/index.md index c9e78af353..a03118b7d2 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/index.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/index.md @@ -24,7 +24,7 @@ versions: {% link_in_list /managing-the-default-branch-name-for-your-repositories %} {% link_in_list /managing-security-and-analysis-settings-for-your-user-account %} {% link_in_list /managing-access-to-your-user-accounts-project-boards %} - + {% link_in_list /integrating-jira-with-your-personal-projects %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/managing-access-to-your-user-accounts-project-boards.md b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/managing-access-to-your-user-accounts-project-boards.md index 09d1575236..5dc5b557a0 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/managing-access-to-your-user-accounts-project-boards.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/managing-access-to-your-user-accounts-project-boards.md @@ -18,8 +18,8 @@ versions: {% data reusables.project-management.click-menu %} {% data reusables.project-management.access-collaboration-settings %} {% data reusables.project-management.collaborator-option %} -5. Under "Search by username, full name or email address", type the collaborator's name, username, or -{% data variables.product.prodname_dotcom %} email. +5. \[Search by username, full name or email address\] (ユーザ名、フルネーム、メールアドレスでの検索) の下で、コラボレータの名前、ユーザ名、または +{% data variables.product.prodname_dotcom %}メールを入力してください。 ![Octocat のユーザ名が検索フィールドに入力されているコラボレーターセクション](/assets/images/help/projects/org-project-collaborators-find-name.png) {% data reusables.project-management.add-collaborator %} 7. 新しいコラボレーターは、デフォルトで読み取り権限を持ちます。 オプションで、新しいコラボレータの名前の隣にあるドロップダウン メニューを使って、権限レベルを変更することもできます。 ![[Collaborators] セクションで [Permissions] ドロップダウン メニューを選択](/assets/images/help/projects/user-project-collaborators-edit-permissions.png) diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md index 2ed2c8fcac..1ff5eca709 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md @@ -8,7 +8,7 @@ versions: ### デフォルトブランチ名について -When you create a new repository on {% data variables.product.product_location %}, the repository contains one branch, which is the default branch. You can change the name that {% data variables.product.product_name %} uses for the default branch in new repositories you create. For more information about the default branch, see "[About branches](/github/collaborating-with-issues-and-pull-requests/about-branches#about-the-default-branch)." +When you create a new repository on {% data variables.product.product_location %}, the repository contains one branch, which is the default branch. You can change the name that {% data variables.product.product_name %} uses for the default branch in new repositories you create. デフォルトブランチの詳細については、「[ブランチについて](/github/collaborating-with-issues-and-pull-requests/about-branches#about-the-default-branch)」を参照してください。 {% data reusables.branches.set-default-branch %} diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md index c6ebc8a604..6c67649671 100644 --- a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md +++ b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md @@ -1,6 +1,6 @@ --- -title: Permission levels for a user account repository -intro: 'A repository owned by a user account has two permission levels: the *repository owner* and *collaborators*.' +title: ユーザーアカウントのリポジトリ権限レベル +intro: 'ユーザーアカウントが所有するリポジトリは、*リポジトリオーナー*と*コラボレーター*という 2 つの権限レベルを持ちます。' redirect_from: - /articles/permission-levels-for-a-user-account-repository versions: @@ -10,64 +10,64 @@ versions: {% tip %} -**Tip:** If you require more granular read/write access to a repository owned by your user account, consider transferring the repository to an organization. For more information, see "[Transferring a repository](/articles/transferring-a-repository)." +**ヒント:** ユーザーアカウントが所有しているリポジトリに対して、より精細な読み取り/書き込みアクセス権が必要な場合には、リポジトリを Organization に移譲することを検討してください。 詳細は「[リポジトリを移譲する](/articles/transferring-a-repository)」を参照してください。 {% endtip %} -#### Owner access on a repository owned by a user account +#### ユーザーアカウントが所有しているリポジトリに対するオーナーアクセス権 -The repository owner has full control of the repository. In addition to all the permissions allowed by repository collaborators, the repository owner can: +リポジトリオーナーは、リポジトリを完全に制御することができます。 リポジトリコラボレータによって許可されるすべての権限に加えて、リポジトリオーナーは次の操作が可能です: - {% if currentVersion == "free-pro-team@latest" %}[Invite collaborators](/articles/inviting-collaborators-to-a-personal-repository){% else %}[Add collaborators](/articles/inviting-collaborators-to-a-personal-repository){% endif %} - Change the visibility of the repository (from [public to private](/articles/making-a-public-repository-private), or from [private to public](/articles/making-a-private-repository-public)){% if currentVersion == "free-pro-team@latest" %} -- [Limit interactions with a repository](/articles/limiting-interactions-with-your-repository){% endif %} -- Merge a pull request on a protected branch, even if there are no approving reviews -- [Delete the repository](/articles/deleting-a-repository) +- [リポジトリでのインタラクションを制限する](/articles/limiting-interactions-with-your-repository){% endif %} +- 保護されたブランチで、レビューの承認がなくてもプルリクエストをマージする +- [リポジトリを削除する](/articles/deleting-a-repository) - [Manage a repository's topics](/articles/classifying-your-repository-with-topics){% if currentVersion == "free-pro-team@latest" %} - Manage security and analysis settings. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)."{% endif %}{% if currentVersion == "free-pro-team@latest" %} - [Enable the dependency graph](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository) for a private repository{% endif %}{% if currentVersion == "free-pro-team@latest" %} -- Delete packages. For more information, see "[Deleting a package](/github/managing-packages-with-github-packages/deleting-a-package)."{% endif %} -- Create and edit repository social cards. For more information, see "[Customizing your repository's social media preview](/articles/customizing-your-repositorys-social-media-preview)." -- Make the repository a template. For more information, see "[Creating a template repository](/articles/creating-a-template-repository)." +- パッケージを削除する。 詳細は「[>パッケージを削除する](/github/managing-packages-with-github-packages/deleting-a-package)」を参照してください。{% endif %} +- リポジトリソーシャルカードを作成および編集する。 詳細は「[リポジトリのソーシャルメディア向けプレビューをカスタマイズする](/articles/customizing-your-repositorys-social-media-preview)」を参照してください。 +- リポジトリをテンプレートにする。 詳細は「[テンプレートリポジトリを作成する](/articles/creating-a-template-repository)」を参照してください。 - Receive [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a repository.{% if currentVersion == "free-pro-team@latest" %} -- Dismiss {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)." -- [Manage data usage for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository){% endif %} -- [Define code owners for the repository](/articles/about-code-owners) +- リポジトリで {% data variables.product.prodname_dependabot_alerts %} を閉じます。 詳細については、「[リポジトリ内の脆弱な依存関係を表示・更新する](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)」を参照してください。 +- [プライベートリポジトリのデータ使用を管理する](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository){% endif %} +- [リポジトリのコードオーナーを定義する](/articles/about-code-owners) - [Archive repositories](/articles/about-archiving-repositories){% if currentVersion == "free-pro-team@latest" %} -- Create security advisories. For more information, see "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." -- Display a sponsor button. For more information, see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)."{% endif %} +- セキュリティアドバイザリを作成する。 詳しい情報については「[{% data variables.product.prodname_security_advisories %}について](/github/managing-security-vulnerabilities/about-github-security-advisories)」を参照してください。 +- スポンサーボタンを表示する。 詳細は「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照してください。{% endif %} -There is only **one owner** of a repository owned by a user account; this permission cannot be shared with another user account. To transfer ownership of a repository to another user, see "[How to transfer a repository](/articles/how-to-transfer-a-repository)." +ユーザアカウントが所有するリポジトリの**オーナーは 1 人**だけです。この権限を他のユーザアカウントと共有することはできません。 リポジトリの所有権を他のユーザに委譲するには、「[リポジトリを委譲する方法](/articles/how-to-transfer-a-repository)」を参照してください。 -#### Collaborator access on a repository owned by a user account +#### ユーザーアカウントが所有しているリポジトリに対するコラボレーターアクセス権 {% note %} -**Note:** In a private repository, repository owners can only grant write access to collaborators. Collaborators can't have read-only access to repositories owned by a user account. +**メモ:** プライベートリポジトリでは、リポジトリオーナーはコラボレーターに書き込みアクセスしか付与できません。 コラボレーターが、ユーザアカウントによって所有されているリポジトリに対して「読み取りのみ」アクセス権を持つことはできません。 {% endnote %} -Collaborators on a personal repository can: +個人リポジトリでのコラボレーターは、次の操作が可能です: -- Push to (write), pull from (read), and fork (copy) the repository -- Create, apply, and delete labels and milestones -- Open, close, re-open, and assign issues -- Edit and delete comments on commits, pull requests, and issues -- Mark an issue or pull request as a duplicate. For more information, see "[About duplicate issues and pull requests](/articles/about-duplicate-issues-and-pull-requests)." +- リポジトリに対してプッシュする (書き込む)、プル (読み取る)、フォーク (コピーする) +- ラベルとマイルストーンを作成、適用、削除する +- Issue をオープン、再オープン、割り当てする +- コミット、プルリクエスト、Issue に対するコメントを編集および削除する +- Issue またはプルリクエストを重複としてマークする。 詳細は「[重複した Issue やプルリクエストについて](/articles/about-duplicate-issues-and-pull-requests)」を参照してください。 - Open, merge and close pull requests -- Apply suggested changes to pull requests. For more information, see "[Incorporating feedback in your pull request](/articles/incorporating-feedback-in-your-pull-request)." +- 提案された変更をプルリクエストに適用する。 詳細は「[プルリクエストでのフィードバックを取り込む](/articles/incorporating-feedback-in-your-pull-request)」を参照してください。 - Send pull requests from forks of the repository{% if currentVersion == "free-pro-team@latest" %} -- Publish, view, and install packages. For more information, see "[Publishing and managing packages](/github/managing-packages-with-github-packages/publishing-and-managing-packages)."{% endif %} -- Create and edit Wikis -- Create and edit releases. For more information, see "[Managing releases in a repository](/github/administering-a-repository/managing-releases-in-a-repository). -- Remove themselves as collaborators on the repository -- Submit a review on a pull request that will affect its mergeability -- Act as a designated code owner for the repository. For more information, see "[About code owners](/articles/about-code-owners)." -- Lock a conversation. For more information, see "[Locking conversations](/articles/locking-conversations)."{% if currentVersion == "free-pro-team@latest" %} -- Report abusive content to {% data variables.contact.contact_support %}. For more information, see "[Reporting abuse or spam](/articles/reporting-abuse-or-spam)."{% endif %} -- Transfer an issue to a different repository. For more information, see "[Transferring an issue to another repository](/articles/transferring-an-issue-to-another-repository)." +- パッケージを公開、表示、インストールする。 詳細は、「[パッケージの公開と管理](/github/managing-packages-with-github-packages/publishing-and-managing-packages)」を参照してください。{% endif %} +- ウィキを作成および編集する +- リリースの作成と編集。 詳細は「[リポジトリのリリースを管理する](/github/administering-a-repository/managing-releases-in-a-repository)」を参照してください。 +- リポジトリでコラボレーターである自身を削除する +- マージ可能性に影響するプルリクエストレビューをサブミットする +- リポジトリに指定されたコードオーナーとして行動する。 詳細は「[コードオーナーについて](/articles/about-code-owners)」を参照してください。 +- 会話をロックする。 For more information, see "[Locking conversations](/articles/locking-conversations)."{% if currentVersion == "free-pro-team@latest" %} +- 乱用コンテンツを {% data variables.contact.contact_support %} にレポートする 詳細は「[乱用やスパムをレポートする](/articles/reporting-abuse-or-spam)」を参照してください。{% endif %} +- 他のリポジトリへ Issue を移譲する。 詳細は「[他のリポジトリへ Issue を移譲する](/articles/transferring-an-issue-to-another-repository)」を参照してください。 -### Further reading +### 参考リンク -- "[Inviting collaborators to a personal repository](/articles/inviting-collaborators-to-a-personal-repository)" -- "[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)" +- [個人リポジトリへのコラボレータの招待](/articles/inviting-collaborators-to-a-personal-repository) +- [Organization のリポジトリ権限レベル](/articles/repository-permission-levels-for-an-organization) diff --git a/translations/ja-JP/content/github/site-policy/github-enterprise-subscription-agreement.md b/translations/ja-JP/content/github/site-policy/github-enterprise-subscription-agreement.md index 549467ffe8..d54791e2ab 100644 --- a/translations/ja-JP/content/github/site-policy/github-enterprise-subscription-agreement.md +++ b/translations/ja-JP/content/github/site-policy/github-enterprise-subscription-agreement.md @@ -330,7 +330,7 @@ GitHubがお客様のプライベートリポジトリにアクセスするの #### 3.5.2 著作権侵害とDMCAポリシー -お客様が著作権所有者であり、「サービス」上のコンテンツがお客様の著作権を侵害していると考えられる場合、お客様は[GitHubのデジタルミレニアム著作権法 (DMCA) ポリシー](https://github.com/contact/dmca)に従って、[DMCAの様式](https://github.com/contact/dmca-notice)でGitHubに通知するか、またはcopyright@github.com.に電子メールを送信すして、GitHubに連絡することができます。 +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 3.5.3 GitHubのトレードマークとロゴ diff --git a/translations/ja-JP/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/translations/ja-JP/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md index c079aa0894..451558b552 100644 --- a/translations/ja-JP/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md +++ b/translations/ja-JP/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md @@ -29,7 +29,7 @@ You have full control over which metrics, reports, repositories, and contributor - **Decide which repositories to include**: Before you start an analysis in {% data variables.product.prodname_insights %}, consider which repositories to include. Administrators can include repositories when adding organizations and can enable and disable repositories at any time. For more information on adding organizations to {% data variables.product.prodname_insights %}, see "[Managing organizations](/insights/installing-and-configuring-github-insights/managing-organizations)." For more information on enabling and disabling repositories, see "[Managing repositories](/insights/installing-and-configuring-github-insights/managing-repositories)." -- **Decide which metrics and reports to include**: Administrators can enable and disable metrics and reports available for all users at any time. Administrators control the {% data variables.product.prodname_insights %} data that users have access to in your installation of {% data variables.product.prodname_ghe_server %}. For more information, see "[Managing available metrics and reports](/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports)." +- **Decide which metrics and reports to include**: Administrators can enable and disable metrics and reports available for all users at any time. Administrators control the {% data variables.product.prodname_insights %} data that users have access to in your installation of {% data variables.product.prodname_ghe_server %}. 詳しい情報については「[利用できるメトリクスとレポートの管理](/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports)」を参照してください。 - **Decide which contributors to include**: Administrators can disable a specific contributor’s data from being processed in the metrics and reports. For more information on managing contributor data, see "[Managing contributors and teams](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)." @@ -37,7 +37,7 @@ You have full control over which metrics, reports, repositories, and contributor Under various data protection regulations, such as the General Data Protection Regulation (GDPR), users may have the right to request exclusion from processing, access, and correction, or to request deletion of their personal data. As the data controller, your organization should evaluate whether a particular user request is valid and, if appropriate, take action to fulfill the request. -- **Exclusion of processing**: Users may have the right to have their personal data excluded from being processed. Administrators have the ability to remove a contributor’s data from being processed in {% data variables.product.prodname_insights %}, and the resulting reports and metrics will exclude the contributor’s data accordingly. For more information, see "[Managing contributors and teams](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)." +- **Exclusion of processing**: Users may have the right to have their personal data excluded from being processed. Administrators have the ability to remove a contributor’s data from being processed in {% data variables.product.prodname_insights %}, and the resulting reports and metrics will exclude the contributor’s data accordingly. 詳しい情報については「[コントリビューターとTeamの管理](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)」を参照してください。 - **Access**: Users may have the right to demand to see what personal data is being processed. Each metric and report has a detailed description of what personal data is being processed. For more information, see "[Metrics available with {% data variables.product.prodname_insights %}](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)." Raw data is available through the {% data variables.product.prodname_enterprise %} API. Your organization is responsible for any decisions to process personal data and for fulfilling any such requests. diff --git a/translations/ja-JP/content/github/site-policy/github-sensitive-data-removal-policy.md b/translations/ja-JP/content/github/site-policy/github-sensitive-data-removal-policy.md index 67de44540f..80488f74c8 100644 --- a/translations/ja-JP/content/github/site-policy/github-sensitive-data-removal-policy.md +++ b/translations/ja-JP/content/github/site-policy/github-sensitive-data-removal-policy.md @@ -76,7 +76,7 @@ GitHub がホストするコンテンツの種類（主にソフトウェアコ ### リクエストの提出方法 -機密データの削除リクエストは、[連絡フォーム](https://support.github.com/contact)から提出できます。 メッセージの本文には平文版のリクエストを含めてください。 添付ファイルでリクエストを送信した場合、処理に時間がかかる場合があります。 +機密データの削除リクエストは、[連絡フォーム](https://support.github.com/contact?tags=docs-sensitive-data)から提出できます。 メッセージの本文には平文版のリクエストを含めてください。 添付ファイルでリクエストを送信した場合、処理に時間がかかる場合があります。 ### 異議申し立て diff --git a/translations/ja-JP/content/github/site-policy/github-subprocessors-and-cookies.md b/translations/ja-JP/content/github/site-policy/github-subprocessors-and-cookies.md index 0f3f6c0d48..85492a4474 100644 --- a/translations/ja-JP/content/github/site-policy/github-subprocessors-and-cookies.md +++ b/translations/ja-JP/content/github/site-policy/github-subprocessors-and-cookies.md @@ -58,29 +58,29 @@ Since the number and names of cookies may change,the table below may be updated | GitHub | `app_manifest_token` | This cookie is used during the App Manifest flow to maintain the state of the flow during the redirect to fetch a user session. | five minutes | | GitHub | `cookie-preferences` | This cookie is used to track user cookie preferences. | one year | | GitHub | `_device_id` | This cookie is used to track recognized devices. | one year | -| GitHub | `dotcom_user` | このクッキーは、ユーザがすでにログインしていることを当社に通知するために使用されます。 | one year | +| GitHub | `dotcom_user` | This cookie is used to signal to us that the user is already logged in. | one year | | GitHub | `_gh_ent` | This cookie is used for temporary application and framework state between pages like what step the customer is on in a multiple step form. | two weeks | -| GitHub | `_gh_sess` | このクッキーは、ユーザが複数のステップのうちどのステップにあるのかなど、一時アプリケーションおよびフレームワークにおけるページ間での状態を記録するために使用されます。 | セッション | -| GitHub | `gist_oauth_csrf` | このクッキーは、OAuthフローを開始したユーザが、それを完了したユーザと同一であることを保証するために、Gistによって設定されます。 | deleted when oauth state is validated | -| GitHub | `gist_user_session` | このクッキーは、別のホストで実行されている場合にGistによって使用されます。 | two weeks | +| GitHub | `_gh_sess` | This cookie is used for temporary application and framework state between pages like what step the user is on in a multiple step form. | セッション | +| GitHub | `gist_oauth_csrf` | This cookie is set by Gist to ensure the user that started the oauth flow is the same user that completes it. | deleted when oauth state is validated | +| GitHub | `gist_user_session` | This cookie is used by Gist when running on a separate host. | two weeks | | GitHub | `has_recent_activity` | This cookie is used to prevent showing the security interstitial to users that have visited the app recently. | one hour | -| GitHub | `__Host-gist_user_session_same_site` | このクッキーは、SameSiteクッキーをサポートするブラウザが、リクエストがGitHubから発信されているかどうかを確認できるように設定されます。 | two weeks | -| GitHub | `__Host-user_session_same_site` | このクッキーは、SameSiteクッキーをサポートするブラウザが、リクエストがGitHubから発信されているかどうかを確認できるように設定されます。 | two weeks | -| GitHub | `logged_in` | このクッキーは、ユーザがすでにログインしていることを当社に通知するために使用されます。 | one year | +| GitHub | `__Host-gist_user_session_same_site` | This cookie is set to ensure that browsers that support SameSite cookies can check to see if a request originates from GitHub. | two weeks | +| GitHub | `__Host-user_session_same_site` | This cookie is set to ensure that browsers that support SameSite cookies can check to see if a request originates from GitHub. | two weeks | +| GitHub | `logged_in` | This cookie is used to signal to us that the user is already logged in. | one year | | GitHub | `marketplace_repository_ids` | This cookie is used for the marketplace installation flow. | one hour | | GitHub | `marketplace_suggested_target_id` | This cookie is used for the marketplace installation flow. | one hour | | GitHub | `_octo` | This cookie is used by our internal analytics service to distinguish unique users and clients. | one year | | GitHub | `org_transform_notice` | This cookie is used to provide notice during organization transforms. | one hour | | GitHub | `private_mode_user_session` | This cookie is used for Enterprise authentication requests. | two weeks | -| GitHub | `saml_csrf_token` | このクッキーは、トークンをクライアントに関連付けるために、SAML認証パスメソッドによって設定されます。 | until user closes browser or completes authentication request | -| GitHub | `saml_csrf_token_legacy` | このクッキーは、トークンをクライアントに関連付けるために、SAML認証パスメソッドによって設定されます。 | until user closes browser or completes authentication request | -| GitHub | `saml_return_to` | このクッキーは、SAML認証ループ時に、状態を維持するためSAML認証パスメソッドによって設定されます。 | until user closes browser or completes authentication request | -| GitHub | `saml_return_to_legacy` | このクッキーは、SAML認証ループ時に、状態を維持するためSAML認証パスメソッドによって設定されます。 | until user closes browser or completes authentication request | -| GitHub | `tz` | このクッキーにより、ブラウザがどのお客様がどのタイムゾーンにいるか、ブラウザから当社に通知されます。 | セッション | -| GitHub | `user_session` | このクッキーはログインに使用されます。 | two weeks | -| Google Analytics** | `_ga` | このクッキーは、Googleアナリティクスにより使用されます。 | two years | -| Google Analytics** | `_gat` | このクッキーは、Googleアナリティクスにより使用されます。 | one minute | -| Google Analytics** | `_gid` | このクッキーは、Googleアナリティクスにより使用されます。 | one day | +| GitHub | `saml_csrf_token` | This cookie is set by SAML auth path method to associate a token with the client. | until user closes browser or completes authentication request | +| GitHub | `saml_csrf_token_legacy` | This cookie is set by SAML auth path method to associate a token with the client. | until user closes browser or completes authentication request | +| GitHub | `saml_return_to` | This cookie is set by the SAML auth path method to maintain state during the SAML authentication loop. | until user closes browser or completes authentication request | +| GitHub | `saml_return_to_legacy` | This cookie is set by the SAML auth path method to maintain state during the SAML authentication loop. | until user closes browser or completes authentication request | +| GitHub | `tz` | This cookie allows your browser to tell us what time zone you're in. | セッション | +| GitHub | `user_session` | This cookie is used to log you in. | two weeks | +| Google Analytics** | `_ga` | This cookie is used by Google Analytics. | two years | +| Google Analytics** | `_gat` | This cookie is used by Google Analytics. | one minute | +| Google Analytics** | `_gid` | This cookie is used by Google Analytics. | one day | _*_ The **expiration** dates for the cookies listed below generally apply on a rolling basis. @@ -88,10 +88,10 @@ _**_ We use **Google Analytics** as a third party analytics service to collect i You can control your Google Analytics cookie preferences through our cookie preference link located at the footer of our website. In addition, Google provides further information about its own privacy practices and [offers a browser add-on to opt out of Google Analytics tracking](https://tools.google.com/dlpage/gaoptout). -(!) Please note certain pages on our website may set other third party cookies. たとえば、クッキーを設定するサイトから、動画などのコンテンツを埋め込むことがあります。 第三者のクッキーは最小限に保つよう努めていますが、当社は第三者のコンテンツが設定するクッキーを常に管理できるわけではありません。 +(!) Please note certain pages on our website may set other third party cookies. For example, we may embed content, such as videos, from another site that sets a cookie. While we try to minimize these third party cookies, we can’t always control what cookies this third party content sets. ### GitHub上のトラッキング -"[Do Not Track](https://www.eff.org/issues/do-not-track)" (DNT) is a privacy preference you can set in your browser if you do not want online services to collect and share certain kinds of information about your online activity from third party tracking services. GitHubは、ブラウザのDNTシグナルに応答し、[DNTシグナルへの応答についてのW3C基準](https://www.w3.org/TR/tracking-dnt/)に従います。 トラッキングを望まないことを通知するようブラウザに対して設定したい場合、この通知を有効化する方法について、ブラウザのドキュメントをご確認ください。 [Privacy Badger](https://www.eff.org/privacybadger)など、トラッキングをブロックする良いアプリケーションもあります。 +"[Do Not Track](https://www.eff.org/issues/do-not-track)" (DNT) is a privacy preference you can set in your browser if you do not want online services to collect and share certain kinds of information about your online activity from third party tracking services. GitHubは、ブラウザのDNTシグナルに応答し、[DNTシグナルへの応答についてのW3C基準](https://www.w3.org/TR/tracking-dnt/)に従います。 If you would like to set your browser to signal that you would not like to be tracked, please check your browser's documentation for how to enable that signal. There are also good applications that block online tracking, such as [Privacy Badger](https://www.eff.org/privacybadger). -DNTをサポートするブラウザでDNTを有効にしていない場合、当社のウェブサイ」のうち一部は、お客様の他のサービスにおけるオンラインブラウジングアクティビティを繰り返しトラッキングします。ただし、当社は、当社のアナリティクスおよびサービスプロバイダ以外の第三者に対して、GitHub上のユーザのアクティビティを繰り返しトラッキングすることを許可しません。 We have agreements with certain vendors, such as analytics providers, who help us track visitors' movements on certain pages on our website. 当社を代行して個人情報を収集しているベンダーのみが、当社のページ上のデータを収集することができます。当社は、当社を代行してこのデータを収集する各ベンダーとデータ保護契約を締結しています。 当社は、これらのベンダーから受け取ったデータを使用して、訪問者の関心をより深く理解し、当社のウェブサイトのパフォーマンスを把握し、コンテンツを改善します。 Any analytics vendor will be listed in our [subprocessor list](#github-subprocessors), and you may see a list of every page where we collect this kind of data below. +If you have not enabled DNT on a browser that supports it, cookies on some parts of our website will track your online browsing activity on other online services over time, though we do not permit third parties other than our analytics and service providers to track GitHub users' activity over time on GitHub. We have agreements with certain vendors, such as analytics providers, who help us track visitors' movements on certain pages on our website. Only our vendors, who are collecting personal information on our behalf, may collect data on our pages, and we have signed data protection agreements with every vendor who collects this data on our behalf. We use the data we receive from these vendors to better understand our visitors' interests, to understand our website's performance, and to improve our content. Any analytics vendor will be listed in our [subprocessor list](#github-subprocessors), and you may see a list of every page where we collect this kind of data below. diff --git a/translations/ja-JP/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md b/translations/ja-JP/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md index 9e8830d22b..6603a05741 100644 --- a/translations/ja-JP/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md +++ b/translations/ja-JP/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md @@ -175,7 +175,7 @@ If GitHub has reason to believe the Content of a Private Repository is in violat #### 2.5.2 Copyright Infringement and DMCA Policy. -お客様が著作権所有者であり、「サービス」上のコンテンツがお客様の著作権を侵害していると考えられる場合、お客様は[GitHubのデジタルミレニアム著作権法 (DMCA) ポリシー](https://github.com/contact/dmca)に従って、[DMCAの様式](https://github.com/contact/dmca-notice)でGitHubに通知するか、またはcopyright@github.com.に電子メールを送信すして、GitHubに連絡することができます。 +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 2.5.3 GitHub Trademarks and Logos. diff --git a/translations/ja-JP/content/github/site-policy/github-trademark-policy.md b/translations/ja-JP/content/github/site-policy/github-trademark-policy.md index fc6583ad44..725c1e82d0 100644 --- a/translations/ja-JP/content/github/site-policy/github-trademark-policy.md +++ b/translations/ja-JP/content/github/site-policy/github-trademark-policy.md @@ -23,7 +23,7 @@ versions: ### トレードマークポリシーの違反を報告するには？ -トレードマークポリシー違反の可能性がある場合、登録商標の所有者は[連絡フォーム](https://support.github.com/contact)から GitHub に報告できます。 商標関連のリクエストを送信する場合は、商標を所有する会社のメールアドレスをお使いください。また、当社が迅速に対応できるよう、以下の情報をすべて記載してください。 また、アカウントが商標と混同される理由や、アカウントによって商標が毀損される理由を明確に説明してください。 +トレードマークポリシー違反の可能性がある場合、登録商標の所有者は[連絡フォーム](https://support.github.com/contact?tags=docs-trademark)から GitHub に報告できます。 商標関連のリクエストを送信する場合は、商標を所有する会社のメールアドレスをお使いください。また、当社が迅速に対応できるよう、以下の情報をすべて記載してください。 また、アカウントが商標と混同される理由や、アカウントによって商標が毀損される理由を明確に説明してください。 ### トレードマークポリシーの違反を報告する際に必要な情報は？ diff --git a/translations/ja-JP/content/github/using-git/changing-a-remotes-url.md b/translations/ja-JP/content/github/using-git/changing-a-remotes-url.md index 3298fef9ec..a81bc16125 100644 --- a/translations/ja-JP/content/github/using-git/changing-a-remotes-url.md +++ b/translations/ja-JP/content/github/using-git/changing-a-remotes-url.md @@ -50,7 +50,7 @@ git@{% data variables.command_line.codeblock %}:USERNAME/REPOSITORY > origin https://{% data variables.command_line.codeblock %}/USERNAME/REPOSITORY.git (push) ``` -次にリモートリポジトリに対して `git fetch`、`git pull`、または `git push` を実行するときに、GitHub ユーザ名とパスワードを求められます。 +次にリモートリポジトリに対して `git fetch`、`git pull`、または `git push` を実行するときに、GitHub ユーザ名とパスワードを求められます。 {% data reusables.user_settings.password-authentication-deprecation %} - [2要素認証](/articles/securing-your-account-with-two-factor-authentication-2fa) を有効にしている場合は、[パーソナルアクセストークンを作成](/github/authenticating-to-github/creating-a-personal-access-token)して、GitHub パスワードのかわりに使用することができます。 - Git が GitHub と通信するたびに GitHub のユーザ名とパスワードを思い出すよう、[認証情報ヘルパーを使用する](/github/using-git/caching-your-github-credentials-in-git)ことができます。 diff --git a/translations/ja-JP/content/github/using-git/pushing-commits-to-a-remote-repository.md b/translations/ja-JP/content/github/using-git/pushing-commits-to-a-remote-repository.md index c90441571b..d755d9bc17 100644 --- a/translations/ja-JP/content/github/using-git/pushing-commits-to-a-remote-repository.md +++ b/translations/ja-JP/content/github/using-git/pushing-commits-to-a-remote-repository.md @@ -97,3 +97,4 @@ git fetch upstream - [`git remote` の man ページ](https://git-scm.com/docs/git-remote.html) - [Git チートシート](/articles/git-cheatsheet) - [Git のワークフロー](/articles/git-workflows) +- "[Git Handbook](https://guides.github.com/introduction/git-handbook/)" diff --git a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md index 069c3b38ed..e674add356 100644 --- a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md +++ b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md @@ -47,9 +47,9 @@ You can use the dependency graph to: {% if currentVersion == "free-pro-team@latest" %}To generate a dependency graph, {% data variables.product.product_name %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private repositories. For information about enabling or disabling it for private repositories, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md index f646fc20e1..86f97e1e9b 100644 --- a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md +++ b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md @@ -35,7 +35,7 @@ If vulnerabilities have been detected in the repository, these are shown at the {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to {% data variables.product.prodname_dependabot_short %} アラート. @@ -55,7 +55,7 @@ Any direct and indirect dependencies that are specified in the repository's mani {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to security alerts. {% note %} diff --git a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md index 52b844cabb..605416e5ac 100644 --- a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md +++ b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md @@ -13,7 +13,7 @@ versions: ### コントリビューターについて -You can view the top 100 contributors to a repository{% if currentVersion != "free-pro-team@latest" %}, including commit co-authors,{% endif %} in the contributors graph. マージコミットと空のコミットは、このグラフでコントリビューションとして数えられません。 +コントリビューターグラフで{% if enterpriseServerVersions contains currentVersion %}、コミットの共作者を含めて{% endif %}、リポジトリに貢献した上位 100 人のコントリビューターを表示できます。 マージコミットと空のコミットは、このグラフでコントリビューションとして数えられません。 {% if currentVersion == "free-pro-team@latest" %} You can also see a list of people who have contributed to the project's Python dependencies. この、コミュニティコントリビューターのリストを表示するには、`https://github.com/REPO-OWNER/REPO-NAME/community_contributors` にアクセスしてください。 diff --git a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md index 5597ba9682..c80e01bdfe 100644 --- a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md +++ b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md @@ -1,6 +1,6 @@ --- -title: Viewing traffic to a repository -intro: 'Anyone with push access to a repository can view its traffic, including full clones (not fetches), visitors from the past 14 days, referring sites, and popular content in the traffic graph.' +title: リポジトリへのトラフィックを表示する +intro: 'フルクローン (フェッチではない)、過去 14 日間の訪問者、参照サイト、トラフィックグラフの人気コンテンツなど、リポジトリへのプッシュアクセスを持つユーザは誰でもそのトラフィックを表示できます。' product: '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 %}, and {% data variables.product.prodname_ghe_cloud %}.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[About repository graphs](/articles/about-repository-graphs)" and "[{% data variables.product.prodname_dotcom %}''s products](/articles/github-s-products)."{% endif %}' redirect_from: - /articles/viewing-traffic-to-a-repository @@ -8,21 +8,20 @@ versions: free-pro-team: '*' --- -You can navigate to referring sites, excluding search engines and {% data variables.product.product_name %} itself, from the links the specific paths were referred from. The popular content links to the specific content that generated traffic. +特定のパスが参照されていたリンクから、検索エンジンと {% data variables.product.product_name %} 自体を除く、参照元サイトに移動できます。 人気のあるコンテンツは、トラフィックを発生させた特定のコンテンツにリンクしています。 -Referring sites and popular content are ordered by views and unique visitors. Full clones and visitor information update hourly, while referring sites and popular content sections update daily. All data in the traffic graph uses the UTC+0 timezone, regardless of your location. +参照サイトと人気のあるコンテンツは、ビューと一意の訪問者によって並べ替えられます。 フルクローンと訪問者情報は 1 時間ごとに更新され、参照サイトと人気のあるコンテンツセクションは毎日更新されます。 現在地に関係なく、トラフィックグラフのすべてのデータは、UTC+0 タイムゾーンを使用します。 {% tip %} -**Tip:** You can hover over a specific day in the traffic graph to view the exact data for that day. +**ヒント:** トラフィックグラフで特定の日にカーソルを合わせると、その日の正確なデータを表示できます。 {% endtip %} -![Repository traffic graphs with tooltip](/assets/images/help/graphs/repo_traffic_graphs_tooltip_dotcom.png) +![ツールチップを使用したリポジトリトラフィックグラフ](/assets/images/help/graphs/repo_traffic_graphs_tooltip_dotcom.png) -### Accessing the traffic graph +### トラフィックグラフにアクセスする {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.accessing-repository-graphs %} -3. In the left sidebar, click **Traffic**. -![Traffic tab](/assets/images/help/graphs/traffic_tab.png) +3. 左側のサイドバーで、[**Traffic**] をクリックします。 ![[Traffic] タブ](/assets/images/help/graphs/traffic_tab.png) diff --git a/translations/ja-JP/content/github/working-with-github-pages/about-github-pages-and-jekyll.md b/translations/ja-JP/content/github/working-with-github-pages/about-github-pages-and-jekyll.md index be0ce8dbb7..68e68e710c 100644 --- a/translations/ja-JP/content/github/working-with-github-pages/about-github-pages-and-jekyll.md +++ b/translations/ja-JP/content/github/working-with-github-pages/about-github-pages-and-jekyll.md @@ -27,7 +27,7 @@ versions: Jekyllは、{% data variables.product.prodname_pages %}に組み込まれている静的サイトジェネレータで、ビルドプロセスを容易化できます。 JekyllはMarkdownおよびHTMLファイルを取り込み、選択したレイアウトに基づいて、完成された静的ウェブサイトを作成します。 Jekyllは、Markdownと、サイトに動的コンテンツを読み込むテンプレート言語のLiquidをサポートします。 詳しい情報については、[Jekyll](https://jekyllrb.com/)を参照してください。 -Windows は、Jekyll を公式にはサポートしていません。 詳しい情報については、Jekyllのドキュメンテーションの「[Jekyll on Windows](http://jekyllrb.com/docs/windows/#installation)」を参照してください。 +Windows は、Jekyll を公式にはサポートしていません。 For more information, see "[Jekyll on Windows](http://jekyllrb.com/docs/windows/#installation)" in the Jekyll documentation. {% data variables.product.prodname_pages %} ではJekyllを使用することをおすすめします。 お好みに応じて、別の静的サイトジェネレータを使用することも、ローカルまたは別のサーバーにおけるビルドプロセスをカスタマイズすることもできます。 詳しい情報については「[{% data variables.product.prodname_pages %}について](/articles/about-github-pages#static-site-generators)」を参照してください。 diff --git a/translations/ja-JP/content/github/working-with-github-pages/about-github-pages.md b/translations/ja-JP/content/github/working-with-github-pages/about-github-pages.md index 890d04243b..36cec95c13 100644 --- a/translations/ja-JP/content/github/working-with-github-pages/about-github-pages.md +++ b/translations/ja-JP/content/github/working-with-github-pages/about-github-pages.md @@ -45,7 +45,7 @@ To publish a user site, you must create a repository owned by your user account {% data variables.product.product_name %} アカウントごとに、ユーザまたは Organization サイトを 1 つだけ作成できます。 プロジェクトサイトの数については、Organization アカウントでもユーザアカウントでも、無制限です。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} The URL where your site is available depends on whether subdomain isolation is enabled for {% data variables.product.product_location %}. @@ -124,7 +124,7 @@ If you choose the `/docs` folder of any branch as your publishing source, {% dat #### 禁止される用途 -{% data variables.product.prodname_pages %} は、オンラインビジネス、eコマースサイト、主に商取引の円滑化またはサービスとしての商用ソフトウェアの提供 (SaaS) のどちらかを目的とるす、その他のウェブサイトを運営するための無料のウェブホスティングサービスとしての使用を意図したものではなく、またそのような使用を許可するものでもありません。 +{% data variables.product.prodname_pages %} は、オンラインビジネス、eコマースサイト、主に商取引の円滑化またはサービスとしての商用ソフトウェアの提供 (SaaS) のどちらかを目的とする、その他のウェブサイトを運営するための無料のウェブホスティングサービスとしての使用を意図したものではなく、またそのような使用を許可するものでもありません。 さらに、{% data variables.product.prodname_pages %} サイトでは、以下を禁じています: diff --git a/translations/ja-JP/content/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site.md b/translations/ja-JP/content/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site.md index 7a450cc84d..28f2775cee 100644 --- a/translations/ja-JP/content/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site.md +++ b/translations/ja-JP/content/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site.md @@ -24,7 +24,7 @@ Before you configure a publishing source, make sure the branch{% if currentVersi 4. Optionally, use the drop-down menu to select a folder for your publishing source. ![Drop-down menu to select a folder for publishing source](/assets/images/help/pages/publishing-source-folder-drop-down.png) 5. [**Save**] をクリックします。 ![Button to save changes to publishing source settings](/assets/images/help/pages/publishing-source-save.png) {% else %} -3. Under " +3. [ {% data variables.product.prodname_pages %}", use the **Source** drop-down menu and select a publishing source. ![公開元を選択するドロップダウンメニュー](/assets/images/help/pages/publishing-source-drop-down.png) {% endif %} diff --git a/translations/ja-JP/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md b/translations/ja-JP/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md index 86907ab801..ffc8d118dd 100644 --- a/translations/ja-JP/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md +++ b/translations/ja-JP/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md @@ -1,24 +1,24 @@ --- -title: Creating a GitHub Pages site with Jekyll -intro: 'You can use Jekyll to create a {% data variables.product.prodname_pages %} site in a new or existing repository.' +title: Jekyll を使用して GitHub Pages サイトを作成する +intro: '新規または既存のリポジトリ内に、{% data variables.product.prodname_pages %} Jekyll を使用してサイトを作成できます。' product: '{% data reusables.gated-features.pages %}' redirect_from: - /articles/creating-a-github-pages-site-with-jekyll -permissions: 'People with admin permissions for a repository can create a {% data variables.product.prodname_pages %} site with Jekyll.' +permissions: 'リポジトリの管理者権限があるユーザは、Jekyll を使用して {% data variables.product.prodname_pages %} サイトにコンテンツを作成できます。' versions: free-pro-team: '*' enterprise-server: '*' --- -### Prerequisites +### 必要な環境 -Before you can use Jekyll to create a {% data variables.product.prodname_pages %} site, you must install Jekyll and Git. For more information, see [Installation](https://jekyllrb.com/docs/installation/) in the Jekyll documentation and "[Set up Git](/articles/set-up-git)." +Jekyll を使用して {% data variables.product.prodname_pages %} サイトを作成する前に、Jekyll と Git をインストールする必要があります。 詳しい情報については、Jekyll ドキュメンテーションの [Installation](https://jekyllrb.com/docs/installation/) および「[Git のセットアップ](/articles/set-up-git)」を参照してください。 {% data reusables.pages.recommend-bundler %} {% data reusables.pages.jekyll-install-troubleshooting %} -### Creating a repository for your site +### サイト用にリポジトリを作成する {% data reusables.pages.new-or-existing-repo %} @@ -29,22 +29,22 @@ Before you can use Jekyll to create a {% data variables.product.prodname_pages % {% data reusables.pages.create-repo-name %} {% data reusables.repositories.choose-repo-visibility %} -### Creating your site +### サイトを作成する {% data reusables.pages.must-have-repo-first %} {% data reusables.command_line.open_the_multi_os_terminal %} -2. If you don't already have a local copy of your repository, navigate to the location where you want to store your site's source files, replacing _PARENT-FOLDER_ with the folder you want to contain the folder for your repository. +2. リポジトリのローカルコピーがまだない場合、サイトのソースファイルを保存したい場所に移動します。_PARENT-FOLDER_ は、リポジトリを保存したいフォルダの名前に置き換えてください。 ```shell $ cd PARENT-FOLDER ``` -3. If you haven't already, initialize a local Git repository, replacing _REPOSITORY-NAME_ with the name of your repository. +3. ローカルの Git リポジトリをまだ初期化していない場合は、初期化します。 _REPOSITORY-NAME_ は、リポジトリの名前に置き換えてください。 ```shell $ git init REPOSITORY-NAME > Initialized empty Git repository in /Users/octocat/my-site/.git/ # Creates a new folder on your computer, initialized as a Git repository - ``` - 4. Change directories to the repository. + ``` + 4. ディレクトリをリポジトリに変更します。 ```shell $ cd REPOSITORY-NAME # Changes the working directory @@ -57,31 +57,30 @@ Before you can use Jekyll to create a {% data variables.product.prodname_pages % # Creates a new folder called docs $ cd docs ``` - If you chose to publish your site from the `gh-pages` branch, create and checkout the `gh-pages` branch. + サイトを `gh-pages` ブランチから公開する場合には、`gh-pages` ブランチを作成してチェックアウトします。 ```shell $ git checkout --orphan gh-pages # Creates a new branch, with no history or contents, called gh-pages and switches to the gh-pages branch ``` - 7. To create a new Jekyll site, use the `jekyll new` command, replacing _VERSION_ with the current dependency version for Jekyll. For more information, see "[Dependency versions](https://pages.github.com/versions/)" on the {% data variables.product.prodname_pages %} site. - - If you installed Bundler: + 7. 新しい Jekyll サイトを作成するには、`jekyll new` コマンドを使用します。_VERSION_ は、Jekyll の現在の依存関係バージョンに置き換えてください。 詳しい情報については、{% data variables.product.prodname_pages %} サイトで「[依存関係のバージョン](https://pages.github.com/versions/)」を参照してください。 + - Bundler をインストールしている場合、以下のコマンドを入力します。 ```shell $ bundle exec jekyll VERSION new . # Creates a Jekyll site in the current directory ``` - - If you don't have Bundler installed: + - Bundler をインストールしていない場合、以下のコマンドを入力します。 ```shell $ jekyll VERSION new . # Creates a Jekyll site in the current directory ``` -8. Open the Gemfile that was created and follow the instructions in the Gemfile's comments to use {% data variables.product.prodname_pages %}. - ![Instructions for updating Gemfile](/assets/images/help/pages/gemfile-instructions.png) -9. Update the `gem "github-pages"` line so that the line looks like this, replacing _VERSION_ with the current dependency version for `github-pages`. For more information, see "[Dependency versions](https://pages.github.com/versions/)" on the {% data variables.product.prodname_pages %} site. +8. 作成された Gemfile を開き、Gemfile のコメントに従って {% data variables.product.prodname_pages %} を使用します。 ![Gemfile の更新手順](/assets/images/help/pages/gemfile-instructions.png) +9. `gem "github-pages"` の行を以下のように更新します。_VERSION_ は、`github-pages` の現在の依存関係バージョンに置き換えてください。 詳しい情報については、{% data variables.product.prodname_pages %} サイトで「[依存関係のバージョン](https://pages.github.com/versions/)」を参照してください。 ```shell gem "github-pages", "~> VERSION", group: :jekyll_plugins ``` -10. Save and close the Gemfile. -11. Optionally, test your site locally. For more information, see "[Testing your {% data variables.product.prodname_pages %} site locally with Jekyll](/articles/testing-your-github-pages-site-locally-with-jekyll)." -12. Add your {% data variables.product.product_name %} repository as a remote, replacing {% if currentVersion != "free-pro-team@latest" %}_HOSTNAME_ with your appliance's hostname,{% endif %} _USER_ with the account that owns the repository{% if currentVersion != "free-pro-team@latest" %},{% endif %} and _REPOSITORY_ with the name of the repository. +10. Gemfile を保存して閉じます。 +11. 必要に応じて、サイトをローカルでテストします。 詳しい情報については、「[Jekyll を使用して {% data variables.product.prodname_pages %} サイトをローカルでテストする](/articles/testing-your-github-pages-site-locally-with-jekyll)」を参照してください。 +12. {% data variables.product.product_name %} リポジトリをリモートとして追加します。{% if enterpriseServerVersions contains currentVersion %}_HOSTNAME_ はアプライアンスのホスト名に、{% endif %}_USER_ はリポジトリ所有者のアカウントに{% if enterpriseServerVersions contains currentVersion %}、{% endif %}そして _REPOSITORY_ はリポジトリの名前に置き換えてください。 ```shell {% if currentVersion == "free-pro-team@latest" %} $ git remote add origin https://github.com/USER/REPOSITORY.git @@ -89,7 +88,7 @@ $ git remote add origin https://github.com/USER/REPOSITORY.git $ git remote add origin https://HOSTNAME/USER/REPOSITORY.git {% endif %} ``` -13. Push the repository to {% data variables.product.product_name %}, replacing _BRANCH_ with the name of the branch you're working on. +13. リポジトリを {% data variables.product.product_name %} にプッシュします。 _BRANCH_ は、作業を行なっているブランチの名前に置き換えてください。 ```shell $ git push -u origin BRANCH ``` @@ -100,8 +99,8 @@ $ git remote add origin https://HOSTNAME/USER/REPOSITORY ``` -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation disabled: +{% if enterpriseServerVersions contains currentVersion %} +たとえば、以下の*OctodogApp*と*OctocatApp*は同じリポジトリに公開されます。 ``` ` element of the *pom.xml* file. {% data variables.product.prodname_dotcom %} will match the repository based on that field. Since the repository name is also part of the `distributionManagement` element, there are no additional steps to publish multiple packages to the same repository. +同じリポジトリに複数のパッケージを公開したい場合には、そのリポジトリのURLを*pom.xml*ファイルの``要素に含めてください。 {% data variables.product.prodname_dotcom %} は、このこのフィールドを元にしてリポジトリを照合します。 リポジトリ名も`distributionManagement`要素の一部なので、複数のパッケージを同じリポジトリに公開するための追加手順はありません。 -For more information on creating a package, see the [maven.apache.org documentation](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html). +パッケージの作成に関する詳しい情報については[maven.apache.orgのドキュメンテーション](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)を参照してください。 -1. Edit the `distributionManagement` element of the *pom.xml* file located in your package directory, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. - {% if currentVersion != "free-pro-team@latest" %} - If your instance has subdomain isolation enabled: +1. パッケージディレクトリ内にある*pom.xml*ファイルの`distributionManagement`要素を編集し、`OWNER`をリポジトリを所有しているユーザもしくはOrganizationアカウントの名前で、`REPOSITORY`をプロジェクトを含むリポジトリの名前で置き換えてください。 + +{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. + {% if enterpriseServerVersions contains currentVersion %} + パッケージの作成に関する詳しい情報については[maven.apache.orgのドキュメンテーション](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)を参照してください。 {% endif %} ``` @@ -144,8 +146,8 @@ For more information on creating a package, see the [maven.apache.org documentat ``` - {% if currentVersion != "free-pro-team@latest" %} - If your instance has subdomain isolation disabled: + {% if enterpriseServerVersions contains currentVersion %} + たとえば、以下の*OctodogApp*と*OctocatApp*は同じリポジトリに公開されます。 ``` @@ -156,7 +158,7 @@ For more information on creating a package, see the [maven.apache.org documentat ``` {% endif %} -2. Publish the package. +2. パッケージを公開します。 ```shell $ mvn deploy @@ -164,12 +166,12 @@ For more information on creating a package, see the [maven.apache.org documentat {% data reusables.package_registry.viewing-packages %} -### Installing a package +### パッケージをインストールする -To install an Apache Maven package from {% data variables.product.prodname_registry %}, edit the *pom.xml* file to include the package as a dependency. If you want to install packages from more than one repository, add a `repository` tag for each. For more information on using a *pom.xml* file in your project, see "[Introduction to the POM](https://maven.apache.org/guides/introduction/introduction-to-the-pom.html)" in the Apache Maven documentation. +{% data variables.product.prodname_registry %}からApache Mavenパッケージをインストールするには、*pom.xml*ファイルを編集してパッケージを依存関係として含めてください。 複数のリポジトリからパッケージをインストールしたい場合は、それぞれについて`repository`タグを追加してください。 プロジェクト内での*pom.xml*ファイルの利用に関する詳しい情報については、Apache Mavenドキュメンテーション中の「[ Introduction to the POM](https://maven.apache.org/guides/introduction/introduction-to-the-pom.html)」を参照してください。 {% data reusables.package_registry.authenticate-step %} -2. Add the package dependencies to the `dependencies` element of your project *pom.xml* file, replacing `com.example:test` with your package. +2. パッケージの依存関係をプロジェクトの*pom.xml*ファルの`dependencies`要素に追加し、`com.example:test`をパッケージで置き換えてください。 ``` @@ -180,13 +182,13 @@ To install an Apache Maven package from {% data variables.product.prodname_regis ``` -3. Install the package. +3. パッケージをインストールします。 ```shell $ mvn install ``` -### Further reading +### 参考リンク -- "[Configuring Gradle for use with {% data variables.product.prodname_registry %}](/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages)" -- "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" +- [{% data variables.product.prodname_registry %}で利用するためのGradleの設定](/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages) +- [パッケージの削除](/packages/publishing-and-managing-packages/deleting-a-package/) diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md index 59c0d2c8b8..db0f9032ba 100644 --- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md +++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md @@ -1,6 +1,6 @@ --- -title: Configuring Docker for use with GitHub Packages -intro: 'You can configure the Docker client to use {% data variables.product.prodname_registry %} to publish and retrieve docker images.' +title: GitHub Packagesで利用するために Docker を設定する +intro: 'Docker クライアントが、{% data variables.product.prodname_registry %} を利用して Docker イメージを公開および取得できるよう設定できます。' product: '{% data reusables.gated-features.packages %}' redirect_from: - /articles/configuring-docker-for-use-with-github-package-registry @@ -13,33 +13,33 @@ versions: {% data reusables.package_registry.packages-ghes-release-stage %} -{% data reusables.package_registry.admins-can-configure-package-types %} +{% data reusables.package_registry.default-name %} たとえば、{% data variables.product.prodname_dotcom %}は`OWNER/test`というリポジトリ内の`com.example:test`という名前のパッケージを公開します。 -### About Docker and {% data variables.product.prodname_registry %} +### {% data variables.product.prodname_registry %} への認証を行う {% data reusables.package_registry.docker_registry_deprecation_status %} -When installing or publishing a docker image, {% data variables.product.prodname_registry %} does not currently support foreign layers, such as Windows images. +`docker` loginコマンドを使い、Dockerで{% data variables.product.prodname_registry %}の認証を受けることができます。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} -Before you can use the Docker registry on {% data variables.product.prodname_registry %}, the site administrator for {% data variables.product.product_location_enterprise %} must enable Docker support and subdomain isolation for your instance. For more information, see "[Managing GitHub Packages for your enterprise](/enterprise/admin/packages)." +Docker レジストリを {% data variables.product.prodname_registry %} で使用する前に、{% data variables.product.product_location_enterprise %} のサイト管理者がインスタンスに対し Docker のサポートとand Subdomain Isolation を有効化する必要があります。 詳しい情報については、「[Enterprise 向けの GitHub Packages を管理する](/enterprise/admin/packages)」を参照してください。 {% endif %} -### Authenticating to {% data variables.product.prodname_registry %} +### {% data variables.product.prodname_registry %} への認証を行う {% data reusables.package_registry.docker_registry_deprecation_status %} {% data reusables.package_registry.authenticate-packages %} -#### Authenticating with a personal access token +#### 個人アクセストークンでの認証 {% data reusables.package_registry.required-scopes %} -You can authenticate to {% data variables.product.prodname_registry %} with Docker using the `docker` login command. +`docker` loginコマンドを使い、Dockerで{% data variables.product.prodname_registry %}の認証を受けることができます。 -To keep your credentials secure, we recommend you save your personal access token in a local file on your computer and use Docker's `--password-stdin` flag, which reads your token from a local file. +クレデンシャルをセキュアに保つ貯めに、個人アクセストークンは自分のコンピュータのローカルファイルに保存し、ローカルファイルからトークンを読み取るDockerの`--password-stdin`フラグを使うことをおすすめします。 {% if currentVersion == "free-pro-team@latest" %} {% raw %} @@ -49,40 +49,50 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% raw %} ```shell - $ cat ~/TOKEN.txt | docker login docker.HOSTNAME -u USERNAME --password-stdin + $ docker images + +> REPOSITORY TAG IMAGE ID CREATED SIZE +> monalisa 1.0 c75bebcdd211 4 weeks ago 1.11MB + +# OWNER/REPO/IMAGE_NAMEでイメージにタグ付けする +$ docker tag c75bebcdd211 docker.pkg.github.com/octocat/octo-app/monalisa:1.0 + +# {{ site.data.variables.product.prodname_registry }}にイメージをプッシュ +$ docker push docker.pkg.github.com/octocat/octo-app/monalisa:1.0 ``` {% endraw %} {% endif %} -To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if currentVersion != "free-pro-team@latest" %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. +To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if enterpriseServerVersions contains currentVersion %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. -For more information, see "[Docker login](https://docs.docker.com/engine/reference/commandline/login/#provide-a-password-using-stdin)." +詳しい情報については「[Docker login](https://docs.docker.com/engine/reference/commandline/login/#provide-a-password-using-stdin)」を参照してください。 -#### Authenticating with the `GITHUB_TOKEN` +#### `GITHUB_TOKEN`での認証 {% data reusables.package_registry.package-registry-with-github-tokens %} -### Publishing a package +### パッケージを公開する {% data reusables.package_registry.docker_registry_deprecation_status %} -{% data variables.product.prodname_registry %} supports multiple top-level Docker images per repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation. +{% data variables.product.prodname_registry %} は、リポジトリごとに複数の最上位 Docker イメージをサポートしています。 リポジトリは任意の数のイメージタグを持つことができます。 10GB以上のDockerイメージの公開やインストールの際には、サービスのパフォーマンスが低下するかもしれず、各レイヤーは5GBが上限です。 詳しい情報については、Dockerのドキュメンテーションの「[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)」を参照してください。 {% data reusables.package_registry.lowercase-name-field %} {% data reusables.package_registry.viewing-packages %} -1. Determine the image name and ID for your docker image using `docker images`. +1. `docker images`を使って、Dockerイメージのイメージ名とIDを確認してください。 ```shell $ docker images > < > > REPOSITORY TAG IMAGE ID CREATED SIZE > IMAGE_NAME VERSION IMAGE_ID 4 weeks ago 1.11MB ``` -2. Using the Docker image ID, tag the docker image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. +2. 新しいDockerイメージを初めて公開し、`monalisa`という名前にできます。 +{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker tag IMAGE_ID docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION @@ -92,7 +102,8 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen $ docker tag IMAGE_ID docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION ``` {% endif %} -3. If you haven't already built a docker image for the package, build the image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, *VERSION* with package version at build time,{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s +3. パッケージ用のDockerイメージをまだ構築していないなら、イメージを構築してください。 *OWNER*をリポジトリを所有しているユーザあるいはOrganizationのアカウント名で、*REPOSITORY*をプロジェクトを含むリポジトリ名で、*IMAGE_NAME*をパッケージもしくはイメージの名前で、*VERSION*をビルド時点のパッケージバージョンで置き換え、イメージが現在のワーキングディレクトリにないなら*PATH*をイメージへのパスで置き換えてください。 +{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker build -t docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH @@ -102,7 +113,8 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen $ docker build -t docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH ``` {% endif %} -4. Publish the image to {% data variables.product.prodname_registry %}. +4. イメージを +{% data variables.product.prodname_registry %}. {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker push docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION @@ -114,15 +126,15 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen {% endif %} {% note %} - **Note:** You must push your image using `IMAGE_NAME:VERSION` and not using `IMAGE_NAME:SHA`. + **ノート:** イメージのプッシュは`IMAGE_NAME:SHA`を使うのではなく、`IMAGE_NAME:VERSION`を使って行ってください。 {% endnote %} -#### Example publishing a Docker image +#### Dockerイメージのプッシュの例 {% data reusables.package_registry.docker_registry_deprecation_status %} -You can publish version 1.0 of the `monalisa` image to the `octocat/octo-app` repository using an image ID. +`monalisa`イメージのバージョン1.0を、イメージIDを使って`octocat/octo-app`に公開できます。 {% if currentVersion == "free-pro-team@latest" %} ```shell @@ -131,10 +143,10 @@ $ docker images > REPOSITORY TAG IMAGE ID CREATED SIZE > monalisa 1.0 c75bebcdd211 4 weeks ago 1.11MB -# Tag the image with OWNER/REPO/IMAGE_NAME +# OWNER/REPO/IMAGE_NAMEでイメージにタグ付けする $ docker tag c75bebcdd211 docker.pkg.github.com/octocat/octo-app/monalisa:1.0 -# Push the image to {% data variables.product.prodname_registry %} +# {% data variables.product.prodname_registry %}にイメージをプッシュ $ docker push docker.pkg.github.com/octocat/octo-app/monalisa:1.0 ``` @@ -155,12 +167,13 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0 {% endif %} -You can publish a new Docker image for the first time and name it `monalisa`. +新しいDockerイメージを初めて公開し、`monalisa`という名前にできます。 {% if currentVersion == "free-pro-team@latest" %} ```shell -# Build the image with docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION -# Assumes Dockerfile resides in the current working directory (.) +# docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION でイメージを構築 +# Dockerfileはカレントワーキングディレクトリ (.)にあるものとする +$ docker build -t docker.pkg.github.com/octocat/octo-app/monalisa:1.0 . $ docker build -t docker.pkg.github.com/octocat/octo-app/monalisa:1.0 . # Push the image to {% data variables.product.prodname_registry %} @@ -178,11 +191,11 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0 ``` {% endif %} -### Installing a package +### パッケージをインストールする {% data reusables.package_registry.docker_registry_deprecation_status %} -You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} +You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} {% if currentVersion == "free-pro-team@latest" %} ```shell @@ -196,10 +209,10 @@ $ docker pull docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:TAG_NAME {% note %} -**Note:** You must pull the image using `IMAGE_NAME:VERSION` and not using `IMAGE_NAME:SHA`. +**ノート:** イメージのプルは`IMAGE_NAME:SHA`を使うのではなく、`IMAGE_NAME:VERSION`を使って行ってください。 {% endnote %} -### Further reading +### 参考リンク -- "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" +- [パッケージの削除](/packages/publishing-and-managing-packages/deleting-a-package/) diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md index ac368d8bee..0bd602f9a3 100644 --- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md +++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md @@ -29,7 +29,7 @@ versions: 以下のように置き換えてください。 - `USERNAME`を{% data variables.product.prodname_dotcom %}上のユーザアカウント名で。 - `TOKEN`を個人アクセストークンで。 -- `OWNER`を、プロジェクトを含むリポジトリを所有しているユーザもしくはOrganizationアカウント名で。{% if currentVersion != "free-pro-team@latest" %} +- `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} - `HOSTNAME`を、{% data variables.product.prodname_ghe_server %}インスタンスのホスト名で。 パッケージの作成に関する詳しい情報については[maven.apache.orgのドキュメンテーション](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)を参照してください。 @@ -51,7 +51,7 @@ versions: ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} たとえば、以下の*OctodogApp*と*OctocatApp*は同じリポジトリに公開されます。 ```xml @@ -90,8 +90,7 @@ versions: 3. プロジェクト固有の情報をプロジェクトファイルに追加してください。プロジェクトファイルは*.csproj*で終わります。 以下のように置き換えてください。 - `OWNER`を、プロジェクトを含むリポジトリを所有しているユーザもしくはOrganizationアカウント名で。 - `REPOSITORY`を、公開したいパッケージを含むリポジトリの名前で。 - - `1.0.0`を、パッケージのバージョン番号で。 -{% if currentVersion != "free-pro-team@latest" %} + - `1.0.0` with the version number of the package.{% if enterpriseServerVersions contains currentVersion %} - `HOSTNAME`を、{% data variables.product.prodname_ghe_server %}インスタンスのホスト名で。{% endif %} ``` xml diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md index 1e3edaaa61..8f2b8d9af9 100644 --- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md +++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md @@ -25,7 +25,7 @@ versions: Gradle GroovyもしくはKotlin DSLを使って、Gradleで{% data variables.product.prodname_registry %}に認証を受けることができます。それには、*build.gradle*ファイル（Gradle Groovy）もしくは*build.gradle.kts*ファイル（Kotlin DSL）ファイルを編集して、個人アクセストークンを含めます。 リポジトリ中の単一のパッケージもしくは複数パッケージを認識するようにGradle Groovy及びKotlin DSLを設定することもできます。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} *REGISTRY-URL* をインスタンスの Maven レジストリの URL に置き換えます。 インスタンスで Subdomain Isolation が有効になっている場合は、`maven.HOSTNAME` を使用します。 インスタンスで Subdomain Isolation が無効になっている場合は、`HOSTNAME/_registry/maven` を使用します。 いずれの場合でも、*HOSTNAME* を {% data variables.product.prodname_ghe_server %} インスタンスのホスト名に置き換えてください。 {% endif %} diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md index efc0e2d450..2fe0d525a4 100644 --- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md +++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md @@ -1,6 +1,6 @@ --- -title: Configuring npm for use with GitHub Packages -intro: 'You can configure npm to publish packages to {% data variables.product.prodname_registry %} and to use packages stored on {% data variables.product.prodname_registry %} as dependencies in an npm project.' +title: GitHub Packagesで利用するためにnpmを設定する +intro: '{% data variables.product.prodname_registry %} にパッケージを公開するよう npm を設定し、{% data variables.product.prodname_registry %} に保存されたパッケージを依存関係として npm プロジェクトで利用できます。' product: '{% data reusables.gated-features.packages %}' redirect_from: - /articles/configuring-npm-for-use-with-github-package-registry @@ -13,40 +13,43 @@ versions: {% data reusables.package_registry.packages-ghes-release-stage %} -{% data reusables.package_registry.admins-can-configure-package-types %} +{% data reusables.package_registry.default-name %} たとえば、{% data variables.product.prodname_dotcom %}は`OWNER/test`というリポジトリ内の`com.example:test`という名前のパッケージを公開します。 -### Authenticating to {% data variables.product.prodname_registry %} +### {% data variables.product.prodname_registry %} への認証を行う {% data reusables.package_registry.authenticate-packages %} -#### Authenticating with a personal access token +#### 個人アクセストークンでの認証 {% data reusables.package_registry.required-scopes %} -You can authenticate to {% data variables.product.prodname_registry %} with npm by either editing your per-user *~/.npmrc* file to include your personal access token or by logging in to npm on the command line using your username and personal access token. +ユーザごとの*~/.npmrc*ファイルを編集して個人アクセストークンを含めるか、コマンドラインからユーザ名と個人アクセストークンを使ってnpmにログインすることによって、npmで{% data variables.product.prodname_registry %}の認証を受けられます。 -To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. Create a new *~/.npmrc* file if one doesn't exist. +To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. *~/.npmrc*ファイルが存在しない場合は、新しく作成してください。 -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation enabled: +{% if enterpriseServerVersions contains currentVersion %} +パッケージの作成に関する詳しい情報については[maven.apache.orgのドキュメンテーション](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)を参照してください。 {% endif %} ```shell //{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}/:_authToken=TOKEN ``` -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation disabled: +{% if enterpriseServerVersions contains currentVersion %} +たとえば、以下の*OctodogApp*と*OctocatApp*は同じリポジトリに公開されます。 ```shell -//HOSTNAME/_registry/npm/:_authToken=TOKEN +$ npm login --registry=https://npm.pkg.github.com +> Username: USERNAME +> Password: TOKEN +> Email: PUBLIC-EMAIL-ADDRESS ``` {% endif %} -To authenticate by logging in to npm, use the `npm login` command, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *PUBLIC-EMAIL-ADDRESS* with your email address. +npmにログインすることで認証を受けるには、`npm login`コマンドを使ってください。*USERNAME*は{% data variables.product.prodname_dotcom %}のユーザ名で、*TOKEN*は個人アクセストークンで、*PUBLIC-EMAIL-ADDRESS*はメールアドレスで置き換えてください。 -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation enabled: +{% if enterpriseServerVersions contains currentVersion %} +パッケージの作成に関する詳しい情報については[maven.apache.orgのドキュメンテーション](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)を参照してください。 {% endif %} ```shell @@ -56,57 +59,57 @@ $ npm login --registry=https://{% if currentVersion == "free-pro-team@latest" %} > Email: PUBLIC-EMAIL-ADDRESS ``` -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation disabled: +{% if enterpriseServerVersions contains currentVersion %} +たとえば、以下の*OctodogApp*と*OctocatApp*は同じリポジトリに公開されます。 ```shell -$ npm login --registry=https://HOSTNAME/_registry/npm/ -> Username: USERNAME -> Password: TOKEN -> Email: PUBLIC-EMAIL-ADDRESS +registry=https://npm.pkg.github.com/OWNER +@OWNER:registry=https://npm.pkg.github.com +@OWNER:registry=https://npm.pkg.github.com ``` {% endif %} -#### Authenticating with the `GITHUB_TOKEN` +#### `GITHUB_TOKEN`での認証 {% data reusables.package_registry.package-registry-with-github-tokens %} -### Publishing a package +### パッケージを公開する -By default, {% data variables.product.prodname_registry %} publishes a package in the {% data variables.product.prodname_dotcom %} repository you specify in the name field of the *package.json* file. For example, you would publish a package named `@my-org/test` to the `my-org/test` {% data variables.product.prodname_dotcom %} repository. You can add a summary for the package listing page by including a *README.md* file in your package directory. For more information, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" and "[How to create Node.js Modules](https://docs.npmjs.com/getting-started/creating-node-modules)" in the npm documentation. +デフォルトでは、{% data variables.product.prodname_registry %}は*package.json*ファイルのnameフィールドで指定された{% data variables.product.prodname_dotcom %}のリポジトリにパッケージを公開します。 たとえば`@my-org/test`という名前のパッケージを{% data variables.product.prodname_dotcom %}リポジトリの`my-org/test`に公開します。 パッケージディレクトリに*README.md*ファイルを置くことで、パッケージリスティングページのためのまとめを追加できます。 詳しい情報については、npmのドキュメンテーション中の「[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)」及び「[How to create Node.js Modules](https://docs.npmjs.com/getting-started/creating-node-modules)」を参照してください。 -You can publish multiple packages to the same {% data variables.product.prodname_dotcom %} repository by including a `URL` field in the *package.json* file. For more information, see "[Publishing multiple packages to the same repository](#publishing-multiple-packages-to-the-same-repository)." +`URL`フィールドを*package.json*ファイルに含めることで、同じ{% data variables.product.prodname_dotcom %}のリポジトリに複数のパッケージを公開できます。 詳しい情報については「[同じリポジトリへの複数パッケージの公開](#publishing-multiple-packages-to-the-same-repository)」を参照してください。 -You can set up the scope mapping for your project using either a local *.npmrc* file in the project or using the `publishConfig` option in the *package.json*. {% data variables.product.prodname_registry %} only supports scoped npm packages. Scoped packages have names with the format of `@owner/name`. Scoped packages always begin with an `@` symbol. You may need to update the name in your *package.json* to use the scoped name. For example, `"name": "@codertocat/hello-world-npm"`. +プロジェクト内にあるローカルの *.npmrc* ファイルか、*package.json* の `publishConfig` オプションを使って、スコープのマッピングを設定できます。 {% data variables.product.prodname_registry %}はスコープ付きのnpmパッケージのみをサポートしています。 スコープ付きパッケージには、`@owner/name` というフォーマットの名前が付いています。 スコープ付きパッケージの先頭には常に `@` 記号が付いています。 スコープ付きの名前を使うには、*package.json* の名前を更新する必要がある場合があります。 たとえば、`"name": "@codertocat/hello-world-npm"` のようになります。 {% data reusables.package_registry.viewing-packages %} -#### Publishing a package using a local *.npmrc* file +#### ローカルの*.npmrc*ファイルを使ったパッケージの公開 -You can use an *.npmrc* file to configure the scope mapping for your project. In the *.npmrc* file, use the {% data variables.product.prodname_registry %} URL and account owner so {% data variables.product.prodname_registry %} knows where to route package requests. Using an *.npmrc* file prevents other developers from accidentally publishing the package to npmjs.org instead of {% data variables.product.prodname_registry %}. {% data reusables.package_registry.lowercase-name-field %} +*.npmrc*ファイルを使って、プロジェクトのスコープのマッピングを設定できます。 *.npmrc*ファイル中で{% data variables.product.prodname_registry %} URLとアカウントオーナーを使い、{% data variables.product.prodname_registry %}がどこへパッケージリクエストをまわせばいいか把握できるようにしてください。 *.npmrc*を使う事で、他の開発者が{% data variables.product.prodname_registry %}の代わりにうっかりパッケージをnpmjs.orgに公開してしまうのを避けることができます。 {% data reusables.package_registry.lowercase-name-field %} {% data reusables.package_registry.authenticate-step %} {% data reusables.package_registry.create-npmrc-owner-step %} {% data reusables.package_registry.add-npmrc-to-repo-step %} -4. Verify the name of your package in your project's *package.json*. The `name` field must contain the scope and the name of the package. For example, if your package is called "test", and you are publishing to the "My-org" {% data variables.product.prodname_dotcom %} organization, the `name` field in your *package.json* should be `@my-org/test`. +4. プロジェクトの*package.json*中のパッケージ名を確認してください。 `name`フィールドは、スコープとパッケージの名前を含まなければなりません。 たとえば、パッケージの名前が "test" で、それを "My-org" という +{% data variables.product.prodname_dotcom %} Organizationに公開する場合、*package.json*の`name`フィールドは `@my-org/test`とする必要があります。 {% data reusables.package_registry.verify_repository_field %} {% data reusables.package_registry.publish_package %} -#### Publishing a package using `publishConfig` in the *package.json* file +#### *package.json*ファイル中の`publishConfig`を利用したパッケージの公開 -You can use `publishConfig` element in the *package.json* file to specify the registry where you want the package published. For more information, see "[publishConfig](https://docs.npmjs.com/files/package.json#publishconfig)" in the npm documentation. +*package.json*ファイル中の`publishConfig`要素を使い、パッケージを公開したいレジストリを指定できます。 詳しい情報についてはnpmドキュメンテーションの「[Configの公開](https://docs.npmjs.com/files/package.json#publishconfig)」を参照してください。 -1. Edit the *package.json* file for your package and include a `publishConfig` entry. - {% if currentVersion != "free-pro-team@latest" %} - If your instance has subdomain isolation enabled: +1. パッケージの*package.json*ファイルを編集して、`publishConfig`エントリを含めてください。 + {% if enterpriseServerVersions contains currentVersion %} + パッケージの作成に関する詳しい情報については[maven.apache.orgのドキュメンテーション](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)を参照してください。 {% endif %} ```shell "publishConfig": { "registry":"https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}" }, ``` - {% if currentVersion != "free-pro-team@latest" %} - If your instance has subdomain isolation disabled: + {% if enterpriseServerVersions contains currentVersion %} + たとえば、以下の*OctodogApp*と*OctocatApp*は同じリポジトリに公開されます。 ```shell "publishConfig": { "registry":"https://HOSTNAME/_registry/npm/" @@ -116,13 +119,13 @@ You can use `publishConfig` element in the *package.json* file to specify the re {% data reusables.package_registry.verify_repository_field %} {% data reusables.package_registry.publish_package %} -### Publishing multiple packages to the same repository +### 同じリポジトリへの複数パッケージの公開 -To publish multiple packages to the same repository, you can include the URL of the {% data variables.product.prodname_dotcom %} repository in the `repository` field of the *package.json* file for each package. +複数のパッケージを同じリポジトリに公開するには、{% data variables.product.prodname_dotcom %}リポジトリのURLを各パッケージの*package.json*ファイル中の`repository`フィールドに含めることができます。 -To ensure the repository's URL is correct, replace REPOSITORY with the name of the repository containing the package you want to publish, and OWNER with the name of the user or organization account on {% data variables.product.prodname_dotcom %} that owns the repository. +リポジトリのURLが正しいことを確認するには、REPOSITORYを公開したいパッケージを含むリポジトリ名で、OWNERをリポジトリを所有している{% data variables.product.prodname_dotcom %}のユーザもしくはOrganizationアカウント名で置き換えてください。 -{% data variables.product.prodname_registry %} will match the repository based on the URL, instead of based on the package name. If you store the *package.json* file outside the root directory of your repository, you can use the `directory` field to specify the location where {% data variables.product.prodname_registry %} can find the *package.json* files. +{% data variables.product.prodname_registry %} は、パッケージ名の代わりに、このURLを元にしてリポジトリを照合します。 *package.json*ファイルをリポジトリのルートディレクトリ外に保存しているなら、`directory`フィールドを使って{% data variables.product.prodname_registry %}が*package.json*ファイルを見つけられる場所を指定できます。 ```shell "repository" : { @@ -132,18 +135,18 @@ To ensure the repository's URL is correct, replace REPOSITORY with the name of t }, ``` -### Installing a package +### パッケージをインストールする -You can install packages from {% data variables.product.prodname_registry %} by adding the packages as dependencies in the *package.json* file for your project. For more information on using a *package.json* in your project, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" in the npm documentation. +プロジェクトの*package.json*ファイルに依存関係としてパッケージを追加することで、{% data variables.product.prodname_registry %}からパッケージをインストールできます。 プロジェクトにおける *package.json* の利用に関する詳しい情報については、npm ドキュメンテーションの「[package.json を使って作業する](https://docs.npmjs.com/getting-started/using-a-package.json)」を参照してください。 -By default, you can add packages from one organization. For more information, see "[Installing packages from other organizations](#installing-packages-from-other-organizations)." +デフォルトでは、パッケージは1つのOrganizationから追加できます。 For more information, see "[Installing packages from other organizations](#installing-packages-from-other-organizations)." -You also need to add the *.npmrc* file to your project so all requests to install packages will go through {% data variables.product.prodname_registry %}. When you route all package requests through {% data variables.product.prodname_registry %}, you can use both scoped and unscoped packages from *npmjs.com*. For more information, see "[npm-scope](https://docs.npmjs.com/misc/scope)" in the npm documentation. +また、*.npmrc*ファイルをプロジェクトに追加して、パッケージのインストールのすべてのリクエストが{% data variables.product.prodname_registry %}を経由するようにしなければなりません。 すべてのパッケージリクエストを{% data variables.product.prodname_registry %}を経由させると、*npmjs.com*からスコープ付き及びスコープ付きではないパッケージの両方を利用できます。 詳しい情報については npm ドキュメンテーションの「[npm-scope](https://docs.npmjs.com/misc/scope)」を参照してください。 {% data reusables.package_registry.authenticate-step %} {% data reusables.package_registry.create-npmrc-owner-step %} {% data reusables.package_registry.add-npmrc-to-repo-step %} -4. Configure *package.json* in your project to use the package you are installing. To add your package dependencies to the *package.json* file for {% data variables.product.prodname_registry %}, specify the full-scoped package name, such as `@my-org/server`. For packages from *npmjs.com*, specify the full name, such as `@babel/core` or `@lodash`. For example, this following *package.json* uses the `@octo-org/octo-app` package as a dependency. +4. インストールしているパッケージを使うには、プロジェクトの*package.json*を設定してください。 {% data variables.product.prodname_registry %}のためにパッケージの依存関係を*package.json*ファイルに追加するには、`@my-org/server`というように完全なスコープ付きのパッケージ名を指定してください。 *npmjs.com*からのパッケージについては、`@babel/core`あるいは`@lodash`というような完全な名前を指定してください。 たとえば、以下の*package.json*は`@octo-org/octo-app`パッケージを依存関係として使っています。 ``` { @@ -158,18 +161,18 @@ You also need to add the *.npmrc* file to your project so all requests to instal } } ``` -5. Install the package. +5. パッケージをインストールします。 ```shell $ npm install ``` -#### Installing packages from other organizations +#### 他のOrganizationからのパッケージのインストール -By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} +デフォルトでは、1つのOrganizationからのみ{% data variables.product.prodname_registry %}パッケージを利用できます。 If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation enabled: +{% if enterpriseServerVersions contains currentVersion %} +パッケージの作成に関する詳しい情報については[maven.apache.orgのドキュメンテーション](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)を参照してください。 {% endif %} ```shell @@ -178,8 +181,8 @@ registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github @OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %} ``` -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation disabled: +{% if enterpriseServerVersions contains currentVersion %} +たとえば、以下の*OctodogApp*と*OctocatApp*は同じリポジトリに公開されます。 ```shell registry=https://HOSTNAME/_registry/npm/OWNER @@ -188,6 +191,6 @@ registry=https://HOSTNAME/_registry/npm/OWNER ``` {% endif %} -### Further reading +### 参考リンク -- "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" +- [パッケージの削除](/packages/publishing-and-managing-packages/deleting-a-package/) diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md index 35f32a1ae3..5a700026bd 100644 --- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md +++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md @@ -1,6 +1,6 @@ --- -title: Configuring RubyGems for use with GitHub Packages -intro: 'You can configure RubyGems to publish a package to {% data variables.product.prodname_registry %} and to use packages stored on {% data variables.product.prodname_registry %} as dependencies in a Ruby project with Bundler.' +title: GitHub Packagesで利用するために RubyGems を設定する +intro: '{% data variables.product.prodname_registry %} にパッケージを公開し、{% data variables.product.prodname_registry %} に保存されたパッケージを依存関係としてBundlerを使うRubyのプロジェクトで利用するよう、RubyGemsを設定できます。' product: '{% data reusables.gated-features.packages %}' redirect_from: - /articles/configuring-rubygems-for-use-with-github-package-registry @@ -13,55 +13,54 @@ versions: {% data reusables.package_registry.packages-ghes-release-stage %} -{% data reusables.package_registry.admins-can-configure-package-types %} +{% data reusables.package_registry.default-name %} たとえば、{% data variables.product.prodname_dotcom %}は`OWNER/test`というリポジトリ内の`com.example:test`という名前のパッケージを公開します。 -### Prerequisites +### 必要な環境 -- You must have rubygems 2.4.1 or higher. To find your rubygems version: +- rubygems 2.4.1 以上. rubygemsのバージョンは以下のようにすればわかります。 ```shell $ gem --version ``` - - - You must have bundler 1.6.4 or higher. To find your Bundler version: + + - Bundler 1.6.4 以上. Bundlerのバージョンは以下のようにすれば分かります。 ```shell $ bundle --version Bundler version 1.13.7 ``` - - - Install keycutter to manage multiple credentials. To install keycutter: + + - 複数の認証情報を扱うには、keycutter をインストールしてください. keycutterは以下のようにすればインストールできます。 ```shell $ gem install keycutter ``` - -### Authenticating to {% data variables.product.prodname_registry %} - + +### {% data variables.product.prodname_registry %} への認証を行う + {% data reusables.package_registry.authenticate-packages %} - -#### Authenticating with a personal access token - + +#### 個人アクセストークンでの認証 + {% data reusables.package_registry.required-scopes %} - -You can authenticate to {% data variables.product.prodname_registry %} with RubyGems by editing the *~/.gem/credentials* file for publishing gems, editing the *~/.gemrc* file for installing a single gem, or using Bundler for tracking and installing one or more gems. - -To publish new gems, you need to authenticate to {% data variables.product.prodname_registry %} with RubyGems by editing your *~/.gem/credentials* file to include your personal access token. Create a new *~/.gem/credentials* file if this file doesn't exist. - -For example, you would create or edit a *~/.gem/credentials* to include the following, replacing *TOKEN* with your personal access token. - + +gemの公開なら*~/.gem/credentials*ファイルを編集することで、単一のgemのインストールなら*~/.gemrc*ファイルを編集することで、Bundlerを使って1つ以上のgemを追跡してインストールするなら*~/.gemrc*ファイルを編集することで、RubyGemsで{% data variables.product.prodname_registry %}に認証を受けることができます。 + +新しいgemsを公開するには、*~/.gem/credentials*ファイルを編集して個人アクセストークンを含めることによって、RubyGemsで{% data variables.product.prodname_registry %}に認証を受けなければなりません。 *~/.gem/credentials*ファイルが存在しない場合、新しく作成してください。 + +たとえば、*~/.gem/credentials*を作成もしくは編集して、以下を含めてください。*TOKEN*は個人アクセストークンで置き換えてください。 + ```shell ---- -:github: Bearer TOKEN +gem.metadata = { "github_repo" => "ssh://github.com/OWNER/REPOSITORY" } ``` - -To install gems, you need to authenticate to {% data variables.product.prodname_registry %} by editing the *~/.gemrc* file for your project to include `https://USERNAME:TOKEN@{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER/`. You must replace: - - `USERNAME` with your {% data variables.product.prodname_dotcom %} username. - - `TOKEN` with your personal access token. - - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} - - `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance. -{% endif %} - -If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this example. - + +gemをインストールするには、プロジェクトの*~/.gemrc*ファイルを編集し、`https://USERNAME:TOKEN@{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER/`を含めることによって{% data variables.product.prodname_registry %}の認証を受けなければなりません。 以下のように置き換えてください。 + - `USERNAME`を{% data variables.product.prodname_dotcom %}のユーザ名で。 + - `TOKEN`を個人アクセストークンで。 + - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} + - `REGISTRY-URL` をインスタンスの Rubygems レジストリの URL で。 インスタンスで Subdomain Isolation が有効になっている場合は、`rubygems.HOSTNAME` を使用します。 インスタンスで Subdomain Isolation が無効になっている場合は、`HOSTNAME/_registry/rubygems` を使用します。 いずれの場合でも、 *HOSTNAME* を {% data variables.product.prodname_ghe_server %} インスタンスのホスト名に置き換えてください。 +{% endif %} + +*~/.gemrc*ファイルがないなら、以下の例を使って新しい*~/.gemrc*ファイルを作成してください。 + ```shell --- :backtrace: false @@ -73,31 +72,31 @@ If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this exa :verbose: true ``` - -To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} - + +To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. インスタンスで Subdomain Isolation が有効になっている場合は、`rubygems.HOSTNAME` を使用します。 インスタンスで Subdomain Isolation が無効になっている場合は、`HOSTNAME/_registry/rubygems` を使用します。 いずれの場合でも、 *HOSTNAME* を {% data variables.product.prodname_ghe_server %} インスタンスのホスト名に置き換えてください。{% endif %} + {% data reusables.package_registry.lowercase-name-field %} - + ```shell $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER USERNAME:TOKEN ``` - -#### Authenticating with the `GITHUB_TOKEN` - -{% data reusables.package_registry.package-registry-with-github-tokens %} - -### Publishing a package -{% data reusables.package_registry.default-name %} For example, when you publish `octo-gem` to the `octo-org` organization, {% data variables.product.prodname_registry %} publishes the gem to the `octo-org/octo-gem` repository. For more information on creating your gem, see "[Make your own gem](http://guides.rubygems.org/make-your-own-gem/)" in the RubyGems documentation. - +#### `GITHUB_TOKEN`での認証 + +{% data reusables.package_registry.package-registry-with-github-tokens %} + +### パッケージを公開する + +{% data reusables.package_registry.default-name %} たとえば、`octo-gem`を`octo-org`というOrganizationに公開するなら、{% data variables.product.prodname_registry %}はそのgemを`octo-org/octo-gem`リポジトリに公開します。 gem の作成に関する詳しい情報については、RubyGems ドキュメンテーションの「[gem の作成](http://guides.rubygems.org/make-your-own-gem/)」を参照してください。 + {% data reusables.package_registry.viewing-packages %} - + {% data reusables.package_registry.authenticate-step %} -2. Build the package from the *gemspec* to create the *.gem* package. +2. *gemspec*からパッケージをビルドして、*.gem*パッケージを作成してください。 ```shell gem build OCTO-GEM.gemspec ``` -3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. インスタンスで Subdomain Isolation が有効になっている場合は、`rubygems.HOSTNAME` を使用します。 インスタンスで Subdomain Isolation が無効になっている場合は、`HOSTNAME/_registry/rubygems` を使用します。 いずれの場合でも、 *HOSTNAME* を {% data variables.product.prodname_ghe_server %} インスタンスのホスト名に置き換えてください。{% endif %} ```shell $ gem push --key github \ @@ -105,20 +104,20 @@ $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygem OCTO-GEM-0.0.1.gem ``` -### Publishing multiple packages to the same repository +### 同じリポジトリへの複数パッケージの公開 -To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if currentVersion != "free-pro-team@latest" %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +複数のgemを同じリポジトリに公開したい場合は、{% data variables.product.prodname_dotcom %}リポジトリの`gem.metadata`にある`github_repo`フィールドに、URL を記述できます。 If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if enterpriseServerVersions contains currentVersion %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` gem.metadata = { "github_repo" => "ssh://{% if currentVersion == "free-pro-team@latest" %}github.com{% else %}HOSTNAME{% endif %}/OWNER/REPOSITORY" } ``` -### Installing a package +### パッケージをインストールする -You can use gems from {% data variables.product.prodname_registry %} much like you use gems from *rubygems.org*. You need to authenticate to {% data variables.product.prodname_registry %} by adding your {% data variables.product.prodname_dotcom %} user or organization as a source in the *~/.gemrc* file or by using Bundler and editing you *Gemfile*. +{% data variables.product.prodname_registry %}からのgemsは、*rubygems.org*からのgemsを使うのと同じように利用できます。 {% data variables.product.prodname_dotcom %}ユーザあるいはOrganizationをソースとして*~/.gemrc*ファイルに追加するか、Bundlerを使い、*Gemfile*を編集することで、{% data variables.product.prodname_registry %}の認証を受けなければなりません。 {% data reusables.package_registry.authenticate-step %} -2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +2. Bundlerについては、{% data variables.product.prodname_dotcom %}ユーザもしくはOrganizationをソースとして*Gemfile*に追加して、この新しいソースからgemsをフェッチするようにしてください。 For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. インスタンスで Subdomain Isolation が有効になっている場合は、`rubygems.HOSTNAME` を使用します。 インスタンスで Subdomain Isolation が無効になっている場合は、`HOSTNAME/_registry/rubygems` を使用します。 いずれの場合でも、 *HOSTNAME* を {% data variables.product.prodname_ghe_server %} インスタンスのホスト名に置き換えてください。{% endif %} ``` source "https://rubygems.org" @@ -130,7 +129,7 @@ You can use gems from {% data variables.product.prodname_registry %} much like y end ``` -3. For Bundler versions earlier than 1.7.0, you need to add a new global `source`. For more information on using Bundler, see the [bundler.io documentation](http://bundler.io/v1.5/gemfile.html). +3. 1.7.0以前のバージョンのBundlerの場合、新しいグローバルな`source`を追加する必要があります。 Bundlerの利用に関する詳しい情報については[bundler.ioのドキュメンテーション](http://bundler.io/v1.5/gemfile.html)を参照してください。 ``` source "https://{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER" @@ -140,11 +139,11 @@ You can use gems from {% data variables.product.prodname_registry %} much like y gem "GEM NAME" ``` -4. Install the package: +4. パッケージをインストールしてください。 ```shell $ gem install octo-gem --version "0.1.1" ``` -### Further reading +### 参考リンク -- "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" +- [パッケージの削除](/packages/publishing-and-managing-packages/deleting-a-package/) diff --git a/translations/ja-JP/content/rest/guides/basics-of-authentication.md b/translations/ja-JP/content/rest/guides/basics-of-authentication.md index a8c9bb8813..e9cfd36c41 100644 --- a/translations/ja-JP/content/rest/guides/basics-of-authentication.md +++ b/translations/ja-JP/content/rest/guides/basics-of-authentication.md @@ -21,7 +21,7 @@ versions: ### アプリケーションの登録 -まず、[アプリケーションの登録][new oauth app]が必要です。 登録された各 OAuth アプリケーションには、一意のクライアント ID とクライアントシークレットが割り当てられます。 クライアントシークレットは共有しないでください。 共有には、文字列をリポジトリにチェックインすることも含まれます。 +First, you'll need to [register your application][new oauth app]. 登録された各 OAuth アプリケーションには、一意のクライアント ID とクライアントシークレットが割り当てられます。 クライアントシークレットは共有しないでください。 共有には、文字列をリポジトリにチェックインすることも含まれます。 どのような情報を入力しても構いませんが、**認証コールバック URL** は例外です。 これが、アプリケーションの設定にあたってもっとも重要な情報と言えるでしょう。 認証の成功後に {% data variables.product.product_name %} がユーザに返すのは、コールバックURLなのです。 @@ -46,7 +46,7 @@ get '/' do end ``` -クライアント ID とクライアントシークレットは、[アプリケーションの設定ページ][app settings]から取得されます。 You should **never, _ever_** store these values in +Your client ID and client secret keys come from [your application's configuration page][app settings]. You should **never, _ever_** store these values in {% data variables.product.product_name %}--or any other public place, for that matter. We recommend storing them as [environment variables][about env vars]--which is exactly what we've done here. diff --git a/translations/ja-JP/content/rest/guides/getting-started-with-the-rest-api.md b/translations/ja-JP/content/rest/guides/getting-started-with-the-rest-api.md index 91e2d1fe6e..3d6ccc50ca 100644 --- a/translations/ja-JP/content/rest/guides/getting-started-with-the-rest-api.md +++ b/translations/ja-JP/content/rest/guides/getting-started-with-the-rest-api.md @@ -54,7 +54,6 @@ $ curl -i {% data variables.product.api_url_pre %}/users/defunkt > Server: GitHub.com > Date: Sun, 11 Nov 2012 18:43:28 GMT > Content-Type: application/json; charset=utf-8 -> Connection: keep-alive > Status: 200 OK > ETag: "bfd85cbf23ac0b0c8a29bee02e7117c6" > X-RateLimit-Limit: 60 diff --git a/translations/ja-JP/content/rest/overview/api-previews.md b/translations/ja-JP/content/rest/overview/api-previews.md index 84c2ef0ac5..f835f8ef18 100644 --- a/translations/ja-JP/content/rest/overview/api-previews.md +++ b/translations/ja-JP/content/rest/overview/api-previews.md @@ -42,7 +42,7 @@ Issue またはプルリクエストの[イベントのリスト](/v3/issues/tim **カスタムメディアタイプ:** `mockingbird-preview` **発表日:** [2016-05-23](https://developer.github.com/changes/2016-05-23-timeline-preview-api/) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### pre-receive 環境 pre-receive フックの環境を作成、一覧表示、更新、削除します。 @@ -50,7 +50,7 @@ pre-receive フックの環境を作成、一覧表示、更新、削除しま **カスタムメディアタイプ:** `eye-scream-preview` **発表日:** [2015-07-29](/rest/reference/enterprise-admin#pre-receive-environments) {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### インテグレーション API を介して[インテグレーション](/early-access/integrations/)を管理します。 @@ -98,7 +98,7 @@ API を介して[インテグレーション](/early-access/integrations/)を管 **カスタムメディアタイプ:** `scarlet-witch-preview` -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### 入れ子チーム 入れ子チームコンテンツを [Team](/v3/teams/) ペイロードに含めます。 @@ -107,7 +107,7 @@ API を介して[インテグレーション](/early-access/integrations/)を管 {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### グローバル webhook @@ -117,7 +117,7 @@ API を介して[インテグレーション](/early-access/integrations/)を管 {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### リポジトリ移譲 [リポジトリ](/v3/repos/)を Organization またはユーザに移譲します。 @@ -125,7 +125,7 @@ API を介して[インテグレーション](/early-access/integrations/)を管 **カスタムメディアタイプ:** `nightshade-preview` **発表日:** [2017-11-09](https://developer.github.com/changes/2017-11-09-repository-transfer-api-preview) {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### ロック理由の追加 [Issue をロック](/v3/issues/#lock-an-issue)するときに理由を追加できるようになりました。 @@ -145,7 +145,7 @@ API を使用して、プルリクエストに対して[複数の承認レビュ **カスタムメディアタイプ:** `luke-cage-preview` **発表日:** [2018-03-16](https://developer.github.com/changes/2018-03-16-protected-branches-required-approving-reviews) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.19" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.19" %} ### ホバーカード情報の取得 [ユーザのホバーカード](/v3/users/#get-contextual-information-for-a-user)から情報を取得します。 @@ -162,7 +162,7 @@ GitHub App がリポジトリのコードに対して外部チェックを実行 **カスタムメディアタイプ:** `antiope-preview` **発表日:** [2018-05-07](https://developer.github.com/changes/2018-05-07-new-checks-api-public-beta/) {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### リポジトリへの匿名 Git アクセス @@ -216,7 +216,7 @@ Organization メンバーによるリポジトリの作成可否、および作 {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### ドラフトプルリクエスト ドラフトプルリクエスト API とその[プルリクエスト](/v3/pulls/)エンドポイントを使用して、プルリクエストがドラフト状態かどうかを確認できます。 ドラフトプルリクエストについての詳細は、「[プルリクエストについて](/articles/about-pull-requests/)」を参照してください。 @@ -237,7 +237,7 @@ Organization メンバーによるリポジトリの作成可否、および作 **カスタムメディアタイプ:** `groot-preview` **発表日:** [2019-04-11](https://developer.github.com/changes/2019-04-11-pulls-branches-for-commit/) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### GitHub App のアンインストール GitHub App の所有者は、[Apps API](/v3/apps/#delete-an-installation-for-the-authenticated-app) を使用してアプリケーションをアンインストールできるようになりました。 diff --git a/translations/ja-JP/content/rest/overview/resources-in-the-rest-api.md b/translations/ja-JP/content/rest/overview/resources-in-the-rest-api.md index 29d9b4b891..54f3991e71 100644 --- a/translations/ja-JP/content/rest/overview/resources-in-the-rest-api.md +++ b/translations/ja-JP/content/rest/overview/resources-in-the-rest-api.md @@ -40,7 +40,7 @@ $ curl -i {% data variables.product.api_url_pre %}/users/octocat/orgs > X-GitHub-Media-Type: github.v3 > X-RateLimit-Limit: 5000 > X-RateLimit-Remaining: 4987 -> X-RateLimit-Reset: 1350085394{% if currentVersion != "free-pro-team@latest" %} +> X-RateLimit-Reset: 1350085394{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: {{ currentVersion }}.0{% endif %} > Content-Length: 5 > Cache-Control: max-age=0, private, must-revalidate @@ -107,7 +107,7 @@ curl -u my_client_id:my_client_secret '{% data variables.product.api_url_pre %}/ `client_id` と `client_secret` を使用してもユーザとして認証_されず_、OAuth アプリケーションを識別してレート制限を増やすだけです。 アクセス許可はユーザにのみ付与され、アプリケーションには付与されません。また、認証されていないユーザに表示されるデータのみが返されます。 このため、サーバー間のシナリオでのみ OAuth2 キー/シークレットを使用する必要があります。 OAuth アプリケーションのクライアントシークレットをユーザーに漏らさないようにしてください。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} プライベートモードでは、OAuth2 キーとシークレットを使用して認証することはできません。認証しようとすると `401 Unauthorized` が返されます。 詳しい情報については、 「[プライベートモードを有効化する](/enterprise/admin/installation/enabling-private-mode)」を参照してください。 {% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -163,10 +163,10 @@ $ curl -i -u username -d '{"scopes":["public_repo"]}' {% data variables.product. ルートエンドポイントに `GET` リクエストを発行して、REST API がサポートするすべてのエンドポイントカテゴリを取得できます。 ```shell -$ curl {% if currentVersion != "free-pro-team@latest" %}-u username:password {% endif %}{% data variables.product.api_url_pre %} +$ curl {% if enterpriseServerVersions contains currentVersion %}-u username:password {% endif %}{% data variables.product.api_url_pre %} ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/ja-JP/content/rest/reference/actions.md b/translations/ja-JP/content/rest/reference/actions.md index ace06f2133..060eafd319 100644 --- a/translations/ja-JP/content/rest/reference/actions.md +++ b/translations/ja-JP/content/rest/reference/actions.md @@ -26,7 +26,7 @@ versions: ## 権限 -The Permissions API allows you to set permissions for what organizations and repositories are allowed to run {% data variables.product.prodname_actions %}, and what actions are allowed to run. For more information, see "[Usage limits, billing, and administration](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)." +The Permissions API allows you to set permissions for what organizations and repositories are allowed to run {% data variables.product.prodname_actions %}, and what actions are allowed to run. 詳しい情報については、「[使用制限、支払い、および管理](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)」を参照してください。 You can also set permissions for an enterprise. 詳しい情報については、「[{% data variables.product.prodname_dotcom %} Enterprise 管理](/rest/reference/enterprise-admin#github-actions)」REST API を参照してください。 diff --git a/translations/ja-JP/content/rest/reference/apps.md b/translations/ja-JP/content/rest/reference/apps.md index 996fefb712..8569b85d39 100644 --- a/translations/ja-JP/content/rest/reference/apps.md +++ b/translations/ja-JP/content/rest/reference/apps.md @@ -61,3 +61,12 @@ Organization のすべての GitHub App インストレーションを一覧表 {% endfor %} {% endif %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +## webhook + +{% for operation in currentRestOperations %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} +{% endfor %} + +{% endif %} \ No newline at end of file diff --git a/translations/ja-JP/content/rest/reference/enterprise-admin.md b/translations/ja-JP/content/rest/reference/enterprise-admin.md index 41ed2381ac..a098b5d9eb 100644 --- a/translations/ja-JP/content/rest/reference/enterprise-admin.md +++ b/translations/ja-JP/content/rest/reference/enterprise-admin.md @@ -21,7 +21,7 @@ You can use these {{ site.data.variables.product.prodname_ghe_cloud }} endpoints {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### エンドポイント URL @@ -39,7 +39,7 @@ http(s)://hostname/ ### 認証 -{% data variables.product.product_name %} のインストールの API エンドポイントは、GitHub.com APIと[同じ認証方法](/rest/overview/resources-in-the-rest-api#authentication)を受け入れます。 **[OAuth トークン](/apps/building-integrations/setting-up-and-registering-oauth-apps/)**（[認証 API](/rest/reference/oauth-authorizations#create-a-new-authorization) を使用して作成可能）または **[Basic 認証](/rest/overview/resources-in-the-rest-api#basic-authentication)**で自分自身を認証できます。 {% if currentVersion != "free-pro-team@latest" %} OAuth tokens must have the `site_admin` [OAuth scope](/developers/apps/scopes-for-oauth-apps#available-scopes) when used with Enterprise-specific endpoints.{% endif %} +{% data variables.product.product_name %} のインストールの API エンドポイントは、GitHub.com APIと[同じ認証方法](/rest/overview/resources-in-the-rest-api#authentication)を受け入れます。 **[OAuth トークン](/apps/building-integrations/setting-up-and-registering-oauth-apps/)**（[認証 API](/rest/reference/oauth-authorizations#create-a-new-authorization) を使用して作成可能）または **[Basic 認証](/rest/overview/resources-in-the-rest-api#basic-authentication)**で自分自身を認証できます。 {% if enterpriseServerVersions contains currentVersion %}Enterprise 固有のエンドポイントで使用する場合、OAuthトークンには `site_admin` [OAuth スコープ](/developers/apps/scopes-for-oauth-apps#available-scopes)が必要です。{% endif %} Enterprise 管理 API エンドポイントには、認証された {% data variables.product.product_name %} サイト管理者のみがアクセスできます。ただし、[Management Console のパスワード](/enterprise/admin/articles/accessing-the-management-console/)が必要な [Management Console](#management-console) API は除きます。 @@ -135,7 +135,7 @@ GET /scim/v2/enterprises/{enterprise}/Users/{scim_user_id} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ## 管理統計 @@ -250,13 +250,13 @@ pre-receive 環境 API を使用すると、pre-receive フックの環境を作 | `image_url` | `string` | ダウンロードおよび抽出される tarball への URL。 | | `default_environment` | `boolean` | これが {% data variables.product.prodname_ghe_server %} に同梱されるデフォルト環境かどうか。 | | `download` | `オブジェクト` | この環境のダウンロードステータス。 | -| `hooks_count` | `整数` | この環境を使用する pre-receive フックの数。 | +| `hooks_count` | `integer` | この環境を使用する pre-receive フックの数。 | #### pre-receive 環境のダウンロード | 名前 | 種類 | 説明 | | --------------- | -------- | --------------------- | -| `状態` | `string` | 最新のダウンロードの状態。 | +| `state` | `string` | 最新のダウンロードの状態。 | | `downloaded_at` | `string` | 最新のダウンロードの開始時刻。 | | `message` | `string` | 失敗時に、エラーメッセージが生成されます。 | diff --git a/translations/ja-JP/content/rest/reference/gists.md b/translations/ja-JP/content/rest/reference/gists.md index e93581b893..0374313761 100644 --- a/translations/ja-JP/content/rest/reference/gists.md +++ b/translations/ja-JP/content/rest/reference/gists.md @@ -9,7 +9,7 @@ versions: ### 認証 -You can read public gists {% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "2.9" %}and create them for anonymous users without a token.{% else %} anonymously, but you must be signed into GitHub to create gists.{% endif %} To read or write gists on a user's behalf, you need the gist OAuth scope and a token. 詳しい情報については、「[OAuth App のスコープ](/developers/apps/scopes-for-oauth-apps)」を参照してください。 +パブリック Gist {% if enterpriseServerVersions contains currentVersion %} を読んで、トークンなしで匿名ユーザ向けに作成できます。{% else %} 匿名でも、Gist を作成するには GitHub にサインインする必要があります。{% endif %}ユーザに代わって Gist を読み書きするには、Gist OAuth スコープとトークンが必要です。 詳しい情報については、「[OAuth App のスコープ](/developers/apps/scopes-for-oauth-apps)」を参照してください。 diff --git a/translations/ja-JP/content/rest/reference/orgs.md b/translations/ja-JP/content/rest/reference/orgs.md index 70bb02e117..b72f52f7d0 100644 --- a/translations/ja-JP/content/rest/reference/orgs.md +++ b/translations/ja-JP/content/rest/reference/orgs.md @@ -56,5 +56,5 @@ webhook 設定に存在する可能性がある機密データを保護するた {% data variables.product.product_name %} は、イベントタイプとペイロード識別子を区別するために、複数の HTTP ヘッダーも送信します。 詳細は「[webhook ヘッダー](/webhooks/event-payloads/#delivery-headers)」を参照してください。 {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} diff --git a/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md b/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md index 7dbe0e191c..3580455f08 100644 --- a/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md +++ b/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md @@ -577,7 +577,7 @@ _Team_ - [`GET /orgs/:org/teams`](/v3/teams/#list-teams) (:read) - [`POST /orgs/:org/teams`](/v3/teams/#create-a-team) (:write) - [`GET /orgs/:org/teams/:team_slug`](/v3/teams/#get-a-team-by-name) (:read) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} - [`GET /teams/:team_id`](/v3/teams/#get-a-team) (:read) {% endif %} - [`PATCH /teams/:team_id`](/v3/teams/#update-a-team) (:write) @@ -619,7 +619,7 @@ _Team_ _Team_ - [`DELETE /teams/:team_id/projects/:project_id`](/v3/teams/#remove-a-project-from-a-team) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### "organization pre receive hooks"に対する権限 - [`GET /orgs/:org/pre-receive-hooks`](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-an-organization) (:read) @@ -766,7 +766,7 @@ _レビュー_ - [`POST /repos/:owner/:repo/hooks/:hook_id/pings`](/v3/repos/hooks/#ping-a-repository-webhook) (:read) - [`POST /repos/:owner/:repo/hooks/:hook_id/tests`](/v3/repos/hooks/#test-the-push-repository-webhook) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### "repository pre receive hooks"に対する権限 - [`GET /repos/:owner/:repo/pre-receive-hooks`](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-a-repository) (:read) diff --git a/translations/ja-JP/content/rest/reference/repos.md b/translations/ja-JP/content/rest/reference/repos.md index dead667bd2..d024bff162 100644 --- a/translations/ja-JP/content/rest/reference/repos.md +++ b/translations/ja-JP/content/rest/reference/repos.md @@ -263,7 +263,7 @@ Repository Webhooks API を使用すると、リポジトリ管理者がリポ Organization のすべてのリポジトリからイベントを受信するため単一の webhook を設定する場合は、[Organization Webhooks](/rest/reference/orgs#webhooks) の API ドキュメントを参照してください。 {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} ### webhook の受信 @@ -292,14 +292,14 @@ GitHub は、すべてのリポジトリに対する [PubSubHubbub](https://gith #### コールバック URL コールバック URL は `http://` プロトコルを使用できます。 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %}You can also `github://` callbacks to specify a GitHub service. +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %}You can also `github://` callbacks to specify a GitHub service. {% data reusables.apps.deprecating_github_services_ghe %} {% endif %} # Send updates to postbin.org http://postbin.org/123 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} # Send updates to Campfire github://campfire?subdomain=github&room=Commits&token=abc123 {% endif %} @@ -321,7 +321,7 @@ PubSubHubbub リクエストは複数回送信できます。 フックがすで | 名前 | 種類 | 説明 | | -------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `hub.mode` | `string` | **Required**. `subscribe` または `unsubscribe`。 | -| `hub.topic` | `string` | **Required**. GitHub リポジトリがサブスクライブする URI。 パスのフォーマットは `/{owner}/{repo}/events/{event}` としてください。 | +| `hub.mode` | `string` | **必須**。 `subscribe` または `unsubscribe`。 | +| `hub.topic` | `string` | **必須**。 GitHub リポジトリがサブスクライブする URI。 パスのフォーマットは `/{owner}/{repo}/events/{event}` としてください。 | | `hub.callback` | `string` | トピックの更新を受信する URI。 | | `hub.secret` | `string` | 送信する本文コンテンツの SHA1 HMAC を生成する共有秘密鍵。 Raw 形式のリクエスト本文と、`X-Hub-Signature` ヘッダのコンテンツを比較することで、 GitHub からのプッシュを検証できます。 詳細は、 [PubSubHubbub のドキュメント](https://pubsubhubbub.github.io/PubSubHubbub/pubsubhubbub-core-0.4.html#authednotify)を参照してください。 | diff --git a/translations/ja-JP/data/reusables/actions/actions-not-verified.md b/translations/ja-JP/data/reusables/actions/actions-not-verified.md index cb26fa9d61..2ab85ce6c1 100644 --- a/translations/ja-JP/data/reusables/actions/actions-not-verified.md +++ b/translations/ja-JP/data/reusables/actions/actions-not-verified.md @@ -1 +1 @@ -Anyone can publish an action in {% data variables.product.prodname_marketplace %} as long as they meet the terms of service. Unlike apps, {% data variables.product.prodname_actions %} listed in {% data variables.product.prodname_marketplace %} are not verified by {% data variables.product.prodname_dotcom %}. +Anyone can publish an action in {% data variables.product.prodname_marketplace %}. {% data variables.product.prodname_dotcom %} verifies some partner organizations, but unlike verified apps, {% data variables.product.prodname_dotcom %} does not review or verify individual actions listed in {% data variables.product.prodname_marketplace %}. diff --git a/translations/ja-JP/data/reusables/actions/enterprise-beta.md b/translations/ja-JP/data/reusables/actions/enterprise-beta.md index 30eac75a91..7a869095a1 100644 --- a/translations/ja-JP/data/reusables/actions/enterprise-beta.md +++ b/translations/ja-JP/data/reusables/actions/enterprise-beta.md @@ -1,7 +1,7 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.22" %} {% note %} -**Note:** {% data variables.product.prodname_actions %} support on {% data variables.product.prodname_ghe_server %} 2.22 is a limited public beta. To review the external storage requirements and request access to the beta, see "[Enabling {% data variables.product.prodname_actions %} and configuring storage](/enterprise/admin/github-actions/enabling-github-actions-and-configuring-storage)." +**注釈:** {% data variables.product.prodname_ghe_server %} 2.22 での {% data variables.product.prodname_actions %} サポートは、限定パブリックベータです。 To review the external storage requirements and request access to the beta, see "[Enabling {% data variables.product.prodname_actions %} and configuring storage](/enterprise/admin/github-actions/enabling-github-actions-and-configuring-storage)." {% endnote %} {% endif %} diff --git a/translations/ja-JP/data/reusables/actions/enterprise-github-hosted-runners.md b/translations/ja-JP/data/reusables/actions/enterprise-github-hosted-runners.md index 178bf09abe..948121d881 100644 --- a/translations/ja-JP/data/reusables/actions/enterprise-github-hosted-runners.md +++ b/translations/ja-JP/data/reusables/actions/enterprise-github-hosted-runners.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} {% note %} **Note:** {% data variables.product.prodname_dotcom %}-hosted runners are not currently supported on {% data variables.product.prodname_ghe_server %}. You can see more information about planned future support on the [{% data variables.product.prodname_roadmap %}](https://github.com/github/roadmap/issues/72). diff --git a/translations/ja-JP/data/reusables/actions/enterprise-marketplace-actions.md b/translations/ja-JP/data/reusables/actions/enterprise-marketplace-actions.md index e67f66b1d4..a4e6cdf8de 100644 --- a/translations/ja-JP/data/reusables/actions/enterprise-marketplace-actions.md +++ b/translations/ja-JP/data/reusables/actions/enterprise-marketplace-actions.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/ja-JP/data/reusables/actions/enterprise-setup-prereq.md b/translations/ja-JP/data/reusables/actions/enterprise-setup-prereq.md index 3ead3e20f9..6646511192 100644 --- a/translations/ja-JP/data/reusables/actions/enterprise-setup-prereq.md +++ b/translations/ja-JP/data/reusables/actions/enterprise-setup-prereq.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} #### Using self-hosted runners on {% data variables.product.prodname_ghe_server %} diff --git a/translations/ja-JP/data/reusables/apps/deprecating_auth_with_query_parameters.md b/translations/ja-JP/data/reusables/apps/deprecating_auth_with_query_parameters.md index 0754e55f81..084b479845 100644 --- a/translations/ja-JP/data/reusables/apps/deprecating_auth_with_query_parameters.md +++ b/translations/ja-JP/data/reusables/apps/deprecating_auth_with_query_parameters.md @@ -3,7 +3,7 @@ **非推奨の注意:** {% data variables.product.prodname_dotcom %}は、クエリパラメータを使ったAPIの認証を廃止します。 Authenticating to the API should be done with [HTTP basic authentication](/v3/auth/#via-oauth-and-personal-access-tokens).{% if currentVersion == "free-pro-team@latest" %} Using query parameters to authenticate to the API will no longer work on May 5, 2021. {% endif %}予定された一時停止を含む詳しい情報については[ブログポスト](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/)を参照してください。 -{% if currentVersion != "free-pro-team@latest" %} Authentication to the API using query parameters while available is no longer supported due to security concerns. その代わりに、インテグレータはアクセストークン、`client_id`もしくは`client_secret`をヘッダに移すことをおすすめします。 {% data variables.product.prodname_dotcom %}は、クエリパラメータによる認証の削除を、事前に通知します。 {% endif %} +{% if enterpriseServerVersions contains currentVersion %}クエリパラメータを使ったAPIの認証は、利用はできるものの、セキュリティ上の懸念からサポートされなくなりました。 その代わりに、インテグレータはアクセストークン、`client_id`もしくは`client_secret`をヘッダに移すことをおすすめします。 {% data variables.product.prodname_dotcom %}は、クエリパラメータによる認証の削除を、事前に通知します。 {% endif %} {% endwarning %} {% endif %} diff --git a/translations/ja-JP/data/reusables/apps/deprecating_github_services_ghe.md b/translations/ja-JP/data/reusables/apps/deprecating_github_services_ghe.md index 0690e7c226..b3c74c5bfd 100644 --- a/translations/ja-JP/data/reusables/apps/deprecating_github_services_ghe.md +++ b/translations/ja-JP/data/reusables/apps/deprecating_github_services_ghe.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% note %} **ノート:** GitHub Enterprise リリース2.17以降では、管理者が新しいGitHub Servicesをインストールすることはできなくなっており、既存のサービスはGitHub Enterprise 2.20以降で動作しなくなります。 サービスをwebhookに更新するためには、[GitHub Servicesの置き換えガイド](/v3/guides/replacing-github-services)が利用できます。 diff --git a/translations/ja-JP/data/reusables/apps/deprecating_password_auth.md b/translations/ja-JP/data/reusables/apps/deprecating_password_auth.md index db78ef5d51..d4c9690fbc 100644 --- a/translations/ja-JP/data/reusables/apps/deprecating_password_auth.md +++ b/translations/ja-JP/data/reusables/apps/deprecating_password_auth.md @@ -3,7 +3,7 @@ **非推奨の注意:** {% data variables.product.prodname_dotcom %}は、APIのパスワード認証を廃止します。 You must now authenticate to the {% data variables.product.prodname_dotcom %} API with an API token, such as an OAuth access token, GitHub App installation access token, or personal access token, depending on what you need to do with the token.{% if currentVersion == "free-pro-team@latest" %} Password authentication to the API will be removed on November 13, 2020.{% endif %} For more information,{% if currentVersion == "free-pro-team@latest" %} including scheduled brownouts,{% endif %} see the [blog post](https://developer.github.com/changes/2020-02-14-deprecating-password-auth/). -{% if currentVersion != "free-pro-team@latest" %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %}は、この機能のサポートの削除に先立って、非推奨化を告知し、通知を行います。{% endif %} +{% if enterpriseServerVersions contains currentVersion %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %}は、この機能のサポートの削除に先立って、非推奨化を告知し、通知を行います。{% endif %} {% endwarning %} {% endif %} diff --git a/translations/ja-JP/data/reusables/apps/deprecating_token_oauth_authorizations.md b/translations/ja-JP/data/reusables/apps/deprecating_token_oauth_authorizations.md index 7bd0d49516..333f7b3f53 100644 --- a/translations/ja-JP/data/reusables/apps/deprecating_token_oauth_authorizations.md +++ b/translations/ja-JP/data/reusables/apps/deprecating_token_oauth_authorizations.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% warning %} **Deprecation Notice:** The `token` attribute is deprecated in some OAuth Authorizations API responses: diff --git a/translations/ja-JP/data/reusables/cli/filter-issues-and-pull-requests-tip.md b/translations/ja-JP/data/reusables/cli/filter-issues-and-pull-requests-tip.md index 949b7938db..3bea719f94 100644 --- a/translations/ja-JP/data/reusables/cli/filter-issues-and-pull-requests-tip.md +++ b/translations/ja-JP/data/reusables/cli/filter-issues-and-pull-requests-tip.md @@ -1,7 +1,7 @@ {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} {% tip %} -**Tip**: You can also filter issues or pull requests using the {% data variables.product.prodname_cli %}. For more information, see "[`gh issue list`](https://cli.github.com/manual/gh_issue_list)" or "[`gh pr list`](https://cli.github.com/manual/gh_pr_list)" in the {% data variables.product.prodname_cli %} documentation. +**Tip**: You can also filter issues or pull requests using the {% data variables.product.prodname_cli %}. 詳しい情報については、ドキュメントの「[`gh issue list`](https://cli.github.com/manual/gh_issue_list)」または「[`gh pr list`](https://cli.github.com/manual/gh_pr_list)」{% data variables.product.prodname_cli %} を参照してください。 {% endtip %} {% endif %} diff --git a/translations/ja-JP/data/reusables/code-scanning/choose-alert-dismissal-reason.md b/translations/ja-JP/data/reusables/code-scanning/choose-alert-dismissal-reason.md new file mode 100644 index 0000000000..e7abf5ece7 --- /dev/null +++ b/translations/ja-JP/data/reusables/code-scanning/choose-alert-dismissal-reason.md @@ -0,0 +1 @@ +It's important to choose the appropriate reason from the drop-down menu as this may affect whether a query continues to be included in future analysis. \ No newline at end of file diff --git a/translations/ja-JP/data/reusables/code-scanning/false-positive-fix-codeql.md b/translations/ja-JP/data/reusables/code-scanning/false-positive-fix-codeql.md index db3da9c9d5..011f129f12 100644 --- a/translations/ja-JP/data/reusables/code-scanning/false-positive-fix-codeql.md +++ b/translations/ja-JP/data/reusables/code-scanning/false-positive-fix-codeql.md @@ -1 +1 @@ -If you close a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." +If you {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." diff --git a/translations/ja-JP/data/reusables/dependabot/automated-tests-note.md b/translations/ja-JP/data/reusables/dependabot/automated-tests-note.md new file mode 100644 index 0000000000..1f15a27f8e --- /dev/null +++ b/translations/ja-JP/data/reusables/dependabot/automated-tests-note.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** It's good practice to have automated tests and acceptance processes in place so that checks are carried out before the pull request is merged. This is particularly important if the suggested version to upgrade to contains additional functionality, or a change that breaks your project's code. For more information about continuous integration, see "[About continuous integration](/actions/building-and-testing-code-with-continuous-integration/about-continuous-integration)." + +{% endnote %} diff --git a/translations/ja-JP/data/reusables/dependabot/pull-request-introduction.md b/translations/ja-JP/data/reusables/dependabot/pull-request-introduction.md new file mode 100644 index 0000000000..8fabb1f455 --- /dev/null +++ b/translations/ja-JP/data/reusables/dependabot/pull-request-introduction.md @@ -0,0 +1 @@ +{% data variables.product.prodname_dependabot %} は、依存関係を更新するプルリクエストを生成します。 リポジトリの設定によっては、{% data variables.product.prodname_dependabot_short %} がバージョン更新やセキュリティアップデートのプルリクエストを発行する場合があります。 これらのプルリクエストは、他のプルリクエストと同じ方法で管理しますが、追加のコマンドもいくつか用意されています。 {% data variables.product.prodname_dependabot %} 依存関係の更新を有効にする方法については、「[{% data variables.product.prodname_dependabot_security_updates %} を構成する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」および「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。 \ No newline at end of file diff --git a/translations/ja-JP/data/reusables/dependabot/supported-package-managers.md b/translations/ja-JP/data/reusables/dependabot/supported-package-managers.md index 0dd99cb104..b8ed930cec 100644 --- a/translations/ja-JP/data/reusables/dependabot/supported-package-managers.md +++ b/translations/ja-JP/data/reusables/dependabot/supported-package-managers.md @@ -7,7 +7,7 @@ | Elm: `elm` | | | gitサブモジュール:`gitsubmodule` | | | GitHub Actions: `github-actions` | | -| Goモジュール:`gomod` | | +| Goモジュール:`gomod` | **X** | | Gradle: `gradle` | | | Maven: `maven` | | | Mix: `mix` | | diff --git a/translations/ja-JP/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md b/translations/ja-JP/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md new file mode 100644 index 0000000000..3c14a76185 --- /dev/null +++ b/translations/ja-JP/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md @@ -0,0 +1,5 @@ +1. {% data variables.product.prodname_dotcom_the_website %}に移動します。 + +1. In the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) + +1. In the list of enterprises, click the enterprise you want to view. ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png) diff --git a/translations/ja-JP/data/reusables/enterprise-accounts/access-enterprise.md b/translations/ja-JP/data/reusables/enterprise-accounts/access-enterprise.md index 2a7bee222c..66edf20433 100644 --- a/translations/ja-JP/data/reusables/enterprise-accounts/access-enterprise.md +++ b/translations/ja-JP/data/reusables/enterprise-accounts/access-enterprise.md @@ -1,3 +1,17 @@ -1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on GitHub](/assets/images/help/enterprises/your-enterprises.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) 1. In the list of enterprises, click the enterprise you want to view. ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png) + +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %} + +1. Navigate to your enterprise account by visiting {% raw %}https://HOSTNAME/enterprises/ENTERPRISE-NAME{% endraw %}, replacing `HOSTNAME` with your instance's hostname and `ENTERPRISE-NAME` with your enterprise account's name. + +{% elsif enterpriseServerVersions contains currentVersion %} + +1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Enterprise settings**. !["Enterprise settings" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/enterprise/settings/enterprise-settings.png) + +{% endif %} diff --git a/translations/ja-JP/data/reusables/enterprise-accounts/license-tab.md b/translations/ja-JP/data/reusables/enterprise-accounts/license-tab.md index 752a146b2c..1e99849fde 100644 --- a/translations/ja-JP/data/reusables/enterprise-accounts/license-tab.md +++ b/translations/ja-JP/data/reusables/enterprise-accounts/license-tab.md @@ -1 +1,9 @@ -1. 左のサイドバーで**License（ライセンス）**をクリックしてください。 ![Enterpriseサーバー設定サイドバー内のライセンスタブ](/assets/images/enterprise/business-accounts/license-tab.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. 左のサイドバーで、** Enterprise licensing（Enterpriseライセンス）**をクリックしてください。 ![[Enterprise account settings] サイトバーの "Enterprise licensing"](/assets/images/help/enterprises/enterprise-licensing-tab.png) + +{% else %} + +1. 左のサイドバーで**License（ライセンス）**をクリックしてください。 !["License" tab in the enterprise account settings sidebar](/assets/images/enterprise/enterprises/license.png) + +{% endif %} diff --git a/translations/ja-JP/data/reusables/enterprise/rate_limit.md b/translations/ja-JP/data/reusables/enterprise/rate_limit.md index 29a4b2e9a9..edb687fcaa 100644 --- a/translations/ja-JP/data/reusables/enterprise/rate_limit.md +++ b/translations/ja-JP/data/reusables/enterprise/rate_limit.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Note that the limits mentioned above are the default rate limits for a {% data variables.product.prodname_ghe_server %} インスタンスのホスト名に置き換えてください。 Contact your site administrator to confirm if rate limits are enabled and how they are configured. {% endif %} diff --git a/translations/ja-JP/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md b/translations/ja-JP/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md index 387360d214..ad53520f2b 100644 --- a/translations/ja-JP/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md +++ b/translations/ja-JP/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md @@ -9,7 +9,7 @@ - Choose **{% data variables.product.support_ticket_priority_urgent %}** to report {% if currentVersion == "free-pro-team@latest" %}critical system failure{% else %}fatal system failures, outages impacting critical system operations, security incidents, and expired licenses{% endif %}. - Choose **{% data variables.product.support_ticket_priority_high %}** to report issues impacting business operations, including {% if currentVersion == "free-pro-team@latest" %}removing sensitive data (commits, issues, pull requests, uploaded attachments) from your own accounts and organization restorations{% else %}system performance issues{% endif %}, or to report critical bugs. - Choose **{% data variables.product.support_ticket_priority_normal %}** to {% if currentVersion == "free-pro-team@latest" %}request account recovery or spam unflagging, report user login issues{% else %}make technical requests like configuration changes and third-party integrations{% endif %}, and to report non-critical bugs. - - Choose **{% data variables.product.support_ticket_priority_low %}** to ask general questions and submit requests for new features, purchases, training, or health checks.{% if currentVersion != "free-pro-team@latest" %} + - 一般的な質問や、新機能のリクエストのサブミット、購入、トレーニング、ヘルスチェックについては**{% data variables.product.support_ticket_priority_low %}**を選択してください。{% if enterpriseServerVersions contains currentVersion %} 1. From the " {% data variables.product.prodname_enterprise %} Series" drop-down menu, select the version of {% data variables.product.prodname_ghe_server %} you're using. ![{% data variables.product.prodname_enterprise %} シリーズ ドロップダウンメニュー](/assets/images/enterprise/support/support-ticket-ghes-series.png) diff --git a/translations/ja-JP/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md b/translations/ja-JP/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md index c93bc74a4c..22a95b7230 100644 --- a/translations/ja-JP/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md +++ b/translations/ja-JP/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md @@ -1,5 +1,5 @@ 1. **Submit（サブミット）**をクリックしてください。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If you chose not to include diagnostics with your support ticket, you can share diagnostic information with {% data variables.product.prodname_enterprise %} Support after submitting your support request. 詳細は「[{% data variables.product.prodname_dotcom %} Support にデータを提供する](/enterprise/admin/guides/enterprise-support/providing-data-to-github-support)」を参照してください。{% endif %} diff --git a/translations/ja-JP/data/reusables/enterprise_installation/aws-recommended-instance-types.md b/translations/ja-JP/data/reusables/enterprise_installation/aws-recommended-instance-types.md index ae85302b0d..a822d49420 100644 --- a/translations/ja-JP/data/reusables/enterprise_installation/aws-recommended-instance-types.md +++ b/translations/ja-JP/data/reusables/enterprise_installation/aws-recommended-instance-types.md @@ -1,5 +1,5 @@ ユーザライセンス数に応じて、以下のインスタンスタイプをおすすめします。 | -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} | ユーザライセンス | 推奨タイプ | |:---------------------- | ----------:| | トライアル、デモ、あるいは10人の軽量ユーザ | r4.large | diff --git a/translations/ja-JP/data/reusables/enterprise_installation/aws-supported-instance-types.md b/translations/ja-JP/data/reusables/enterprise_installation/aws-supported-instance-types.md index 7251adf59c..264172e0c2 100644 --- a/translations/ja-JP/data/reusables/enterprise_installation/aws-supported-instance-types.md +++ b/translations/ja-JP/data/reusables/enterprise_installation/aws-supported-instance-types.md @@ -28,9 +28,9 @@ | ------------ | -------------------------------------------------------------------- | | R4 | r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge | -| EC2インスタンスタイプ | モデル | -| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} +| EC2インスタンスタイプ | モデル | +| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} | EC2インスタンスタイプ | モデル | | ------------ | ------------------------ | diff --git a/translations/ja-JP/data/reusables/files/add-file.md b/translations/ja-JP/data/reusables/files/add-file.md index daf8d37dba..9eaecc80e4 100644 --- a/translations/ja-JP/data/reusables/files/add-file.md +++ b/translations/ja-JP/data/reusables/files/add-file.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Above the list of files, click **Create new file**. !["Create new file" button](/assets/images/help/repository/create_new_file.png) {% else %} 1. Above the list of files, using the **Add file** drop-down, click **Create new file**. !["Create new file" in the "Add file" dropdown](/assets/images/help/repository/create_new_file.png) diff --git a/translations/ja-JP/data/reusables/files/commit-author-email-options.md b/translations/ja-JP/data/reusables/files/commit-author-email-options.md index d715584694..c911684a11 100644 --- a/translations/ja-JP/data/reusables/files/commit-author-email-options.md +++ b/translations/ja-JP/data/reusables/files/commit-author-email-options.md @@ -1,4 +1,4 @@ {% if currentVersion == "free-pro-team@latest" %} If you haven't enabled email address privacy, you can choose which verified email address to author changes with when you edit, delete, or create files or merge a pull request on -{% data variables.product.product_name %}. メールアドレスのプライバシーを有効化しているなら、コミット作者のメールアドレスは変更できず、デフォルトで`@users.noreply.github.com`になります。 +{% data variables.product.product_name %} の Enterprise 設定を使用してアナウンスバナーを設定することもできます。 メールアドレスのプライバシーを有効化しているなら、コミット作者のメールアドレスは変更できず、デフォルトで`@users.noreply.github.com`になります。 {% endif %} diff --git a/translations/ja-JP/data/reusables/gated-features/code-scanning.md b/translations/ja-JP/data/reusables/gated-features/code-scanning.md index a1aca3e675..2bcd80c1d4 100644 --- a/translations/ja-JP/data/reusables/gated-features/code-scanning.md +++ b/translations/ja-JP/data/reusables/gated-features/code-scanning.md @@ -1 +1 @@ -{% data variables.product.prodname_code_scanning_capc %} is available in public repositories, and in public and private repositories owned by organizations with a license for {% data variables.product.prodname_advanced_security %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +{% data variables.product.prodname_code_scanning_capc %} is available {% if currentVersion == "free-pro-team@latest" %}in public repositories, and in private repositories owned by organizations with {% else %}if you have {% endif %}an {% data variables.product.prodname_advanced_security %} license. {% data reusables.gated-features.more-info %} diff --git a/translations/ja-JP/data/reusables/gated-features/draft-prs.md b/translations/ja-JP/data/reusables/gated-features/draft-prs.md index 0379025602..52b7344ec8 100644 --- a/translations/ja-JP/data/reusables/gated-features/draft-prs.md +++ b/translations/ja-JP/data/reusables/gated-features/draft-prs.md @@ -1 +1 @@ -Draft pull requests are 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 %}{% if currentVersion != "free-pro-team@latest" %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +Draft pull requests are 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 %}{% if enterpriseServerVersions contains currentVersion %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} diff --git a/translations/ja-JP/data/reusables/gist/anonymous-gists-cannot-be-deleted.md b/translations/ja-JP/data/reusables/gist/anonymous-gists-cannot-be-deleted.md index aa2c0491af..19a2f699f2 100644 --- a/translations/ja-JP/data/reusables/gist/anonymous-gists-cannot-be-deleted.md +++ b/translations/ja-JP/data/reusables/gist/anonymous-gists-cannot-be-deleted.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% warning %} **警告：** 匿名GistはWebブラウザーからは削除できません。 匿名Gistを削除するには、{% data variables.contact.contact_support %}に連絡してください。 削除したいGistのURLを提供してください。 diff --git a/translations/ja-JP/data/reusables/github-actions/macos-runner-preview.md b/translations/ja-JP/data/reusables/github-actions/macos-runner-preview.md new file mode 100644 index 0000000000..88a2d482c4 --- /dev/null +++ b/translations/ja-JP/data/reusables/github-actions/macos-runner-preview.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** The MacOS 11.0 virtual environment is currently provided as a preview only. The `macos-latest` YAML workflow label still uses the MacOS 10.15 virtual environment. + +{% endnote %} diff --git a/translations/ja-JP/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md b/translations/ja-JP/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md index 0313546827..939efb7367 100644 --- a/translations/ja-JP/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md +++ b/translations/ja-JP/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md @@ -1,9 +1,9 @@ -A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. セルフホストランナーを管理するには、セルフホストランナーが追加された場所に応じて以下の権限が必要になります。 +A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. セルフホストランナーを管理するには、セルフホストランナーが追加された場所に応じて以下の権限が必要になります。 - **User repository**: You must be the repository owner. - **Organization**: You must be an organization owner. - **Organization repository**: You must be an organization owner, or have admin access to the repository. {% if currentVersion == "free-pro-team@latest" %} - **Enterprise account**: You must be an enterprise owner. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} - **Enterprise**: You must be a {% data variables.product.prodname_enterprise %} site administrator. {% endif %} diff --git a/translations/ja-JP/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md b/translations/ja-JP/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md index fc334669d6..a8ad1ec018 100644 --- a/translations/ja-JP/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md +++ b/translations/ja-JP/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md @@ -1,6 +1,6 @@ 1. Navigate to where your self-hosted runner is registered: * **In an organization or repository**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. - * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: 1. 任意のページの右上で {% octicon "rocket" aria-label="The rocket ship" %} をクリックします。 1. In the left sidebar, click **Enterprise overview**. @@ -9,4 +9,4 @@ * **In an organization or repository**: click **Actions** in the left sidebar. ![アクションの設定](/assets/images/help/settings/settings-sidebar-actions.png) - * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". diff --git a/translations/ja-JP/data/reusables/github-actions/supported-github-runners.md b/translations/ja-JP/data/reusables/github-actions/supported-github-runners.md index d02d11e319..38516f39fc 100644 --- a/translations/ja-JP/data/reusables/github-actions/supported-github-runners.md +++ b/translations/ja-JP/data/reusables/github-actions/supported-github-runners.md @@ -4,4 +4,5 @@ | Ubuntu 20.04 | `ubuntu-20.04` | | Ubuntu 18.04 | `ubuntu-latest`または`ubuntu-18.04` | | Ubuntu 16.04 | `ubuntu-16.04` | +| macOS Big Sur 11.0 | `macos-11.0` | | macOS Catalina 10.15 | `macos-latest`もしくは`macos-10.15` | diff --git a/translations/ja-JP/data/reusables/github-actions/usage-matrix-limits.md b/translations/ja-JP/data/reusables/github-actions/usage-matrix-limits.md index 203db11d30..f9f09e4e19 100644 --- a/translations/ja-JP/data/reusables/github-actions/usage-matrix-limits.md +++ b/translations/ja-JP/data/reusables/github-actions/usage-matrix-limits.md @@ -1 +1 @@ -- **Job matrix** - A job matrix can generate a maximum of 256 jobs per workflow run. この制限は、セルフホストランナーにも適用されます。 +ジョブマトリックスは、ワークフローの実行ごとに最大で256のジョブを生成できます。 この制限は、セルフホストランナーにも適用されます。 diff --git a/translations/ja-JP/data/reusables/issue-events/issue-event-common-properties.md b/translations/ja-JP/data/reusables/issue-events/issue-event-common-properties.md index 2d756da5f0..6872d48d33 100644 --- a/translations/ja-JP/data/reusables/issue-events/issue-event-common-properties.md +++ b/translations/ja-JP/data/reusables/issue-events/issue-event-common-properties.md @@ -1,10 +1,10 @@ -| 名前 | 種類 | 説明 | -| ------------ | -------- | -------------------------------------------------------------------- | -| `id` | `整数` | The unique identifier of the event. | -| `node_id` | `string` | The [Global Node ID](/v4/guides/using-global-node-ids) of the event. | -| `url` | `string` | The REST API URL for fetching the event. | -| `actor` | `オブジェクト` | The person who generated the event. | -| `event` | `string` | Identifies the actual type of event that occurred. | -| `commit_id` | `string` | The SHA of the commit that referenced this issue. | -| `commit_url` | `string` | The GitHub REST API link to the commit that referenced this issue. | -| `created_at` | `string` | The timestamp indicating when the event occurred. | +| 名前 | 種類 | 説明 | +| ------------ | --------- | -------------------------------------------------------------------- | +| `id` | `integer` | The unique identifier of the event. | +| `node_id` | `string` | The [Global Node ID](/v4/guides/using-global-node-ids) of the event. | +| `url` | `string` | The REST API URL for fetching the event. | +| `actor` | `オブジェクト` | The person who generated the event. | +| `event` | `string` | Identifies the actual type of event that occurred. | +| `commit_id` | `string` | The SHA of the commit that referenced this issue. | +| `commit_url` | `string` | The GitHub REST API link to the commit that referenced this issue. | +| `created_at` | `string` | The timestamp indicating when the event occurred. | diff --git a/translations/ja-JP/data/reusables/marketplace/github_apps_preferred.md b/translations/ja-JP/data/reusables/marketplace/github_apps_preferred.md index c9ccbece0d..5cd2a753aa 100644 --- a/translations/ja-JP/data/reusables/marketplace/github_apps_preferred.md +++ b/translations/ja-JP/data/reusables/marketplace/github_apps_preferred.md @@ -1 +1 @@ -GitHub Apps are the officially recommended way to integrate with GitHub because they offer much more granular permissions to access data +GitHub Appsは、データへのアクセスについてより細やかな権限を提供することから、GitHubとのインテグレーションのための公式に推奨される方式ですが diff --git a/translations/ja-JP/data/reusables/marketplace/unverified-apps.md b/translations/ja-JP/data/reusables/marketplace/unverified-apps.md index b7ce68277e..f2a5380110 100644 --- a/translations/ja-JP/data/reusables/marketplace/unverified-apps.md +++ b/translations/ja-JP/data/reusables/marketplace/unverified-apps.md @@ -1 +1 @@ -Unverified apps are only offered with free plans. To list paid plans, you must submit a verified app. +未検証のアプリケーションは、Freeプランでのみ提供されます。 有料プランでリストされるには、検証済みアプリケーションをサブミットしなければなりません。 diff --git a/translations/ja-JP/data/reusables/notifications/outbound_email_tip.md b/translations/ja-JP/data/reusables/notifications/outbound_email_tip.md index c8b4b59d36..9b604f166e 100644 --- a/translations/ja-JP/data/reusables/notifications/outbound_email_tip.md +++ b/translations/ja-JP/data/reusables/notifications/outbound_email_tip.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} {% data variables.product.product_location_enterprise %}上でアウトバウンドメールのサポートが有効化されている場合にのみ、メール通知を受信することになります。 詳しい情報については、サイト管理者にお問い合わせください。 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 new file mode 100644 index 0000000000..6b3de47d4c --- /dev/null +++ b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md @@ -0,0 +1,3 @@ +You can choose the delivery method for notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} on repositories that you are watching, 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-options.md b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-options.md new file mode 100644 index 0000000000..29e67dd447 --- /dev/null +++ b/translations/ja-JP/data/reusables/notifications/vulnerable-dependency-notification-options.md @@ -0,0 +1,33 @@ +{% if currentVersion == "free-pro-team@latest" %} +By default, you will receive +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) + +You can customize the way you are notified about security alerts. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} diff --git a/translations/ja-JP/data/reusables/package_registry/admins-can-configure-package-types.md b/translations/ja-JP/data/reusables/package_registry/admins-can-configure-package-types.md index 029a213121..19d73a41f7 100644 --- a/translations/ja-JP/data/reusables/package_registry/admins-can-configure-package-types.md +++ b/translations/ja-JP/data/reusables/package_registry/admins-can-configure-package-types.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **Note:** This package type may not be available for your instance, because site administrators can enable or disable each supported package type. 詳しい情報については、「[Enterprise 向けのパッケージサポートを設定する](/enterprise/admin/packages/configuring-packages-support-for-your-enterprise)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/package_registry/docker_registry_deprecation_status.md b/translations/ja-JP/data/reusables/package_registry/docker_registry_deprecation_status.md index 79e9650f34..2df9364c31 100644 --- a/translations/ja-JP/data/reusables/package_registry/docker_registry_deprecation_status.md +++ b/translations/ja-JP/data/reusables/package_registry/docker_registry_deprecation_status.md @@ -1,5 +1,5 @@ {% warning %} -**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if currentVersion != "free-pro-team@latest" %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} +**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if enterpriseServerVersions contains currentVersion %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} {% endwarning %} diff --git a/translations/ja-JP/data/reusables/package_registry/packages-ghes-release-stage.md b/translations/ja-JP/data/reusables/package_registry/packages-ghes-release-stage.md index 66d73926c6..03d9b25f84 100644 --- a/translations/ja-JP/data/reusables/package_registry/packages-ghes-release-stage.md +++ b/translations/ja-JP/data/reusables/package_registry/packages-ghes-release-stage.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **Note:** {% data variables.product.prodname_registry %} is currently in beta for {% data variables.product.prodname_ghe_server %} 2.22. To join the beta for your instance, use the [sign-up form](https://resources.github.com/beta-signup/). diff --git a/translations/ja-JP/data/reusables/pages/build-failure-email-server.md b/translations/ja-JP/data/reusables/pages/build-failure-email-server.md index df9faf50db..8f16d38a7d 100644 --- a/translations/ja-JP/data/reusables/pages/build-failure-email-server.md +++ b/translations/ja-JP/data/reusables/pages/build-failure-email-server.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} {% data variables.product.product_location_enterprise %}上でアウトバウンドメールのサポートが有効化されている場合にのみ、メールを受信することになります。 詳しい情報については、サイト管理者にお問い合わせください。 diff --git a/translations/ja-JP/data/reusables/pages/build-locally-download-cname.md b/translations/ja-JP/data/reusables/pages/build-locally-download-cname.md index e552ba15b3..5d47eaad14 100644 --- a/translations/ja-JP/data/reusables/pages/build-locally-download-cname.md +++ b/translations/ja-JP/data/reusables/pages/build-locally-download-cname.md @@ -1 +1 @@ -1. 静的サイトジェネレータを使ってローカルでサイトを構築し、生成されたファイルを{% data variables.product.product_name %}にプッシュしてイルなら、ローカルのリポジトリに_CNAME_ファイルを追加したコミットをプルしてください。 詳しい情報については「[カスタムドメインと{% data variables.product.prodname_pages %}のトラブルシューティング](/articles/troubleshooting-custom-domains-and-github-pages#cname-errors)」を参照してください。 +1. 静的サイトジェネレータを使ってローカルでサイトを構築し、生成されたファイルを{% data variables.product.product_name %}にプッシュしているなら、ローカルのリポジトリに_CNAME_ファイルを追加したコミットをプルしてください。 詳しい情報については「[カスタムドメインと{% data variables.product.prodname_pages %}のトラブルシューティング](/articles/troubleshooting-custom-domains-and-github-pages#cname-errors)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/pages/private_pages_are_public_warning.md b/translations/ja-JP/data/reusables/pages/private_pages_are_public_warning.md index 2579c5d10f..f6006eee2c 100644 --- a/translations/ja-JP/data/reusables/pages/private_pages_are_public_warning.md +++ b/translations/ja-JP/data/reusables/pages/private_pages_are_public_warning.md @@ -1,5 +1,5 @@ {% warning %} - **Warning**: {% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. If you have sensitive data in your site's repository, you may want to remove it before publishing. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." + **Warning**: {% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. サイトのリポジトリにセンシティブなデータがあるなら、公開前にそれを取り除くのが良いでしょう。 詳しい情報については{% if enterpriseServerVersions contains currentVersion %}「[アプライアンス上での{% data variables.product.prodname_pages %}の設定](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)」及び{% endif %}「[リポジトリの可視性について](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)」を参照してください。 {% endwarning %} diff --git a/translations/ja-JP/data/reusables/pre-release-program/fury-pre-release.md b/translations/ja-JP/data/reusables/pre-release-program/fury-pre-release.md index 5e63be7160..25b74a97ea 100644 --- a/translations/ja-JP/data/reusables/pre-release-program/fury-pre-release.md +++ b/translations/ja-JP/data/reusables/pre-release-program/fury-pre-release.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% note %} **Note:** {% data variables.product.prodname_github_app %} Manifests are currently available for developers to preview. To access this API during the preview period, you must provide a custom [media type](/v3/media) in the `Accept` header: diff --git a/translations/ja-JP/data/reusables/pre-release-program/machine-man-preview.md b/translations/ja-JP/data/reusables/pre-release-program/machine-man-preview.md index bdcee03dec..d18399b663 100644 --- a/translations/ja-JP/data/reusables/pre-release-program/machine-man-preview.md +++ b/translations/ja-JP/data/reusables/pre-release-program/machine-man-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **Note:** To access the API with your GitHub App, you must provide a custom [media type](/v3/media) in the `Accept` Header for your requests. diff --git a/translations/ja-JP/data/reusables/pre-release-program/sailor-v-preview.md b/translations/ja-JP/data/reusables/pre-release-program/sailor-v-preview.md index 271ed23002..fcf2e98e68 100644 --- a/translations/ja-JP/data/reusables/pre-release-program/sailor-v-preview.md +++ b/translations/ja-JP/data/reusables/pre-release-program/sailor-v-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **Note:** You can now use the REST API to add a reason when you lock an issue, and you will see lock reasons in responses that include issues or pull requests. You will also see lock reasons in `locked` events. This feature is currently available for developers to preview. See the [blog post](https://developer.github.com/changes/2018-01-10-lock-reason-api-preview) for full details. To access this feature, you must provide a custom [media type](/v3/media) in the `Accept` header: diff --git a/translations/ja-JP/data/reusables/profile/user_profile_page_block_or_report.md b/translations/ja-JP/data/reusables/profile/user_profile_page_block_or_report.md index d58624452e..10747dfaf1 100644 --- a/translations/ja-JP/data/reusables/profile/user_profile_page_block_or_report.md +++ b/translations/ja-JP/data/reusables/profile/user_profile_page_block_or_report.md @@ -1 +1 @@ -1. 左サイドバーで、ユーザプロフィール画像の下にある**Block or report user（ユーザをブロックもしくはレポート）**をクリックします。 ![ユーザのブロックもしくはレポートのリンク](/assets/images/help/profile/profile-block-or-report-button.png) +1. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Block or report user**. ![ユーザのブロックもしくはレポートのリンク](/assets/images/help/profile/profile-block-or-report-button.png) diff --git a/translations/ja-JP/data/reusables/project-management/project-progress-locations.md b/translations/ja-JP/data/reusables/project-management/project-progress-locations.md index c56f59c5cd..9ac6c41be9 100644 --- a/translations/ja-JP/data/reusables/project-management/project-progress-locations.md +++ b/translations/ja-JP/data/reusables/project-management/project-progress-locations.md @@ -1 +1 @@ -プロジェクトボードの自動化が有効になっていると、プロジェクトボードの上部、プロジェクトのリストのページ、Issue サイドバー、他のプロジェクトボード上のプロジェクトの参照にプログレスバーが表示されます。 +If progress tracking is enabled, a progress bar appears above the project board, on the project listing page, in the issue sidebar, and in references to the project on other project boards. diff --git a/translations/ja-JP/data/reusables/pull_requests/pull_request_merges_and_contributions.md b/translations/ja-JP/data/reusables/pull_requests/pull_request_merges_and_contributions.md index a6ba58a5a6..bacc21c99b 100644 --- a/translations/ja-JP/data/reusables/pull_requests/pull_request_merges_and_contributions.md +++ b/translations/ja-JP/data/reusables/pull_requests/pull_request_merges_and_contributions.md @@ -1,6 +1,6 @@ {% note %} -**Notes:**{% if currentVersion != "free-pro-team@latest" %} +**Notes:**{% if enterpriseServerVersions contains currentVersion %} - プロフィールのコントリビューショングラフに表示されるためには、co-authoredコミットは一人の作者によるコミットと同じ条件を満たさなければなりません。{% endif %} - コミットをリベースする際には、コミットのオリジナルの作者と、コマンドラインか{% data variables.product.product_location %}かによらずコミットをリベースした人が、コントリビューションクレジットを受け取ります。 diff --git a/translations/ja-JP/data/reusables/repositories/about-internal-repos.md b/translations/ja-JP/data/reusables/repositories/about-internal-repos.md index d921cfd133..cfa9b36198 100644 --- a/translations/ja-JP/data/reusables/repositories/about-internal-repos.md +++ b/translations/ja-JP/data/reusables/repositories/about-internal-repos.md @@ -1 +1 @@ -You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if currentVersion != "free-pro-team@latest" %}, even with private mode disabled{% endif %}. +You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if enterpriseServerVersions contains currentVersion %}, even with private mode disabled{% endif %}. diff --git a/translations/ja-JP/data/reusables/repositories/copy-clone-url.md b/translations/ja-JP/data/reusables/repositories/copy-clone-url.md index f397023830..5126e5bca6 100644 --- a/translations/ja-JP/data/reusables/repositories/copy-clone-url.md +++ b/translations/ja-JP/data/reusables/repositories/copy-clone-url.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. リポジトリ名の下で**Clone or download（クローンもしくはダウンロード）**をクリックしてください。 ![Clone or downloadボタン](/assets/images/help/repository/clone-repo-clone-url-button.png) 2. To clone the repository using HTTPS, under "Clone with HTTPS", click {% octicon "clippy" aria-label="The clipboard icon" %}. diff --git a/translations/ja-JP/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md b/translations/ja-JP/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md index 84f425d319..72bc9e47c0 100644 --- a/translations/ja-JP/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md +++ b/translations/ja-JP/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md @@ -2,7 +2,7 @@ **警告:** -- プライベートリポジトリへの個人のアクセス権を削除すると、そのプライベートリポジトリからその人が作成したフォークはすべて削除されます。 プライベートリポジトリのローカルクローンは残ります。 If a team's access to a private repository is revoked or a team with access to a private repository is deleted, and team members do not have access to the repository through another team, private forks of the repository will be deleted.{% if currentVersion != "free-pro-team@latest" %} +- プライベートリポジトリへの個人のアクセス権を削除すると、そのプライベートリポジトリからその人が作成したフォークはすべて削除されます。 プライベートリポジトリのローカルクローンは残ります。 プライベートリポジトリへのTeamのアクセス権が削除されたり、プライベートリポジトリへのアクセス権を持つTeamが削除された場合、Teamのメンバーが他のTeamを通じてそのリポジトリへのアクセス権を持っていなければ、そのリポジトリのプライベートフォークは削除されます。{% if enterpriseServerVersions contains currentVersion %} - [LDAP Syncが有効化されている](/enterprise/{{ page.version }}/admin/guides/user-management/using-ldap/#enabling-ldap-sync)場合、リポジトリから個人を削除すると、その人はアクセス権を失いますが、その人のフォークは削除されません。 元々のOrganizationのリポジトリへのアクセスできるように3ヶ月以内にその人がTeamに追加されたなら、次回の同期の際にフォークへのアクセスは自動的に回復されます。{% endif %} - リポジトリへのアクセスを失った個人に、機密情報や知的財産を確実に削除してもらうのは、あなたの責任です。 diff --git a/translations/ja-JP/data/reusables/repositories/enable-security-alerts.md b/translations/ja-JP/data/reusables/repositories/enable-security-alerts.md index 4ab63edcb3..d47e84d4f6 100644 --- a/translations/ja-JP/data/reusables/repositories/enable-security-alerts.md +++ b/translations/ja-JP/data/reusables/repositories/enable-security-alerts.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Your site administrator must enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location_enterprise %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/ja-JP/data/reusables/repositories/navigate-to-job-superlinter.md b/translations/ja-JP/data/reusables/repositories/navigate-to-job-superlinter.md index ff66205b87..a389d235a1 100644 --- a/translations/ja-JP/data/reusables/repositories/navigate-to-job-superlinter.md +++ b/translations/ja-JP/data/reusables/repositories/navigate-to-job-superlinter.md @@ -1,5 +1,5 @@ {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -1. 左のサイドバーで、表示させたいジョブをクリックしてください。 ![Lint code base job](/assets/images/help/repository/superlinter-lint-code-base-job.png) +1. 左のサイドバーで、表示させたいジョブをクリックしてください。 ![Lint コードベースジョブ](/assets/images/help/repository/superlinter-lint-code-base-job.png) {% else %} -1. 左のサイドバーで、表示させたいジョブをクリックしてください。 ![Select a workflow job](/assets/images/help/repository/workflow-job.png) +1. 左のサイドバーで、表示させたいジョブをクリックしてください。 ![ワークフロージョブを選択](/assets/images/help/repository/workflow-job.png) {% endif %} \ No newline at end of file diff --git a/translations/ja-JP/data/reusables/repositories/new-pull-request.md b/translations/ja-JP/data/reusables/repositories/new-pull-request.md index 81d8b119f2..a55d4f0c5c 100644 --- a/translations/ja-JP/data/reusables/repositories/new-pull-request.md +++ b/translations/ja-JP/data/reusables/repositories/new-pull-request.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Branchメニューの右の**New pull request（新規プルリクエスト）**をクリックしてください。 !["Pull request" link above list of files](/assets/images/help/pull_requests/pull-request-start-review-button.png) {% else %} 1. Above the list of files, click diff --git a/translations/ja-JP/data/reusables/repositories/open-with-github-desktop.md b/translations/ja-JP/data/reusables/repositories/open-with-github-desktop.md index 7f94397582..ba7b805693 100644 --- a/translations/ja-JP/data/reusables/repositories/open-with-github-desktop.md +++ b/translations/ja-JP/data/reusables/repositories/open-with-github-desktop.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. リポジトリ名の下にある**Clone or download**をクリックします。 ![Clone or downloadボタン](/assets/images/help/repository/clone-repo-clone-url-button.png) 1. Click **Open in Desktop** to clone the repository and open it in {% data variables.product.prodname_desktop %}. diff --git a/translations/ja-JP/data/reusables/repositories/releases.md b/translations/ja-JP/data/reusables/repositories/releases.md index 52d0db5b49..199023d712 100644 --- a/translations/ja-JP/data/reusables/repositories/releases.md +++ b/translations/ja-JP/data/reusables/repositories/releases.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. リポジトリ名の下で**Releases（リリース）**をクリックしてください。 ![リリースタブ](/assets/images/help/releases/release-link.png) diff --git a/translations/ja-JP/data/reusables/repositories/tracks-vulnerabilities.md b/translations/ja-JP/data/reusables/repositories/tracks-vulnerabilities.md index 6738271fc3..7b131594a3 100644 --- a/translations/ja-JP/data/reusables/repositories/tracks-vulnerabilities.md +++ b/translations/ja-JP/data/reusables/repositories/tracks-vulnerabilities.md @@ -3,4 +3,3 @@ We add vulnerabilities to the {% data variables.product.prodname_advisory_databa - {% data variables.product.prodname_dotcom %}上のパブリックなコミット内の脆弱性の検出に、機械学習と人間によるレビューの組み合わせ - Security advisories reported on {% data variables.product.prodname_dotcom %} - The [npm Security advisories](https://www.npmjs.com/advisories) database -- [FriendsOfPHP](https://github.com/FriendsOfPHP/security-advisories) diff --git a/translations/ja-JP/data/reusables/repositories/you-can-fork.md b/translations/ja-JP/data/reusables/repositories/you-can-fork.md index 2d290ce6cd..6ba41cc13b 100644 --- a/translations/ja-JP/data/reusables/repositories/you-can-fork.md +++ b/translations/ja-JP/data/reusables/repositories/you-can-fork.md @@ -1,3 +1,3 @@ -You can fork any public repository to your user account or any organization where you have repository creation permissions. For more information, see "[Permission levels for an organization](/articles/permission-levels-for-an-organization)." +任意のパブリックなリポジトリを、自分のユーザアカウントあるいはリポジトリの作成権限を持っている任意のOrganization にフォークできます。 詳細は「[Organization の権限レベル](/articles/permission-levels-for-an-organization)」を参照してください。 -You can fork any private repository you can access to your user account and any organization on {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} where you have repository creation permissions. You cannot fork a private repository to an organization using {% data variables.product.prodname_free_team %}.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[GitHub's products](/articles/githubs-products)."{% endif %} +アクセス権を持っている任意のプライベートリポジトリを、自分のユーザアカウント及びリポジトリの作成権限を持っている{% data variables.product.prodname_team %}もしくは{% data variables.product.prodname_enterprise %}上の任意のOrganizationにフォークできます。 You cannot fork a private repository to an organization using {% data variables.product.prodname_free_team %}.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[GitHub's products](/articles/githubs-products)."{% endif %} diff --git a/translations/ja-JP/data/reusables/search/syntax_tips.md b/translations/ja-JP/data/reusables/search/syntax_tips.md index 7526b8dc69..a4c23d8864 100644 --- a/translations/ja-JP/data/reusables/search/syntax_tips.md +++ b/translations/ja-JP/data/reusables/search/syntax_tips.md @@ -1,6 +1,6 @@ {% tip %} -**Tips:**{% if currentVersion != "free-pro-team@latest" %} +**ヒント:**{% if enterpriseServerVersions contains currentVersion %} - この記事には、{% data variables.product.prodname_dotcom %}.com のウェブサイトでの検索例が含まれています。ですが、同じ検索フィルターを {% data variables.product.product_location_enterprise %} で使えます。{% endif %} - 検索結果を改良する検索修飾子を追加できる検索構文のリストについては、「[検索構文を理解する](/articles/understanding-the-search-syntax)」を参照してください。 - 複数単語の検索用語は引用符で囲みます。 たとえば "In progress" というラベルを持つ Issue を検索したい場合は、`label:"in progress"` とします。 検索では、大文字と小文字は区別されません。 diff --git a/translations/ja-JP/data/reusables/two_fa/auth_methods_2fa.md b/translations/ja-JP/data/reusables/two_fa/auth_methods_2fa.md index 92b6fc1662..f26636bd5f 100644 --- a/translations/ja-JP/data/reusables/two_fa/auth_methods_2fa.md +++ b/translations/ja-JP/data/reusables/two_fa/auth_methods_2fa.md @@ -1,10 +1,10 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 2FAをサポートする認証方式 -| 認証方式 | 説明 | 2要素認証のサポート | -| ----------------------- | -------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| ビルトイン | 認証は{% data variables.product.prodname_ghe_server %}アプライアンスに保存されているユーザアカウントに対して行われます。 | {% data variables.product.prodname_ghe_server %}アプライアンスでサポートされ、管理されます。 Organizationの管理者は、Organizationのメンバーに対して2FAの有効化を要求できます。 |{% if currentVersion != "free-pro-team@latest" %} +| 認証方式 | 説明 | 2要素認証のサポート | +| ----------------------- | -------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| ビルトイン | 認証は{% data variables.product.prodname_ghe_server %}アプライアンスに保存されているユーザアカウントに対して行われます。 | {% data variables.product.prodname_ghe_server %}アプライアンスでサポートされ、管理されます。 Organizationの管理者は、Organizationのメンバーに対して2FAの有効化を要求できます。 |{% if enterpriseServerVersions contains currentVersion %} | アイデンティティプロバイダ付きのビルトイン認証 | 認証は、アイデンティティプロバイダに保存されたユーザアカウントに対して行われます。 | アイデンティティプロバイダに依存します。{% endif %} -| LDAP | 会社のディレクトリサービスとの認証のインテグレーションができます。 | {% data variables.product.prodname_ghe_server %}アプライアンスでサポートされ、管理されます。 Organizationの管理者は、Organizationのメンバーに対して2FAの有効化を要求できます。 | +| LDAP | 会社のディレクトリサービスとの認証のインテグレーションができます。 | {% data variables.product.prodname_ghe_server %}アプライアンスでサポートされ、管理されます。 Organizationの管理者は、Organizationのメンバーに対して2FAの有効化を要求できます。 | | SAML | 認証は外部のアイデンティティプロバイダに対して行われます。 | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %} | CAS | 外部のサーバーによってシングルサインオンサービスが提供されます。 | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %}{% endif %} diff --git a/translations/ja-JP/data/reusables/user-settings/marketplace_apps.md b/translations/ja-JP/data/reusables/user-settings/marketplace_apps.md index ca67c90f87..11ffb16b03 100644 --- a/translations/ja-JP/data/reusables/user-settings/marketplace_apps.md +++ b/translations/ja-JP/data/reusables/user-settings/marketplace_apps.md @@ -1,4 +1,4 @@ {% if currentVersion == "free-pro-team@latest" %} -1. In the left sidebar, click either **OAuth Apps** or **GitHub Apps** depending on the {% data variables.product.prodname_marketplace %} listing you'd like to manage. **Note:** You can also manage your listing by navigating to https://github.com/marketplace/manage. ![App type selection](/assets/images/settings/apps_choose_app.png) +1. In the left sidebar, click either **OAuth Apps** or **GitHub Apps** depending on the {% data variables.product.prodname_marketplace %} listing you'd like to manage. **Note:** You can also manage your listing by navigating to https://github.com/marketplace/manage. ![アプリケーションの種類の選択](/assets/images/settings/apps_choose_app.png) {% endif %} diff --git a/translations/ja-JP/data/reusables/webhooks/check_run_properties.md b/translations/ja-JP/data/reusables/webhooks/check_run_properties.md index f5a304e4dc..f28b123046 100644 --- a/translations/ja-JP/data/reusables/webhooks/check_run_properties.md +++ b/translations/ja-JP/data/reusables/webhooks/check_run_properties.md @@ -1,10 +1,10 @@ -| キー | 種類 | 説明 | -| ------------------------------ | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `action` | `string` | 実行されたアクション。 Can be one of:
    • `created` - A new check run was created.
    • `completed` - The `status` of the check run is `completed`.
    • `rerequested` - Someone requested to re-run your check run from the pull request UI. See "[About status checks](/articles/about-status-checks#checks)" for more details about the GitHub UI. When you receive a `rerequested` action, you'll need to [create a new check run](/v3/checks/runs/#create-a-check-run). Only the {% data variables.product.prodname_github_app %} that someone requests to re-run the check will receive the `rerequested` payload.
    • `requested_action` - Someone requested an action your app provides to be taken. Only the {% data variables.product.prodname_github_app %} someone requests to perform an action will receive the `requested_action` payload. To learn more about check runs and requested actions, see "[Check runs and requested actions](/v3/checks/runs/#check-runs-and-requested-actions)."
    | -| `check_run` | `オブジェクト` | The [check_run](/v3/checks/runs/#get-a-check-run). | -| `check_run[status]` | `string` | The current status of the check run. Can be `queued`, `in_progress`, or `completed`. | -| `check_run[conclusion]` | `string` | The result of the completed check run. Can be one of `success`, `failure`, `neutral`, `cancelled`, `timed_out`, {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}`action_required` or `stale`{% else %}or `action_required`{% endif %}. This value will be `null` until the check run has `completed`. | -| `check_run[name]` | `string` | The name of the check run. | -| `check_run[check_suite][id]` | `整数` | The id of the check suite that this check run is part of. | -| `requested_action` | `オブジェクト` | The action requested by the user. | -| `requested_action[identifier]` | `string` | The integrator reference of the action requested by the user. | +| キー | 種類 | 説明 | +| ------------------------------ | --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action` | `string` | 実行されたアクション。 Can be one of:
    • `created` - A new check run was created.
    • `completed` - The `status` of the check run is `completed`.
    • `rerequested` - Someone requested to re-run your check run from the pull request UI. See "[About status checks](/articles/about-status-checks#checks)" for more details about the GitHub UI. When you receive a `rerequested` action, you'll need to [create a new check run](/v3/checks/runs/#create-a-check-run). Only the {% data variables.product.prodname_github_app %} that someone requests to re-run the check will receive the `rerequested` payload.
    • `requested_action` - Someone requested an action your app provides to be taken. Only the {% data variables.product.prodname_github_app %} someone requests to perform an action will receive the `requested_action` payload. To learn more about check runs and requested actions, see "[Check runs and requested actions](/v3/checks/runs/#check-runs-and-requested-actions)."
    | +| `check_run` | `オブジェクト` | The [check_run](/v3/checks/runs/#get-a-check-run). | +| `check_run[status]` | `string` | The current status of the check run. Can be `queued`, `in_progress`, or `completed`. | +| `check_run[conclusion]` | `string` | The result of the completed check run. Can be one of `success`, `failure`, `neutral`, `cancelled`, `timed_out`, {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}`action_required` or `stale`{% else %}or `action_required`{% endif %}. This value will be `null` until the check run has `completed`. | +| `check_run[name]` | `string` | The name of the check run. | +| `check_run[check_suite][id]` | `integer` | The id of the check suite that this check run is part of. | +| `requested_action` | `オブジェクト` | The action requested by the user. | +| `requested_action[identifier]` | `string` | The integrator reference of the action requested by the user. | diff --git a/translations/ja-JP/data/reusables/webhooks/content_type.md b/translations/ja-JP/data/reusables/webhooks/content_type.md index 23245b2dfc..6d5c98e3f1 100644 --- a/translations/ja-JP/data/reusables/webhooks/content_type.md +++ b/translations/ja-JP/data/reusables/webhooks/content_type.md @@ -1,6 +1,6 @@ -Webhooks can be delivered using different content types: +webhookは、様々なコンテンツタイプを使って配信できます。 -- The `application/json` content type will deliver the JSON payload directly as the body of the `POST` request. -- The `application/x-www-form-urlencoded` content type will send the JSON payload as a form parameter called `payload`. +- `application/json`コンテンツタイプは、JSONペイロードを`POST`リクエストのボディとして直接配信します。 +- `application/x-www-form-urlencoded`コンテンツタイプは、JSONペイロードを`payload`と呼ばれるフォームのパラメータとして送信します。 -Choose the one that best fits your needs. +要求に最適なものを選んでください。 diff --git a/translations/ja-JP/data/reusables/webhooks/project_card_properties.md b/translations/ja-JP/data/reusables/webhooks/project_card_properties.md index 386b7fb63e..acd386a739 100644 --- a/translations/ja-JP/data/reusables/webhooks/project_card_properties.md +++ b/translations/ja-JP/data/reusables/webhooks/project_card_properties.md @@ -1,7 +1,7 @@ -| キー | 種類 | 説明 | -| --------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------- | -| `action` | `string` | The action performed on the project card. Can be `created`, `edited`, `moved`, `converted`, or `deleted`. | -| `変更` | `オブジェクト` | The changes to the project card if the action was `edited` or `converted`. | -| `changes[note][from]` | `string` | The previous version of the note if the action was `edited` or `converted`. | -| `after_id` | `整数` | The id of the card that this card now follows if the action was "moved". Will be `null` if it is the first card in a column. | -| `project_card` | `オブジェクト` | The [project card](/v3/projects/cards) itself. | +| キー | 種類 | 説明 | +| --------------------- | --------- | ---------------------------------------------------------------------------------------------------------------------------- | +| `action` | `string` | The action performed on the project card. Can be `created`, `edited`, `moved`, `converted`, or `deleted`. | +| `変更` | `オブジェクト` | The changes to the project card if the action was `edited` or `converted`. | +| `changes[note][from]` | `string` | The previous version of the note if the action was `edited` or `converted`. | +| `after_id` | `integer` | The id of the card that this card now follows if the action was "moved". Will be `null` if it is the first card in a column. | +| `project_card` | `オブジェクト` | The [project card](/v3/projects/cards) itself. | diff --git a/translations/ja-JP/data/reusables/webhooks/project_column_properties.md b/translations/ja-JP/data/reusables/webhooks/project_column_properties.md index 401b11b245..87f5eed710 100644 --- a/translations/ja-JP/data/reusables/webhooks/project_column_properties.md +++ b/translations/ja-JP/data/reusables/webhooks/project_column_properties.md @@ -1,7 +1,7 @@ -| キー | 種類 | 説明 | -| --------------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------- | -| `action` | `string` | The action that was performed on the project column. Can be one of `created`, `edited`, `moved` or `deleted`. | -| `変更` | `オブジェクト` | The changes to the project column if the action was `edited`. | -| `changes[name][from]` | `string` | The previous version of the name if the action was `edited`. | -| `after_id` | `整数` | The id of the column that this column now follows if the action was "moved". Will be `null` if it is the first column in a project. | -| `project_column` | `オブジェクト` | The [project column](/v3/projects/columns) itself. | +| キー | 種類 | 説明 | +| --------------------- | --------- | ----------------------------------------------------------------------------------------------------------------------------------- | +| `action` | `string` | The action that was performed on the project column. Can be one of `created`, `edited`, `moved` or `deleted`. | +| `変更` | `オブジェクト` | The changes to the project column if the action was `edited`. | +| `changes[name][from]` | `string` | The previous version of the name if the action was `edited`. | +| `after_id` | `integer` | The id of the column that this column now follows if the action was "moved". Will be `null` if it is the first column in a project. | +| `project_column` | `オブジェクト` | The [project column](/v3/projects/columns) itself. | diff --git a/translations/ja-JP/data/reusables/webhooks/webhooks-rest-api-links.md b/translations/ja-JP/data/reusables/webhooks/webhooks-rest-api-links.md new file mode 100644 index 0000000000..3882222b05 --- /dev/null +++ b/translations/ja-JP/data/reusables/webhooks/webhooks-rest-api-links.md @@ -0,0 +1,4 @@ +You can use the repository, organization, and app webhook REST APIs to create, update, delete, and ping webhooks. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}You can also use the REST API to change the configuration of the webhook. For example, you can modify the payload URL, content type, SSL verification, and secret. {% endif %}For more information, see: +- [Repository Webhooks REST API](/rest/reference/repos#webhooks) +- [Organization Webhooks REST API](/rest/reference/orgs#webhooks){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +- [GitHub App Webhooks REST API](/rest/reference/apps#webhooks){% endif %} diff --git a/translations/ko-KR/content/actions/creating-actions/creating-a-javascript-action.md b/translations/ko-KR/content/actions/creating-actions/creating-a-javascript-action.md index 60cb037c1d..8bcad07573 100644 --- a/translations/ko-KR/content/actions/creating-actions/creating-a-javascript-action.md +++ b/translations/ko-KR/content/actions/creating-actions/creating-a-javascript-action.md @@ -262,4 +262,4 @@ From your repository, click the **Actions** tab, and select the latest workflow ![A screenshot of using your action in a workflow](/assets/images/help/repository/javascript-action-workflow-run-updated.png) {% else %} ![A screenshot of using your action in a workflow](/assets/images/help/repository/javascript-action-workflow-run.png) -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/ko-KR/content/actions/guides/building-and-testing-nodejs.md b/translations/ko-KR/content/actions/guides/building-and-testing-nodejs.md index 96f5ccf70e..69d1a978ad 100644 --- a/translations/ko-KR/content/actions/guides/building-and-testing-nodejs.md +++ b/translations/ko-KR/content/actions/guides/building-and-testing-nodejs.md @@ -33,7 +33,7 @@ We recommend that you have a basic understanding of Node.js, YAML, workflow conf To get started quickly, add the template to the `.github/workflows` directory of your repository. {% raw %} -```yaml +```yaml{:copy} name: Node.js CI on: [push] diff --git a/translations/ko-KR/content/actions/guides/publishing-docker-images.md b/translations/ko-KR/content/actions/guides/publishing-docker-images.md index 7778800a80..14b0cade15 100644 --- a/translations/ko-KR/content/actions/guides/publishing-docker-images.md +++ b/translations/ko-KR/content/actions/guides/publishing-docker-images.md @@ -50,7 +50,7 @@ To push to Docker Hub, you will need to have a Docker Hub account, and have a Do The `build-push-action` options required for Docker Hub are: -* `username` and `password`: This is your Docker Hub username and password. We recommend storing your Docker Hub username and password as encrypted secrets in the your {% data variables.product.prodname_dotcom %} repository so they aren't exposed in your workflow file. For more information, see "[Creating and using encrypted secrets](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)." +* `username` and `password`: This is your Docker Hub username and password. We recommend storing your Docker Hub username and password as encrypted secrets in your {% data variables.product.prodname_dotcom %} repository so they aren't exposed in your workflow file. For more information, see "[Creating and using encrypted secrets](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)." * `repository`: Your Docker Hub repository in the format `DOCKER-HUB-NAMESPACE/DOCKER-HUB-REPOSITORY`. {% raw %} diff --git a/translations/ko-KR/content/actions/guides/storing-workflow-data-as-artifacts.md b/translations/ko-KR/content/actions/guides/storing-workflow-data-as-artifacts.md index 059ed8a858..42c5602559 100644 --- a/translations/ko-KR/content/actions/guides/storing-workflow-data-as-artifacts.md +++ b/translations/ko-KR/content/actions/guides/storing-workflow-data-as-artifacts.md @@ -74,7 +74,7 @@ For example, your repository or a web application might contain SASS and TypeScr | ``` -This example shows you how to create a workflow for a Node.js project that `builds` the code in the `src` directory and runs the tests in the `tests` directory. You can assume that running `npm test` produces a code coverage report named `code-coverage.html` stored in the `output/test/` directory. +This example shows you how to create a workflow for a Node.js project that builds the code in the `src` directory and runs the tests in the `tests` directory. You can assume that running `npm test` produces a code coverage report named `code-coverage.html` stored in the `output/test/` directory. The workflow uploads the production artifacts in the `dist` directory, but excludes any markdown files. It also and uploads the `code-coverage.html` report as another artifact. diff --git a/translations/ko-KR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/ko-KR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index 48ba5968ca..49fe56fbdc 100644 --- a/translations/ko-KR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/translations/ko-KR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -91,7 +91,7 @@ The following operating systems are supported for the self-hosted runner applica - macOS 10.13 (High Sierra) or later -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Supported actions on self-hosted runners diff --git a/translations/ko-KR/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md b/translations/ko-KR/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md index 6f0d8a18b8..ad4b2a21e9 100644 --- a/translations/ko-KR/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md +++ b/translations/ko-KR/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md @@ -50,14 +50,14 @@ You can add self-hosted runners to an enterprise, where they can be assigned to {% if currentVersion == "free-pro-team@latest" %} To add a self-hosted runner to an enterprise account, you must be an enterprise owner. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} To add a self-hosted runner at the enterprise level of {% data variables.product.product_location %}, you must be a site administrator. {% endif %} {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/ko-KR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/translations/ko-KR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index 00b4c59f46..7c3e4a45e9 100644 --- a/translations/ko-KR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/translations/ko-KR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -56,7 +56,7 @@ When creating a group, you must choose a policy that grants access to all organi {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/ko-KR/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md b/translations/ko-KR/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md index 58f8548dc7..02e76d0794 100644 --- a/translations/ko-KR/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md +++ b/translations/ko-KR/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md @@ -62,7 +62,7 @@ To remove a self-hosted runner from an organization, you must be an organization {% if currentVersion == "free-pro-team@latest" %} To remove a self-hosted runner from an enterprise account, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} To remove a self-hosted runner at the enterprise level of {% data variables.product.product_location %}, you must be a site administrator. We recommend that you also have access to the self-hosted runner machine. {% endif %} @@ -71,7 +71,7 @@ To remove a self-hosted runner at the enterprise level of {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/ko-KR/content/actions/index.md b/translations/ko-KR/content/actions/index.md index 9cb200f069..804cd3e8ea 100644 --- a/translations/ko-KR/content/actions/index.md +++ b/translations/ko-KR/content/actions/index.md @@ -37,7 +37,7 @@ versions:
    -

    {% data ui.toc.getting_started %}

    +

    {% data ui.toc.guides %}

      {% for link in featuredLinks.gettingStarted %} @@ -68,34 +68,10 @@ versions:
    - -
    -
    - -
    {% octicon "bookmark" width="24" %}
    -

    Create actions

    -

    A complete guide to creating and sharing actions with the community.

    -     -
    -
    - -
    {% octicon "rocket" width="24" %}
    -

    Starter workflows

    -

    A collection of workflow files to help you get started with GitHub Actions.

    -     -
    -
    - -
    {% octicon "light-bulb" width="24" %}
    -

    GitHub Actions Marketplace

    -

    Explore community actions and supercharge your workflow.

    -     -
    -
    -

    안내서

    +

    More guides

    @@ -184,7 +160,7 @@ versions:

    Publishing Node.js packages

    Use GitHub Actions to push your Node.js package to GitHub Packages or npm.

    - Java + JavaScript/TypeScript CI
    @@ -196,5 +172,5 @@ versions:
    - More guides {% octicon "arrow-right" %} + Show all guides {% octicon "arrow-right" %} diff --git a/translations/ko-KR/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/translations/ko-KR/content/actions/learn-github-actions/security-hardening-for-github-actions.md index 2b5ceae9d5..abe2244646 100644 --- a/translations/ko-KR/content/actions/learn-github-actions/security-hardening-for-github-actions.md +++ b/translations/ko-KR/content/actions/learn-github-actions/security-hardening-for-github-actions.md @@ -95,3 +95,40 @@ As a result, self-hosted runners should almost [never be used for public reposit You should also consider the environment of the self-hosted runner machines: - What sensitive information resides on the machine configured as a self-hosted runner? For example, private SSH keys, API access tokens, among others. - Does the machine have network access to sensitive services? For example, Azure or AWS metadata services. The amount of sensitive information in this environment should be kept to a minimum, and you should always be mindful that any user capable of invoking workflows has access to this environment. + +### Auditing {% data variables.product.prodname_actions %} events + +You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account perfomed the action. + +For example, you can use the audit log to track the `action:org.update_actions_secret` event, which tracks changes to organization secrets: ![Audit log entries](/assets/images/help/repository/audit-log-entries.png) + +The following tables describe the {% data variables.product.prodname_actions %} events that you can find in the audit log. For more information on using the audit log, see "[Reviewing the audit log for your organization](/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization#searching-the-audit-log)." + +#### Events for secret management +| 동작 | 설명 | +| ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `action:org.create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization). | +| `action:org.remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret. | +| `action:org.update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret. | +| `action:repo.create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository). | +| `action:repo.remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret. | +| `action:repo.update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret. | + +#### Events for self-hosted runners +| 동작 | 설명 | +| ----------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). | +| `action:org.remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). | +| `action:repo.register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). | +| `action:repo.remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). | + +#### Events for self-hosted runner groups +| 동작 | 설명 | +| ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). | +| `action:org.runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. | +| `action:org.runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. | +| `action:org.runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). | +| `action:org.runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. | + + diff --git a/translations/ko-KR/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md b/translations/ko-KR/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md index a95381aadd..0b46fd51a5 100644 --- a/translations/ko-KR/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md +++ b/translations/ko-KR/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md @@ -1,6 +1,6 @@ --- title: Disabling and enabling a workflow -intro: You can disable and re-enable a workflow using {% data variables.product.prodname_dotcom %} or the REST API. +intro: 'You can disable and re-enable a workflow using {% data variables.product.prodname_dotcom %} or the REST API.' product: '{% data reusables.gated-features.actions %}' versions: free-pro-team: '*' diff --git a/translations/ko-KR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md b/translations/ko-KR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md index df297ba2b6..a7eb83e1c6 100644 --- a/translations/ko-KR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md +++ b/translations/ko-KR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md @@ -38,4 +38,4 @@ You can also define a custom retention period for individual artifacts using the ### Finding the expiration date of an artifact You can use the API to confirm the date that an artifact is scheduled to be deleted. For more information, see the `expires_at` value returned by "[List artifacts for a repository](/rest/reference/actions#artifacts)." -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/ko-KR/content/actions/quickstart.md b/translations/ko-KR/content/actions/quickstart.md index 474258c049..32ca2a56db 100644 --- a/translations/ko-KR/content/actions/quickstart.md +++ b/translations/ko-KR/content/actions/quickstart.md @@ -21,7 +21,7 @@ You only need an existing {% data variables.product.prodname_dotcom %} repositor 1. From your repository on {% data variables.product.prodname_dotcom %}, create a new file in the `.github/workflows` directory named `superlinter.yml`. For more information, see "[Creating new files](/github/managing-files-in-a-repository/creating-new-files)." 2. Copy the following YAML contents into the `superlinter.yml` file. **Note:** If your default branch is not `main`, update the value of `DEFAULT_BRANCH` to match your repository's default branch name. {% raw %} - ```yaml + ```yaml{:copy} name: Super-Linter # Run this workflow every time a new commit pushed to your repository diff --git a/translations/ko-KR/content/actions/reference/context-and-expression-syntax-for-github-actions.md b/translations/ko-KR/content/actions/reference/context-and-expression-syntax-for-github-actions.md index d29bd96190..1f6b29d987 100644 --- a/translations/ko-KR/content/actions/reference/context-and-expression-syntax-for-github-actions.md +++ b/translations/ko-KR/content/actions/reference/context-and-expression-syntax-for-github-actions.md @@ -93,7 +93,7 @@ The `github` context contains information about the workflow run and the event t | `github.event_path` | `문자열` | The path to the full event webhook payload on the runner. | | `github.head_ref` | `문자열` | The `head_ref` or source branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is a `pull_request`. | | `github.job` | `문자열` | The [`job_id`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_id) of the current job. | -| `github.ref` | `문자열` | The branch or tag ref that triggered the workflow run. | +| `github.ref` | `문자열` | The branch or tag ref that triggered the workflow run. For branches this in the format `refs/heads/`, and for tags it is `refs/tags/`. | | `github.repository` | `문자열` | The owner and repository name. For example, `Codertocat/Hello-World`. | | `github.repository_owner` | `문자열` | The repository owner's name. For example, `Codertocat`. | | `github.run_id` | `문자열` | {% data reusables.github-actions.run_id_description %} diff --git a/translations/ko-KR/content/actions/reference/specifications-for-github-hosted-runners.md b/translations/ko-KR/content/actions/reference/specifications-for-github-hosted-runners.md index 586204ead7..6176c4ce2a 100644 --- a/translations/ko-KR/content/actions/reference/specifications-for-github-hosted-runners.md +++ b/translations/ko-KR/content/actions/reference/specifications-for-github-hosted-runners.md @@ -50,6 +50,7 @@ Each virtual machine has the same hardware resources available. {% data reusables.github-actions.supported-github-runners %} {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} Workflow logs list the runner used to run a job. For more information, see "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history)." @@ -63,8 +64,10 @@ The software tools included in {% data variables.product.prodname_dotcom %}-host * [Windows Server 2019](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md) * [Windows Server 2016](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md) * [MacOS 10.15](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md) +* [MacOS 11.0](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md) {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} {% data variables.product.prodname_dotcom %}-hosted runners include the operating system's default built-in tools, in addition to the packages listed in the above references. For example, Ubuntu and macOS runners include `grep`, `find`, and `which`, among other default tools. diff --git a/translations/ko-KR/content/actions/reference/workflow-commands-for-github-actions.md b/translations/ko-KR/content/actions/reference/workflow-commands-for-github-actions.md index 4d9ce7b4b8..1c6dee2ed7 100644 --- a/translations/ko-KR/content/actions/reference/workflow-commands-for-github-actions.md +++ b/translations/ko-KR/content/actions/reference/workflow-commands-for-github-actions.md @@ -53,13 +53,15 @@ core.setOutput('SELECTED_COLOR', 'green'); You can use the `set-output` command in your workflow to set the same value: +{% raw %} ``` yaml - name: Set selected color run: echo '::set-output name=SELECTED_COLOR::green' id: random-color-generator - name: Get color - run: echo 'The selected color is' ${steps.random-color-generator.outputs.SELECTED_COLOR} + run: echo "The selected color is ${{ steps.random-color-generator.outputs.SELECTED_COLOR }}" ``` +{% endraw %} The following table shows which toolkit functions are available within a workflow: diff --git a/translations/ko-KR/content/actions/reference/workflow-syntax-for-github-actions.md b/translations/ko-KR/content/actions/reference/workflow-syntax-for-github-actions.md index 6b684f4357..74c04380da 100644 --- a/translations/ko-KR/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/translations/ko-KR/content/actions/reference/workflow-syntax-for-github-actions.md @@ -946,7 +946,7 @@ jobs: #### **`jobs..container.image`** -The Docker image to use as the container to run the action. The value can be the Docker Hub image name or a {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. +The Docker image to use as the container to run the action. The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..container.credentials`** @@ -1029,7 +1029,7 @@ services: #### **`jobs..services..image`** -The Docker image to use as the service container to run the action. The value can be the Docker Hub image name or a {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. +The Docker image to use as the service container to run the action. The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..services..credentials`** diff --git a/translations/ko-KR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/translations/ko-KR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md index f6a08240e3..90a226a78b 100644 --- a/translations/ko-KR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md +++ b/translations/ko-KR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md @@ -18,10 +18,13 @@ You can connect {% data variables.product.product_location_enterprise %} to {% d After connecting {% data variables.product.product_location_enterprise %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. You can also choose to manually sync vulnerability data at any time. No code or information about code from {% data variables.product.product_location_enterprise %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}. -{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send {% data variables.product.prodname_dependabot_short %} alerts to owners and people with admin access in those repositories. They can customize how they receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)." +{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send {% data variables.product.prodname_dependabot_short %} alerts. You can customize how you receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)." {% endif %} -{% if currentVersion ver_lt "enterprise-server@2.21" or currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts to owners and people with admin access in those repositories. They can customize how they receive security alerts. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)." +{% if currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts. You can customize how you receive security alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)." +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts. You can customize how you receive security alerts. For more information, see "[Choosing the delivery method for your notifications](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications#choosing-the-delivery-method-for-security-alerts-for-vulnerable-dependencies)." {% endif %} {% if currentVersion ver_gt "enterprise-server@2.21" %} @@ -45,7 +48,14 @@ Before enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data v ``` shell $ ghe-dep-graph-enable ``` + {% note %} + + **Note**: For more information about enabling access to the administrative shell via SSH, see "[Accessing the administrative shell (SSH)](/enterprise/{{ currentVersion }}/admin/configuration/accessing-the-administrative-shell-ssh)." + + {% endnote %} + 3. Return to + {% data variables.product.prodname_ghe_server %}. {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} diff --git a/translations/ko-KR/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md b/translations/ko-KR/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md index e9276b758c..4353629ea2 100644 --- a/translations/ko-KR/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md +++ b/translations/ko-KR/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md @@ -30,6 +30,15 @@ The time required to failover depends on how long it takes to manually promote t 5. Update the DNS record to point to the IP address of the replica. Traffic is directed to the replica after the TTL period elapses. If you are using a load balancer, ensure it is configured to send traffic to the replica. 6. Notify users that they can resume normal operations. 7. If desired, set up replication from the new primary to existing appliances and the previous primary. For more information, see "[About high availability configuration](/enterprise/{{ currentVersion }}/admin/guides/installation/about-high-availability-configuration/#utilities-for-replication-management)." +8. Appliances you do not intend to setup replication to that were part of the high availability configuration prior the failover, need to be removed from the high availability configuration by UUID. + - On the former appliances, get their UUID via `cat /data/user/common/uuid`. + ```shell + $ cat /data/user/common/uuid + ``` + - On the new primary, remove the UUIDs using `ghe-repl-teardown`. Please replace *`UUID`* with a UUID you retrieved in the previous step. + ```shell + $ ghe-repl-teardown -u UUNID + ``` ### 더 읽을거리 diff --git a/translations/ko-KR/content/admin/enterprise-management/upgrade-requirements.md b/translations/ko-KR/content/admin/enterprise-management/upgrade-requirements.md index ae3bf31f23..cbe53d18f5 100644 --- a/translations/ko-KR/content/admin/enterprise-management/upgrade-requirements.md +++ b/translations/ko-KR/content/admin/enterprise-management/upgrade-requirements.md @@ -21,7 +21,7 @@ versions: ### Recommendations -- Include as few upgrades as possible in your upgrade process. For example, instead of upgrading from {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} to {{ enterpriseVersions.supported[1] }} to {{ enterpriseVersions.latest }}, you could upgrade from {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} to {{ enterpriseVersions.latest }}. +- Include as few upgrades as possible in your upgrade process. For example, instead of upgrading from {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} to {{ enterpriseServerReleases.supported[1] }} to {{ enterpriseServerReleases.latest }}, you could upgrade from {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} to {{ enterpriseServerReleases.latest }}. - If you’re several versions behind, upgrade {% data variables.product.product_location_enterprise %} as far forward as possible with each step of your upgrade process. Using the latest version possible on each upgrade allows you to take advantage of performance improvements and bug fixes. For example, you could upgrade from {% data variables.product.prodname_enterprise %} 2.7 to 2.8 to 2.10, but upgrading from {% data variables.product.prodname_enterprise %} 2.7 to 2.9 to 2.10 uses a later version in the second step. - Use the latest patch release when upgrading. {% data reusables.enterprise_installation.enterprise-download-upgrade-pkg %} - Use a staging instance to test the upgrade steps. For more information, see "[Setting up a staging instance](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-staging-instance/)." @@ -29,7 +29,7 @@ versions: ### 요구 사항 -- You must upgrade from a feature release that's **at most** two releases behind. For example, to upgrade to {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.latest }}, you must be on {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[1] }} or {{ enterpriseVersions.supported[2] }}. +- You must upgrade from a feature release that's **at most** two releases behind. For example, to upgrade to {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.latest }}, you must be on {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[1] }} or {{ enterpriseServerReleases.supported[2] }}. - {% data reusables.enterprise_installation.hotpatching-explanation %} - A hotpatch may require downtime if the affected services (like kernel, MySQL, or Elasticsearch) require a VM reboot or a service restart. You'll be notified when a reboot or restart is required. You can complete the reboot or restart at a later time. - Additional root storage must be available when upgrading through hotpatching, as it installs multiple versions of certain services until the upgrade is complete. Pre-flight checks will notify you if you don't have enough root disk storage. diff --git a/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md index a607ebcc77..64a386a968 100644 --- a/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,7 +59,7 @@ For urgent issues, we can help you in English 24 hours per day, 7 days per week, {% data variables.contact.enterprise_support %} observes these U.S. holidays, although our global support team is available to answer urgent tickets. -| U.S. holiday | Date observed | +| U.S. holiday | Date observed | | --------------------------- | --------------------------- | | New Year's Day | January 1 | | Martin Luther King, Jr. Day | Third Monday in January | diff --git a/translations/ko-KR/content/admin/enterprise-support/providing-data-to-github-support.md b/translations/ko-KR/content/admin/enterprise-support/providing-data-to-github-support.md index de0c01fdd8..3214c079fb 100644 --- a/translations/ko-KR/content/admin/enterprise-support/providing-data-to-github-support.md +++ b/translations/ko-KR/content/admin/enterprise-support/providing-data-to-github-support.md @@ -99,9 +99,9 @@ You can use these steps to create and share a support bundle if you have SSH acc #### Uploading a support bundle using your enterprise account -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Under "{% data variables.product.prodname_enterprise %} Help", click **Upload a support bundle**. ![Upload a support bundle link](/assets/images/enterprise/support/upload-support-bundle.png) 5. Under "Select an enterprise account", select the support bundle's associated account from the drop-down menu. ![Choose the support bundle's enterprise account](/assets/images/enterprise/support/support-bundle-account.png) 6. Under "Upload a support bundle for {% data variables.contact.enterprise_support %}", to select your support bundle, click **Choose file**, or drag your support bundle file onto **Choose file**. ![Upload support bundle file](/assets/images/enterprise/support/choose-support-bundle-file.png) diff --git a/translations/ko-KR/content/admin/enterprise-support/submitting-a-ticket.md b/translations/ko-KR/content/admin/enterprise-support/submitting-a-ticket.md index 71a73580cd..f213fafae7 100644 --- a/translations/ko-KR/content/admin/enterprise-support/submitting-a-ticket.md +++ b/translations/ko-KR/content/admin/enterprise-support/submitting-a-ticket.md @@ -22,9 +22,9 @@ After submitting your support request and optional diagnostic information, {% da ### Submitting a ticket using your enterprise account -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Under "{% data variables.product.prodname_enterprise %} Help", click **{% data variables.contact.enterprise_support %} Portal**. ![Link to navigate to Enterprise support site](/assets/images/enterprise/support/enterprise-support-link.png) 5. Click **Submit a Ticket** ![Submit a ticket to Enterprise Support team](/assets/images/enterprise/support/submit-ticket-button.png) {% data reusables.enterprise_enterprise_support.submit-support-ticket-first-section %} diff --git a/translations/ko-KR/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md b/translations/ko-KR/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md index c17404e32c..9e060a0a5b 100644 --- a/translations/ko-KR/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md +++ b/translations/ko-KR/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md @@ -34,7 +34,7 @@ You can populate the runner tool cache by running a {% data variables.product.pr ### Populating the tool cache for a self-hosted runner -1. On {% data variables.product.prodname_dotcom_the_website %}, navigate to a repostory that you can use to run a {% data variables.product.prodname_actions %} workflow. +1. On {% data variables.product.prodname_dotcom_the_website %}, navigate to a repository that you can use to run a {% data variables.product.prodname_actions %} workflow. 1. Create a new workflow file in the repository's `.github/workflows` folder that uploads an artifact containing the {% data variables.product.prodname_dotcom %}-hosted runner's tool cache. The following example demonstrates a workflow that uploads the tool cache for an Ubuntu 18.04 environment, using the `setup-node` action with Node.js versions 10 and 12. diff --git a/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md b/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md index 33ca918b22..b9c6c45e88 100644 --- a/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md +++ b/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md @@ -25,8 +25,7 @@ Before launching {% data variables.product.product_location_enterprise %} on Goo #### Supported machine types {% data variables.product.prodname_ghe_server %} is supported on the following Google Compute Engine (GCE) machine types. For more information, see [the Google Cloud Platform machine types article](https://cloud.google.com/compute/docs/machine-types). -| -{% if currentVersion != "free-pro-team@latest" %} + | | High-memory | | | ------------- | | | n1-highmem-4 | @@ -35,7 +34,6 @@ Before launching {% data variables.product.product_location_enterprise %} on Goo | | n1-highmem-32 | | | n1-highmem-64 | | | n1-highmem-96 | -{% endif %} #### Recommended machine types diff --git a/translations/ko-KR/content/admin/overview/managing-your-github-enterprise-license.md b/translations/ko-KR/content/admin/overview/managing-your-github-enterprise-license.md index a35377b399..207a78cfa5 100644 --- a/translations/ko-KR/content/admin/overview/managing-your-github-enterprise-license.md +++ b/translations/ko-KR/content/admin/overview/managing-your-github-enterprise-license.md @@ -30,9 +30,9 @@ After you purchase a new license or upgrade an existing license from {% data var If you'd like to renew or add user licenses to {% data variables.product.prodname_enterprise %}, contact {% data variables.contact.contact_enterprise_sales %}. Your new license file will be available for download immediately after you complete your order. -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Under "Enterprise Server Instances", click {% octicon "download" aria-label="The download icon" %} to download your license file. ![Download GitHub Enterprise Server license](/assets/images/help/business-accounts/download-ghes-license.png) 5. Log into your {% data variables.product.prodname_ghe_server %} instance as a site administrator. @@ -46,9 +46,9 @@ If you'd like to renew or add user licenses to {% data variables.product.prodnam ### Viewing license usage -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses. ### Automatically syncing user license usage with {% data variables.product.prodname_ghe_cloud %} @@ -63,11 +63,12 @@ You can download a JSON file from {% data variables.product.prodname_ghe_server {% data reusables.enterprise_site_admin_settings.business %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.license-tab %} -5. Under "Quick links", to download a file containing your current license usage on {% data variables.product.prodname_ghe_server %}, click **Export license usage**. ![Export license usage link](/assets/images/enterprise/business-accounts/export-license-usage-link.png) -6. Navigate to -{% data variables.product.prodname_ghe_cloud %}. -{% data reusables.enterprise-accounts.access-enterprise %} +5. Under "Quick links", to download a file containing your current license usage on +{% data variables.product.prodname_ghe_server %}, click **Export license usage**. + ![Export license usage link](/assets/images/enterprise/business-accounts/export-license-usage-link.png) +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +8. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) +{% data reusables.enterprise-accounts.license-tab %} 10. Under "Enterprise Server Instances", click **Add server usage**. ![Upload GitHub Enterprise Servers usage link](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png) 11. Upload the JSON file you downloaded from {% data variables.product.prodname_ghe_server %}. ![Drag and drop or select a file to upload](/assets/images/help/business-accounts/upload-ghe-server-usage-file.png) diff --git a/translations/ko-KR/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md b/translations/ko-KR/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md index d6fbe18473..6f0b7fc666 100644 --- a/translations/ko-KR/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md +++ b/translations/ko-KR/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md @@ -11,7 +11,7 @@ When using LDAP or built-in authentication, two-factor authentication is support {% data reusables.enterprise_user_management.external_auth_disables_2fa %} -For more information, see [this chart on authentication methods that support 2FA](/enterprise/{{ currentVersion }}/user/articles/about-two-factor-authentication/#authentication-methods-that-support-2fa). +For more information, see "[About two-factor authentication](/github/authenticating-to-github/about-two-factor-authentication)." ### Requirements for enforcing two-factor authentication diff --git a/translations/ko-KR/content/developers/apps/authenticating-with-github-apps.md b/translations/ko-KR/content/developers/apps/authenticating-with-github-apps.md index 79dd1fc619..db6f497430 100644 --- a/translations/ko-KR/content/developers/apps/authenticating-with-github-apps.md +++ b/translations/ko-KR/content/developers/apps/authenticating-with-github-apps.md @@ -10,7 +10,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -92,7 +92,7 @@ Use your {% data variables.product.prodname_github_app %}'s identifier (`YOUR_AP After creating the JWT, set it in the `Header` of the API request: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -H "Authorization: Bearer YOUR_JWT" -H "Accept: application/vnd.github.machine-man-preview+json" {% data variables.product.api_url_pre %}/app ``` @@ -127,7 +127,7 @@ By default, installation access tokens are scoped to all the repositories that a To create an installation access token, include the JWT [generated above](#jwt-payload) in the Authorization header in the API request: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -X POST \ -H "Authorization: Bearer YOUR_JWT" \ @@ -147,7 +147,7 @@ The response will include your installation access token, the expiration date, t To authenticate with an installation access token, include it in the Authorization header in the API request: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i \ -H "Authorization: token YOUR_INSTALLATION_ACCESS_TOKEN" \ diff --git a/translations/ko-KR/content/developers/apps/creating-a-github-app-from-a-manifest.md b/translations/ko-KR/content/developers/apps/creating-a-github-app-from-a-manifest.md index 7feef22370..0a47d6e3a9 100644 --- a/translations/ko-KR/content/developers/apps/creating-a-github-app-from-a-manifest.md +++ b/translations/ko-KR/content/developers/apps/creating-a-github-app-from-a-manifest.md @@ -162,7 +162,7 @@ You must complete this step of the GitHub App Manifest flow within one hour. {% endnote %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% data reusables.pre-release-program.fury-pre-release %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/ko-KR/content/developers/apps/creating-a-github-app-using-url-parameters.md b/translations/ko-KR/content/developers/apps/creating-a-github-app-using-url-parameters.md index 367169ee68..49c8e71daa 100644 --- a/translations/ko-KR/content/developers/apps/creating-a-github-app-using-url-parameters.md +++ b/translations/ko-KR/content/developers/apps/creating-a-github-app-using-url-parameters.md @@ -54,7 +54,7 @@ You can select permissions in a query string using the permission name in the fo | [`checks`](/rest/reference/permissions-required-for-github-apps/#permission-on-checks) | Grants access to the [Checks API](/v3/checks/). Can be one of: `none`, `read`, or `write`. | | `content_references` | Grants access to the "[Create a content attachment](/v3/apps/installations/#create-a-content-attachment)" endpoint. Can be one of: `none`, `read`, or `write`. | | [`contents`](/rest/reference/permissions-required-for-github-apps/#permission-on-contents) | Grants access to various endpoints that allow you to modify repository contents. Can be one of: `none`, `read`, or `write`. | -| [`deployments`](/rest/reference/permissions-required-for-github-apps/#permission-on-deployments) | Grants access to the [Deployments API](/v3/repos/deployments/). Can be one of: `none`, `read`, or `write`. | +| [`deployments`](/rest/reference/permissions-required-for-github-apps/#permission-on-deployments) | Grants access to the [Deployments API](/rest/reference/repos#deployments). Can be one of: `none`, `read`, or `write`. | | [`emails`](/rest/reference/permissions-required-for-github-apps/#permission-on-emails) | Grants access to the [Emails API](/v3/users/emails/). Can be one of: `none`, `read`, or `write`. | | [`followers`](/rest/reference/permissions-required-for-github-apps/#permission-on-followers) | Grants access to the [Followers API](/v3/users/followers/). Can be one of: `none`, `read`, or `write`. | | [`gpg_keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-gpg-keys) | Grants access to the [GPG Keys API](/v3/users/gpg_keys/). Can be one of: `none`, `read`, or `write`. | @@ -63,11 +63,11 @@ You can select permissions in a query string using the permission name in the fo | [`members`](/rest/reference/permissions-required-for-github-apps/#permission-on-members) | Grants access to manage an organization's members. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} | [`메타데이터`](/rest/reference/permissions-required-for-github-apps/#metadata-permissions) | Grants access to read-only endpoints that do not leak sensitive data. Can be `read` or `none`. Defaults to `read` when you set any permission, or defaults to `none` when you don't specify any permissions for the {% data variables.product.prodname_github_app %}. | | [`organization_administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-administration) | Grants access to "[Update an organization](/v3/orgs/#update-an-organization)" endpoint and the [Organization Interaction Restrictions API](/v3/interactions/orgs/#set-interaction-restrictions-for-an-organization). Can be one of: `none`, `read`, or `write`.{% endif %} -| [`organization_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-hooks) | Grants access to the [Organization Webhooks API](/v3/orgs/hooks/). Can be one of: `none`, `read`, or `write`. | +| [`organization_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-hooks) | Grants access to the [Organization Webhooks API](/rest/reference/orgs#webhooks/). Can be one of: `none`, `read`, or `write`. | | `organization_plan` | Grants access to get information about an organization's plan using the "[Get an organization](/v3/orgs/#get-an-organization)" endpoint. Can be one of: `none` or `read`. | | [`organization_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`.{% if currentVersion == "free-pro-team@latest" %} | [`organization_user_blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Blocking Organization Users API](/v3/orgs/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} -| [`pages`](/rest/reference/permissions-required-for-github-apps/#permission-on-pages) | Grants access to the [Pages API](/v3/repos/pages/). Can be one of: `none`, `read`, or `write`. | +| [`pages`](/rest/reference/permissions-required-for-github-apps/#permission-on-pages) | Grants access to the [Pages API](/rest/reference/repos#pages). Can be one of: `none`, `read`, or `write`. | | `plan` | Grants access to get information about a user's GitHub plan using the "[Get a user](/v3/users/#get-a-user)" endpoint. Can be one of: `none` or `read`. | | [`pull_requests`](/rest/reference/permissions-required-for-github-apps/#permission-on-pull-requests) | Grants access to various pull request endpoints. Can be one of: `none`, `read`, or `write`. | | [`repository_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-hooks) | Grants access to the [Repository Webhooks API](/v3/repos/hooks/). Can be one of: `none`, `read`, or `write`. | diff --git a/translations/ko-KR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/translations/ko-KR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md index 96441ecb7b..af8d3e1655 100644 --- a/translations/ko-KR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md +++ b/translations/ko-KR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md @@ -136,7 +136,7 @@ For more information about authorizing users using the device flow, see "[Author ### Check which installation's resources a user can access -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -422,7 +422,7 @@ While most of your API interaction should occur using your server-to-server inst * [Convert an organization member to outside collaborator](/v3/orgs/outside_collaborators/#convert-an-organization-member-to-outside-collaborator) * [Remove outside collaborator from an organization](/v3/orgs/outside_collaborators/#remove-outside-collaborator-from-an-organization) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Organization Pre Receive Hooks * [List pre-receive hooks for an organization](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-an-organization) @@ -460,7 +460,7 @@ While most of your API interaction should occur using your server-to-server inst * [List teams](/v3/teams/#list-teams) * [Create a team](/v3/teams/#create-a-team) * [Get a team by name](/v3/teams/#get-a-team-by-name) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} * [Get a team](/v3/teams/#get-a-team) {% endif %} * [Update a team](/v3/teams/#update-a-team) @@ -762,7 +762,7 @@ While most of your API interaction should occur using your server-to-server inst * [Get GitHub Pages build](/rest/reference/repos#get-github-pages-build) * [Get latest pages build](/rest/reference/repos#get-latest-pages-build) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Repository Pre Receive Hooks * [List pre-receive hooks for a repository](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-a-repository) diff --git a/translations/ko-KR/content/developers/apps/installing-github-apps.md b/translations/ko-KR/content/developers/apps/installing-github-apps.md index 85a635fff5..ff6dd370a9 100644 --- a/translations/ko-KR/content/developers/apps/installing-github-apps.md +++ b/translations/ko-KR/content/developers/apps/installing-github-apps.md @@ -52,7 +52,7 @@ These steps assume you have [built a {% data variables.product.prodname_github_a You can simplify the authorization process by completing it during app installation. To do this, select **Request user authorization (OAuth) during installation** when creating or modifying your app in GitHub. See "[Creating a GitHub App](/apps/building-github-apps/creating-a-github-app/)" to learn more. -Once someone has installed your app, you will need to get an access token for the user. See steps 2 and 3 in "[Identifying a users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. +Once someone has installed your app, you will need to get an access token for the user. See steps 2 and 3 in "[Identifying users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. ### Preserving an application state during installation You can provide a `state` parameter in an app's installation URL to preserve the state of the application page and return people back to that state after they install, authenticate, or accept updates to your GitHub App. For example, you could use the `state` to correlate an installation to a user or account. diff --git a/translations/ko-KR/content/developers/apps/scopes-for-oauth-apps.md b/translations/ko-KR/content/developers/apps/scopes-for-oauth-apps.md index 94be43cb22..87cecfd62f 100644 --- a/translations/ko-KR/content/developers/apps/scopes-for-oauth-apps.md +++ b/translations/ko-KR/content/developers/apps/scopes-for-oauth-apps.md @@ -37,42 +37,42 @@ X-Accepted-OAuth-Scopes: user ### Available scopes -| 이름 | 설명 | -| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| **`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if currentVersion != "free-pro-team@latest" %} +| 이름 | 설명 | +| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if enterpriseServerVersions contains currentVersion %} | **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/v3/enterprise-admin).{% endif %} -| **`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects. | -|  `repo:status` | Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. | -|  `repo_deployment` | Grants access to [deployment statuses](/v3/repos/deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code. | -|  `public_repo` | Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories. | +| **`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects. | +|  `repo:status` | Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. | +|  `repo_deployment` | Grants access to [deployment statuses](/v3/repos/deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code. | +|  `public_repo` | Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories. | |  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21"%} |  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/v3/code-scanning).{% endif %} -| **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. | -|  `write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories. | -|  `read:repo_hook` | Grants read and ping access to hooks in public or private repositories. | -| **`admin:org`** | Fully manage the organization and its teams, projects, and memberships. | -|  `write:org` | Read and write access to organization membership, organization projects, and team membership. | -|  `read:org` | Read-only access to organization membership, organization projects, and team membership. | -| **`admin:public_key`** | Fully manage public keys. | -|  `write:public_key` | Create, list, and view details for public keys. | -|  `read:public_key` | List and view details for public keys. | -| **`admin:org_hook`** | Grants read, write, ping, and delete access to organization hooks. **Note:** OAuth tokens will only be able to perform these actions on organization hooks which were created by the OAuth App. Personal access tokens will only be able to perform these actions on organization hooks created by a user. | -| **`gist`** | Grants write access to gists. | -| **`알림(Notifications)`** | Grants:
    * read access to a user's notifications
    * mark as read access to threads
    * watch and unwatch access to a repository, and
    * read, write, and delete access to thread subscriptions. | -| **`사용자`** | Grants read/write access to profile info only. Note that this scope includes `user:email` and `user:follow`. | -|  `read:user` | Grants access to read a user's profile data. | -|  `user:email` | Grants read access to a user's email addresses. | -|  `user:follow` | Grants access to follow or unfollow other users. | -| **`delete_repo`** | Grants access to delete adminable repositories. | -| **`write:discussion`** | Allows read and write access for team discussions. | +| **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. | +|  `write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories. | +|  `read:repo_hook` | Grants read and ping access to hooks in public or private repositories. | +| **`admin:org`** | Fully manage the organization and its teams, projects, and memberships. | +|  `write:org` | Read and write access to organization membership, organization projects, and team membership. | +|  `read:org` | Read-only access to organization membership, organization projects, and team membership. | +| **`admin:public_key`** | Fully manage public keys. | +|  `write:public_key` | Create, list, and view details for public keys. | +|  `read:public_key` | List and view details for public keys. | +| **`admin:org_hook`** | Grants read, write, ping, and delete access to organization hooks. **Note:** OAuth tokens will only be able to perform these actions on organization hooks which were created by the OAuth App. Personal access tokens will only be able to perform these actions on organization hooks created by a user. | +| **`gist`** | Grants write access to gists. | +| **`알림(Notifications)`** | Grants:
    * read access to a user's notifications
    * mark as read access to threads
    * watch and unwatch access to a repository, and
    * read, write, and delete access to thread subscriptions. | +| **`사용자`** | Grants read/write access to profile info only. Note that this scope includes `user:email` and `user:follow`. | +|  `read:user` | Grants access to read a user's profile data. | +|  `user:email` | Grants read access to a user's email addresses. | +|  `user:follow` | Grants access to follow or unfollow other users. | +| **`delete_repo`** | Grants access to delete adminable repositories. | +| **`write:discussion`** | Allows read and write access for team discussions. | |  `read:discussion` | Allows read access for team discussions.{% if currentVersion == "free-pro-team@latest" %} -| **`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[Publishing a package](/github/managing-packages-with-github-packages/publishing-a-package)". | -| **`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[Installing a package](/github/managing-packages-with-github-packages/installing-a-package)". | +| **`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[Publishing a package](/github/managing-packages-with-github-packages/publishing-a-package)". | +| **`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[Installing a package](/github/managing-packages-with-github-packages/installing-a-package)". | | **`delete:packages`** | Grants access to delete packages from {% data variables.product.prodname_registry %}. For more information, see "[Deleting packages](/github/managing-packages-with-github-packages/deleting-a-package)".{% endif %} -| **`admin:gpg_key`** | Fully manage GPG keys. | -|  `write:gpg_key` | Create, list, and view details for GPG keys. | +| **`admin:gpg_key`** | Fully manage GPG keys. | +|  `write:gpg_key` | Create, list, and view details for GPG keys. | |  `read:gpg_key` | List and view details for GPG keys.{% if currentVersion == "free-pro-team@latest" %} -| **`워크플로`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository.{% endif %} +| **`워크플로`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes, see https://docs.github.com/en/free-pro-team@latest/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token for details.{% endif %} {% note %} diff --git a/translations/ko-KR/content/developers/github-marketplace/about-github-marketplace.md b/translations/ko-KR/content/developers/github-marketplace/about-github-marketplace.md index 5749868a6f..0ea91b55cb 100644 --- a/translations/ko-KR/content/developers/github-marketplace/about-github-marketplace.md +++ b/translations/ko-KR/content/developers/github-marketplace/about-github-marketplace.md @@ -14,7 +14,7 @@ versions: {% data reusables.actions.actions-not-verified %} -To learn about publishing {% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}, see "[{% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}](/marketplace/actions/)." +To learn about publishing {% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}, see "[Publishing actions in GitHub Marketplace](/actions/creating-actions/publishing-actions-in-github-marketplace)." ### 앱 diff --git a/translations/ko-KR/content/developers/overview/replacing-github-services.md b/translations/ko-KR/content/developers/overview/replacing-github-services.md index eb1925fc9e..7cc93257bf 100644 --- a/translations/ko-KR/content/developers/overview/replacing-github-services.md +++ b/translations/ko-KR/content/developers/overview/replacing-github-services.md @@ -29,7 +29,7 @@ As an alternative to the email service, you can now start using email notificati GitHub Services (sometimes referred to as Service Hooks) is the legacy method of integrating where GitHub hosted a portion of our integrator’s services via [the `github-services` repository](https://github.com/github/github-services). Actions performed on GitHub trigger these services, and you can use these services to trigger actions outside of GitHub. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Finding repositories that use GitHub Services We provide a command-line script that helps you identify which repositories on your appliance use GitHub Services. For more information, see [ghe-legacy-github-services-report](/enterprise/{{currentVersion}}/admin/articles/command-line-utilities/#ghe-legacy-github-services-report).{% endif %} diff --git a/translations/ko-KR/content/developers/webhooks-and-events/about-webhooks.md b/translations/ko-KR/content/developers/webhooks-and-events/about-webhooks.md index 048e5dd703..2023a28e0e 100644 --- a/translations/ko-KR/content/developers/webhooks-and-events/about-webhooks.md +++ b/translations/ko-KR/content/developers/webhooks-and-events/about-webhooks.md @@ -11,9 +11,9 @@ versions: Webhooks allow you to build or set up integrations, such as [{% data variables.product.prodname_github_app %}s](/apps/building-github-apps/) or [{% data variables.product.prodname_oauth_app %}s](/apps/building-oauth-apps/), which subscribe to certain events on GitHub.com. When one of those events is triggered, we'll send a HTTP POST payload to the webhook's configured URL. Webhooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server. You're only limited by your imagination. -Webhooks can be installed on{% if currentVersion != "free-pro-team@latest" %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. +Webhooks can be installed on{% if enterpriseServerVersions contains currentVersion %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. -You can create up to {% if currentVersion != "free-pro-team@latest" %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if currentVersion != "free-pro-team@latest" %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} +You can create up to {% if enterpriseServerVersions contains currentVersion %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if enterpriseServerVersions contains currentVersion %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} ### 이벤트 diff --git a/translations/ko-KR/content/developers/webhooks-and-events/creating-webhooks.md b/translations/ko-KR/content/developers/webhooks-and-events/creating-webhooks.md index 9dfc16c27c..d59fe79115 100644 --- a/translations/ko-KR/content/developers/webhooks-and-events/creating-webhooks.md +++ b/translations/ko-KR/content/developers/webhooks-and-events/creating-webhooks.md @@ -14,6 +14,9 @@ Now that we understand [the basics of webhooks][webhooks-overview], let's go thr Creating a webhook is a two-step process. You'll first need to set up how you want your webhook to behave through {% data variables.product.product_name %}--what events should it listen to. After that, you'll set up your server to receive and manage the payload. + +{% data reusables.webhooks.webhooks-rest-api-links %} + ### Setting up a Webhook You can install webhooks on an organization or on a specific repository. diff --git a/translations/ko-KR/content/developers/webhooks-and-events/github-event-types.md b/translations/ko-KR/content/developers/webhooks-and-events/github-event-types.md index 4adf87a23a..8176385d84 100644 --- a/translations/ko-KR/content/developers/webhooks-and-events/github-event-types.md +++ b/translations/ko-KR/content/developers/webhooks-and-events/github-event-types.md @@ -28,13 +28,13 @@ The event objects returned from the Events API endpoints have the same structure | `actor.id` | The unique identifier for the actor. | | `actor.login` | The username of the actor. | | `actor.display_login` | The specific display format of the username. | -| `actor.gravatar_id` | The unique indentifier of the Gravatar profile for the actor. | +| `actor.gravatar_id` | The unique identifier of the Gravatar profile for the actor. | | `actor.url` | The REST API URL used to retrieve the user object, which includes additional user information. | | `actor.avatar_url` | The URL of the actor's profile image. | | `repo` | The repository object where the event occurred. | | `repo.id` | The unique identifier of the repository. | | `repo.name` | The name of the repository, which includes the owner and repository name. For example, `octocat/hello-world` is the name of the `hello-world` repository owned by the `octocat` user account. | -| `repo.url` | The REST API URL used to retrive the repository object, which includes additional repository information. | +| `repo.url` | The REST API URL used to retrieve the repository object, which includes additional repository information. | | `payload` | The event payload object is unique to the event type. See the event type below for the event API `payload` object. | #### Example WatchEvent event object diff --git a/translations/ko-KR/content/developers/webhooks-and-events/issue-event-types.md b/translations/ko-KR/content/developers/webhooks-and-events/issue-event-types.md index 3a48cff1cb..b6e71b6e29 100644 --- a/translations/ko-KR/content/developers/webhooks-and-events/issue-event-types.md +++ b/translations/ko-KR/content/developers/webhooks-and-events/issue-event-types.md @@ -229,7 +229,7 @@ The issue or pull request was referenced from another issue or pull request. | --------------- | ----- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `actor` | `개체` | The person who generated the event. | | `created_at` | `문자열` | The timestamp indicating when the cross-reference was added. | -| `updated_at` | `문자열` | The timestamp indicating when the cross-refererence was updated or created, if the cross-reference is never updated. | +| `updated_at` | `문자열` | The timestamp indicating when the cross-reference was updated or created, if the cross-reference is never updated. | | `source` | `개체` | The issue or pull request that added a cross-reference. | | `source[type]` | `문자열` | This value will always be `"issue"` because pull requests are of type issue. Only cross-reference events triggered by issues or pull requests are returned in the Timeline Events API. To determine if the issue that triggered the event is a pull request, you can check if the `source[issue][pull_request` object exists. | | `source[issue]` | `개체` | The `issue` object that added the cross-reference. | @@ -347,7 +347,7 @@ The issue or pull request was locked. #### Event object properties -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -664,7 +664,7 @@ The issue was unlocked. #### Event object properties -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/ko-KR/content/developers/webhooks-and-events/securing-your-webhooks.md b/translations/ko-KR/content/developers/webhooks-and-events/securing-your-webhooks.md index 0a5ed84359..09dd7373c1 100644 --- a/translations/ko-KR/content/developers/webhooks-and-events/securing-your-webhooks.md +++ b/translations/ko-KR/content/developers/webhooks-and-events/securing-your-webhooks.md @@ -12,6 +12,7 @@ versions: Once your server is configured to receive payloads, it'll listen for any payload sent to the endpoint you configured. For security reasons, you probably want to limit requests to those coming from GitHub. There are a few ways to go about this--for example, you could opt to allow requests from GitHub's IP address--but a far easier method is to set up a secret token and validate the information. +{% data reusables.webhooks.webhooks-rest-api-links %} ### Setting your secret token diff --git a/translations/ko-KR/content/developers/webhooks-and-events/testing-webhooks.md b/translations/ko-KR/content/developers/webhooks-and-events/testing-webhooks.md index be8a04c41b..afa9a1ca84 100644 --- a/translations/ko-KR/content/developers/webhooks-and-events/testing-webhooks.md +++ b/translations/ko-KR/content/developers/webhooks-and-events/testing-webhooks.md @@ -13,7 +13,7 @@ Now that you've [configured your local server](/webhooks/configuring/), you migh ### Listing recent deliveries -Every webhook has its own "Recent Deliveries" section, which lists, at a glance whether a deployment was successful (green check) or failed (red x). You can also identify when each delivery was attempted. +Every webhook has its own "Recent Deliveries" section, which lists, at a glance whether a delivery was successful (green check) or failed (red x). You can also identify when each delivery was attempted. {% data variables.product.product_name %} keeps a log of each webhook delivery for {% if currentVersion == "free-pro-team@latest" %} 30 {% else %} 8 {% endif %} days. diff --git a/translations/ko-KR/content/developers/webhooks-and-events/webhook-events-and-payloads.md b/translations/ko-KR/content/developers/webhooks-and-events/webhook-events-and-payloads.md index 14c6ba12c9..18797bb5ce 100644 --- a/translations/ko-KR/content/developers/webhooks-and-events/webhook-events-and-payloads.md +++ b/translations/ko-KR/content/developers/webhooks-and-events/webhook-events-and-payloads.md @@ -47,7 +47,7 @@ HTTP POST payloads that are delivered to your webhook's configured URL endpoint | Header | 설명 | | ----------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `X-GitHub-Event` | Name of the event that triggered the delivery. | -| `X-GitHub-Delivery` | A [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) to identify the delivery.{% if currentVersion != "free-pro-team@latest" %} +| `X-GitHub-Delivery` | A [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) to identify the delivery.{% if enterpriseServerVersions contains currentVersion %} | `X-GitHub-Enterprise-Version` | The version of the {% data variables.product.prodname_ghe_server %} instance that sent the HTTP POST payload. | | `X-GitHub-Enterprise-Host` | The hostname of the {% data variables.product.prodname_ghe_server %} instance that sent the HTTP POST payload.{% endif %}{% if currentVersion != "private-instances@latest" %} | `X-Hub-Signature` | This header is sent if the webhook is configured with a [`secret`](/v3/repos/hooks/#create-hook-config-params). This is the HMAC hex digest of the request body, and is generated using the SHA-1 hash function and the `secret` as the HMAC `key`.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} `X-Hub-Signature` is provided for compatibility with existing integrations, and we recommend that you use the more secure `X-Hub-Signature-256` instead.{% endif %}{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -61,7 +61,7 @@ Also, the `User-Agent` for the requests will have the prefix `GitHub-Hookshot/`. > POST /payload HTTP/1.1 > Host: localhost:4567 -> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if currentVersion != "free-pro-team@latest" %} +> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: 2.15.0 > X-GitHub-Enterprise-Host: example.com{% endif %}{% if currentVersion != "private-instances@latest" %} > X-Hub-Signature: sha1=7d38cdd689735b008b3c702edd92eea23791c5f6{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -332,7 +332,7 @@ Only {% data variables.product.prodname_github_app %}s can receive this event. { {{ webhookPayloadsForCurrentVersion.deployment_status }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 엔터프라이즈 @@ -617,7 +617,7 @@ For a detailed description of this payload and the payload for each type of `act ### meta -The webhook this event is configured on was deleted. This event will only listen for changes to the particular hook the event is installed on. Therefore, it must be selected for each hook that you'd like to recieve meta events for. +The webhook this event is configured on was deleted. This event will only listen for changes to the particular hook the event is installed on. Therefore, it must be selected for each hook that you'd like to receive meta events for. #### Availability @@ -667,18 +667,18 @@ The webhook this event is configured on was deleted. This event will only listen #### Availability -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} - GitHub Enterprise webhooks only receive `created` and `deleted` events. For more information, "[Global webhooks](/rest/reference/enterprise-admin#global-webhooks/).{% endif %} - Organization webhooks only receive the `deleted`, `added`, `removed`, `renamed`, and `invited` events - {% data variables.product.prodname_github_app %}s with the `members` permission #### Webhook payload object -| 키 | 유형 | 설명 | -| ------------ | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `동작` | `문자열` | The action that was performed. Can be one of:{% if currentVersion != "free-pro-team@latest" %} `created`,{% endif %} `deleted`, `renamed`, `member_added`, `member_removed`, or `member_invited`. | -| `초대` | `개체` | The invitation for the user or email if the action is `member_invited`. | -| `membership` | `개체` | The membership between the user and the organization. Not present when the action is `member_invited`. | +| 키 | 유형 | 설명 | +| ------------ | ----- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `동작` | `문자열` | The action that was performed. Can be one of:{% if enterpriseServerVersions contains currentVersion %} `created`,{% endif %} `deleted`, `renamed`, `member_added`, `member_removed`, or `member_invited`. | +| `초대` | `개체` | The invitation for the user or email if the action is `member_invited`. | +| `membership` | `개체` | The membership between the user and the organization. Not present when the action is `member_invited`. | {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} {% data reusables.webhooks.sender_desc %} @@ -974,13 +974,17 @@ Deliveries for `review_requested` and `review_request_removed` events will have | `before` | `문자열` | The SHA of the most recent commit on `ref` before the push. | | `after` | `문자열` | The SHA of the most recent commit on `ref` after the push. | | `commits` | `array` | An array of commit objects describing the pushed commits. (The array includes a maximum of 20 commits. If necessary, you can use the [Commits API](/v3/repos/commits/) to fetch additional commits. This limit is applied to timeline events only and isn't applied to webhook deliveries.) | -| `commits[][sha]` | `문자열` | The SHA of the commit. | +| `commits[][id]` | `문자열` | The SHA of the commit. | +| `commits[][timestamp]` | `문자열` | The ISO 8601 timestamp of the commit. | | `commits[][message]` | `문자열` | The commit message. | | `commits[][author]` | `개체` | The git author of the commit. | | `commits[][author][name]` | `문자열` | The git author's name. | | `commits[][author][email]` | `문자열` | The git author's email address. | | `commits[][url]` | `url` | URL that points to the commit API resource. | | `commits[][distinct]` | `boolean` | Whether this commit is distinct from any that have been pushed before. | +| `commits[][added]` | `array` | An array of files added in the commit. | +| `commits[][modified]` | `array` | An array of files modified by the commit. | +| `commits[][removed]` | `array` | An array of files removed in the commit. | | `pusher` | `개체` | The user who pushed the commits. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} @@ -1042,7 +1046,7 @@ This event occurs when a {% data variables.product.prodname_github_app %} sends | 키 | 유형 | 설명 | | ---- | ----- | --------------------------------------------------------------------------- | -| `동작` | `문자열` | The action that was performed. This can be one of:
    • `created` - A repository is created.
    • `deleted` - A repository is deleted. This event type is only available to [organization hooks](/rest/reference/orgs#webhooks/)
    • `archived` - A repository is archived.
    • `unarchived` - A repository is unarchived.
      • {% if currentVersion != "free-pro-team@latest" %}
    • `anonymous_access_enabled` - A repository is [enabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories), `anonymous_access_disabled` - A repository is [disabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories)
      • {% endif %}
    • `edited` - A repository's information is edited.
    • `renamed` - A repository is renamed.
    • `transferred` - A repository is transferred.
    • `publicized` - A repository is made public.
    • `privatized` - A repository is made private.
    | +| `동작` | `문자열` | The action that was performed. This can be one of:
    • `created` - A repository is created.
    • `deleted` - A repository is deleted. This event type is only available to [organization hooks](/rest/reference/orgs#webhooks/)
    • `archived` - A repository is archived.
    • `unarchived` - A repository is unarchived.
      • {% if enterpriseServerVersions contains currentVersion %}
    • `anonymous_access_enabled` - A repository is [enabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories), `anonymous_access_disabled` - A repository is [disabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories)
      • {% endif %}
    • `edited` - A repository's information is edited.
    • `renamed` - A repository is renamed.
    • `transferred` - A repository is transferred.
    • `publicized` - A repository is made public.
    • `privatized` - A repository is made private.
    | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -1244,7 +1248,7 @@ You can only create a sponsorship webhook on {% data variables.product.prodname_ {{ webhookPayloadsForCurrentVersion.team_add }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 사용자 diff --git a/translations/ko-KR/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md b/translations/ko-KR/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md index 0eb73197da..1887c9a44a 100644 --- a/translations/ko-KR/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md +++ b/translations/ko-KR/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md @@ -12,7 +12,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" %}{% data reusables.notifications.outbound_email_tip %}{% endif %} +{% if enterpriseServerVersions contains currentVersion %}{% data reusables.notifications.outbound_email_tip %}{% endif %} Each email notification for a push to a repository lists the new commits and links to a diff containing just those commits. In the email notification you'll see: diff --git a/translations/ko-KR/content/github/administering-a-repository/about-github-dependabot-version-updates.md b/translations/ko-KR/content/github/administering-a-repository/about-github-dependabot-version-updates.md index 617d1c7778..8978a11290 100644 --- a/translations/ko-KR/content/github/administering-a-repository/about-github-dependabot-version-updates.md +++ b/translations/ko-KR/content/github/administering-a-repository/about-github-dependabot-version-updates.md @@ -17,7 +17,7 @@ You enable {% data variables.product.prodname_dependabot_version_updates %} by c When {% data variables.product.prodname_dependabot_short %} identifies an outdated dependency, it raises a pull request to update the manifest to the latest version of the dependency. For vendored dependencies, {% data variables.product.prodname_dependabot_short %} raises a pull request to directly replace the outdated dependency with the new version. You check that your tests pass, review the changelog and release notes included in the pull request summary, and then merge it. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." -If you enable security updates, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +If you enable security updates, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." {% data reusables.dependabot.dependabot-tos %} diff --git a/translations/ko-KR/content/github/administering-a-repository/about-required-commit-signing.md b/translations/ko-KR/content/github/administering-a-repository/about-required-commit-signing.md index a26d860dc3..a9d35353f6 100644 --- a/translations/ko-KR/content/github/administering-a-repository/about-required-commit-signing.md +++ b/translations/ko-KR/content/github/administering-a-repository/about-required-commit-signing.md @@ -11,7 +11,7 @@ versions: If you've enforced branch protections in your repository, you can set up required commit signing. For more information, see "[Configuring protected branches](/articles/configuring-protected-branches/)." -When you enable required commit signing on a branch, contibutors {% if currentVersion == "free-pro-team@latest" %}and bots{% endif %} can only push commits that have been signed and verified to the branch. For more information, see "[About commit signature verification](/articles/about-commit-signature-verification)." +When you enable required commit signing on a branch, contributors {% if currentVersion == "free-pro-team@latest" %}and bots{% endif %} can only push commits that have been signed and verified to the branch. For more information, see "[About commit signature verification](/articles/about-commit-signature-verification)." You can always push local commits to the branch if the commits are signed and verified. {% if currentVersion == "free-pro-team@latest" %}You can also merge signed and verified commits into the branch using a pull request on {% data variables.product.product_name %}. However, you cannot squash and merge a pull request into the branch on {% data variables.product.product_name %} unless you are the author of the pull request.{% else %} However, you cannot merge pull requests into the branch on {% data variables.product.product_name %}.{% endif %} You can {% if currentVersion == "free-pro-team@latest" %}squash and {% endif %}merge pull requests locally. For more information, see "[Checking out pull requests locally](/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally)."{% if currentVersion == "free-pro-team@latest" %} For more information about merge methods, see "[About merge methods on {% data variables.product.prodname_dotcom %}](/github/administering-a-repository/about-merge-methods-on-github)."{% endif %} diff --git a/translations/ko-KR/content/github/administering-a-repository/about-securing-your-repository.md b/translations/ko-KR/content/github/administering-a-repository/about-securing-your-repository.md index 2b7c963ec1..9b1b79977a 100644 --- a/translations/ko-KR/content/github/administering-a-repository/about-securing-your-repository.md +++ b/translations/ko-KR/content/github/administering-a-repository/about-securing-your-repository.md @@ -21,9 +21,13 @@ The first step to securing a repository is to set up who can see and modify your Privately discuss and fix security vulnerabilities in your repository's code. You can then publish a security advisory to alert your community to the vulnerability and encourage them to upgrade. For more information, see "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." -- **{% data variables.product.prodname_dependabot_short %} alerts** +- **{% data variables.product.prodname_dependabot_short %} alerts and security updates** - View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." + +- **{% data variables.product.prodname_dependabot_short %} version updates** + + Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot-version-updates)." - **{% data variables.product.prodname_code_scanning_capc %} alerts** diff --git a/translations/ko-KR/content/github/administering-a-repository/classifying-your-repository-with-topics.md b/translations/ko-KR/content/github/administering-a-repository/classifying-your-repository-with-topics.md index bb919c1771..db10d95a24 100644 --- a/translations/ko-KR/content/github/administering-a-repository/classifying-your-repository-with-topics.md +++ b/translations/ko-KR/content/github/administering-a-repository/classifying-your-repository-with-topics.md @@ -27,7 +27,7 @@ You can search for repositories that are associated with a particular topic. For ### Adding topics to your repository -{% data reusables.repositories.navigate-to-repo %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% data reusables.repositories.navigate-to-repo %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. Under your repository description, click **Add topics**. ![Add topics link on a repository's main page](/assets/images/help/repository/add-topics-link.png) 3. Type the topic you want to add to your repository, then type a space. ![Form to enter topics](/assets/images/help/repository/add-topic-form.png) 4. After you've finished adding topics, click **Done**. ![Form with a list of topics and Done button](/assets/images/help/repository/add-topics-done-button.png) diff --git a/translations/ko-KR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md b/translations/ko-KR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md index ac223fe9c4..2ac0938a19 100644 --- a/translations/ko-KR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md +++ b/translations/ko-KR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md @@ -545,12 +545,6 @@ updates: Use the `vendor` option to tell {% data variables.product.prodname_dependabot_short %} to vendor dependencies when updating them. -{% note %} - -Currently, {% data variables.product.prodname_dependabot_short %} only supports vendoring dependencies for Bundler. - -{% endnote %} - ```yaml # Configure version updates for both dependencies defined in manifests and vendored dependencies @@ -564,7 +558,13 @@ updates: interval: "weekly" ``` -{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. For Bundler, the dependencies must be in the _vendor/cache_ directory. Other file paths are not supported. For more information, see the [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html). +{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. + +| Package manager | Required file path for vendored dependencies | More information | +| --------------- | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------- | +| `bundler` | The dependencies must be in the _vendor/cache_ directory.
    Other file paths are not supported. | [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html) | +| `gomod` | No path requirement (dependencies are usually located in the _vendor_ directory) | [`go mod vendor` documentation](https://golang.org/ref/mod#go-mod-vendor) | + ### `versioning-strategy` diff --git a/translations/ko-KR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/translations/ko-KR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md index dc98637951..cde1f08871 100644 --- a/translations/ko-KR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md +++ b/translations/ko-KR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md @@ -17,7 +17,7 @@ You can enable {% data variables.product.prodname_actions %} for your repository Alternatively, you can enable {% data variables.product.prodname_actions %} in your repository but limit the actions a workflow can run. {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### Managing {% data variables.product.prodname_actions %} permissions for your repository diff --git a/translations/ko-KR/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md b/translations/ko-KR/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md index 8e8fa47277..c2f06eb458 100644 --- a/translations/ko-KR/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md +++ b/translations/ko-KR/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md @@ -15,7 +15,7 @@ By default, force pushes are blocked on all protected branches. When you enable Enabling force pushes will not override any other branch protection rules. For example, if a branch requires a linear commit history, you cannot force push merge commits to that branch. -{% if currentVersion != "free-pro-team@latest" %}You cannot enable force pushes for a protected branch if a site administrator has blocked force pushes to all branches in your repository. For more information, see "[Blocking force pushes to repositories owned by a user account or organization](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)." +{% if enterpriseServerVersions contains currentVersion %}You cannot enable force pushes for a protected branch if a site administrator has blocked force pushes to all branches in your repository. For more information, see "[Blocking force pushes to repositories owned by a user account or organization](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)." If a site administrator has blocked force pushes to the default branch only, you can still enable force pushes for any other protected branch.{% endif %} diff --git a/translations/ko-KR/content/github/administering-a-repository/index.md b/translations/ko-KR/content/github/administering-a-repository/index.md index b7d660caa4..0d1558ccfc 100644 --- a/translations/ko-KR/content/github/administering-a-repository/index.md +++ b/translations/ko-KR/content/github/administering-a-repository/index.md @@ -26,7 +26,7 @@ versions: {% link_in_list /viewing-deployment-activity-for-your-repository %} {% link_in_list /managing-the-forking-policy-for-your-repository %} - + {% link_in_list /setting-the-default-branch %} {% link_in_list /disabling-or-limiting-github-actions-for-a-repository %} {% link_in_list /managing-git-lfs-objects-in-archives-of-your-repository %} diff --git a/translations/ko-KR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/translations/ko-KR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md index d59bf97cc3..6f93905e1f 100644 --- a/translations/ko-KR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md +++ b/translations/ko-KR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md @@ -9,9 +9,9 @@ versions: ### About {% data variables.product.prodname_dependabot %} pull requests -{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot_short %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." +{% data reusables.dependabot.pull-request-introduction %} -When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package management system. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package manager. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." If you have many dependencies to manage, you may want to customize the configuration for each package manager so that pull requests have specific reviewers, assignees, and labels. For more information, see "[Customizing dependency updates](/github/administering-a-repository/customizing-dependency-updates)." diff --git a/translations/ko-KR/content/github/administering-a-repository/setting-repository-visibility.md b/translations/ko-KR/content/github/administering-a-repository/setting-repository-visibility.md index 2f13e6b62a..0c744152a8 100644 --- a/translations/ko-KR/content/github/administering-a-repository/setting-repository-visibility.md +++ b/translations/ko-KR/content/github/administering-a-repository/setting-repository-visibility.md @@ -23,7 +23,7 @@ We recommend reviewing the following caveats before you change the visibility of {% if currentVersion == "free-pro-team@latest" %}* If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. {% data reusables.gated-features.more-info %} * Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)." * {% data variables.product.prodname_dotcom %} will no longer included the repository in the {% data variables.product.prodname_archive %}. For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)."{% endif %} - {% if currentVersion != "free-pro-team@latest" %}* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} + {% if enterpriseServerVersions contains currentVersion %}* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} #### Making a repository public diff --git a/translations/ko-KR/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md b/translations/ko-KR/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md index 73ec8b99c4..235d626086 100644 --- a/translations/ko-KR/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md +++ b/translations/ko-KR/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md @@ -14,7 +14,7 @@ versions: {% endnote %} -People with read access to a repository can see an overview of all current deployments and a log of past deployment activity, if the repository's deployment workflow is integrated with {% data variables.product.product_name %} through the Deployments API or an app from [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment). For more information, see "[Deployments](/v3/repos/deployments/)." +People with read access to a repository can see an overview of all current deployments and a log of past deployment activity, if the repository's deployment workflow is integrated with {% data variables.product.product_name %} through the Deployments API or an app from [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment). For more information, see "[Deployments](/rest/reference/repos#deployments)." You can also see deployment information on the "Conversation" tab of a pull request. diff --git a/translations/ko-KR/content/github/authenticating-to-github/generating-a-new-gpg-key.md b/translations/ko-KR/content/github/authenticating-to-github/generating-a-new-gpg-key.md index 3cbddd8df7..7738dcaaae 100644 --- a/translations/ko-KR/content/github/authenticating-to-github/generating-a-new-gpg-key.md +++ b/translations/ko-KR/content/github/authenticating-to-github/generating-a-new-gpg-key.md @@ -29,7 +29,7 @@ versions: ```shell $ gpg --default-new-key-algo rsa4096 --gen-key ``` -4. At the prompt, specify the kind of key you want, or press `Enter` to accept the default `RSA and DSA`. +4. At the prompt, specify the kind of key you want, or press `Enter` to accept the default `RSA and RSA`. 5. Enter the desired key size. Your key must be at least `4096` bits. 6. Enter the length of time the key should be valid. Press `Enter` to specify the default selection, indicating that the key doesn't expire. 7. Verify that your selections are correct. diff --git a/translations/ko-KR/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md b/translations/ko-KR/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md index 0e73552ba4..b8337d57fe 100644 --- a/translations/ko-KR/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md +++ b/translations/ko-KR/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md @@ -134,7 +134,7 @@ To illustrate how `git filter-branch` works, we'll show you how to remove your f {% endnote %} -## Avoiding accidental commits in the future +### Avoiding accidental commits in the future There are a few simple tricks to avoid committing things you don't want committed: @@ -145,5 +145,5 @@ There are a few simple tricks to avoid committing things you don't want committe ### 더 읽을거리 -- [`git filter-branch` main page](https://git-scm.com/docs/git-filter-branch) +- [`git filter-branch` man page](https://git-scm.com/docs/git-filter-branch) - [Pro Git: Git Tools - Rewriting History](https://git-scm.com/book/en/Git-Tools-Rewriting-History) diff --git a/translations/ko-KR/content/github/authenticating-to-github/reviewing-your-security-log.md b/translations/ko-KR/content/github/authenticating-to-github/reviewing-your-security-log.md index fe9db34d96..b51060974e 100644 --- a/translations/ko-KR/content/github/authenticating-to-github/reviewing-your-security-log.md +++ b/translations/ko-KR/content/github/authenticating-to-github/reviewing-your-security-log.md @@ -31,22 +31,22 @@ The security log lists all actions performed within the last 90 days{% if curren ### Understanding events in your security log Actions listed in your security log are grouped within the following categories: |{% endif %} -| Category Name | 설명 | -| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |{% if currentVersion == "free-pro-team@latest" %} -| `account_recovery_token` | Contains all activities related to [adding a recovery token](/articles/configuring-two-factor-authentication-recovery-methods). | -| `결제` | Contains all activities related to your billing information. | -| `marketplace_agreement_signature` | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | +| Category Name | 설명 | +| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest" %} +| `account_recovery_token` | Contains all activities related to [adding a recovery token](/articles/configuring-two-factor-authentication-recovery-methods). | +| `결제` | Contains all activities related to your billing information. | +| `marketplace_agreement_signature` | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | | `marketplace_listing` | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %} | `oauth_access` | Contains all activities related to [{% data variables.product.prodname_oauth_app %}s](/articles/authorizing-oauth-apps) you've connected with.{% if currentVersion == "free-pro-team@latest" %} | `payment_method` | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %} -| `profile_picture` | Contains all activities related to your profile picture. | -| `프로젝트` | Contains all activities related to project boards. | -| `public_key` | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). | +| `profile_picture` | Contains all activities related to your profile picture. | +| `프로젝트` | Contains all activities related to project boards. | +| `public_key` | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). | | `repo` | Contains all activities related to the repositories you own.{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to {% data variables.product.prodname_sponsors %} and sponsor buttons (see "[About {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)" and "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} +| `sponsors` | Contains all events related to {% data variables.product.prodname_sponsors %} and sponsor buttons (see "[About {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)" and "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion %} | `팀` | Contains all activities related to teams you are a part of.{% endif %} -| `two_factor_authentication` | Contains all activities related to [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa). | -| `사용자` | Contains all activities related to your account. | +| `two_factor_authentication` | Contains all activities related to [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa). | +| `사용자` | Contains all activities related to your account. | A description of the events within these categories is listed below. @@ -137,7 +137,7 @@ A description of the events within these categories is listed below. | 액세스 | Triggered when you a repository you own is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). | | add_member | Triggered when a {% data variables.product.product_name %} user is {% if currentVersion == "free-pro-team@latest" %}[invited to have collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% else %}[given collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% endif %} to a repository. | | add_topic | Triggered when a repository owner [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. | -| archived | Triggered when a repository owner [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} +| archived | Triggered when a repository owner [archives a repository](/articles/about-archiving-repositories).{% if enterpriseServerVersions contains currentVersion %} | config.disable_anonymous_git_access | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | | config.enable_anonymous_git_access | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | | config.lock_anonymous_git_access | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). | @@ -186,7 +186,7 @@ A description of the events within these categories is listed below. | revoke | Triggered when you revoke a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") | {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} #### The `team` category diff --git a/translations/ko-KR/content/github/building-a-strong-community/adding-a-license-to-a-repository.md b/translations/ko-KR/content/github/building-a-strong-community/adding-a-license-to-a-repository.md index b22101e882..b32db0ca9c 100644 --- a/translations/ko-KR/content/github/building-a-strong-community/adding-a-license-to-a-repository.md +++ b/translations/ko-KR/content/github/building-a-strong-community/adding-a-license-to-a-repository.md @@ -32,7 +32,7 @@ Open source licenses enable others to freely use, change, and distribute the pro {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.files.add-file %} diff --git a/translations/ko-KR/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md b/translations/ko-KR/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md index bb7eea59e7..a94b44254f 100644 --- a/translations/ko-KR/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md +++ b/translations/ko-KR/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md @@ -28,7 +28,7 @@ assignees: octocat ``` {% note %} -**Note:** You must put YAML-reserved characters such as `:` in quotes. For example, `":bug: Bug"`. +**Note:** If a front matter value includes a YAML-reserved character such as `:` , you must put the whole value in quotes. For example, `":bug: Bug"` or `":new: triage needed, :bug: bug"`. {% endnote %} diff --git a/translations/ko-KR/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md b/translations/ko-KR/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md index e5cfa229a5..302bedce24 100644 --- a/translations/ko-KR/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md +++ b/translations/ko-KR/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md @@ -22,7 +22,7 @@ You can unblock a user in your account settings or from the user's profile page. ### Unblocking a user from their profile page {% data reusables.profile.user_profile_page_navigation %} -2. In the left sidebar, under the user's profile picture, click **Unblock or report user**. ![Unblock or report user link](/assets/images/help/profile/profile-unblock-or-report-user.png) +2. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Unblock or report user**. ![Unblock or report user link](/assets/images/help/profile/profile-unblock-or-report-user.png) 3. Click **Unblock user**. ![Modal box with option to unblock user or report abuse](/assets/images/help/profile/profile-unblockuser.png) {% tip %} diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md index a6ec747ad7..c15a2f09c5 100644 --- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md +++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md @@ -53,6 +53,13 @@ When you create a pull request, you can choose to create a pull request that is {% data reusables.pull_requests.mark-ready-review %} You can convert a pull request to a draft at any time. For more information, see "[Changing the stage of a pull request](/articles/changing-the-stage-of-a-pull-request)." +### Differences between commits on compare and pull request pages + +The compare and pull request pages use different methods to calculate the diff for changed files: + +- Compare pages show the diff between the tip of the head ref and the current common ancestor (that is, the merge base) of the head and base ref. +- Pull request pages show the diff between the tip of the head ref and the common ancestor of the head and base ref at the time when the pull request was created. Consequently, the merge base used for the comparison might be different. + ### 더 읽을거리 - "[Pull request](/articles/github-glossary/#pull-request)" in the {% data variables.product.prodname_dotcom %} glossary diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md index 6e407c98cd..ec96f15854 100644 --- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md +++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md @@ -20,6 +20,12 @@ versions: 4. In the base branch drop-down menu, select the base branch you'd like to [compare changes against](/github/committing-changes-to-your-project/comparing-commits#comparing-branches). ![Base branch drop-down menu ](/assets/images/help/pull_requests/pull-request-edit-base-branch.png) 5. Read the information about changing the base branch and click **Change base**. ![Base branch change confirmation button ](/assets/images/help/pull_requests/pull-request-base-branch-confirm.png) +{% tip %} + +**Tip:** When you open a pull request, {% data variables.product.product_name %} will set the base to the commit that branch references. If the branch is updated in the future, {% data variables.product.product_name %} will not update the base branch's commit. + +{% endtip %} + ### 더 읽을거리 - "[Creating a pull request](/articles/creating-a-pull-request)" diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md index 95ca378e1e..0d6e6b63f5 100644 --- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md +++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md @@ -1,6 +1,6 @@ --- title: Collaborating on repositories with code quality features -intro: 'Workflow quality features like statuses, {% if currentVersion != "free-pro-team@latest" %}pre-receive hooks, {% endif %}protected branches, and required status checks help collaborators make contributions that meet conditions set by organization and repository administrators.' +intro: 'Workflow quality features like statuses, {% if enterpriseServerVersions contains currentVersion %}pre-receive hooks, {% endif %}protected branches, and required status checks help collaborators make contributions that meet conditions set by organization and repository administrators.' mapTopic: true redirect_from: - /articles/collaborating-on-repositories-with-code-quality-features-enabled/ diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/index.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/index.md index 96b1e50d22..63d76c463f 100644 --- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/index.md +++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/index.md @@ -28,7 +28,7 @@ versions: {% link_in_list /what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility %} {% topic_link_in_list /collaborating-on-repositories-with-code-quality-features %} {% link_in_list /about-status-checks %} - + {% link_in_list /working-with-pre-receive-hooks %} {% topic_link_in_list /proposing-changes-to-your-work-with-pull-requests %} diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md index 82a9f8a804..b9a1967de7 100644 --- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md +++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md @@ -10,7 +10,7 @@ versions: You can only resolve merge conflicts on {% data variables.product.product_name %} that are caused by competing line changes, such as when people make different changes to the same line of the same file on different branches in your Git repository. For all other types of merge conflicts, you must resolve the conflict locally on the command line. For more information, see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line/)." -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If a site administrator disables the merge conflict editor for pull requests between repositories, you cannot use the conflict editor on {% data variables.product.product_name %} and must resolve merge conflicts on the command line. For example, if the merge conflict editor is disabled, you cannot use it on a pull request between a fork and upstream repository. {% endif %} @@ -33,7 +33,7 @@ If a site administrator disables the merge conflict editor for pull requests bet {% tip %} - **Tip:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line)." + **Tip:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% if enterpriseServerVersions contains currentVersion %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line)." {% endtip %} {% data reusables.pull_requests.decide-how-to-resolve-competing-line-change-merge-conflict %} diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md index 458bfa66d6..a3d3ac7f76 100644 --- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md +++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md @@ -20,16 +20,16 @@ Before you can sync your fork with an upstream repository, you must [configure a > remote: Total 62 (delta 27), reused 44 (delta 9) > Unpacking objects: 100% (62/62), done. > From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY - > * [new branch] master -> upstream/master + > * [new branch] main -> upstream/main ``` -4. Check out your fork's local `master` branch. +4. Check out your fork's local `main` branch. ```shell - $ git checkout master - > Switched to branch 'master' + $ git checkout main + > Switched to branch 'main' ``` -5. Merge the changes from `upstream/master` into your local `master` branch. This brings your fork's `master` branch into sync with the upstream repository, without losing your local changes. +5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes. ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating a422352..5fdff0f > Fast-forward > README | 9 ------- @@ -39,7 +39,7 @@ Before you can sync your fork with an upstream repository, you must [configure a > create mode 100644 README.md ``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward": ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating 34e91da..16c56ad > Fast-forward > README.md | 5 +++-- diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index 59b8bae1a4..c72f5b3830 100644 --- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -29,7 +29,7 @@ If a public repository is made private, its public forks are split off into a ne In other words, a public repository's forks will remain public in their own separate repository network even after the parent repository is made private. This allows the fork owners to continue to work and collaborate without interruption. If public forks were not moved into a separate network in this way, the owners of those forks would need to get the appropriate [access permissions](/articles/access-permissions-on-github) to pull changes from and submit pull requests to the (now private) parent repository—even though they didn't need those permissions before. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If a public repository has anonymous Git read access enabled and the repository is made private, all of the repository's forks will lose anonymous Git read access and return to the default disabled setting. If a forked repository is made public, repository administrators can re-enable anonymous Git read access. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)." {% endif %} diff --git a/translations/ko-KR/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md b/translations/ko-KR/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md index bb4f9cce6e..004c239549 100644 --- a/translations/ko-KR/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md +++ b/translations/ko-KR/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md @@ -1,6 +1,6 @@ --- title: Creating a commit with multiple authors -intro: 'You can attribute a commit to more than one author by adding one or more `Co-authored-by` trailers to the commit''s message. Co-authored commits are visible on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} and can be included in the profile contributions graph and the repository''s statistics{% endif %}.' +intro: 'You can attribute a commit to more than one author by adding one or more `Co-authored-by` trailers to the commit''s message. Co-authored commits are visible on {% data variables.product.product_name %}{% if enterpriseServerVersions contains currentVersion %} and can be included in the profile contributions graph and the repository''s statistics{% endif %}.' redirect_from: - /articles/creating-a-commit-with-multiple-authors versions: @@ -67,7 +67,7 @@ After you've made changes in a file using the web editor on {% data variables.pr The new commit and message will appear on {% data variables.product.product_location %}. ### 더 읽을거리 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} - "[Viewing contributions on your profile](/articles/viewing-contributions-on-your-profile)" - "[Why are my contributions not showing up on my profile?](/articles/why-are-my-contributions-not-showing-up-on-my-profile)"{% endif %} - "[Viewing a summary of repository activity](/articles/viewing-a-summary-of-repository-activity)" diff --git a/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md b/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md index b27145281c..0c73f568d7 100644 --- a/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md +++ b/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md @@ -10,7 +10,7 @@ versions: When you create a repository, you can choose to make the repository public or private. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you're creating the repository in an organization{% if currentVersion == "free-pro-team@latest" %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %} -{% if currentVersion != "free-pro-team@latest" %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if currentVersion != "free-pro-team@latest" %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to {% if currentVersion == "free-pro-team@latest" %}members of your enterprise account{% else %}members of any organization on your instance{% endif %}. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} +{% if enterpriseServerVersions contains currentVersion %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if enterpriseServerVersions contains currentVersion %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to members of your enterprise. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} Organization owners always have access to every repository created in an organization. For more information, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." diff --git a/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md b/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md index a7c42ff263..d87a77c6c8 100644 --- a/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md +++ b/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md @@ -1,6 +1,6 @@ --- title: Backing up a repository -intro: 'You can use{% if currentVersion != "free-pro-team@latest" %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' +intro: 'You can use{% if enterpriseServerVersions contains currentVersion %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' redirect_from: - /articles/backing-up-a-repository versions: @@ -31,7 +31,7 @@ When you clone a repository or wiki, only Git data, such as project files and co - [Projects](/v3/projects/#list-repository-projects) {% endif %} -Once you have {% if currentVersion != "free-pro-team@latest" %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). +Once you have {% if enterpriseServerVersions contains currentVersion %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). {% if currentVersion == "free-pro-team@latest" %} ### Third-party backup tools diff --git a/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md b/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md index fdf9378035..50231fa578 100644 --- a/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md +++ b/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md @@ -1,6 +1,7 @@ --- title: Creating a template repository intro: 'You can make an existing repository a template, so you and others can generate new repositories with the same directory structure{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}, branches,{% endif %} and files.' +permissions: 'Anyone with admin permissions to a repository can make the repository a template.' redirect_from: - /articles/creating-a-template-repository versions: @@ -8,7 +9,11 @@ versions: enterprise-server: '*' --- -Anyone with admin permissions to a repository can make the repository a template. +{% note %} + +**Note**: Your template repository cannot include files stored using {% data variables.large_files.product_name_short %}. + +{% endnote %} To create a template repository, you must create a repository, then make the repository a template. For more information about creating a repository, see "[Creating a new repository](/articles/creating-a-new-repository)." @@ -16,4 +21,4 @@ After you make your repository a template, anyone with access to the repository {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -3. Select **Template repository**. ![Checkbox to make a repository a template](/assets/images/help/repository/template-repository-checkbox.png) +1. Select **Template repository**. ![Checkbox to make a repository a template](/assets/images/help/repository/template-repository-checkbox.png) diff --git a/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md b/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md index 134004c045..e8ca80005d 100644 --- a/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md +++ b/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md @@ -42,7 +42,7 @@ If the repository belongs to an organization and you're using an SSH key generat For more information, see [Adding a new SSH key to your GitHub account](/articles/adding-a-new-ssh-key-to-your-github-account). -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Check if your instance is in private mode diff --git a/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md b/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md index 4e50f0caec..8a24bb5005 100644 --- a/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md +++ b/translations/ko-KR/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md @@ -70,7 +70,7 @@ When prompted for a username and password, make sure you use an account that has {% tip %} -**Tip**: If you don't want to enter your credentials every time you interact with the remote repository, you can turn on [credential caching](/github/using-git/caching-your-github-credentials-in-git). +**Tip**: If you don't want to enter your credentials every time you interact with the remote repository, you can turn on [credential caching](/github/using-git/caching-your-github-credentials-in-git). If you are already using credential caching, please make sure that your computer has the correct credentials cached. Incorrect or out of date credentials will cause authentication to fail. {% endtip %} diff --git a/translations/ko-KR/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md b/translations/ko-KR/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md index e10171796c..9d49e1b75b 100644 --- a/translations/ko-KR/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md +++ b/translations/ko-KR/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md @@ -10,7 +10,7 @@ versions: ### Editor tools -To streamline your workflow, you can connect to {% data variables.product.product_name %} repositories within third-party editor tools, such as Atom, Unity, and Visual Studio. +You can connect to {% data variables.product.product_name %} repositories within third-party editor tools, such as Atom, Unity, and Visual Studio. #### {% data variables.product.product_name %} for Atom @@ -30,8 +30,12 @@ With the {% data variables.product.prodname_dotcom %} for Visual Studio Code ext ### Project management tools -To streamline your workflow, you can integrate your {% data variables.product.product_name %} personal account or organization with third-party project management tools, such as Jira. +You can integrate your {% data variables.product.product_name %} personal account or organization with third-party project management tools, such as Jira or Slack. #### Jira Cloud and {% data variables.product.product_name %}.com integration -You can integrate Jira Cloud with your personal or organization account to scan commits and pull requests, creating relevant metadata and hyperlinks in any mentioned Jira issues. +You can integrate Jira Cloud with your personal or organization account to scan commits and pull requests, creating relevant metadata and hyperlinks in any mentioned Jira issues. For more information, visit the [Jira integration app](https://github.com/marketplace/jira-software-github) in the marketplace. + +#### Slack and {% data variables.product.product_name %} integration + +You can integrate Slack with your personal or organization account to subscribe for notifications, close or open issues, and provide rich references to issues and pull requests without leaving Slack. For more information, visit the [Slack integration app](https://github.com/marketplace/slack-github) in the marketplace. diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md index 65a9359fb4..ce3a04d001 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md @@ -22,5 +22,5 @@ You can use {% data variables.product.prodname_code_scanning %} webhooks to buil ### 더 읽을거리 * "[About code scanning](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" -* "[Configuring code scanning in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning-in-your-ci-system)" +* "[Using {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} with your existing CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/using-codeql-code-scanning-with-your-existing-ci-system)" * "[SARIF support for code scanning](/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning)" diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md index f9ed946bfb..f6a0e3abd4 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md @@ -46,7 +46,7 @@ By default, the {% data variables.product.prodname_codeql_workflow %} uses the ` #### Scanning pull requests -The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on the `HEAD` commit of a pull request against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} +The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on pull requests targeted against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} For more information about the `pull_request` event, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags)." @@ -148,8 +148,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - with: - fetch-depth: 2 - name: Set up Python uses: actions/setup-python@v2 with: @@ -163,8 +161,6 @@ jobs: # Set the `CODEQL-PYTHON` environment variable to the Python executable # that includes the dependencies echo "::set-env name=CODEQL_PYTHON::$(which python)" - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md index d30c234f29..d7bb51ccfc 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md @@ -38,7 +38,7 @@ You decide how you generate {% data variables.product.prodname_code_scanning %} 7. Choose whether you'd like to commit directly to the default branch, or create a new branch and start a pull request. ![Choose where to commit](/assets/images/help/repository/start-commit-choose-where-to-commit.png) 8. Click **Commit new file** or **Propose new file**. -In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch or any protected branches. As a result, {% data variables.product.prodname_code_scanning %} will now commence. +In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch. As a result, {% data variables.product.prodname_code_scanning %} will now commence. ### Viewing the logging output from {% data variables.product.prodname_code_scanning %} @@ -86,7 +86,7 @@ After {% data variables.product.prodname_code_scanning %} has analyzed the code There are other situations where there may be no analysis for the latest commit to the base branch for a pull request. These include: -* The pull request has been raised against a branch other than the default branch or a protected branch, and this branch hasn't been analyzed. +* The pull request has been raised against a branch other than the default branch, and this branch hasn't been analyzed. To check whether a branch has been scanned, go to the {% data variables.product.prodname_code_scanning_capc %} page, click the **Branch** drop-down and select the relevant branch. diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md index d6cf4c0596..0ccb22e86c 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md @@ -1,5 +1,6 @@ --- title: Finding security vulnerabilities and errors in your code +shortTitle: Finding vulnerabilities and coding errors product: '{% data reusables.gated-features.code-scanning %}' redirect_from: - /github/managing-security-vulnerabilities/finding-security-vulnerabilities-in-your-projects-code @@ -18,6 +19,7 @@ versions: {% link_in_list /configuring-code-scanning %} {% link_in_list /configuring-the-codeql-workflow-for-compiled-languages %} {% link_in_list /troubleshooting-the-codeql-workflow %} + {% link_in_list /running-codeql-code-scanning-in-a-container %} {% topic_link_in_list /integrating-with-code-scanning %} {% link_in_list /about-integration-with-code-scanning %} {% link_in_list /uploading-a-sarif-file-to-github %} diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md index 87ca81fed5..16beb1f4e1 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md @@ -1,7 +1,7 @@ --- title: Managing code scanning alerts for your repository shortTitle: Managing alerts -intro: 'You can view, fix, and close alerts for potential vulnerabilities or errors in your project''s code.' +intro: 'You can view, fix, {% if currentVersion == "enterprise-server@2.22" %}or close{% else %}dismiss, or delete{% endif %} alerts for potential vulnerabilities or errors in your project''s code.' product: '{% data reusables.gated-features.code-scanning %}' permissions: 'People with write permission to a repository can manage {% data variables.product.prodname_code_scanning %} alerts for the repository.' versions: @@ -37,25 +37,89 @@ Anyone with read permission for a repository can see {% data variables.product.p {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} -{% data reusables.code-scanning.click-alert-in-list %} -5. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. ![Example data-flow alert](/assets/images/help/repository/code-scanning-show-paths.png) +1. Under "{% data variables.product.prodname_code_scanning_capc %}," click the alert you'd like to explore. ![Summary of alerts](/assets/images/help/repository/code-scanning-click-alert.png) +1. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. ![The "Show paths" link on an alert](/assets/images/help/repository/code-scanning-show-paths.png) +1. Alerts from {% data variables.product.prodname_codeql %} analysis include a description of the problem. Click **Show more** for guidance on how to fix your code. ![Details for an alert](/assets/images/help/repository/code-scanning-alert-details.png) ### Fixing an alert Anyone with write permission for a repository can fix an alert by committing a correction to the code. If the repository has {% data variables.product.prodname_code_scanning %} scheduled to run on pull requests, it's best to raise a pull request with your correction. This will trigger {% data variables.product.prodname_code_scanning %} analysis of the changes and test that your fix doesn't introduce any new problems. For more information, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)" and "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)." +If you have write permission for a repository, you can view fixed alerts by viewing the summary of alerts and clicking **Closed**. For more information, see "[Viewing an alert](#viewing-an-alert)." The "Closed" list shows fixed alerts and alerts that users have {% if currentVersion == "enterprise-server@2.22" %}closed{% else %}dismissed{% endif %}. + +Alerts may be fixed in one branch but not in another. You can use the "Branch" drop-down menu, on the summary of alerts, to check whether an alert is fixed in a particular branch. + +![Filtering alerts by branch](/assets/images/help/repository/code-scanning-branch-filter.png) + +{% if currentVersion == "enterprise-server@2.22" %} + ### Closing an alert Closing an alert is a way to resolve an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} +{% else %} + +### Dismissing or deleting alerts + +There are two ways of closing an alert. You can fix the problem in the code, or you can dismiss the alert. Alternatively, if you have admin permissions for the repository, you can delete alerts. Deleting alerts is useful in situations where you have enabled a {% data variables.product.prodname_code_scanning %} tool and then decided to remove it, or where you have enabled {% data variables.product.prodname_codeql %} analysis with a larger set of queries than you want to continue using, and you've then removed some queries from the tool. In both cases, deleting alerts allows you to clean up your {% data variables.product.prodname_code_scanning %} results. You can delete alerts from the summary list within the **Security** tab. + +Dismissing an alert is a way of closing an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} You can dismiss alerts from {% data variables.product.prodname_code_scanning %} annotations in code, or from the summary list within the **Security** tab. + +When you dismiss an alert: + +- It's dismissed in all branches. +- The alert is removed from the number of current alerts for your project. +- The alert is moved to the "Closed" list in the summary of alerts, from where you can reopen it, if required. +- The reason why you closed the alert is recorded. +- Next time {% data variables.product.prodname_code_scanning %} runs, the same code won't generate an alert. + +When you delete an alert: + +- It's deleted in all branches. +- The alert is removed from the number of current alerts for your project. +- It is _not_ added to the "Closed" list in the summary of alerts. +- If the code that generated the alert stays the same, and the same {% data variables.product.prodname_code_scanning %} tool runs again without any configuration changes, the alert will be shown again in your analysis results. + +To dismiss or delete alerts: + +{% endif %} + {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} +{% if currentVersion == "enterprise-server@2.22" %} {% data reusables.code-scanning.click-alert-in-list %} -5. Select the Close drop-down menu and click a reason for closing the alert. ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) +1. Select the **Close** drop-down menu and click a reason for closing the alert. + ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) {% data reusables.code-scanning.false-positive-fix-codeql %} +{% else %} + +1. If you have admin permissions for the repository, and you want to delete alerts for this {% data variables.product.prodname_code_scanning %} tool, select some or all of the check boxes and click **Delete**. + + ![Deleting alerts](/assets/images/help/repository/code-scanning-delete-alerts.png) + + Optionally, you can use the filters to display a subset of alerts and then delete all matching alerts at once. For example, if you have removed a query from {% data variables.product.prodname_codeql %} analysis, you can use the "Rule" filter to list just the alerts for that query and then select and delete all of those alerts. + + ![Filter alerts by rule](/assets/images/help/repository/code-scanning-filter-by-rule.png) + +1. If you want to dismiss an alert, it's important to explore the alert first, so that you can choose the correct dismissal reason. Click the alert you'd like to explore. + + ![Open an alert from the summary list](/assets/images/help/repository/code-scanning-click-alert.png) + +1. Review the alert, then click **Dismiss** and choose a reason for closing the alert. ![Choosing a reason for dismissing an alert](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + + {% data reusables.code-scanning.choose-alert-dismissal-reason %} + + {% data reusables.code-scanning.false-positive-fix-codeql %} + +#### Dismissing multiple alerts at once + +If a project has multiple alerts that you want to dismiss for the same reason, you can bulk dismiss them from the summary of alerts. Typically, you'll want to filter the list and then dismiss all of the matching alerts. For example, you might want to dismiss all of the current alerts in the project that have been tagged for a particular Common Weakness Enumeration (CWE) vulnerability. + +{% endif %} + ### 더 읽을거리 - "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)" diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md new file mode 100644 index 0000000000..d32e59c2c2 --- /dev/null +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md @@ -0,0 +1,69 @@ +--- +title: Running CodeQL code scanning in a container +shortTitle: '{% data variables.product.prodname_code_scanning_capc %} in a container' +intro: 'You can run {% data variables.product.prodname_code_scanning %} in a container by ensuring that all processes run in the same container.' +product: '{% data reusables.gated-features.code-scanning %}' +versions: + free-pro-team: '*' + enterprise-server: '>=2.22' +--- + +{% data reusables.code-scanning.beta %} + +### About {% data variables.product.prodname_code_scanning %} with a containerized build + +If you're setting up {% data variables.product.prodname_code_scanning %} for a compiled language, and you're building the code in a containerized environment, the analysis may fail with the error message "No source code was seen during the build." This indicates that {% data variables.product.prodname_codeql %} was unable to monitor your code as it was compiled. + +You must run {% data variables.product.prodname_codeql %} in the same container in which you build your code. This applies whether you are using the {% data variables.product.prodname_codeql_runner %}, or {% data variables.product.prodname_actions %}. If you're using the {% data variables.product.prodname_codeql_runner %}, run it in the container where your code builds. For more information about the {% data variables.product.prodname_codeql_runner %}, see "[Running {% data variables.product.prodname_codeql %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-code-scanning-in-your-ci-system)." If you're using {% data variables.product.prodname_actions %}, configure your workflow to run all the actions in the same container. For more information, see "[Example workflow](#example-workflow)." + +### Dependencies + +You may have difficulty running {% data variables.product.prodname_code_scanning %} if the container you're using is missing certain dependencies (for example, Git must be installed and added to the PATH variable). If you encounter dependency issues, review the list of software typically included on {% data variables.product.prodname_dotcom %}'s virtual environments. For more information, see the version-specific `readme` files in these locations: + +* Linux: https://github.com/actions/virtual-environments/tree/main/images/linux +* MacOS: https://github.com/actions/virtual-environments/tree/main/images/macos +* Windows: https://github.com/actions/virtual-environments/tree/main/images/win + +### Example workflow + +This sample workflow uses {% data variables.product.prodname_actions %} to run {% data variables.product.prodname_codeql %} analysis in a containerized environment. The value of `container.image` identifies the container to use. In this example the image is named `codeql-container`, with a tag of `f0f91db`. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)." + +``` yaml +name: "{% data variables.product.prodname_codeql %}" + +on: + push: + branches: [main] + pull_request: + branches: [main] + schedule: + - cron: '0 0 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: [java] + + # Specify the container in which actions will run + container: + image: codeql-container:f0f91db + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Initialize {% data variables.product.prodname_codeql %} + uses: github/codeql-action/init@v1 + with: + languages: {% raw %}${{ matrix.language }}{% endraw %} + - name: Build + run: | + ./configure + make + - name: Perform {% data variables.product.prodname_codeql %} Analysis + uses: github/codeql-action/analyze@v1 +``` diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md index ed70c40db4..c1f4131223 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md @@ -10,6 +10,8 @@ versions: enterprise-server: '>=2.22' --- + + {% data reusables.code-scanning.beta-codeql-runner %} {% data reusables.code-scanning.beta %} {% data reusables.code-scanning.enterprise-enable-code-scanning %} @@ -66,7 +68,7 @@ The options for providing access to the {% data variables.product.prodname_codeq 1. Allow the CI servers access to {% data variables.product.prodname_dotcom_the_website %} so that the {% data variables.product.prodname_codeql_runner %} can download the bundle automatically. 1. Manually download/extract the bundle, store it with other central resources, and use the `--codeql-path` flag to specify the location of the bundle in calls to initialize the {% data variables.product.prodname_codeql_runner %}. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} 1. You can mirror the `github/codeql-action` repository on {% data variables.product.product_location %}. Unless you specify the `--codeql-path` flag, the runner automatically checks for the bundle in this location and on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} ### Calling the {% data variables.product.prodname_codeql_runner %} @@ -76,7 +78,7 @@ You should call the {% data variables.product.prodname_codeql_runner %} from the 1. `init` required to initialize the runner and create a {% data variables.product.prodname_codeql %} database for each language to be analyzed. These databases are populated and analyzed by subsequent commands. 1. `analyze` required to populate the {% data variables.product.prodname_codeql %} databases, analyze them, and upload results to {% data variables.product.product_location %}. -For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}. +For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if enterpriseServerVersions contains currentVersion %} or mirrored on {% data variables.product.product_location %}{% endif %}. You can configure where the {% data variables.product.prodname_codeql_runner %} stores the CodeQL bundle for future analysis on a server using the `--tools-dir` flag and where it stores temporary files during analysis using `--temp-dir`. @@ -110,7 +112,7 @@ This example runs {% data variables.product.prodname_codeql %} analysis on a Lin > Successfully uploaded results ``` -The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if enterpriseServerVersions contains currentVersion %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." #### Compiled language example diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md index eeafd05dff..8e382ca4b8 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md @@ -36,6 +36,8 @@ If you upload a SARIF file without fingerprint data using the `/code-scanning/sa ### Validating your SARIF file + + You can check a SARIF file is compatible with {% data variables.product.prodname_code_scanning %} by testing it against the {% data variables.product.prodname_dotcom %} ingestion rules. For more information, visit the [Microsoft SARIF validator](https://sarifweb.azurewebsites.net/). ### Supported SARIF output file properties diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md index 931419d501..ea1297c8d9 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md @@ -13,11 +13,11 @@ versions: ### About {% data variables.product.prodname_code_scanning %} results on pull requests -In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch or protected branches, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." -If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch, and the repository owner has configured required status checks, then you must either fix or close any error alerts before the pull request can be merged. For more information, see "[About required status checks](/github/administering-a-repository/about-required-status-checks)." +If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch that has been enabled for {% data variables.product.prodname_code_scanning %}, and the repository owner has configured required status checks, then you must either fix or {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} all error alerts before the pull request can be merged. For more information, see "[About required status checks](/github/administering-a-repository/about-required-status-checks)." -![Example pull request check status with {% data variables.product.prodname_code_scanning %} alert](/assets/images/help/repository/code-scanning-check-failure.png) +![Failed {% data variables.product.prodname_code_scanning %} check on a pull request](/assets/images/help/repository/code-scanning-check-failure.png) ### About {% data variables.product.prodname_code_scanning %} as a pull request check @@ -29,20 +29,38 @@ If the repository uses the {% data variables.product.prodname_codeql_workflow %} When you look at the **Files changed** tab for a pull request, you see annotations for any lines of code that triggered the alert. -![Example {% data variables.product.prodname_code_scanning %} alert shown as an annotation in the "Files changed" view of a pull request](/assets/images/help/repository/code-scanning-pr-annotation.png) +![Alert annotation within a pull request diff](/assets/images/help/repository/code-scanning-pr-annotation.png) Some annotations contain links with extra context for the alert. In the example above, from {% data variables.product.prodname_codeql %} analysis, you can click **user-provided value** to see where the untrusted data enters the data flow (this is referred to as the source). In this case you can view the full path from the source to the code that uses the data (the sink) by clicking **Show paths**. This makes it easy to check whether the data is untrusted or if the analysis failed to recognize a data sanitization step between the source and the sink. For information about analyzing data flow using {% data variables.product.prodname_codeql %}, see "[About data flow analysis](https://help.semmle.com/QL/learn-ql/intro-to-data-flow.html)." For more information about an alert, click **Show more details** on the annotation. This allows you to see all of the context and metadata provided by the tool in an alert view. In the example below, you can see tags showing the severity, type, and relevant common weakness enumerations (CWEs) for the problem. The view also shows which commit introduced the problem. -Alerts from some tools, like {% data variables.product.prodname_codeql %}, also include a description and a **Show more** link for guidance on how to fix the problem in the code. +In the detailed view for an alert, some {% data variables.product.prodname_code_scanning %} tools, like {% data variables.product.prodname_codeql %} analysis, also include a description of the problem and a **Show more** link for guidance on how to fix your code. -![Example of "Show more details" for a {% data variables.product.prodname_code_scanning %} alert in a pull request](/assets/images/help/repository/code-scanning-pr-alert.png) +![Alert description and link to show more information](/assets/images/help/repository/code-scanning-pr-alert.png) -### Resolving an alert on your pull request +### {% if currentVersion == "enterprise-server@2.22" %}Resolving{% else %}Fixing{% endif %} an alert on your pull request -Anyone with write permission for a repository can resolve alerts on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is resolved and the annotation removed. +Anyone with write permission for a repository can fix a {% data variables.product.prodname_code_scanning %} alert that's identified on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is closed and the annotation removed. + +{% if currentVersion == "enterprise-server@2.22" %} If you don't think that an alert needs to be fixed, you can close the alert manually. {% data reusables.code-scanning.close-alert-examples %} The **Close** button is available in annotations and in the alerts view if you have write permission for the repository. {% data reusables.code-scanning.false-positive-fix-codeql %} + +{% else %} + +### Dismissing an alert on your pull request + +An alternative way of closing an alert is to dismiss it. You can dismiss an alert if you don't think it needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} If you have write permission for the repository, the **Dismiss** button is available in code annotations and in the alerts summary. When you click **Dismiss** you will be prompted to choose a reason for closing the alert. + +![Choosing a reason for dismissing an alert](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + +{% data reusables.code-scanning.choose-alert-dismissal-reason %} + +{% data reusables.code-scanning.false-positive-fix-codeql %} + +For more information about dismissing alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#dismissing-or-deleting-alerts)." + +{% endif %} \ No newline at end of file diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md index 317698c3e0..05cc0e7610 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md @@ -49,4 +49,4 @@ If the `analyze` command for the {% data variables.product.prodname_codeql_runne {% endnote %} -1. The code is built in a container or on a separate machine. If you use a containerized build or if you outsource the build to another machine, make sure to run the {% data variables.product.prodname_codeql_runner %} in the container or on the machine where your build task takes place. +1. The code is built in a container or on a separate machine. If you use a containerized build or if you outsource the build to another machine, make sure to run the {% data variables.product.prodname_codeql_runner %} in the container or on the machine where your build task takes place. For more information, see "[Running CodeQL code scanning in a container](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)." diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md index a34e7f6ac2..120f8640c1 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md @@ -60,7 +60,11 @@ For more information, see the workflow extract in "[Automatic build for a compil 1. Your {% data variables.product.prodname_code_scanning %} workflow is analyzing a compiled language (C, C++, C#, or Java), but the code was not compiled. By default, the {% data variables.product.prodname_codeql %} analysis workflow contains an `autobuild` step, however, this step represents a best effort process, and may not succeed in building your code, depending on your specific build environment. Compilation may also fail if you have removed the `autobuild` step and did not include build steps manually. For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." 1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but portions of your build are cached to improve performance (most likely to occur with build systems like Gradle or Bazel). Since {% data variables.product.prodname_codeql %} observes the activity of the compiler to understand the data flows in a repository, {% data variables.product.prodname_codeql %} requires a complete build to take place in order to perform analysis. 1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but compilation does not occur between the `init` and `analyze` steps in the workflow. {% data variables.product.prodname_codeql %} requires that your build happens in between these two steps in order to observe the activity of the compiler and perform analysis. -1. Your compiled code (in C, C++, C#, or Java) was compiled successfully, but {% data variables.product.prodname_codeql %} was unable to detect the compiler invocations. The most common causes are certain configuration options like running your build process in a container, if you're building using a distributed build system external to {% data variables.product.prodname_actions %} using a daemon process, or if {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. +1. Your compiled code (in C, C++, C#, or Java) was compiled successfully, but {% data variables.product.prodname_codeql %} was unable to detect the compiler invocations. The most common causes are: + + * Running your build process in a separate container to {% data variables.product.prodname_codeql %}. For more information, see "[Running CodeQL code scanning in a container](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)." + * Building using a distributed build system external to GitHub Actions, using a daemon process. + * {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. For C# projects using either `dotnet build` or `msbuild` which target .NET Core 2, you should specify `/p:UseSharedCompilation=false` in your workflow's `run` step, when you build your code. The `UseSharedCompilation` flag isn't necessary for .NET Core 3.0 and later. @@ -123,4 +127,4 @@ If you are analyzing code written in Python, you may see different results depen On GitHub-hosted runners that use Linux, the {% data variables.product.prodname_codeql_workflow %} tries to install and analyze Python dependencies, which could lead to more results. To disable the auto-install, add `setup-python-dependencies: false` to the "Initialize CodeQL" step of the workflow. For more information about configuring the analysis of Python dependencies, see "[Analyzing Python dependencies](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#analyzing-python-dependencies)." -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/uploading-a-sarif-file-to-github.md b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/uploading-a-sarif-file-to-github.md index 01caf5341f..fc2866d1fa 100644 --- a/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/uploading-a-sarif-file-to-github.md +++ b/translations/ko-KR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/uploading-a-sarif-file-to-github.md @@ -24,7 +24,7 @@ You can upload the results using {% data variables.product.prodname_actions %}{% - {% data variables.product.prodname_actions %} to run the {% data variables.product.prodname_codeql %} action, there is no further action required. The {% data variables.product.prodname_codeql %} action uploads the SARIF file automatically when it completes analysis. - {% data variables.product.prodname_actions %} to run a SARIF-compatible analysis tool, you could update the workflow to include a final step that uploads the results (see below). -- The {% data variables.product.prodname_codeql_runner %}, to run {% data variables.product.prodname_code_scanning %} in your CI system, by default the runner automatically uploads results to {% data variables.product.prodname_dotcom %} on completion. The {% data variables.product.prodname_codeql_runner %}, to run {% data variables.product.prodname_code_scanning %} in your CI system, by default the runner automatically uploads results to {% data variables.product.prodname_dotcom %} on completion. +- The {% data variables.product.prodname_codeql_runner %}, to run {% data variables.product.prodname_code_scanning %} in your CI system, by default the runner automatically uploads results to {% data variables.product.prodname_dotcom %} on completion. If you block the automatic upload, when you are ready to upload results you can use the `upload` command (for more information, see "[Running {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system)"). - A tool that generates results as an artifact outside of your repository, you can use the {% data variables.product.prodname_code_scanning %} API to upload the file (for more information, see "[Upload a SARIF file](/rest/reference/code-scanning#upload-a-sarif-file)"). ### Uploading a {% data variables.product.prodname_code_scanning %} analysis with {% data variables.product.prodname_actions %} @@ -110,5 +110,5 @@ jobs: - "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions)" - "[Viewing your workflow history](/actions/managing-workflow-runs/viewing-workflow-run-history)" -- "[Running {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-code-scanning-in-your-ci-system)" +- "[Running {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system)" - "[Upload a SARIF file](/rest/reference/code-scanning#upload-a-sarif-file)" diff --git a/translations/ko-KR/content/github/getting-started-with-github/githubs-products.md b/translations/ko-KR/content/github/getting-started-with-github/githubs-products.md index 441315fb55..5b29e81ef4 100644 --- a/translations/ko-KR/content/github/getting-started-with-github/githubs-products.md +++ b/translations/ko-KR/content/github/getting-started-with-github/githubs-products.md @@ -96,7 +96,7 @@ For more information about hosting your own instance of [{% data variables.produ - {% data variables.contact.github_support %} {% data variables.product.premium_plus_support_plan %} - {% data variables.product.prodname_insights %} -- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} +- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} - [{% data variables.product.prodname_learning %} for organizations](https://lab.github.com/organizations) For more information about signing up for {% data variables.product.prodname_ghe_one %}, contact [{% data variables.product.product_name %}'s Sales team](https://enterprise.github.com/contact). diff --git a/translations/ko-KR/content/github/getting-started-with-github/supported-browsers.md b/translations/ko-KR/content/github/getting-started-with-github/supported-browsers.md index 57d8e0ab96..4432a1f0f3 100644 --- a/translations/ko-KR/content/github/getting-started-with-github/supported-browsers.md +++ b/translations/ko-KR/content/github/getting-started-with-github/supported-browsers.md @@ -4,7 +4,7 @@ redirect_from: - /articles/why-doesn-t-graphs-work-with-ie-8/ - /articles/why-don-t-graphs-work-with-ie8/ - /articles/supported-browsers -intro: 'We design {% data variables.product.product_name %} to support the latest web browsers. We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.16" %}Internet Explorer 11, {% endif %}and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' +intro: 'We design {% data variables.product.product_name %} to support the latest web browsers. We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' versions: free-pro-team: '*' enterprise-server: '*' diff --git a/translations/ko-KR/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md b/translations/ko-KR/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md index f8910e819a..8bee9ef207 100644 --- a/translations/ko-KR/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md +++ b/translations/ko-KR/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md @@ -29,7 +29,7 @@ versions: 3. Change the current working directory to your local project. 4. Initialize the local directory as a Git repository. ```shell - $ git init + $ git init -b main ``` 5. Add the files in your new local repository. This stages them for the first commit. ```shell @@ -67,7 +67,7 @@ versions: 3. Change the current working directory to your local project. 4. Initialize the local directory as a Git repository. ```shell - $ git init + $ git init -b main ``` 5. Add the files in your new local repository. This stages them for the first commit. ```shell @@ -105,7 +105,7 @@ versions: 3. Change the current working directory to your local project. 4. Initialize the local directory as a Git repository. ```shell - $ git init + $ git init -b main ``` 5. Add the files in your new local repository. This stages them for the first commit. ```shell diff --git a/translations/ko-KR/content/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git.md b/translations/ko-KR/content/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git.md index 1332f03f9d..cd49a64992 100644 --- a/translations/ko-KR/content/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git.md +++ b/translations/ko-KR/content/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git.md @@ -35,9 +35,9 @@ Git projects are also stored within a single directory. However, Git obscures th A Git workflow looks like this: * A Git repository stores the full history of all of its branches and tags within the *.git* directory. -* The latest stable release is contained within the `master` branch. +* The latest stable release is contained within the default branch. * Active feature work is developed in separate branches. -* When a feature is finished, the feature branch is merged into `master` and deleted. +* When a feature is finished, the feature branch is merged into the default branch and deleted. Unlike SVN, with Git the directory structure remains the same, but the contents of the files change based on your branch. diff --git a/translations/ko-KR/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md b/translations/ko-KR/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md index 43002584fc..79d291be76 100644 --- a/translations/ko-KR/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md +++ b/translations/ko-KR/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md @@ -19,7 +19,7 @@ Files that you add to a repository via a browser are limited to {% data variable {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. Under your repository name, click **Upload files**. ![Upload files button](/assets/images/help/repository/upload-files-button.png) {% else %} 2. Above the list of files, using the **Add file** drop-down, click **Upload files**. !["Upload files" in the "Add file" dropdown](/assets/images/help/repository/upload-files-button.png) diff --git a/translations/ko-KR/content/github/managing-files-in-a-repository/navigating-code-on-github.md b/translations/ko-KR/content/github/managing-files-in-a-repository/navigating-code-on-github.md index e71b9d858f..316807351b 100644 --- a/translations/ko-KR/content/github/managing-files-in-a-repository/navigating-code-on-github.md +++ b/translations/ko-KR/content/github/managing-files-in-a-repository/navigating-code-on-github.md @@ -10,6 +10,7 @@ versions: ### About navigating code on {% data variables.product.prodname_dotcom %} Navigating code functions use the open source library [`semantic`](https://github.com/github/semantic). The following languages are supported: +- C# - CodeQL - Go - Java diff --git a/translations/ko-KR/content/github/managing-large-files/about-git-large-file-storage.md b/translations/ko-KR/content/github/managing-large-files/about-git-large-file-storage.md index ff9b1cd022..086ae4c04e 100644 --- a/translations/ko-KR/content/github/managing-large-files/about-git-large-file-storage.md +++ b/translations/ko-KR/content/github/managing-large-files/about-git-large-file-storage.md @@ -41,11 +41,13 @@ size 84977953 It tracks the `version` of {% data variables.large_files.product_name_short %} you're using, followed by a unique identifier for the file (`oid`). It also stores the `size` of the final file. -{% tip %} +{% note %} -**Tip**: {% data variables.large_files.product_name_short %} cannot be used with {% data variables.product.prodname_pages %} sites. +**Notes**: +- {% data variables.large_files.product_name_short %} cannot be used with {% data variables.product.prodname_pages %} sites. +- {% data variables.large_files.product_name_short %} cannot be used with template repositories. -{% endtip %} +{% endnote %} ### 더 읽을거리 diff --git a/translations/ko-KR/content/github/managing-large-files/conditions-for-large-files.md b/translations/ko-KR/content/github/managing-large-files/conditions-for-large-files.md index 3daf4fef53..262eaddd69 100644 --- a/translations/ko-KR/content/github/managing-large-files/conditions-for-large-files.md +++ b/translations/ko-KR/content/github/managing-large-files/conditions-for-large-files.md @@ -16,4 +16,4 @@ If you attempt to add or update a file that is larger than {% data variables.lar ### Blocked pushes for large files -{% if currentVersion != "free-pro-team@latest" %}By default, {% endif %}{% data variables.product.product_name %} blocks pushes that exceed {% data variables.large_files.max_github_size %}. {% if currentVersion != "free-pro-team@latest" %}However, a site administrator can configure a different limit for your {% data variables.product.prodname_ghe_server %} instance. For more information, see "[Setting Git push limits](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits)".{% endif %} +{% if enterpriseServerVersions contains currentVersion %}By default, {% endif %}{% data variables.product.product_name %} blocks pushes that exceed {% data variables.large_files.max_github_size %}. {% if enterpriseServerVersions contains currentVersion %}However, a site administrator can configure a different limit for your {% data variables.product.prodname_ghe_server %} instance. For more information, see "[Setting Git push limits](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits)".{% endif %} diff --git a/translations/ko-KR/content/github/managing-large-files/configuring-git-large-file-storage.md b/translations/ko-KR/content/github/managing-large-files/configuring-git-large-file-storage.md index 8561dae6a7..413aa43737 100644 --- a/translations/ko-KR/content/github/managing-large-files/configuring-git-large-file-storage.md +++ b/translations/ko-KR/content/github/managing-large-files/configuring-git-large-file-storage.md @@ -13,7 +13,7 @@ If there are existing files in your repository that you'd like to use {% data va {% data reusables.large_files.resolving-upload-failures %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index 53709021f1..82f9ed31d4 100644 --- a/translations/ko-KR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -50,10 +50,10 @@ You can also enable or disable {% data variables.product.prodname_dependabot %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} When -{% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert also contains a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."{% endif %} +{% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert will also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a security alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% endif %} @@ -73,46 +73,16 @@ We send {% data variables.product.prodname_dependabot_short %} alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository.{% if currentVersion == "free-pro-team@latest" %} You can also enable {% data variables.product.prodname_dependabot_short %} alerts for additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} We send security alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. {% endif %} -### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} - -{% if currentVersion == "free-pro-team@latest" %} -By default, you will receive -{% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive -{% data variables.product.prodname_dependabot_alerts %} by email. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the -{% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#security-alert-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the -{% data variables.product.product_name %} user interface. For more information, see "[Choosing the delivery method for your notifications ](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.20" % %} - -{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} For more information, see "[Choosing the delivery method for your notifications](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)."{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."{% endif %} {% if currentVersion == "free-pro-team@latest" %} ### 더 읽을거리 -- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" +- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" - "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Understanding how {% data variables.product.product_name %} uses and protects your data](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %} diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md new file mode 100644 index 0000000000..786d16ce1d --- /dev/null +++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md @@ -0,0 +1,33 @@ +--- +title: About GitHub Dependabot security updates +intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.' +shortTitle: About Dependabot security updates +versions: + free-pro-team: '*' +--- + +### About {% data variables.product.prodname_dependabot_security_updates %} + +{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot_short %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot_short %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + +{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot_short %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." + +{% note %} + +**참고** + +The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. You will see a {% data variables.product.prodname_dependabot_short %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot_short %} is unable to update an indirect or transitive dependency that is not explicitly defined. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)." + +{% endnote %} + +### About pull requests for security updates + +Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. This includes information about the vulnerability like release notes, changelog entries, and commit details. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_short %} alerts for the repository. + +When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot_short %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot_short %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)." + +{% data reusables.dependabot.automated-tests-note %} + +### About compatibility scores + +{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency. diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md index 24d119a1a9..4b01db6af5 100644 --- a/translations/ko-KR/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md +++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md @@ -1,6 +1,7 @@ --- title: Browsing security vulnerabilities in the GitHub Advisory Database intro: 'The {% data variables.product.prodname_advisory_database %} allows you to browse or search for vulnerabilities that affect open source projects on {% data variables.product.company_short %}.' +shortTitle: Browsing the Advisory Database versions: free-pro-team: '*' --- diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md index 06b60a9a3f..5ecac3ac32 100644 --- a/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md +++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md @@ -5,30 +5,16 @@ redirect_from: - /articles/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-updates +shortTitle: Configuring Dependabot security updates versions: free-pro-team: '*' --- -### About {% data variables.product.prodname_dependabot_security_updates %} +### About configuring {% data variables.product.prodname_dependabot_security_updates %} -{% data variables.product.prodname_dependabot_short %} monitors security advisories such as the {% data variables.product.prodname_advisory_database %} and [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database) and automatically triggers a pull request when it detects a new vulnerable dependency in the dependency graph of repositories. For more information about the {% data variables.product.prodname_advisory_database %}, see "[About the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database#about-the-github-advisory-database)." +You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_short %} alerts and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." -{% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} - -{% data variables.product.prodname_dependabot_short %} includes a link to the pull request in the alert for the vulnerable dependency. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." - -Each security update contains everything you need to quickly and safely review and merge a proposed fix into your project. This includes information about the vulnerability like release notes, changelog entries, and commit details. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_short %} alerts for the repository. - -When you merge a pull request that contains a security update, the corresponding alert is marked as resolved for your repository. - -{% note %} - -**참고** -{% data variables.product.prodname_dependabot_security_updates %} only resolve security vulnerabilities in the dependencies tracked by your dependency graph. Security updates are not created to resolve vulnerabilities in private registries or packages hosted in private repositories. However, indirect or transitive dependencies are included if they are explicitly defined in a lock file, or similar. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." Additionally, it's important to highlight that {% data variables.product.prodname_dependabot_security_updates %} automatically create pulls requests with proposed fixes to the lock files, for the dependencies detected as vulnerable. - -{% endnote %} - -You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_short %} alerts and the dependency graph. You can disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository or for all repositories owned by your user account or organization. For more information, see "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-github-dependabot-security-updates-for-your-repositories)" below. +You can disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository or for all repositories owned by your user account or organization. For more information, see "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-github-dependabot-security-updates-for-your-repositories)" below. {% data reusables.dependabot.dependabot-tos %} @@ -53,10 +39,6 @@ You can enable {% data variables.product.prodname_dependabot_security_updates %} If security updates are not enabled for your repository and you don't know why, first try enabling them using the instructions given in the procedural sections below. If security updates are still not working, you can [contact support](https://support.github.com/contact). -### About compatibility scores - -{% data variables.product.prodname_dependabot_security_updates %} also include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. We look at previously-passing CI tests from public repositories where we've generated a given security update to learn whether the update causes tests to fail. An update's compatibility score is the percentage of CI runs that passed when updating between relevant versions of the dependency. - ### Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories You can enable or disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository. diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md new file mode 100644 index 0000000000..e1c1fe5318 --- /dev/null +++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md @@ -0,0 +1,58 @@ +--- +title: Configuring notifications for vulnerable dependencies +shortTitle: Configuring notifications +intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts.' +versions: + free-pro-team: '*' + enterprise-server: '>=2.21' +--- + +### About notifications for vulnerable dependencies + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we send you {% data variables.product.prodname_dependabot_short %} alerts.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. +{% endif %} + +{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)." +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %} +Your site administrator needs to enable security alerts for vulnerable dependencies for +{% data variables.product.product_location_enterprise %} before you can use the feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.20" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive +{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} by email.{% endif %} + +{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} + +You can configure notification settings for yourself or your organization from the Manage notifications drop-down {% octicon "bell" aria-label="The notifications bell" %} shown at the top of each page. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#choosing-your-notification-settings)." + +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} + ![{% data variables.product.prodname_dependabot_short %} alerts options](/assets/images/help/notifications-v2/dependabot-alerts-options.png) +{% else %} + ![Security alerts options](/assets/images/help/notifications-v2/security-alerts-options.png) +{% endif %} + +{% note %} + +**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)." + +{% endnote %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} + +### How to reduce the noise from notifications for vulnerable dependencies + +If you are concerned about receiving too many notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, we recommend you opt into the weekly email digest, or turn off notifications while keeping {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} enabled. You can still navigate to see your {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} in your repository's Security tab.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %} + +### 더 읽을거리 + +- "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications)" +- "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-is-queries)" diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/index.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/index.md index a4285a6d86..61c09009e1 100644 --- a/translations/ko-KR/content/github/managing-security-vulnerabilities/index.md +++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/index.md @@ -28,8 +28,11 @@ versions: {% link_in_list /browsing-security-vulnerabilities-in-the-github-advisory-database %} {% link_in_list /about-alerts-for-vulnerable-dependencies %} + {% link_in_list /configuring-notifications-for-vulnerable-dependencies %} + {% link_in_list /about-github-dependabot-security-updates %} {% link_in_list /configuring-github-dependabot-security-updates %} {% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %} {% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %} + {% link_in_list /troubleshooting-github-dependabot-errors %} diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md new file mode 100644 index 0000000000..a376ff1995 --- /dev/null +++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md @@ -0,0 +1,82 @@ +--- +title: Troubleshooting GitHub Dependabot errors +intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot_short %}.' +shortTitle: Troubleshooting errors +versions: + free-pro-team: '*' +--- + +{% data reusables.dependabot.beta-note %} + +### About {% data variables.product.prodname_dependabot %} errors + +{% data reusables.dependabot.pull-request-introduction %} + +If anything prevents {% data variables.product.prodname_dependabot_short %} from raising a pull request, this is reported as an error. + +### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot_short %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_short %} alerts view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_short %} alerts** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request. + +![{% data variables.product.prodname_dependabot_short %} alerts view showing a pull request link](/assets/images/help/dependabot/dependabot-alert-pr-link.png) + +There are three reasons why an alert may have no pull request link: + +1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository. +1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file. +1. An error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request. + +If an error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request, you can display details of the error by clicking the alert. + +![{% data variables.product.prodname_dependabot_short %} alert showing the error that blocked the creation of a pull request](/assets/images/help/dependabot/dependabot-security-update-error.png) + +### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot_short %} are listed on the {% data variables.product.prodname_dependabot_short %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot_short %}** tab. + +![{% data variables.product.prodname_dependabot_short %} view showing an error](/assets/images/help/dependabot/dependabot-tab-view-error-beta.png) + +To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed. + +![{% data variables.product.prodname_dependabot_short %} version update error and log ](/assets/images/help/dependabot/dependabot-version-update-error-beta.png) + +### Understanding {% data variables.product.prodname_dependabot_short %} errors + +Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot_short %} configuration files. Consequently, some errors are specific to one type of update. + +#### {% data variables.product.prodname_dependabot_short %} cannot update DEPENDENCY to a non-vulnerable version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository. + +Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem. + +The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." + +#### {% data variables.product.prodname_dependabot_short %} cannot update to the required version as there is already an open pull request for the latest version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version. + +There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +#### {% data variables.product.prodname_dependabot_short %} timed out during its update + +{% data variables.product.prodname_dependabot_short %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out. + +This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot_short %} to review the version update and generate the pull request in the time available. + +If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." + +#### {% data variables.product.prodname_dependabot_short %} cannot open any more pull requests + +There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot_short %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests. + +There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit)." + +The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +### Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually + +If you unblock {% data variables.product.prodname_dependabot_short %}, you can manually trigger a fresh attempt to create a pull request. + +- **Security updates**—display the {% data variables.product.prodname_dependabot_short %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot_short %} security update**. +- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**. diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md index 0d5738a805..2ca896617a 100644 --- a/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md +++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md @@ -1,6 +1,7 @@ --- title: Troubleshooting the detection of vulnerable dependencies intro: 'If the dependency information reported by {% data variables.product.product_name %} is not what you expected, there are a number of points to consider, and various things you can check.' +shortTitle: Troubleshooting detection versions: free-pro-team: '*' --- @@ -14,9 +15,9 @@ The results of dependency detection reported by {% data variables.product.produc * {% data variables.product.prodname_advisory_database %} is one of the data sources that {% data variables.product.prodname_dotcom %} uses to identify vulnerable dependencies. It's a free, curated database of vulnerability information for common package ecosystems on {% data variables.product.prodname_dotcom %}. It includes both data reported directly to {% data variables.product.prodname_dotcom %} from {% data variables.product.prodname_security_advisories %}, as well as official feeds and community sources. This data is reviewed and curated by {% data variables.product.prodname_dotcom %} to ensure that false or unactionable information is not shared with the development community. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)" and "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." * The dependency graph parses all known package manifest files in a user’s repository. For example, for npm it will parse the _package-lock.json_ file. It constructs a graph of all of the repository’s dependencies and public dependents. This happens when you enable the dependency graph and when anyone pushes to the default branch, and it includes commits that makes changes to a supported manifest format. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." * {% data variables.product.prodname_dependabot_short %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_short %} alerts are aggregated at the repository level, rather than creating one alert per vulnerability. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." -* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive a security alert about a vulnerable dependency in your repository. {% data variables.product.prodname_dotcom %} automatically creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." - {% data variables.product.prodname_dependabot_short %} doesn't scan repositories on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database. + {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database. ### Why don't I get vulnerability alerts for some ecosystems? @@ -97,3 +98,4 @@ When you click to display the alert details, you can see how many vulnerabilitie - "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index 6e1205f538..6489e80de0 100644 --- a/translations/ko-KR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -4,17 +4,18 @@ intro: 'If {% data variables.product.product_name %} discovers vulnerable depend redirect_from: - /articles/viewing-and-updating-vulnerable-dependencies-in-your-repository permissions: Repository administrators and organization owners can view and update dependencies. +shortTitle: Viewing and updating vulnerable dependencies versions: free-pro-team: '*' --- Your repository's {% data variables.product.prodname_dependabot %} alerts tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}. You can sort the list of alerts using the drop-down menu, and you can click into specific alerts for more details. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." -You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." ### About updates for vulnerable dependencies in your repository -{% data variables.product.product_name %} sends {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} creates a pull request to fix it. {% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} +{% data variables.product.product_name %} sends {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} 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. ### Viewing and updating vulnerable dependencies @@ -33,3 +34,4 @@ You can enable automatic security updates for any repository that uses {% data v - "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" - "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" - "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md index 3ffc67fcc2..d7e9b5640a 100644 --- a/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md +++ b/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md @@ -163,25 +163,10 @@ If you are a member of more than one organization, you can configure each one to ### Security alert notification options {% endif %} -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}Choose how you want to receive {% data variables.product.prodname_dependabot_alerts %} for repositories that you are watching. You can receive {% data variables.product.prodname_dependabot_alerts %} in your inbox, as a banner on {% data variables.product.product_name %}, on the command line, through email, or some combination of these options. +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} -If you want to receive {% data variables.product.prodname_dependabot_alerts %} by email, choose whether you want a weekly email summary of vulnerabilities for up 10 repositories or a new email each time a vulnerability is detected. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."{% endif %} - -{% if currentVersion == "enterprise-server@2.21" %}Choose how you want to receive security alerts for repositories that you are watching. You can receive security alerts in your inbox, as a banner on {% data variables.product.product_name %}, on the command line, through email, or some combination of these options. - -If you want to receive security alerts by email, choose whether you want a weekly email summary of vulnerabilities for up 10 repositories or a new email each time a vulnerability is detected. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."{% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} - ![{% data variables.product.prodname_dependabot_short %} alerts options](/assets/images/help/notifications-v2/dependabot-alerts-options.png) -{% else %} - ![Security alerts options](/assets/images/help/notifications-v2/security-alerts-options.png) -{% endif %} - -{% note %} - -**Note:** You can filter your {% data variables.product.company_short %} inbox notifications by {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)." - -{% endnote %} +For more information about the notification delivery methods available to you, and advice on optimizing your notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} diff --git a/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md index d5593a412e..48472c95d7 100644 --- a/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md +++ b/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md @@ -124,6 +124,8 @@ To filter notifications for specific activity on {% data variables.product.produ - `is:repository-advisory` - `is:team-discussion` +For information about reducing noise from notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." + You can also use the `is:` query to describe how the notification was triaged. - `is:saved` diff --git a/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md b/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md index 15708a2bf8..c230f8978a 100644 --- a/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md +++ b/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md @@ -38,7 +38,7 @@ When you unsubscribe from notifications in your inbox, they will automatically d {% data reusables.notifications.access_notifications %} 1. From the notifications inbox, select the notifications you want to unsubscribe to. -2. Use the the **selected** {% octicon "triangle-down" aria-label="The down triangle icon" %} drop-down to click **Unsubscribe.** ![Unsubcribe option from main inbox](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) +2. Use the **selected** {% octicon "triangle-down" aria-label="The down triangle icon" %} drop-down to click **Unsubscribe.** ![Unsubcribe option from main inbox](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) ### Unsubscribing from notifications on the subscriptions page diff --git a/translations/ko-KR/content/github/managing-your-work-on-github/about-automation-for-project-boards.md b/translations/ko-KR/content/github/managing-your-work-on-github/about-automation-for-project-boards.md index 44a38b32bf..749af10f1e 100644 --- a/translations/ko-KR/content/github/managing-your-work-on-github/about-automation-for-project-boards.md +++ b/translations/ko-KR/content/github/managing-your-work-on-github/about-automation-for-project-boards.md @@ -29,7 +29,10 @@ Project board automation can also help teams develop a shared understanding of a | Done |
    • Move all closed issues here
    • Move all merged pull requests here
    • Move all closed, unmerged pull requests here
    | ### Project progress tracking -Project board automation enables progress tracking by default. Cards in columns with the "To do", "In progress", or "Done" presets count toward the overall project progress. {% data reusables.project-management.project-progress-locations %} + +You can track the progress on your project board. Cards in the "To do", "In progress", or "Done" columns count toward the overall project progress. {% data reusables.project-management.project-progress-locations %} + +For more information, see "[Tracking progress on your project board](/github/managing-your-work-on-github/tracking-progress-on-your-project-board)." ### 더 읽을거리 - "[Configuring automation for project boards](/articles/configuring-automation-for-project-boards)"{% if currentVersion == "free-pro-team@latest" %} diff --git a/translations/ko-KR/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md b/translations/ko-KR/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md index a1db5e6177..46c6b67fc0 100644 --- a/translations/ko-KR/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md +++ b/translations/ko-KR/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md @@ -11,7 +11,7 @@ versions: {% warning %} -**Warning:** If you add an image to a pull request or issue comment, anyone can view the anonymized image URL without authentication, even if the pull request is in a private repository{% if currentVersion != "free-pro-team@latest" %}, or if private mode is enabled{% endif %}. To keep sensitive images private, serve them from a private network or server that requires authentication. {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} +**Warning:** If you add an image to a pull request or issue comment, anyone can view the anonymized image URL without authentication, even if the pull request is in a private repository{% if enterpriseServerVersions contains currentVersion %}, or if private mode is enabled{% endif %}. To keep sensitive images private, serve them from a private network or server that requires authentication. {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} {% endwarning %} @@ -21,7 +21,7 @@ To attach a file to an issue or pull request conversation, drag and drop it into {% tip %} -**Tip:** If you're using Chrome, you can also copy-and-paste images directly into the box. +**Tip:** In many browsers, you can copy-and-paste images directly into the box. {% endtip %} diff --git a/translations/ko-KR/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md b/translations/ko-KR/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md index ae23e04eef..105d351184 100644 --- a/translations/ko-KR/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md +++ b/translations/ko-KR/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md @@ -8,6 +8,12 @@ versions: enterprise-server: '*' --- +{% note %} + +**Note:** In order to link a repository to your organization or user owned project board the repository needs to have issues enabled. For information on how to see if issues are disabled for a repository, see "[Disabling issues](/github/managing-your-work-on-github/disabling-issues) ." + +{% endnote %} + Anyone with write permissions to a project board can link repositories owned by that organization or user account to the project board. For more information, see "[Project board permissions for an organization](/articles/project-board-permissions-for-an-organization/)" or "[Permission levels for user-owned project boards](/articles/permission-levels-for-user-owned-project-boards/)." {% data reusables.project-management.link-repos-to-project-board %} You can add issues and pull requests from any unlinked repositories by typing the issue or pull request URL in a card. For more information, see "[Adding issues and pull requests to a project board](/articles/adding-issues-and-pull-requests-to-a-project-board)." diff --git a/translations/ko-KR/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md b/translations/ko-KR/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md index 67d7e71547..de986e8ae3 100644 --- a/translations/ko-KR/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md +++ b/translations/ko-KR/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md @@ -1,6 +1,6 @@ --- title: Tracking progress on your project board -intro: 'By default, when you enable automation on a project board, the overall progress of the project is tracked in a progress bar.' +intro: 'You can see the overall progress of your project in a progress bar.' redirect_from: - /articles/tracking-progress-on-your-project-board versions: @@ -10,7 +10,7 @@ versions: {% data reusables.project-management.project-progress-locations %} -1. Navigate to the project board where you want to disable project progress tracking. +1. Navigate to the project board where you want to enable or disable project progress tracking. {% data reusables.project-management.click-menu %} -{% data reusables.project-management.access-collaboration-settings %} -4. Unselect **Track project progress**. +{% data reusables.project-management.click-edit-sidebar-menu-project-board %} +4. Select or deselect **Track project progress**. diff --git a/translations/ko-KR/content/github/searching-for-information-on-github/finding-files-on-github.md b/translations/ko-KR/content/github/searching-for-information-on-github/finding-files-on-github.md index 610d104f63..4e0d800ead 100644 --- a/translations/ko-KR/content/github/searching-for-information-on-github/finding-files-on-github.md +++ b/translations/ko-KR/content/github/searching-for-information-on-github/finding-files-on-github.md @@ -18,7 +18,7 @@ versions: {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. Under your repository name, click **Find file**. ![Find file button](/assets/images/help/search/find-file-button.png) {% else %} 2. Above the list of files, click **Go to file**. ![Find file button](/assets/images/help/search/find-file-button.png) diff --git a/translations/ko-KR/content/github/searching-for-information-on-github/searching-for-packages.md b/translations/ko-KR/content/github/searching-for-information-on-github/searching-for-packages.md index 9bbf4f8b15..402d19543a 100644 --- a/translations/ko-KR/content/github/searching-for-information-on-github/searching-for-packages.md +++ b/translations/ko-KR/content/github/searching-for-information-on-github/searching-for-packages.md @@ -14,7 +14,7 @@ versions: You can search for packages globally across all of {% data variables.product.product_name %}, or search for packages within a particular organization. For more information, see "[About searching on {% data variables.product.prodname_dotcom %}](/articles/about-searching-on-github)." -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} You can only search for packages on {% data variables.product.product_location_enterprise %}, not {% data variables.product.prodname_dotcom_the_website %}, even if {% data variables.product.prodname_github_connect %} is enabled. {% endif %} diff --git a/translations/ko-KR/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md b/translations/ko-KR/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md index 413c940e55..0d2a94490c 100644 --- a/translations/ko-KR/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md +++ b/translations/ko-KR/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md @@ -13,7 +13,7 @@ You can search for issues and pull requests globally across all of {% data varia {% tip %} -**Tips:**{% if currentVersion != "free-pro-team@latest" %} +**Tips:**{% if enterpriseServerVersions contains currentVersion %} - This article contains example searches on the {% data variables.product.prodname_dotcom %}.com website, but you can use the same search filters on {% data variables.product.product_location_enterprise %}.{% endif %} - For a list of search syntaxes that you can add to any search qualifier to further improve your results, see "[Understanding the search syntax](/articles/understanding-the-search-syntax)". - Use quotations around multi-word search terms. For example, if you want to search for issues with the label "In progress," you'd search for `label:"in progress"`. Search is not case sensitive. diff --git a/translations/ko-KR/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md b/translations/ko-KR/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md index 6fd8478717..582f7db2aa 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md @@ -51,7 +51,7 @@ The number of jobs you can run concurrently across all repositories in your user At the end of the month, {% data variables.product.prodname_dotcom %} calculates the cost of minutes and storage used over the amount included in your account. For example, if your organization uses {% data variables.product.prodname_team %} and allows unlimited spending, using 15,000 minutes could have a total storage and minute overage cost of $56, depending on the operating systems used to run jobs. - 5,000 (3,000 Linux and 2,000 Windows) minutes = $56 ($24 + $32). - - 3,000 Linux minutes at $0.008 per = $24. + - 3,000 Linux minutes at $0.008 per minute = $24. - 2,000 Windows minutes at $0.016 per minute = $32. At the end of the month, {% data variables.product.prodname_dotcom %} rounds your data transfer to the nearest GB. diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md index d5923a6399..62e034ee24 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md @@ -19,7 +19,7 @@ For more information, see: ![Image of a team mention](/assets/images/help/teams/team-mention.png) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} You can also use LDAP Sync to synchronize {% data variables.product.product_location_enterprise %} team members and team roles against your established LDAP groups. This lets you establish role-based access control for users from your LDAP server instead of manually within {% data variables.product.product_location_enterprise %}. For more information, see "[Enabling LDAP Sync](/enterprise/admin/authentication/using-ldap#enabling-ldap-sync)." @@ -55,7 +55,7 @@ To easily understand who shares a parent team's permissions and mentions, you ca You can choose a parent when you create the team, or you can move a team in your organization's hierarchy later. For more information see, "[Moving a team in your organization’s hierarchy](/articles/moving-a-team-in-your-organization-s-hierarchy)." -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.enterprise_user_management.ldap-sync-nested-teams %} diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md index 5893835485..70fd57ed1e 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md @@ -28,7 +28,7 @@ In the left sidebar of your dashboard, you can access your organization's top re In the "All activity" section of your news feed, you can view updates from other teams and repositories in your organization. -The "All activity" section shows all recent activity in the organization, including activity in repositories you're not subscribed to and of people you're not following. For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." +The "All activity" section shows all recent activity in the organization, including activity in repositories you're not subscribed to and of people you're not following. For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." For instance, the organization news feed shows updates when someone in the organization: - Creates a new branch. diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md index 2a6807c27c..1c3b0ddfa8 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md @@ -17,7 +17,7 @@ You can enable {% data variables.product.prodname_actions %} for all repositorie Alternatively, you can enable {% data variables.product.prodname_actions %} for all repositories in your organization but limit the actions a workflow can run. {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### Managing {% data variables.product.prodname_actions %} permissions for your organization diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md index 4af92ee86b..874d4ba6ce 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md @@ -12,7 +12,7 @@ versions: You can control whether members of your organization can publish websites from repositories in your organization using {% data variables.product.prodname_pages %}. For more information about {% data variables.product.prodname_pages %}, see "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages)." -{% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." +{% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. For more information, see{% if enterpriseServerVersions contains currentVersion %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." ### Disabling publication of {% data variables.product.prodname_pages %} sites diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/index.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/index.md index 771bfe8a8d..b4da2b12e3 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/index.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/index.md @@ -127,7 +127,7 @@ versions: {% link_in_list /disabling-publication-of-github-pages-sites-for-your-organization %} {% link_in_list /deleting-an-organization-account %} {% link_in_list /converting-an-organization-into-a-user %} - + {% link_in_list /integrating-jira-with-your-organization-project-board %} diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md index 918c3f0f2c..a6a1d6d3ba 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md @@ -63,7 +63,7 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | Purchase, install, manage billing for, and cancel {% data variables.product.prodname_marketplace %} apps | **X** | | | | List apps in {% data variables.product.prodname_marketplace %} | **X** | | | | Receive [{% data variables.product.prodname_dependabot_alerts %} about vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) for all of an organization's repositories | **X** | | | -| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)") | **X** | | | +| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | | | [Manage the forking policy](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | | | [Limit activity in public repositories in an organization](/articles/limiting-interactions-in-your-organization) | **X** | | | | Pull (read), push (write), and clone (copy) *all repositories* in the organization | **X** | | | diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md index daee59b400..952fe98c17 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md @@ -47,7 +47,7 @@ To search for specific events, use the `action` qualifier in your query. Actions | `repository_content_analysis` | Contains all activities related to [enabling or disabling data use for a private repository](/articles/about-github-s-use-of-your-data). | | `repository_dependency_graph` | Contains all activities related to [enabling or disabling the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository).{% endif %} | `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} +| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion %} | `팀` | Contains all activities related to teams in your organization.{% endif %} | `team_discussions` | Contains activities related to managing team discussions for an organization. | @@ -85,7 +85,7 @@ This list describes the available categories and associated events: - [The `repository_content_analysis` category](#the-repository_content_analysis-category) - [The `repository_dependency_graph` category](#the-repository_dependency_graph-category){% endif %} - [The `repository_vulnerability_alert` category](#the-repository_vulnerability_alert-category){% if currentVersion == "free-pro-team@latest" %} -- [The `sponsors` category](#the-sponsors-category){% endif %}{% if currentVersion != "free-pro-team@latest" %} +- [The `sponsors` category](#the-sponsors-category){% endif %}{% if enterpriseServerVersions contains currentVersion %} - [The `team` category](#the-team-category){% endif %} - [The `team_discussions` category](#the-team_discussions-category) @@ -180,35 +180,45 @@ For more information, see "[Restricting publication of {% data variables.product ##### The `org` category -| 동작 | 설명 | -| ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest"%} -| `audit_log_export` | Triggered when an organization admin [creates an export of the organization audit log](#exporting-the-audit-log). If the export included a query, the log will list the query used and the number of audit log entries matching that query. | -| `block_user` | Triggered when an organization owner [blocks a user from accessing the organization's repositories](/articles/blocking-a-user-from-your-organization). | -| `cancel_invitation` | Triggered when an organization invitation has been revoked. | -| `disable_oauth_app_restrictions` | Triggered when an owner [disables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/disabling-oauth-app-access-restrictions-for-your-organization) for your organization. | -| `disable_saml` | Triggered when an organization admin disables SAML single sign-on for an organization.{% endif %} -| `disable_member_team_creation_permission` | Triggered when an organization owner limits team creation to owners. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | -| `disable_two_factor_requirement` | Triggered when an owner disables a two-factor authentication requirement for all members{% if currentVersion == "free-pro-team@latest" %}, billing managers,{% endif %} and outside collaborators in an organization.{% if currentVersion == "free-pro-team@latest" %} -| `enable_oauth_app_restrictions` | Triggered when an owner [enables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/enabling-oauth-app-access-restrictions-for-your-organization) for your organization. | -| `enable_saml` | Triggered when an organization admin [enables SAML single sign-on](/articles/enabling-and-testing-saml-single-sign-on-for-your-organization) for an organization.{% endif %} -| `enable_member_team_creation_permission` | Triggered when an organization owner allows members to create teams. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | -| `enable_two_factor_requirement` | Triggered when an owner requires two-factor authentication for all members{% if currentVersion == "free-pro-team@latest" %}, billing managers,{% endif %} and outside collaborators in an organization. | -| `invite_member` | Triggered when [a new user was invited to join your organization](/articles/adding-organization-members-to-a-team).{% if currentVersion == "free-pro-team@latest" %} -| `oauth_app_access_approved` | Triggered when an owner [grants organization access to an {% data variables.product.prodname_oauth_app %}](/articles/approving-oauth-apps-for-your-organization/). | -| `oauth_app_access_denied` | Triggered when an owner [disables a previously approved {% data variables.product.prodname_oauth_app %}'s access](/articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization) to your organization. | -| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" %} -| `remove_billing_manager` | Triggered when an [owner removes a billing manager from an organization](/articles/removing-a-billing-manager-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and a billing manager doesn't use 2FA or disables 2FA. |{% endif %} -| `remove_member` | Triggered when an [owner removes a member from an organization](/articles/removing-a-member-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an organization member doesn't use 2FA or disables 2FA. Also triggered when an [organization member removes themselves](/articles/removing-yourself-from-an-organization/) from an organization. | -| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" %} -| `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." | -| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." | -| `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/articles/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -| `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} -| `update_default_repository_permission` | Triggered when an owner changes the default repository permission level for organization members. | -| `update_member` | Triggered when an owner changes a person's role from owner to member or member to owner. | -| `update_member_repository_creation_permission` | Triggered when an owner changes the create repository permission for organization members.{% if currentVersion == "free-pro-team@latest" %} -| `update_saml_provider_settings` | Triggered when an organization's SAML provider settings are updated. | -| `update_terms_of_service` | Triggered when an organization changes between the Standard Terms of Service and the Corporate Terms of Service. For more information, see "[Upgrading to the Corporate Terms of Service](/articles/upgrading-to-the-corporate-terms-of-service)."{% endif %} +| 동작 | 설명 | +| -------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest"%} +| `audit_log_export` | Triggered when an organization admin [creates an export of the organization audit log](#exporting-the-audit-log). If the export included a query, the log will list the query used and the number of audit log entries matching that query. | +| `block_user` | Triggered when an organization owner [blocks a user from accessing the organization's repositories](/articles/blocking-a-user-from-your-organization). | +| `cancel_invitation` | Triggered when an organization invitation has been revoked. |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization).{% endif %} |{% if currentVersion == "free-pro-team@latest"%} +| `disable_oauth_app_restrictions` | Triggered when an owner [disables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/disabling-oauth-app-access-restrictions-for-your-organization) for your organization. | +| `disable_saml` | Triggered when an organization admin disables SAML single sign-on for an organization.{% endif %} +| `disable_member_team_creation_permission` | Triggered when an organization owner limits team creation to owners. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | +| `disable_two_factor_requirement` | Triggered when an owner disables a two-factor authentication requirement for all members{% if currentVersion == "free-pro-team@latest" %}, billing managers,{% endif %} and outside collaborators in an organization.{% if currentVersion == "free-pro-team@latest" %} +| `enable_oauth_app_restrictions` | Triggered when an owner [enables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/enabling-oauth-app-access-restrictions-for-your-organization) for your organization. | +| `enable_saml` | Triggered when an organization admin [enables SAML single sign-on](/articles/enabling-and-testing-saml-single-sign-on-for-your-organization) for an organization.{% endif %} +| `enable_member_team_creation_permission` | Triggered when an organization owner allows members to create teams. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | +| `enable_two_factor_requirement` | Triggered when an owner requires two-factor authentication for all members{% if currentVersion == "free-pro-team@latest" %}, billing managers,{% endif %} and outside collaborators in an organization. | +| `invite_member` | Triggered when [a new user was invited to join your organization](/articles/adding-organization-members-to-a-team).{% if currentVersion == "free-pro-team@latest" %} +| `oauth_app_access_approved` | Triggered when an owner [grants organization access to an {% data variables.product.prodname_oauth_app %}](/articles/approving-oauth-apps-for-your-organization/). | +| `oauth_app_access_denied` | Triggered when an owner [disables a previously approved {% data variables.product.prodname_oauth_app %}'s access](/articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization) to your organization. | +| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). | +| `remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest"%} +| `remove_billing_manager` | Triggered when an [owner removes a billing manager from an organization](/articles/removing-a-billing-manager-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and a billing manager doesn't use 2FA or disables 2FA. |{% endif %} +| `remove_member` | Triggered when an [owner removes a member from an organization](/articles/removing-a-member-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an organization member doesn't use 2FA or disables 2FA. Also triggered when an [organization member removes themselves](/articles/removing-yourself-from-an-organization/) from an organization. | +| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). |{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." | +| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). | +| `runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. | +| `runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. | +| `runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). | +| `runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. |{% endif %}{% if currentVersion == "free-pro-team@latest"%} +| `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/articles/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +| `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} +| `update_default_repository_permission` | Triggered when an owner changes the default repository permission level for organization members. | +| `update_member` | Triggered when an owner changes a person's role from owner to member or member to owner. | +| `update_member_repository_creation_permission` | Triggered when an owner changes the create repository permission for organization members.{% if currentVersion == "free-pro-team@latest" %} +| `update_saml_provider_settings` | Triggered when an organization's SAML provider settings are updated. | +| `update_terms_of_service` | Triggered when an organization changes between the Standard Terms of Service and the Corporate Terms of Service. For more information, see "[Upgrading to the Corporate Terms of Service](/articles/upgrading-to-the-corporate-terms-of-service)."{% endif %} {% if currentVersion == "free-pro-team@latest" %} ##### The `org_credential_authorization` category @@ -295,26 +305,31 @@ For more information, see "[Restricting publication of {% data variables.product ##### The `repo` category -| 동작 | 설명 | -| ------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `액세스` | Triggered when a repository owned by an organization is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). | -| `add_member` | Triggered when a user accepts an [invitation to have collaboration access to a repository](/articles/inviting-collaborators-to-a-personal-repository). | -| `add_topic` | Triggered when a repository admin [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. | -| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} -| `config.disable_anonymous_git_access` | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | -| `config.enable_anonymous_git_access` | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | -| `config.lock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). | +| 동작 | 설명 | +| ------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `액세스` | Triggered when a repository owned by an organization is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). | +| `add_member` | Triggered when a user accepts an [invitation to have collaboration access to a repository](/articles/inviting-collaborators-to-a-personal-repository). | +| `add_topic` | Triggered when a repository admin [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. | +| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if enterpriseServerVersions contains currentVersion %} +| `config.disable_anonymous_git_access` | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | +| `config.enable_anonymous_git_access` | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | +| `config.lock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). | | `config.unlock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is unlocked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access).{% endif %} -| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository). | +| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository).{% endif %} | `destroy` | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} | `비활성화` | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %} -| `활성화` | Triggered when a repository is reenabled. | -| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository). | -| `remove_topic` | Triggered when a repository admin removes a topic from a repository. | -| `rename` | Triggered when [a repository is renamed](/articles/renaming-a-repository). | -| `전송` | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). | -| `transfer_start` | Triggered when a repository transfer is about to occur. | -| `unarchived` | Triggered when a repository admin unarchives a repository. | +| `활성화` | Triggered when a repository is reenabled.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret.{% endif %} +| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). | +| `remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). |{% endif %} +| `remove_topic` | Triggered when a repository admin removes a topic from a repository. | +| `rename` | Triggered when [a repository is renamed](/articles/renaming-a-repository). | +| `전송` | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). | +| `transfer_start` | Triggered when a repository transfer is about to occur. | +| `unarchived` | Triggered when a repository admin unarchives a repository.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret.{% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -352,7 +367,7 @@ For more information, see "[Restricting publication of {% data variables.product | repo_funding_links_file_action | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") | {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### The `team` category | 동작 | 설명 | diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md index 794f20cd77..0486b796b5 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md @@ -27,6 +27,8 @@ For more information about member access and management, see "[Managing users in For more information about managing enterprise accounts using the GraphQL API, see "[Enterprise accounts](/v4/guides/managing-enterprise-accounts)." +{% if currentVersion == "free-pro-team@latest" %} + ### Managing organizations linked to your enterprise account Organizations are shared accounts where groups of people can collaborate across many projects at once. Owners can manage member access to the organization's data and projects with sophisticated security and administrative features. For more information, see "[About organizations](/articles/about-organizations)." @@ -35,6 +37,8 @@ Enterprise owners can create organizations and link them to the enterprise. Afte For more information, see "[Managing organizations in your enterprise account](/articles/managing-organizations-in-your-enterprise-account)" and "[Setting policies for organizations in your enterprise account](/articles/setting-policies-for-organizations-in-your-enterprise-account)." +{% endif %} + ### Managing {% data variables.product.prodname_ghe_server %} licenses linked to your enterprise account {% data reusables.enterprise-accounts.admin-managing-licenses %} diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/index.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/index.md index 2eac95839d..647d15530f 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/index.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/index.md @@ -6,6 +6,7 @@ redirect_from: - /categories/setting-up-and-managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md index 614a01214c..9bce247ef1 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/managing-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md index a85f74127e..348926c13c 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md @@ -6,5 +6,6 @@ redirect_from: - /articles/managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md index 05032da4ee..4d664620ad 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/setting-policies-for-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md index 11c6b3b94e..da7c1cbeb3 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md @@ -18,6 +18,9 @@ Enterprise accounts are currently available to {% data variables.product.prodnam {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} -4. Under "User licenses", view your total licenses, number of consumed licenses, and your subscription expiration date. ![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png) -5. To view details of the user licenses currently in use, click **View details**. +{% data reusables.enterprise-accounts.license-tab %} +4. Under "User +{% if currentVersion == "free-pro-team@latest" %}Licenses{% else %}licenses{% endif %}", view your total licenses, number of consumed licenses, and your subscription expiration date. + {% if currentVersion == "free-pro-team@latest" %}![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png){% else %} + ![License and subscription information in enterprise billing settings](/assets/images/enterprise/enterprises/enterprise-server-billing-license-info.png){% endif %} +5. To view details of the user licenses currently in use, click **View {% if currentVersion == "free-pro-team@latest" %}details{% else %}users{% endif %}**. diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md b/translations/ko-KR/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md index 53f33afce5..340e4084a3 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md @@ -25,7 +25,7 @@ On your profile page, certain actions count as contributions: - Committing to a repository's default branch or `gh-pages` branch - Opening an issue - Proposing a pull request -- Submitting a pull request review{% if currentVersion != "free-pro-team@latest" %} +- Submitting a pull request review{% if enterpriseServerVersions contains currentVersion %} - Co-authoring commits in a repository's default branch or `gh-pages` branch{% endif %} {% data reusables.pull_requests.pull_request_merges_and_contributions %} diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md b/translations/ko-KR/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md index d51d3d119b..447317b734 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md @@ -29,10 +29,10 @@ In addition, **at least one** of the following must be true: - You have forked the repository. - You have opened a pull request or issue in the repository. - You have starred the repository. -{% if currentVersion != "free-pro-team@latest" %} + ### Common reasons that contributions are not counted -{% data reusables.pull_requests.pull_request_merges_and_contributions %}{% endif %} +{% data reusables.pull_requests.pull_request_merges_and_contributions %} #### Commit was made less than 24 hours ago diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-github-user-account/index.md b/translations/ko-KR/content/github/setting-up-and-managing-your-github-user-account/index.md index aaf38e6431..5ea0fb1d8b 100644 --- a/translations/ko-KR/content/github/setting-up-and-managing-your-github-user-account/index.md +++ b/translations/ko-KR/content/github/setting-up-and-managing-your-github-user-account/index.md @@ -24,7 +24,7 @@ versions: {% link_in_list /managing-the-default-branch-name-for-your-repositories %} {% link_in_list /managing-security-and-analysis-settings-for-your-user-account %} {% link_in_list /managing-access-to-your-user-accounts-project-boards %} - + {% link_in_list /integrating-jira-with-your-personal-projects %} diff --git a/translations/ko-KR/content/github/site-policy/github-enterprise-subscription-agreement.md b/translations/ko-KR/content/github/site-policy/github-enterprise-subscription-agreement.md index b6bcac169a..50ad30b4a7 100644 --- a/translations/ko-KR/content/github/site-policy/github-enterprise-subscription-agreement.md +++ b/translations/ko-KR/content/github/site-policy/github-enterprise-subscription-agreement.md @@ -330,7 +330,7 @@ The look and feel of the Service is copyright © GitHub, Inc. All rights reserve #### 3.5.2 Copyright Infringement and DMCA Policy. -If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millenium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 3.5.3 GitHub Trademarks and Logos. diff --git a/translations/ko-KR/content/github/site-policy/github-sensitive-data-removal-policy.md b/translations/ko-KR/content/github/site-policy/github-sensitive-data-removal-policy.md index b19c2c5061..f6ba5904ac 100644 --- a/translations/ko-KR/content/github/site-policy/github-sensitive-data-removal-policy.md +++ b/translations/ko-KR/content/github/site-policy/github-sensitive-data-removal-policy.md @@ -76,7 +76,7 @@ These guidelines are designed to make the processing of requests to remove sensi ### How to Submit Your Request -You can submit your request to remove sensitive data via our [contact form](https://support.github.com/contact). Please include a plain-text version of your request in the body of your message. Sending your request in an attachment may result in processing delays. +You can submit your request to remove sensitive data via our [contact form](https://support.github.com/contact?tags=docs-sensitive-data). Please include a plain-text version of your request in the body of your message. Sending your request in an attachment may result in processing delays. ### Disputes diff --git a/translations/ko-KR/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md b/translations/ko-KR/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md index 76f5daf6d7..06dfda34d0 100644 --- a/translations/ko-KR/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md +++ b/translations/ko-KR/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md @@ -175,7 +175,7 @@ The look and feel of the Service is copyright © GitHub, Inc. All rights reserve #### 2.5.2 Copyright Infringement and DMCA Policy. -If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millenium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 2.5.3 GitHub Trademarks and Logos. diff --git a/translations/ko-KR/content/github/site-policy/github-trademark-policy.md b/translations/ko-KR/content/github/site-policy/github-trademark-policy.md index 1ecf0a7a6c..0b49956f29 100644 --- a/translations/ko-KR/content/github/site-policy/github-trademark-policy.md +++ b/translations/ko-KR/content/github/site-policy/github-trademark-policy.md @@ -23,7 +23,7 @@ When we receive reports of trademark policy violations from holders of federal o ### How Do I Report a Trademark Policy Violation? -Holders of registered trademarks can report possible trademark policy violations to GitHub via our [contact form](https://support.github.com/contact). Please submit trademark-related requests using your company email address and include all the information requested below to help expedite our response. Also be sure to clearly describe to us why the account may cause confusion with your mark or how the account may dilute or tarnish your mark. +Holders of registered trademarks can report possible trademark policy violations to GitHub via our [contact form](https://support.github.com/contact?tags=docs-trademark). Please submit trademark-related requests using your company email address and include all the information requested below to help expedite our response. Also be sure to clearly describe to us why the account may cause confusion with your mark or how the account may dilute or tarnish your mark. ### What Information is Required When Reporting Trademark Policy Violations? diff --git a/translations/ko-KR/content/github/using-git/changing-a-remotes-url.md b/translations/ko-KR/content/github/using-git/changing-a-remotes-url.md index e07074d76d..3cc2034bb0 100644 --- a/translations/ko-KR/content/github/using-git/changing-a-remotes-url.md +++ b/translations/ko-KR/content/github/using-git/changing-a-remotes-url.md @@ -50,7 +50,7 @@ git@{% data variables.command_line.codeblock %}:USERNAME/REPOSITORY > origin https://{% data variables.command_line.codeblock %}/USERNAME/REPOSITORY.git (push) ``` -The next time you `git fetch`, `git pull`, or `git push` to the remote repository, you'll be asked for your GitHub username and password. +The next time you `git fetch`, `git pull`, or `git push` to the remote repository, you'll be asked for your GitHub username and password. {% data reusables.user_settings.password-authentication-deprecation %} - If you have [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) enabled, you must [create a personal access token](/github/authenticating-to-github/creating-a-personal-access-token) to use instead of your GitHub password. - You can [use a credential helper](/github/using-git/caching-your-github-credentials-in-git) so Git will remember your GitHub username and password every time it talks to GitHub. diff --git a/translations/ko-KR/content/github/using-git/pushing-commits-to-a-remote-repository.md b/translations/ko-KR/content/github/using-git/pushing-commits-to-a-remote-repository.md index 8984350f01..532fcc2a64 100644 --- a/translations/ko-KR/content/github/using-git/pushing-commits-to-a-remote-repository.md +++ b/translations/ko-KR/content/github/using-git/pushing-commits-to-a-remote-repository.md @@ -97,3 +97,4 @@ For more information on working with forks, see "[Syncing a fork](/articles/sync - [`git remote` man page](https://git-scm.com/docs/git-remote.html) - "[Git cheatsheet](/articles/git-cheatsheet)" - "[Git workflows](/articles/git-workflows)" +- "[Git Handbook](https://guides.github.com/introduction/git-handbook/)" diff --git a/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md index a1b5ac9cf6..c6d15949ba 100644 --- a/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md +++ b/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md @@ -47,9 +47,9 @@ You can use the dependency graph to: {% if currentVersion == "free-pro-team@latest" %}To generate a dependency graph, {% data variables.product.product_name %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private repositories. For information about enabling or disabling it for private repositories, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md index d0b201ffb1..72eb0a08a8 100644 --- a/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md +++ b/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md @@ -35,7 +35,7 @@ If vulnerabilities have been detected in the repository, these are shown at the {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to {% data variables.product.prodname_dependabot_short %} alerts. @@ -55,7 +55,7 @@ Any direct and indirect dependencies that are specified in the repository's mani {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to security alerts. {% note %} diff --git a/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md b/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md index f70a3bb2d6..f8a642bf2f 100644 --- a/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md +++ b/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md @@ -13,7 +13,7 @@ versions: ### About contributors -You can view the top 100 contributors to a repository{% if currentVersion != "free-pro-team@latest" %}, including commit co-authors,{% endif %} in the contributors graph. Merge commits and empty commits aren't counted as contributions for this graph. +You can view the top 100 contributors to a repository{% if enterpriseServerVersions contains currentVersion %}, including commit co-authors,{% endif %} in the contributors graph. Merge commits and empty commits aren't counted as contributions for this graph. {% if currentVersion == "free-pro-team@latest" %} You can also see a list of people who have contributed to the project's Python dependencies. To access this list of community contributors, visit `https://github.com/REPO-OWNER/REPO-NAME/community_contributors`. diff --git a/translations/ko-KR/content/github/working-with-github-pages/about-github-pages-and-jekyll.md b/translations/ko-KR/content/github/working-with-github-pages/about-github-pages-and-jekyll.md index 80bc0ea4cc..39bad3c9df 100644 --- a/translations/ko-KR/content/github/working-with-github-pages/about-github-pages-and-jekyll.md +++ b/translations/ko-KR/content/github/working-with-github-pages/about-github-pages-and-jekyll.md @@ -27,7 +27,7 @@ versions: Jekyll is a static site generator with built-in support for {% data variables.product.prodname_pages %} and a simplified build process. Jekyll takes Markdown and HTML files and creates a complete static website based on your choice of layouts. Jekyll supports Markdown and Liquid, a templating language that loads dynamic content on your site. For more information, see [Jekyll](https://jekyllrb.com/). -Jekyll is not officially supported for Windows. For more information, see "[Jekyll on Windows](http://jekyllrb.com/docs/windows/#installation)" in the Jekyll documenation. +Jekyll is not officially supported for Windows. For more information, see "[Jekyll on Windows](http://jekyllrb.com/docs/windows/#installation)" in the Jekyll documentation. We recommend using Jekyll with {% data variables.product.prodname_pages %}. If you prefer, you can use other static site generators or customize your own build process locally or on another server. For more information, see "[About {% data variables.product.prodname_pages %}](/articles/about-github-pages#static-site-generators)." diff --git a/translations/ko-KR/content/github/working-with-github-pages/about-github-pages.md b/translations/ko-KR/content/github/working-with-github-pages/about-github-pages.md index bb3bd3def2..ff9f7ed4f9 100644 --- a/translations/ko-KR/content/github/working-with-github-pages/about-github-pages.md +++ b/translations/ko-KR/content/github/working-with-github-pages/about-github-pages.md @@ -45,7 +45,7 @@ For more information about how custom domains affect the URL for your site, see You can only create one user or organization site for each {% data variables.product.product_name %} account. Project sites, whether owned by an organization or a user account, are unlimited. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} The URL where your site is available depends on whether subdomain isolation is enabled for {% data variables.product.product_location %}. diff --git a/translations/ko-KR/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md b/translations/ko-KR/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md index 88219778a2..9984ecb5a5 100644 --- a/translations/ko-KR/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md +++ b/translations/ko-KR/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md @@ -80,7 +80,7 @@ gem "github-pages", "~> VERSION", group: :jekyll_plugins ``` 10. Save and close the Gemfile. 11. Optionally, test your site locally. For more information, see "[Testing your {% data variables.product.prodname_pages %} site locally with Jekyll](/articles/testing-your-github-pages-site-locally-with-jekyll)." -12. Add your {% data variables.product.product_name %} repository as a remote, replacing {% if currentVersion != "free-pro-team@latest" %}_HOSTNAME_ with your appliance's hostname,{% endif %} _USER_ with the account that owns the repository{% if currentVersion != "free-pro-team@latest" %},{% endif %} and _REPOSITORY_ with the name of the repository. +12. Add your {% data variables.product.product_name %} repository as a remote, replacing {% if enterpriseServerVersions contains currentVersion %}_HOSTNAME_ with your appliance's hostname,{% endif %} _USER_ with the account that owns the repository{% if enterpriseServerVersions contains currentVersion %},{% endif %} and _REPOSITORY_ with the name of the repository. ```shell {% if currentVersion == "free-pro-team@latest" %} $ git remote add origin https://github.com/USER/REPOSITORY.git diff --git a/translations/ko-KR/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md b/translations/ko-KR/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md index af2dfb775d..d41d2813b2 100644 --- a/translations/ko-KR/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md +++ b/translations/ko-KR/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md @@ -13,7 +13,7 @@ versions: People with write permissions for a repository can set the Markdown processor for a {% data variables.product.prodname_pages %} site. -{% data variables.product.prodname_pages %} supports two Markdown processors: [kramdown](http://kramdown.gettalong.org/) and {% data variables.product.prodname_dotcom %}'s own extended [CommonMark](https://commonmark.org/) processer, which is used to render {% data variables.product.prodname_dotcom %} Flavored Markdown throughout {% data variables.product.product_name %}. For more information, see "[About writing and formatting on {% data variables.product.prodname_dotcom %}](/articles/about-writing-and-formatting-on-github)." +{% data variables.product.prodname_pages %} supports two Markdown processors: [kramdown](http://kramdown.gettalong.org/) and {% data variables.product.prodname_dotcom %}'s own extended [CommonMark](https://commonmark.org/) processor, which is used to render {% data variables.product.prodname_dotcom %} Flavored Markdown throughout {% data variables.product.product_name %}. For more information, see "[About writing and formatting on {% data variables.product.prodname_dotcom %}](/articles/about-writing-and-formatting-on-github)." You can use {% data variables.product.prodname_dotcom %} Flavored Markdown with either processor, but only our CommonMark processor will always match the results you see on {% data variables.product.product_name %}. diff --git a/translations/ko-KR/content/github/writing-on-github/creating-gists.md b/translations/ko-KR/content/github/writing-on-github/creating-gists.md index 495822dd49..588b471cfd 100644 --- a/translations/ko-KR/content/github/writing-on-github/creating-gists.md +++ b/translations/ko-KR/content/github/writing-on-github/creating-gists.md @@ -17,9 +17,9 @@ Every gist is a Git repository, which means that it can be forked and cloned. If Gists can be public or secret. Public gists show up in {% data variables.gists.discover_url %}, where people can browse new gists as they're created. They're also searchable, so you can use them if you'd like other people to find and see your work. {% data reusables.gist.cannot-convert-public-gists-to-secret %} -Secret gists don't show up in {% data variables.gists.discover_url %}{% if currentVersion != "free-pro-team@latest" %},{% endif %} and are not searchable. {% data reusables.gist.cannot-convert-public-gists-to-secret %} Secret gists aren't private. If you send the URL of a secret gist to a friend, they'll be able to see it. However, if someone you don't know discovers the URL, they'll also be able to see your gist. If you need to keep your code away from prying eyes, you may want to [create a private repository](/articles/creating-a-new-repository) instead. +Secret gists don't show up in {% data variables.gists.discover_url %} and are not searchable. {% data reusables.gist.cannot-convert-public-gists-to-secret %} Secret gists aren't private. If you send the URL of a secret gist to a friend, they'll be able to see it. However, if someone you don't know discovers the URL, they'll also be able to see your gist. If you need to keep your code away from prying eyes, you may want to [create a private repository](/articles/creating-a-new-repository) instead. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your site administrator has disabled private mode, you can also use anonymous gists, which can be public or secret. diff --git a/translations/ko-KR/content/insights/installing-and-configuring-github-insights/updating-github-insights.md b/translations/ko-KR/content/insights/installing-and-configuring-github-insights/updating-github-insights.md index df02d3fc47..e17b23f341 100644 --- a/translations/ko-KR/content/insights/installing-and-configuring-github-insights/updating-github-insights.md +++ b/translations/ko-KR/content/insights/installing-and-configuring-github-insights/updating-github-insights.md @@ -6,7 +6,6 @@ redirect_from: - /github/installing-and-configuring-github-insights/updating-github-insights permissions: 'People with read permissions to the `github/insights-releases` repository and administrative access to the application server can update {% data variables.product.prodname_insights %}.' versions: - free-pro-team: '*' enterprise-server: '*' --- diff --git a/translations/ko-KR/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md b/translations/ko-KR/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md index 702b2af741..8516292b81 100644 --- a/translations/ko-KR/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md +++ b/translations/ko-KR/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md @@ -78,7 +78,7 @@ If you have a {% data variables.product.prodname_actions %} workflow that uses a 2. In your {% data variables.product.prodname_actions %} workflow file, update the package url from `https://docker.pkg.github.com` to `ghcr.io`. -3. Add your new {% data variables.product.prodname_container_registry %} authentication personal access token (PAT) as a GitHub ACtions secret. {% data variables.product.prodname_github_container_registry %} does not support using `GITHUB_TOKEN` for your PAT so you must use a different custom variable, such as `CR_PAT`. For more information, see "[Creating and storing encrypted secrets](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)." +3. Add your new {% data variables.product.prodname_container_registry %} authentication personal access token (PAT) as a GitHub Actions secret. {% data variables.product.prodname_github_container_registry %} does not support using `GITHUB_TOKEN` for your PAT so you must use a different custom variable, such as `CR_PAT`. For more information, see "[Creating and storing encrypted secrets](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)." 4. In your {% data variables.product.prodname_actions %} workflow file, update the authentication PAT by replacing your Docker registry PAT ({% raw %}`${{ secrets.GITHUB_TOKEN }}`{% endraw %}) with a new variable for your {% data variables.product.prodname_container_registry %} PAT, such as {% raw %}`${{ secrets.CR_PAT }}`{% endraw %}. diff --git a/translations/ko-KR/content/packages/publishing-and-managing-packages/about-github-packages.md b/translations/ko-KR/content/packages/publishing-and-managing-packages/about-github-packages.md index 18b81364ff..82aec1472e 100644 --- a/translations/ko-KR/content/packages/publishing-and-managing-packages/about-github-packages.md +++ b/translations/ko-KR/content/packages/publishing-and-managing-packages/about-github-packages.md @@ -100,7 +100,7 @@ If {% data variables.product.product_location_enterprise %} has subdomain isolat | Ruby | RubyGems package manager | `Gemfile` | `gem` | `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` | | Java | Apache Maven project management and comprehension tool | `pom.xml` | `mvn` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` | | Java | Gradle build automation tool for Java | `build.gradle` or `build.gradle.kts` | `gradle` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` | -| .NET | NuGet package management for .NET | `nupkg` | `dotnet` CLI | nuget.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` | +| .NET | NuGet package management for .NET | `nupkg` | `dotnet` CLI | `nuget.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` | {% else %} diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md index e454688bed..75a8d2a919 100644 --- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md +++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md @@ -27,13 +27,13 @@ You can authenticate to {% data variables.product.prodname_registry %} with Apac In the `servers` tag, add a child `server` tag with an `id`, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, and *TOKEN* with your personal access token. -In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. {% data reusables.package_registry.lowercase-name-field %} +In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. {% data reusables.package_registry.lowercase-name-field %} If you want to interact with multiple repositories, you can add each repository to separate `repository` children in the `repositories` tag, mapping the `id` of each to the credentials in the `servers` tag. {% data reusables.package_registry.apache-maven-snapshot-versions-supported %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -76,7 +76,7 @@ If your instance has subdomain isolation enabled:     ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ``` @@ -133,8 +133,8 @@ For more information on creating a package, see the [maven.apache.org documentat 1. Edit the `distributionManagement` element of the *pom.xml* file located in your package directory, replacing -{% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. - {% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} ``` @@ -146,7 +146,7 @@ For more information on creating a package, see the [maven.apache.org documentat ``` - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ``` diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md index 7613721792..ca4ffebdd4 100644 --- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md +++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md @@ -21,7 +21,7 @@ versions: When installing or publishing a docker image, {% data variables.product.prodname_registry %} does not currently support foreign layers, such as Windows images. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Before you can use the Docker registry on {% data variables.product.prodname_registry %}, the site administrator for {% data variables.product.product_location_enterprise %} must enable Docker support and subdomain isolation for your instance. For more information, see "[Managing GitHub Packages for your enterprise](/enterprise/admin/packages)." @@ -49,7 +49,7 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% raw %} ```shell $ cat ~/TOKEN.txt | docker login docker.HOSTNAME -u USERNAME --password-stdin @@ -57,7 +57,7 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if currentVersion != "free-pro-team@latest" %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. +To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if enterpriseServerVersions contains currentVersion %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. For more information, see "[Docker login](https://docs.docker.com/engine/reference/commandline/login/#provide-a-password-using-stdin)." @@ -83,7 +83,7 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen > IMAGE_NAME VERSION IMAGE_ID 4 weeks ago 1.11MB ``` 2. Using the Docker image ID, tag the docker image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, -{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. +{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker tag IMAGE_ID docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION @@ -94,7 +94,7 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen ``` {% endif %} 3. If you haven't already built a docker image for the package, build the image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, *VERSION* with package version at build time, -{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s +{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker build -t docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH @@ -185,7 +185,7 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0 {% data reusables.package_registry.docker_registry_deprecation_status %} -You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} +You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} {% if currentVersion == "free-pro-team@latest" %} ```shell diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md index 91bcc0b7f5..84ea3515d0 100644 --- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md +++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md @@ -29,7 +29,7 @@ To authenticate to {% data variables.product.prodname_registry %} with the `dotn You must replace: - `USERNAME` with the name of your user account on {% data variables.product.prodname_dotcom %}. - `TOKEN` with your personal access token. -- `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} +- `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} - `HOSTNAME` with the host name for your {% data variables.product.prodname_ghe_server %} instance. If your instance has subdomain isolation enabled: @@ -51,7 +51,7 @@ If your instance has subdomain isolation enabled: ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```xml @@ -89,7 +89,7 @@ You can publish a package to {% data variables.product.prodname_registry %} by a 3. Add your project's specific information to your project's file, which ends in *.csproj*. You must replace: - `OWNER` with the name of the user or organization account that owns the repository containing your project. - `REPOSITORY` with the name of the repository containing the package you want to publish. - - `1.0.0` with the version number of the package.{% if currentVersion != "free-pro-team@latest" %} + - `1.0.0` with the version number of the package.{% if enterpriseServerVersions contains currentVersion %} - `HOSTNAME` with the host name for your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` xml diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md index f483f359ff..c3a614d19d 100644 --- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md +++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md @@ -25,7 +25,7 @@ versions: You can authenticate to {% data variables.product.prodname_registry %} with Gradle using either Gradle Groovy or Kotlin DSL by editing your *build.gradle* file (Gradle Groovy) or *build.gradle.kts* file (Kotlin DSL) file to include your personal access token. You can also configure Gradle Groovy and Kotlin DSL to recognize a single package or multiple packages in a repository. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Replace *REGISTRY-URL* with the URL for your instance's Maven registry. If your instance has subdomain isolation enabled, use `maven.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/maven`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance. {% endif %} diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md index 342be9c5c3..7f1e63aabb 100644 --- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md +++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md @@ -25,9 +25,9 @@ versions: You can authenticate to {% data variables.product.prodname_registry %} with npm by either editing your per-user *~/.npmrc* file to include your personal access token or by logging in to npm on the command line using your username and personal access token. -To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. Create a new *~/.npmrc* file if one doesn't exist. +To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. Create a new *~/.npmrc* file if one doesn't exist. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -35,7 +35,7 @@ If your instance has subdomain isolation enabled: //{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}/:_authToken=TOKEN ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell @@ -45,7 +45,7 @@ If your instance has subdomain isolation disabled: To authenticate by logging in to npm, use the `npm login` command, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *PUBLIC-EMAIL-ADDRESS* with your email address. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -56,7 +56,7 @@ $ npm login --registry=https://{% if currentVersion == "free-pro-team@latest" %} > Email: PUBLIC-EMAIL-ADDRESS ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell @@ -98,20 +98,20 @@ You can use an *.npmrc* file to configure the scope mapping for your project. In You can use `publishConfig` element in the *package.json* file to specify the registry where you want the package published. For more information, see "[publishConfig](https://docs.npmjs.com/files/package.json#publishconfig)" in the npm documentation. 1. Edit the *package.json* file for your package and include a `publishConfig` entry. - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} ```shell - "publishConfig": { - "registry":"https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}" - }, + "publishConfig": { + "registry":"https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}" + }, ``` - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell - "publishConfig": { - "registry":"https://HOSTNAME/_registry/npm/" - }, + "publishConfig": { + "registry":"https://HOSTNAME/_registry/npm/" + }, ``` {% endif %} {% data reusables.package_registry.verify_repository_field %} @@ -137,7 +137,7 @@ To ensure the repository's URL is correct, replace REPOSITORY with the name of t You can install packages from {% data variables.product.prodname_registry %} by adding the packages as dependencies in the *package.json* file for your project. For more information on using a *package.json* in your project, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" in the npm documentation. -By default, you can add packages from one organization. For more information, see [Installing packages from other organizations](#installing-packages-from-other-organizations) +By default, you can add packages from one organization. For more information, see "[Installing packages from other organizations](#installing-packages-from-other-organizations)." You also need to add the *.npmrc* file to your project so all requests to install packages will go through {% data variables.product.prodname_registry %}. When you route all package requests through {% data variables.product.prodname_registry %}, you can use both scoped and unscoped packages from *npmjs.com*. For more information, see "[npm-scope](https://docs.npmjs.com/misc/scope)" in the npm documentation. @@ -167,19 +167,19 @@ You also need to add the *.npmrc* file to your project so all requests to instal #### Installing packages from other organizations -By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} +By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} ```shell -registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}OWNER +registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME{% endif %}/OWNER @OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %} @OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %} ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md index e323207206..7f347260b1 100644 --- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md +++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md @@ -56,7 +56,7 @@ For example, you would create or edit a *~/.gem/credentials* to include the foll To install gems, you need to authenticate to {% data variables.product.prodname_registry %} by editing the *~/.gemrc* file for your project to include `https://USERNAME:TOKEN@{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER/`. You must replace: - `USERNAME` with your {% data variables.product.prodname_dotcom %} username. - `TOKEN` with your personal access token. - - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} + - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} - `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance. {% endif %} @@ -74,7 +74,7 @@ If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this exa ``` -To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} {% data reusables.package_registry.lowercase-name-field %} @@ -97,7 +97,7 @@ $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygem ```shell gem build OCTO-GEM.gemspec ``` -3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ```shell $ gem push --key github \ @@ -107,7 +107,7 @@ $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygem ### Publishing multiple packages to the same repository -To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if currentVersion != "free-pro-team@latest" %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if enterpriseServerVersions contains currentVersion %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` gem.metadata = { "github_repo" => "ssh://{% if currentVersion == "free-pro-team@latest" %}github.com{% else %}HOSTNAME{% endif %}/OWNER/REPOSITORY" } @@ -118,7 +118,7 @@ gem.metadata = { "github_repo" => "ssh://{% if currentVersion == "free-pro-team@ You can use gems from {% data variables.product.prodname_registry %} much like you use gems from *rubygems.org*. You need to authenticate to {% data variables.product.prodname_registry %} by adding your {% data variables.product.prodname_dotcom %} user or organization as a source in the *~/.gemrc* file or by using Bundler and editing you *Gemfile*. {% data reusables.package_registry.authenticate-step %} -2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` source "https://rubygems.org" diff --git a/translations/ko-KR/content/rest/overview/api-previews.md b/translations/ko-KR/content/rest/overview/api-previews.md index 4ba2d6b8b5..2cdd00b812 100644 --- a/translations/ko-KR/content/rest/overview/api-previews.md +++ b/translations/ko-KR/content/rest/overview/api-previews.md @@ -42,7 +42,7 @@ Get a [list of events](/v3/issues/timeline/) for an issue or pull request. **Custom media type:** `mockingbird-preview` **Announced:** [2016-05-23](https://developer.github.com/changes/2016-05-23-timeline-preview-api/) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Pre-receive environments Create, list, update, and delete environments for pre-receive hooks. @@ -50,7 +50,7 @@ Create, list, update, and delete environments for pre-receive hooks. **Custom media type:** `eye-scream-preview` **Announced:** [2015-07-29](/rest/reference/enterprise-admin#pre-receive-environments) {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### Integrations Manage [integrations](/early-access/integrations/) through the API. @@ -98,7 +98,7 @@ View all [codes of conduct](/v3/codes_of_conduct) or get which code of conduct a **Custom media type:** `scarlet-witch-preview` -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### Nested teams Include nested team content in [team](/v3/teams/) payloads. @@ -107,7 +107,7 @@ Include nested team content in [team](/v3/teams/) payloads. {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Global webhooks @@ -117,7 +117,7 @@ Enables [global webhooks](/rest/reference/enterprise-admin#global-webhooks/) for {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### Repository transfer Transfer a [repository](/v3/repos/) to an organization or user. @@ -125,7 +125,7 @@ Transfer a [repository](/v3/repos/) to an organization or user. **Custom media type:** `nightshade-preview` **Announced:** [2017-11-09](https://developer.github.com/changes/2017-11-09-repository-transfer-api-preview) {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### Add lock reason You can now add a reason when you [lock an issue](/v3/issues/#lock-an-issue). @@ -145,7 +145,7 @@ You can now [require multiple approving reviews](/v3/repos/branches) for a pull **Custom media type:** `luke-cage-preview` **Announced:** [2018-03-16](https://developer.github.com/changes/2018-03-16-protected-branches-required-approving-reviews) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.19" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.19" %} ### Retrieve hovercard information Retrieve information from [someone's hovercard](/v3/users/#get-contextual-information-for-a-user). @@ -162,7 +162,7 @@ Allows a GitHub App to run external checks on a repository's code. See the [Chec **Custom media type:** `antiope-preview` **Announced:** [2018-05-07](https://developer.github.com/changes/2018-05-07-new-checks-api-public-beta/) {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Anonymous Git access to repositories @@ -216,7 +216,7 @@ Allows you to temporarily restrict interactions, such as commenting, opening iss {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### Draft pull requests You can use the Draft Pull Requests API and its [pull request](/v3/pulls/) endpoints to see whether a pull request is in draft state. To learn more about draft pull requests, see "[About pull requests](/articles/about-pull-requests/)". @@ -237,7 +237,7 @@ You can use two new endpoints in the [Commits API](/v3/repos/commits/) to list b **Custom media types:** `groot-preview` **Announced:** [2019-04-11](https://developer.github.com/changes/2019-04-11-pulls-branches-for-commit/) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### Uninstall a GitHub App Owners of GitHub Apps can now uninstall an app using the [Apps API](/v3/apps/#delete-an-installation-for-the-authenticated-app). diff --git a/translations/ko-KR/content/rest/overview/resources-in-the-rest-api.md b/translations/ko-KR/content/rest/overview/resources-in-the-rest-api.md index 0bc5ddb440..bdb3771568 100644 --- a/translations/ko-KR/content/rest/overview/resources-in-the-rest-api.md +++ b/translations/ko-KR/content/rest/overview/resources-in-the-rest-api.md @@ -40,7 +40,7 @@ $ curl -i {% data variables.product.api_url_pre %}/users/octocat/orgs > X-GitHub-Media-Type: github.v3 > X-RateLimit-Limit: 5000 > X-RateLimit-Remaining: 4987 -> X-RateLimit-Reset: 1350085394{% if currentVersion != "free-pro-team@latest" %} +> X-RateLimit-Reset: 1350085394{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: {{ currentVersion }}.0{% endif %} > Content-Length: 5 > Cache-Control: max-age=0, private, must-revalidate @@ -107,7 +107,7 @@ curl -u my_client_id:my_client_secret '{% data variables.product.api_url_pre %}/ Using your `client_id` and `client_secret` does _not_ authenticate as a user, it will only identify your OAuth application to increase your rate limit. Permissions are only granted to users, not applications, and you will only get back data that an unauthenticated user would see. For this reason, you should only use the OAuth2 key/secret in server-to-server scenarios. Don't leak your OAuth application's client secret to your users. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} You will be unable to authenticate using your OAuth2 key and secret while in private mode, and trying to authenticate will return `401 Unauthorized`. For more information, see "[Enabling private mode](/enterprise/admin/installation/enabling-private-mode)". {% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -163,10 +163,10 @@ $ curl -i -u username -d '{"scopes":["public_repo"]}' {% data variables.product. You can issue a `GET` request to the root endpoint to get all the endpoint categories that the REST API supports: ```shell -$ curl {% if currentVersion != "free-pro-team@latest" %}-u username:password {% endif %}{% data variables.product.api_url_pre %} +$ curl {% if enterpriseServerVersions contains currentVersion %}-u username:password {% endif %}{% data variables.product.api_url_pre %} ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/ko-KR/content/rest/reference/apps.md b/translations/ko-KR/content/rest/reference/apps.md index cc22cb8172..482032970c 100644 --- a/translations/ko-KR/content/rest/reference/apps.md +++ b/translations/ko-KR/content/rest/reference/apps.md @@ -61,3 +61,12 @@ Be sure to replace stubbed endpoints with production endpoints before deploying {% endfor %} {% endif %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +## Webhooks + +{% for operation in currentRestOperations %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} +{% endfor %} + +{% endif %} \ No newline at end of file diff --git a/translations/ko-KR/content/rest/reference/enterprise-admin.md b/translations/ko-KR/content/rest/reference/enterprise-admin.md index ad8f07a1df..c14017111e 100644 --- a/translations/ko-KR/content/rest/reference/enterprise-admin.md +++ b/translations/ko-KR/content/rest/reference/enterprise-admin.md @@ -21,7 +21,7 @@ You can use these endpoints to administer your enterprise. {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Endpoint URLs @@ -39,7 +39,7 @@ http(s)://hostname/ ### Authentication -Your {% data variables.product.product_name %} installation's API endpoints accept [the same authentication methods](/rest/overview/resources-in-the-rest-api#authentication) as the GitHub.com API. You can authenticate yourself with **[OAuth tokens](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** (which can be created using the [Authorizations API](/rest/reference/oauth-authorizations#create-a-new-authorization)) or **[basic authentication](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if currentVersion != "free-pro-team@latest" %} OAuth tokens must have the `site_admin` [OAuth scope](/developers/apps/scopes-for-oauth-apps#available-scopes) when used with Enterprise-specific endpoints.{% endif %} +Your {% data variables.product.product_name %} installation's API endpoints accept [the same authentication methods](/rest/overview/resources-in-the-rest-api#authentication) as the GitHub.com API. You can authenticate yourself with **[OAuth tokens](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** (which can be created using the [Authorizations API](/rest/reference/oauth-authorizations#create-a-new-authorization)) or **[basic authentication](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if enterpriseServerVersions contains currentVersion %} OAuth tokens must have the `site_admin` [OAuth scope](/developers/apps/scopes-for-oauth-apps#available-scopes) when used with Enterprise-specific endpoints.{% endif %} Enterprise administration API endpoints are only accessible to authenticated {% data variables.product.product_name %} site administrators, except for the [Management Console](#management-console) API, which requires the [Management Console password](/enterprise/admin/articles/accessing-the-management-console/). @@ -135,7 +135,7 @@ GET /scim/v2/enterprises/{enterprise}/Users/{scim_user_id} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ## Admin stats diff --git a/translations/ko-KR/content/rest/reference/gists.md b/translations/ko-KR/content/rest/reference/gists.md index fff45f6fc6..14e6eed912 100644 --- a/translations/ko-KR/content/rest/reference/gists.md +++ b/translations/ko-KR/content/rest/reference/gists.md @@ -9,7 +9,7 @@ versions: ### Authentication -You can read public gists {% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "2.9" %}and create them for anonymous users without a token.{% else %} anonymously, but you must be signed into GitHub to create gists.{% endif %} To read or write gists on a user's behalf, you need the gist OAuth scope and a token. For more information, see "[Scopes for OAuth Apps](/developers/apps/scopes-for-oauth-apps)." +You can read public gists {% if enterpriseServerVersions contains currentVersion %}and create them for anonymous users without a token.{% else %} anonymously, but you must be signed into GitHub to create gists.{% endif %} To read or write gists on a user's behalf, you need the gist OAuth scope and a token. For more information, see "[Scopes for OAuth Apps](/developers/apps/scopes-for-oauth-apps)." diff --git a/translations/ko-KR/content/rest/reference/orgs.md b/translations/ko-KR/content/rest/reference/orgs.md index 07eaed5dcf..19fc2c63e2 100644 --- a/translations/ko-KR/content/rest/reference/orgs.md +++ b/translations/ko-KR/content/rest/reference/orgs.md @@ -56,5 +56,5 @@ For more best practices, [see our guide](/guides/best-practices-for-integrators/ {% data variables.product.product_name %} will send along several HTTP headers to differentiate between event types and payload identifiers. See [webhook headers](/webhooks/event-payloads/#delivery-headers) for details. {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} diff --git a/translations/ko-KR/content/rest/reference/permissions-required-for-github-apps.md b/translations/ko-KR/content/rest/reference/permissions-required-for-github-apps.md index 0342b02d29..ee4b9452d1 100644 --- a/translations/ko-KR/content/rest/reference/permissions-required-for-github-apps.md +++ b/translations/ko-KR/content/rest/reference/permissions-required-for-github-apps.md @@ -577,7 +577,7 @@ _Teams_ - [`GET /orgs/:org/teams`](/v3/teams/#list-teams) (:read) - [`POST /orgs/:org/teams`](/v3/teams/#create-a-team) (:write) - [`GET /orgs/:org/teams/:team_slug`](/v3/teams/#get-a-team-by-name) (:read) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} - [`GET /teams/:team_id`](/v3/teams/#get-a-team) (:read) {% endif %} - [`PATCH /teams/:team_id`](/v3/teams/#update-a-team) (:write) @@ -619,7 +619,7 @@ _Teams_ _Teams_ - [`DELETE /teams/:team_id/projects/:project_id`](/v3/teams/#remove-a-project-from-a-team) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Permission on "organization pre receive hooks" - [`GET /orgs/:org/pre-receive-hooks`](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-an-organization) (:read) @@ -766,7 +766,7 @@ _Reviews_ - [`POST /repos/:owner/:repo/hooks/:hook_id/pings`](/v3/repos/hooks/#ping-a-repository-webhook) (:read) - [`POST /repos/:owner/:repo/hooks/:hook_id/tests`](/v3/repos/hooks/#test-the-push-repository-webhook) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Permission on "repository pre receive hooks" - [`GET /repos/:owner/:repo/pre-receive-hooks`](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-a-repository) (:read) diff --git a/translations/ko-KR/content/rest/reference/repos.md b/translations/ko-KR/content/rest/reference/repos.md index cf176b4909..aa24343b7f 100644 --- a/translations/ko-KR/content/rest/reference/repos.md +++ b/translations/ko-KR/content/rest/reference/repos.md @@ -263,7 +263,7 @@ The Repository Webhooks API allows repository admins to manage the post-receive If you would like to set up a single webhook to receive events from all of your organization's repositories, see our API documentation for [Organization Webhooks](/rest/reference/orgs#webhooks). {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} ### Receiving Webhooks @@ -292,14 +292,14 @@ The default format is what [existing post-receive hooks should expect](/post-rec #### Callback URLs Callback URLs can use the `http://` protocol. -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %}You can also `github://` callbacks to specify a GitHub service. +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %}You can also `github://` callbacks to specify a GitHub service. {% data reusables.apps.deprecating_github_services_ghe %} {% endif %} # Send updates to postbin.org http://postbin.org/123 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} # Send updates to Campfire github://campfire?subdomain=github&room=Commits&token=abc123 {% endif %} diff --git a/translations/ko-KR/data/reusables/actions/actions-not-verified.md b/translations/ko-KR/data/reusables/actions/actions-not-verified.md index cb26fa9d61..2ab85ce6c1 100644 --- a/translations/ko-KR/data/reusables/actions/actions-not-verified.md +++ b/translations/ko-KR/data/reusables/actions/actions-not-verified.md @@ -1 +1 @@ -Anyone can publish an action in {% data variables.product.prodname_marketplace %} as long as they meet the terms of service. Unlike apps, {% data variables.product.prodname_actions %} listed in {% data variables.product.prodname_marketplace %} are not verified by {% data variables.product.prodname_dotcom %}. +Anyone can publish an action in {% data variables.product.prodname_marketplace %}. {% data variables.product.prodname_dotcom %} verifies some partner organizations, but unlike verified apps, {% data variables.product.prodname_dotcom %} does not review or verify individual actions listed in {% data variables.product.prodname_marketplace %}. diff --git a/translations/ko-KR/data/reusables/actions/enterprise-beta.md b/translations/ko-KR/data/reusables/actions/enterprise-beta.md index 30eac75a91..5c456da70d 100644 --- a/translations/ko-KR/data/reusables/actions/enterprise-beta.md +++ b/translations/ko-KR/data/reusables/actions/enterprise-beta.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.22" %} {% note %} **Note:** {% data variables.product.prodname_actions %} support on {% data variables.product.prodname_ghe_server %} 2.22 is a limited public beta. To review the external storage requirements and request access to the beta, see "[Enabling {% data variables.product.prodname_actions %} and configuring storage](/enterprise/admin/github-actions/enabling-github-actions-and-configuring-storage)." diff --git a/translations/ko-KR/data/reusables/actions/enterprise-github-hosted-runners.md b/translations/ko-KR/data/reusables/actions/enterprise-github-hosted-runners.md index 178bf09abe..948121d881 100644 --- a/translations/ko-KR/data/reusables/actions/enterprise-github-hosted-runners.md +++ b/translations/ko-KR/data/reusables/actions/enterprise-github-hosted-runners.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} {% note %} **Note:** {% data variables.product.prodname_dotcom %}-hosted runners are not currently supported on {% data variables.product.prodname_ghe_server %}. You can see more information about planned future support on the [{% data variables.product.prodname_roadmap %}](https://github.com/github/roadmap/issues/72). diff --git a/translations/ko-KR/data/reusables/actions/enterprise-marketplace-actions.md b/translations/ko-KR/data/reusables/actions/enterprise-marketplace-actions.md index 5b5987de4b..6d326f2fb2 100644 --- a/translations/ko-KR/data/reusables/actions/enterprise-marketplace-actions.md +++ b/translations/ko-KR/data/reusables/actions/enterprise-marketplace-actions.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/ko-KR/data/reusables/actions/enterprise-setup-prereq.md b/translations/ko-KR/data/reusables/actions/enterprise-setup-prereq.md index 3ead3e20f9..6646511192 100644 --- a/translations/ko-KR/data/reusables/actions/enterprise-setup-prereq.md +++ b/translations/ko-KR/data/reusables/actions/enterprise-setup-prereq.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} #### Using self-hosted runners on {% data variables.product.prodname_ghe_server %} diff --git a/translations/ko-KR/data/reusables/apps/deprecating_auth_with_query_parameters.md b/translations/ko-KR/data/reusables/apps/deprecating_auth_with_query_parameters.md index c7642634c7..68d632051f 100644 --- a/translations/ko-KR/data/reusables/apps/deprecating_auth_with_query_parameters.md +++ b/translations/ko-KR/data/reusables/apps/deprecating_auth_with_query_parameters.md @@ -3,7 +3,7 @@ **Deprecation Notice:** {% data variables.product.prodname_dotcom %} will discontinue authentication to the API using query parameters. Authenticating to the API should be done with [HTTP basic authentication](/v3/auth/#via-oauth-and-personal-access-tokens).{% if currentVersion == "free-pro-team@latest" %} Using query parameters to authenticate to the API will no longer work on May 5, 2021. {% endif %} For more information, including scheduled brownouts, see the [blog post](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/). -{% if currentVersion != "free-pro-team@latest" %} Authentication to the API using query parameters while available is no longer supported due to security concerns. Instead we recommend integrators move their access token, `client_id`, or `client_secret` in the header. {% data variables.product.prodname_dotcom %} will announce the removal of authentication by query parameters with advanced notice. {% endif %} +{% if enterpriseServerVersions contains currentVersion %} Authentication to the API using query parameters while available is no longer supported due to security concerns. Instead we recommend integrators move their access token, `client_id`, or `client_secret` in the header. {% data variables.product.prodname_dotcom %} will announce the removal of authentication by query parameters with advanced notice. {% endif %} {% endwarning %} {% endif %} diff --git a/translations/ko-KR/data/reusables/apps/deprecating_github_services_ghe.md b/translations/ko-KR/data/reusables/apps/deprecating_github_services_ghe.md index ebdcd4af06..72e5d399fb 100644 --- a/translations/ko-KR/data/reusables/apps/deprecating_github_services_ghe.md +++ b/translations/ko-KR/data/reusables/apps/deprecating_github_services_ghe.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% note %} **Note:** GitHub Enterprise release 2.17 and higher no longer allows admins to install new GitHub Services, and existing services will stop working in GitHub Enterprise release 2.20 and higher. You can use the [Replacing GitHub Services guide](/v3/guides/replacing-github-services) to help you update your services to webhooks. diff --git a/translations/ko-KR/data/reusables/apps/deprecating_password_auth.md b/translations/ko-KR/data/reusables/apps/deprecating_password_auth.md index d10ba259e1..9fd86310d3 100644 --- a/translations/ko-KR/data/reusables/apps/deprecating_password_auth.md +++ b/translations/ko-KR/data/reusables/apps/deprecating_password_auth.md @@ -3,7 +3,7 @@ **Deprecation Notice:** {% data variables.product.prodname_dotcom %} will discontinue password authentication to the API. You must now authenticate to the {% data variables.product.prodname_dotcom %} API with an API token, such as an OAuth access token, GitHub App installation access token, or personal access token, depending on what you need to do with the token.{% if currentVersion == "free-pro-team@latest" %} Password authentication to the API will be removed on November 13, 2020.{% endif %} For more information,{% if currentVersion == "free-pro-team@latest" %} including scheduled brownouts,{% endif %} see the [blog post](https://developer.github.com/changes/2020-02-14-deprecating-password-auth/). -{% if currentVersion != "free-pro-team@latest" %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %} will announce the deprecation and provide advanced notice before removing support for this feature.{% endif %} +{% if enterpriseServerVersions contains currentVersion %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %} will announce the deprecation and provide advanced notice before removing support for this feature.{% endif %} {% endwarning %} {% endif %} diff --git a/translations/ko-KR/data/reusables/apps/deprecating_token_oauth_authorizations.md b/translations/ko-KR/data/reusables/apps/deprecating_token_oauth_authorizations.md index 7bd0d49516..333f7b3f53 100644 --- a/translations/ko-KR/data/reusables/apps/deprecating_token_oauth_authorizations.md +++ b/translations/ko-KR/data/reusables/apps/deprecating_token_oauth_authorizations.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% warning %} **Deprecation Notice:** The `token` attribute is deprecated in some OAuth Authorizations API responses: diff --git a/translations/ko-KR/data/reusables/code-scanning/choose-alert-dismissal-reason.md b/translations/ko-KR/data/reusables/code-scanning/choose-alert-dismissal-reason.md new file mode 100644 index 0000000000..e7abf5ece7 --- /dev/null +++ b/translations/ko-KR/data/reusables/code-scanning/choose-alert-dismissal-reason.md @@ -0,0 +1 @@ +It's important to choose the appropriate reason from the drop-down menu as this may affect whether a query continues to be included in future analysis. \ No newline at end of file diff --git a/translations/ko-KR/data/reusables/code-scanning/false-positive-fix-codeql.md b/translations/ko-KR/data/reusables/code-scanning/false-positive-fix-codeql.md index db3da9c9d5..011f129f12 100644 --- a/translations/ko-KR/data/reusables/code-scanning/false-positive-fix-codeql.md +++ b/translations/ko-KR/data/reusables/code-scanning/false-positive-fix-codeql.md @@ -1 +1 @@ -If you close a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." +If you {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." diff --git a/translations/ko-KR/data/reusables/dependabot/automated-tests-note.md b/translations/ko-KR/data/reusables/dependabot/automated-tests-note.md new file mode 100644 index 0000000000..1f15a27f8e --- /dev/null +++ b/translations/ko-KR/data/reusables/dependabot/automated-tests-note.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** It's good practice to have automated tests and acceptance processes in place so that checks are carried out before the pull request is merged. This is particularly important if the suggested version to upgrade to contains additional functionality, or a change that breaks your project's code. For more information about continuous integration, see "[About continuous integration](/actions/building-and-testing-code-with-continuous-integration/about-continuous-integration)." + +{% endnote %} diff --git a/translations/ko-KR/data/reusables/dependabot/pull-request-introduction.md b/translations/ko-KR/data/reusables/dependabot/pull-request-introduction.md new file mode 100644 index 0000000000..7494d21059 --- /dev/null +++ b/translations/ko-KR/data/reusables/dependabot/pull-request-introduction.md @@ -0,0 +1 @@ +{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot_short %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." \ No newline at end of file diff --git a/translations/ko-KR/data/reusables/dependabot/supported-package-managers.md b/translations/ko-KR/data/reusables/dependabot/supported-package-managers.md index 22b7b86792..4d60df37bb 100644 --- a/translations/ko-KR/data/reusables/dependabot/supported-package-managers.md +++ b/translations/ko-KR/data/reusables/dependabot/supported-package-managers.md @@ -7,7 +7,7 @@ | Elm: `elm` | | | git submodule: `gitsubmodule` | | | GitHub Actions: `github-actions` | | -| Go modules: `gomod` | | +| Go modules: `gomod` | **X** | | Gradle: `gradle` | | | Maven: `maven` | | | Mix: `mix` | | diff --git a/translations/ko-KR/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md b/translations/ko-KR/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md new file mode 100644 index 0000000000..11f71b27bd --- /dev/null +++ b/translations/ko-KR/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md @@ -0,0 +1,5 @@ +1. Navigate to {% data variables.product.prodname_dotcom_the_website %}. + +1. In the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) + +1. In the list of enterprises, click the enterprise you want to view. ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png) diff --git a/translations/ko-KR/data/reusables/enterprise-accounts/access-enterprise.md b/translations/ko-KR/data/reusables/enterprise-accounts/access-enterprise.md index 2a7bee222c..66edf20433 100644 --- a/translations/ko-KR/data/reusables/enterprise-accounts/access-enterprise.md +++ b/translations/ko-KR/data/reusables/enterprise-accounts/access-enterprise.md @@ -1,3 +1,17 @@ -1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on GitHub](/assets/images/help/enterprises/your-enterprises.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) 1. In the list of enterprises, click the enterprise you want to view. ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png) + +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %} + +1. Navigate to your enterprise account by visiting {% raw %}https://HOSTNAME/enterprises/ENTERPRISE-NAME{% endraw %}, replacing `HOSTNAME` with your instance's hostname and `ENTERPRISE-NAME` with your enterprise account's name. + +{% elsif enterpriseServerVersions contains currentVersion %} + +1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Enterprise settings**. !["Enterprise settings" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/enterprise/settings/enterprise-settings.png) + +{% endif %} diff --git a/translations/ko-KR/data/reusables/enterprise-accounts/license-tab.md b/translations/ko-KR/data/reusables/enterprise-accounts/license-tab.md index 45482a5843..f6f2068da3 100644 --- a/translations/ko-KR/data/reusables/enterprise-accounts/license-tab.md +++ b/translations/ko-KR/data/reusables/enterprise-accounts/license-tab.md @@ -1 +1,9 @@ -1. In the left sidebar, click **License**. ![License tab in the enterprise server settings sidebar](/assets/images/enterprise/business-accounts/license-tab.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) + +{% else %} + +1. In the left sidebar, click **License**. !["License" tab in the enterprise account settings sidebar](/assets/images/enterprise/enterprises/license.png) + +{% endif %} diff --git a/translations/ko-KR/data/reusables/enterprise/rate_limit.md b/translations/ko-KR/data/reusables/enterprise/rate_limit.md index ddf01e8d88..7412078c13 100644 --- a/translations/ko-KR/data/reusables/enterprise/rate_limit.md +++ b/translations/ko-KR/data/reusables/enterprise/rate_limit.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Note that the limits mentioned above are the default rate limits for a {% data variables.product.prodname_ghe_server %} instance. Contact your site administrator to confirm if rate limits are enabled and how they are configured. {% endif %} diff --git a/translations/ko-KR/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md b/translations/ko-KR/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md index 42247032b4..7b4c3f1ab5 100644 --- a/translations/ko-KR/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md +++ b/translations/ko-KR/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md @@ -9,7 +9,7 @@ - Choose **{% data variables.product.support_ticket_priority_urgent %}** to report {% if currentVersion == "free-pro-team@latest" %}critical system failure{% else %}fatal system failures, outages impacting critical system operations, security incidents, and expired licenses{% endif %}. - Choose **{% data variables.product.support_ticket_priority_high %}** to report issues impacting business operations, including {% if currentVersion == "free-pro-team@latest" %}removing sensitive data (commits, issues, pull requests, uploaded attachments) from your own accounts and organization restorations{% else %}system performance issues{% endif %}, or to report critical bugs. - Choose **{% data variables.product.support_ticket_priority_normal %}** to {% if currentVersion == "free-pro-team@latest" %}request account recovery or spam unflagging, report user login issues{% else %}make technical requests like configuration changes and third-party integrations{% endif %}, and to report non-critical bugs. - - Choose **{% data variables.product.support_ticket_priority_low %}** to ask general questions and submit requests for new features, purchases, training, or health checks.{% if currentVersion != "free-pro-team@latest" %} + - Choose **{% data variables.product.support_ticket_priority_low %}** to ask general questions and submit requests for new features, purchases, training, or health checks.{% if enterpriseServerVersions contains currentVersion %} 1. From the " {% data variables.product.prodname_enterprise %} Series" drop-down menu, select the version of {% data variables.product.prodname_ghe_server %} you're using. ![{% data variables.product.prodname_enterprise %} Series drop-down menu](/assets/images/enterprise/support/support-ticket-ghes-series.png) diff --git a/translations/ko-KR/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md b/translations/ko-KR/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md index 67f68c6f7e..7ee7b5cb83 100644 --- a/translations/ko-KR/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md +++ b/translations/ko-KR/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md @@ -1,5 +1,5 @@ 1. Click **Submit**. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If you chose not to include diagnostics with your support ticket, you can share diagnostic information with {% data variables.product.prodname_enterprise %} Support after submitting your support request. For more information, see "[Providing data to {% data variables.product.prodname_dotcom %} Support](/enterprise/admin/guides/enterprise-support/providing-data-to-github-support)."{% endif %} diff --git a/translations/ko-KR/data/reusables/enterprise_installation/aws-recommended-instance-types.md b/translations/ko-KR/data/reusables/enterprise_installation/aws-recommended-instance-types.md index bd0ccf27d4..c70974f1cf 100644 --- a/translations/ko-KR/data/reusables/enterprise_installation/aws-recommended-instance-types.md +++ b/translations/ko-KR/data/reusables/enterprise_installation/aws-recommended-instance-types.md @@ -1,5 +1,5 @@ Based on your user license count, we recommend the following instance types. | -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} | User licenses | Recommended type | |:------------------------------ | ----------------:| | Trial, demo, or 10 light users | r4.large | diff --git a/translations/ko-KR/data/reusables/enterprise_installation/aws-supported-instance-types.md b/translations/ko-KR/data/reusables/enterprise_installation/aws-supported-instance-types.md index 7b4af4b392..5cf0c50693 100644 --- a/translations/ko-KR/data/reusables/enterprise_installation/aws-supported-instance-types.md +++ b/translations/ko-KR/data/reusables/enterprise_installation/aws-supported-instance-types.md @@ -28,9 +28,9 @@ | ----------------- | -------------------------------------------------------------------- | | R4 | r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge | -| EC2 instance type | Model | -| ----------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} +| EC2 instance type | Model | +| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} | EC2 instance type | Model | | ----------------- | ------------------------ | diff --git a/translations/ko-KR/data/reusables/files/add-file.md b/translations/ko-KR/data/reusables/files/add-file.md index daf8d37dba..9eaecc80e4 100644 --- a/translations/ko-KR/data/reusables/files/add-file.md +++ b/translations/ko-KR/data/reusables/files/add-file.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Above the list of files, click **Create new file**. !["Create new file" button](/assets/images/help/repository/create_new_file.png) {% else %} 1. Above the list of files, using the **Add file** drop-down, click **Create new file**. !["Create new file" in the "Add file" dropdown](/assets/images/help/repository/create_new_file.png) diff --git a/translations/ko-KR/data/reusables/gated-features/code-scanning.md b/translations/ko-KR/data/reusables/gated-features/code-scanning.md index a1aca3e675..2bcd80c1d4 100644 --- a/translations/ko-KR/data/reusables/gated-features/code-scanning.md +++ b/translations/ko-KR/data/reusables/gated-features/code-scanning.md @@ -1 +1 @@ -{% data variables.product.prodname_code_scanning_capc %} is available in public repositories, and in public and private repositories owned by organizations with a license for {% data variables.product.prodname_advanced_security %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +{% data variables.product.prodname_code_scanning_capc %} is available {% if currentVersion == "free-pro-team@latest" %}in public repositories, and in private repositories owned by organizations with {% else %}if you have {% endif %}an {% data variables.product.prodname_advanced_security %} license. {% data reusables.gated-features.more-info %} diff --git a/translations/ko-KR/data/reusables/gated-features/draft-prs.md b/translations/ko-KR/data/reusables/gated-features/draft-prs.md index 0379025602..52b7344ec8 100644 --- a/translations/ko-KR/data/reusables/gated-features/draft-prs.md +++ b/translations/ko-KR/data/reusables/gated-features/draft-prs.md @@ -1 +1 @@ -Draft pull requests are 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 %}{% if currentVersion != "free-pro-team@latest" %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +Draft pull requests are 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 %}{% if enterpriseServerVersions contains currentVersion %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} diff --git a/translations/ko-KR/data/reusables/gist/anonymous-gists-cannot-be-deleted.md b/translations/ko-KR/data/reusables/gist/anonymous-gists-cannot-be-deleted.md index 44325424b3..ade80ffc33 100644 --- a/translations/ko-KR/data/reusables/gist/anonymous-gists-cannot-be-deleted.md +++ b/translations/ko-KR/data/reusables/gist/anonymous-gists-cannot-be-deleted.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% warning %} **Warning:** Anonymous gists cannot be deleted from the web browser. To have an anonymous gist deleted, contact {% data variables.contact.contact_support %}. Please provide the URL of the gist you wish to delete. diff --git a/translations/ko-KR/data/reusables/github-actions/macos-runner-preview.md b/translations/ko-KR/data/reusables/github-actions/macos-runner-preview.md new file mode 100644 index 0000000000..88a2d482c4 --- /dev/null +++ b/translations/ko-KR/data/reusables/github-actions/macos-runner-preview.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** The MacOS 11.0 virtual environment is currently provided as a preview only. The `macos-latest` YAML workflow label still uses the MacOS 10.15 virtual environment. + +{% endnote %} diff --git a/translations/ko-KR/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md b/translations/ko-KR/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md index d23a898876..35bb629135 100644 --- a/translations/ko-KR/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md +++ b/translations/ko-KR/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md @@ -1,9 +1,9 @@ -A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. To manage a self-hosted runner, you must have the following permissions, depending on where the self-hosted runner was added: +A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. To manage a self-hosted runner, you must have the following permissions, depending on where the self-hosted runner was added: - **User repository**: You must be the repository owner. - **Organization**: You must be an organization owner. - **Organization repository**: You must be an organization owner, or have admin access to the repository. {% if currentVersion == "free-pro-team@latest" %} - **Enterprise account**: You must be an enterprise owner. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} - **Enterprise**: You must be a {% data variables.product.prodname_enterprise %} site administrator. {% endif %} diff --git a/translations/ko-KR/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md b/translations/ko-KR/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md index 51b89e7e7a..37ea26c669 100644 --- a/translations/ko-KR/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md +++ b/translations/ko-KR/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md @@ -1,6 +1,6 @@ 1. Navigate to where your self-hosted runner is registered: * **In an organization or repository**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. - * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: 1. In the upper-right corner of any page, click {% octicon "rocket" aria-label="The rocket ship" %}. 1. In the left sidebar, click **Enterprise overview**. @@ -9,4 +9,4 @@ * **In an organization or repository**: click **Actions** in the left sidebar. ![Actions setting](/assets/images/help/settings/settings-sidebar-actions.png) - * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". diff --git a/translations/ko-KR/data/reusables/github-actions/supported-github-runners.md b/translations/ko-KR/data/reusables/github-actions/supported-github-runners.md index 0812cf7d05..37caf3e2cc 100644 --- a/translations/ko-KR/data/reusables/github-actions/supported-github-runners.md +++ b/translations/ko-KR/data/reusables/github-actions/supported-github-runners.md @@ -4,4 +4,5 @@ | Ubuntu 20.04 | `ubuntu-20.04` | | Ubuntu 18.04 | `ubuntu-latest` or `ubuntu-18.04` | | Ubuntu 16.04 | `ubuntu-16.04` | +| macOS Big Sur 11.0 | `macos-11.0` | | macOS Catalina 10.15 | `macos-latest` or `macos-10.15` | diff --git a/translations/ko-KR/data/reusables/github-actions/usage-matrix-limits.md b/translations/ko-KR/data/reusables/github-actions/usage-matrix-limits.md index 8ffadd1225..76d5a907a4 100644 --- a/translations/ko-KR/data/reusables/github-actions/usage-matrix-limits.md +++ b/translations/ko-KR/data/reusables/github-actions/usage-matrix-limits.md @@ -1 +1 @@ -- **Job matrix** - A job matrix can generate a maximum of 256 jobs per workflow run. This limit also applies to self-hosted runners. +A job matrix can generate a maximum of 256 jobs per workflow run. This limit also applies to self-hosted runners. diff --git a/translations/ko-KR/data/reusables/notifications/outbound_email_tip.md b/translations/ko-KR/data/reusables/notifications/outbound_email_tip.md index 5a7b57bc35..292e34810a 100644 --- a/translations/ko-KR/data/reusables/notifications/outbound_email_tip.md +++ b/translations/ko-KR/data/reusables/notifications/outbound_email_tip.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} You'll only receive email notifications if outbound email support is enabled on {% data variables.product.product_location_enterprise %}. For more information, contact your site administrator. diff --git a/translations/ko-KR/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md b/translations/ko-KR/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md new file mode 100644 index 0000000000..6b3de47d4c --- /dev/null +++ b/translations/ko-KR/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md @@ -0,0 +1,3 @@ +You can choose the delivery method for notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} on repositories that you are watching, as well as the frequency at which the notifications are sent to you. + + diff --git a/translations/ko-KR/data/reusables/notifications/vulnerable-dependency-notification-options.md b/translations/ko-KR/data/reusables/notifications/vulnerable-dependency-notification-options.md new file mode 100644 index 0000000000..29e67dd447 --- /dev/null +++ b/translations/ko-KR/data/reusables/notifications/vulnerable-dependency-notification-options.md @@ -0,0 +1,33 @@ +{% if currentVersion == "free-pro-team@latest" %} +By default, you will receive +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) + +You can customize the way you are notified about security alerts. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} diff --git a/translations/ko-KR/data/reusables/package_registry/admins-can-configure-package-types.md b/translations/ko-KR/data/reusables/package_registry/admins-can-configure-package-types.md index efe344932d..23e237356b 100644 --- a/translations/ko-KR/data/reusables/package_registry/admins-can-configure-package-types.md +++ b/translations/ko-KR/data/reusables/package_registry/admins-can-configure-package-types.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **Note:** This package type may not be available for your instance, because site administrators can enable or disable each supported package type. For more information, see "[Configuring packages support for your enterprise](/enterprise/admin/packages/configuring-packages-support-for-your-enterprise)." diff --git a/translations/ko-KR/data/reusables/package_registry/docker_registry_deprecation_status.md b/translations/ko-KR/data/reusables/package_registry/docker_registry_deprecation_status.md index 79e9650f34..2df9364c31 100644 --- a/translations/ko-KR/data/reusables/package_registry/docker_registry_deprecation_status.md +++ b/translations/ko-KR/data/reusables/package_registry/docker_registry_deprecation_status.md @@ -1,5 +1,5 @@ {% warning %} -**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if currentVersion != "free-pro-team@latest" %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} +**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if enterpriseServerVersions contains currentVersion %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} {% endwarning %} diff --git a/translations/ko-KR/data/reusables/package_registry/packages-ghes-release-stage.md b/translations/ko-KR/data/reusables/package_registry/packages-ghes-release-stage.md index 66d73926c6..03d9b25f84 100644 --- a/translations/ko-KR/data/reusables/package_registry/packages-ghes-release-stage.md +++ b/translations/ko-KR/data/reusables/package_registry/packages-ghes-release-stage.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **Note:** {% data variables.product.prodname_registry %} is currently in beta for {% data variables.product.prodname_ghe_server %} 2.22. To join the beta for your instance, use the [sign-up form](https://resources.github.com/beta-signup/). diff --git a/translations/ko-KR/data/reusables/pages/build-failure-email-server.md b/translations/ko-KR/data/reusables/pages/build-failure-email-server.md index d61fac9ecc..bd6581b553 100644 --- a/translations/ko-KR/data/reusables/pages/build-failure-email-server.md +++ b/translations/ko-KR/data/reusables/pages/build-failure-email-server.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} You will only receive an email if outbound email support is enabled on {% data variables.product.product_location_enterprise %}. For more information, contact your site administrator. diff --git a/translations/ko-KR/data/reusables/pages/private_pages_are_public_warning.md b/translations/ko-KR/data/reusables/pages/private_pages_are_public_warning.md index 2579c5d10f..eb8dfe837d 100644 --- a/translations/ko-KR/data/reusables/pages/private_pages_are_public_warning.md +++ b/translations/ko-KR/data/reusables/pages/private_pages_are_public_warning.md @@ -1,5 +1,5 @@ {% warning %} - **Warning**: {% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. If you have sensitive data in your site's repository, you may want to remove it before publishing. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." + **Warning**: {% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. If you have sensitive data in your site's repository, you may want to remove it before publishing. For more information, see{% if enterpriseServerVersions contains currentVersion %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." {% endwarning %} diff --git a/translations/ko-KR/data/reusables/pre-release-program/fury-pre-release.md b/translations/ko-KR/data/reusables/pre-release-program/fury-pre-release.md index 5e63be7160..25b74a97ea 100644 --- a/translations/ko-KR/data/reusables/pre-release-program/fury-pre-release.md +++ b/translations/ko-KR/data/reusables/pre-release-program/fury-pre-release.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% note %} **Note:** {% data variables.product.prodname_github_app %} Manifests are currently available for developers to preview. To access this API during the preview period, you must provide a custom [media type](/v3/media) in the `Accept` header: diff --git a/translations/ko-KR/data/reusables/pre-release-program/machine-man-preview.md b/translations/ko-KR/data/reusables/pre-release-program/machine-man-preview.md index bdcee03dec..d18399b663 100644 --- a/translations/ko-KR/data/reusables/pre-release-program/machine-man-preview.md +++ b/translations/ko-KR/data/reusables/pre-release-program/machine-man-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **Note:** To access the API with your GitHub App, you must provide a custom [media type](/v3/media) in the `Accept` Header for your requests. diff --git a/translations/ko-KR/data/reusables/pre-release-program/sailor-v-preview.md b/translations/ko-KR/data/reusables/pre-release-program/sailor-v-preview.md index 271ed23002..fcf2e98e68 100644 --- a/translations/ko-KR/data/reusables/pre-release-program/sailor-v-preview.md +++ b/translations/ko-KR/data/reusables/pre-release-program/sailor-v-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **Note:** You can now use the REST API to add a reason when you lock an issue, and you will see lock reasons in responses that include issues or pull requests. You will also see lock reasons in `locked` events. This feature is currently available for developers to preview. See the [blog post](https://developer.github.com/changes/2018-01-10-lock-reason-api-preview) for full details. To access this feature, you must provide a custom [media type](/v3/media) in the `Accept` header: diff --git a/translations/ko-KR/data/reusables/profile/user_profile_page_block_or_report.md b/translations/ko-KR/data/reusables/profile/user_profile_page_block_or_report.md index 0af470cffd..65e0ff56f1 100644 --- a/translations/ko-KR/data/reusables/profile/user_profile_page_block_or_report.md +++ b/translations/ko-KR/data/reusables/profile/user_profile_page_block_or_report.md @@ -1 +1 @@ -1. In the left sidebar, under the user's profile picture, click **Block or report user**. ![Block or report user link](/assets/images/help/profile/profile-block-or-report-button.png) +1. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Block or report user**. ![Block or report user link](/assets/images/help/profile/profile-block-or-report-button.png) diff --git a/translations/ko-KR/data/reusables/project-management/project-progress-locations.md b/translations/ko-KR/data/reusables/project-management/project-progress-locations.md index d8863f3c3b..9ac6c41be9 100644 --- a/translations/ko-KR/data/reusables/project-management/project-progress-locations.md +++ b/translations/ko-KR/data/reusables/project-management/project-progress-locations.md @@ -1 +1 @@ -When project board automation is enabled, a progress bar appears above the project board, on the project listing page, in the issue sidebar and in references to the project on other project boards. +If progress tracking is enabled, a progress bar appears above the project board, on the project listing page, in the issue sidebar, and in references to the project on other project boards. diff --git a/translations/ko-KR/data/reusables/pull_requests/pull_request_merges_and_contributions.md b/translations/ko-KR/data/reusables/pull_requests/pull_request_merges_and_contributions.md index 1117b51b1e..10c8bdf4b3 100644 --- a/translations/ko-KR/data/reusables/pull_requests/pull_request_merges_and_contributions.md +++ b/translations/ko-KR/data/reusables/pull_requests/pull_request_merges_and_contributions.md @@ -1,6 +1,6 @@ {% note %} -**Notes:**{% if currentVersion != "free-pro-team@latest" %} +**Notes:**{% if enterpriseServerVersions contains currentVersion %} - To appear on your profile contributions graph, co-authored commits must meet the same criteria as commits with one author.{% endif %} - When rebasing commits, the original authors of the commit and the person who rebased the commits, whether on the command line or on {% data variables.product.product_location %}, receive contribution credit. diff --git a/translations/ko-KR/data/reusables/repositories/about-internal-repos.md b/translations/ko-KR/data/reusables/repositories/about-internal-repos.md index d921cfd133..cfa9b36198 100644 --- a/translations/ko-KR/data/reusables/repositories/about-internal-repos.md +++ b/translations/ko-KR/data/reusables/repositories/about-internal-repos.md @@ -1 +1 @@ -You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if currentVersion != "free-pro-team@latest" %}, even with private mode disabled{% endif %}. +You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if enterpriseServerVersions contains currentVersion %}, even with private mode disabled{% endif %}. diff --git a/translations/ko-KR/data/reusables/repositories/copy-clone-url.md b/translations/ko-KR/data/reusables/repositories/copy-clone-url.md index 2f24104d3c..6d0bfc9d9c 100644 --- a/translations/ko-KR/data/reusables/repositories/copy-clone-url.md +++ b/translations/ko-KR/data/reusables/repositories/copy-clone-url.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Under the repository name, click **Clone or download**. ![Clone or download button](/assets/images/help/repository/clone-repo-clone-url-button.png) 2. To clone the repository using HTTPS, under "Clone with HTTPS", click {% octicon "clippy" aria-label="The clipboard icon" %}. diff --git a/translations/ko-KR/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md b/translations/ko-KR/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md index 9a8ba68745..3e567182d1 100644 --- a/translations/ko-KR/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md +++ b/translations/ko-KR/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md @@ -2,7 +2,7 @@ **Warning:** -- If you remove a person’s access to a private repository, any of their forks of that private repository are deleted. Local clones of the private repository are retained. If a team's access to a private repository is revoked or a team with access to a private repository is deleted, and team members do not have access to the repository through another team, private forks of the repository will be deleted.{% if currentVersion != "free-pro-team@latest" %} +- If you remove a person’s access to a private repository, any of their forks of that private repository are deleted. Local clones of the private repository are retained. If a team's access to a private repository is revoked or a team with access to a private repository is deleted, and team members do not have access to the repository through another team, private forks of the repository will be deleted.{% if enterpriseServerVersions contains currentVersion %} - When [LDAP Sync is enabled](/enterprise/admin/authentication/using-ldap#enabling-ldap-sync), if you remove a person from a repository, they will lose access but their forks will not be deleted. If the person is added to a team with access to the original organization repository within three months, their access to the forks will be automatically restored on the next sync.{% endif %} - You are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property. diff --git a/translations/ko-KR/data/reusables/repositories/enable-security-alerts.md b/translations/ko-KR/data/reusables/repositories/enable-security-alerts.md index 4ab63edcb3..d47e84d4f6 100644 --- a/translations/ko-KR/data/reusables/repositories/enable-security-alerts.md +++ b/translations/ko-KR/data/reusables/repositories/enable-security-alerts.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Your site administrator must enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location_enterprise %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/ko-KR/data/reusables/repositories/new-pull-request.md b/translations/ko-KR/data/reusables/repositories/new-pull-request.md index 59aa6d504b..6f072a6271 100644 --- a/translations/ko-KR/data/reusables/repositories/new-pull-request.md +++ b/translations/ko-KR/data/reusables/repositories/new-pull-request.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. To the right of the Branch menu, click **New pull request**. !["Pull request" link above list of files](/assets/images/help/pull_requests/pull-request-start-review-button.png) {% else %} 1. Above the list of files, click diff --git a/translations/ko-KR/data/reusables/repositories/open-with-github-desktop.md b/translations/ko-KR/data/reusables/repositories/open-with-github-desktop.md index 1759292143..068cce834c 100644 --- a/translations/ko-KR/data/reusables/repositories/open-with-github-desktop.md +++ b/translations/ko-KR/data/reusables/repositories/open-with-github-desktop.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Under your repository name, click **Clone or download**. ![Clone or download button](/assets/images/help/repository/clone-repo-clone-url-button.png) 1. Click **Open in Desktop** to clone the repository and open it in {% data variables.product.prodname_desktop %}. diff --git a/translations/ko-KR/data/reusables/repositories/releases.md b/translations/ko-KR/data/reusables/repositories/releases.md index 8805fe71ad..0281e389b2 100644 --- a/translations/ko-KR/data/reusables/repositories/releases.md +++ b/translations/ko-KR/data/reusables/repositories/releases.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Under your repository name, click **Releases**. ![Releases tab](/assets/images/help/releases/release-link.png) diff --git a/translations/ko-KR/data/reusables/repositories/tracks-vulnerabilities.md b/translations/ko-KR/data/reusables/repositories/tracks-vulnerabilities.md index d2ad199b79..f0d6decd8f 100644 --- a/translations/ko-KR/data/reusables/repositories/tracks-vulnerabilities.md +++ b/translations/ko-KR/data/reusables/repositories/tracks-vulnerabilities.md @@ -3,4 +3,3 @@ We add vulnerabilities to the {% data variables.product.prodname_advisory_databa - A combination of machine learning and human review to detect vulnerabilities in public commits on {% data variables.product.prodname_dotcom %} - Security advisories reported on {% data variables.product.prodname_dotcom %} - The [npm Security advisories](https://www.npmjs.com/advisories) database -- [FriendsOfPHP](https://github.com/FriendsOfPHP/security-advisories) diff --git a/translations/ko-KR/data/reusables/search/syntax_tips.md b/translations/ko-KR/data/reusables/search/syntax_tips.md index 6dc749ad94..d757af82e4 100644 --- a/translations/ko-KR/data/reusables/search/syntax_tips.md +++ b/translations/ko-KR/data/reusables/search/syntax_tips.md @@ -1,6 +1,6 @@ {% tip %} -**Tips:**{% if currentVersion != "free-pro-team@latest" %} +**Tips:**{% if enterpriseServerVersions contains currentVersion %} - This article contains example searches on the {% data variables.product.prodname_dotcom %}.com website, but you can use the same search filters on {% data variables.product.product_location_enterprise %}.{% endif %} - For a list of search syntaxes that you can add to any search qualifier to further improve your results, see "[Understanding the search syntax](/articles/understanding-the-search-syntax)". - Use quotations around multi-word search terms. For example, if you want to search for issues with the label "In progress," you'd search for `label:"in progress"`. Search is not case sensitive. diff --git a/translations/ko-KR/data/reusables/two_fa/auth_methods_2fa.md b/translations/ko-KR/data/reusables/two_fa/auth_methods_2fa.md index c6ecc76d27..85b72e3b63 100644 --- a/translations/ko-KR/data/reusables/two_fa/auth_methods_2fa.md +++ b/translations/ko-KR/data/reusables/two_fa/auth_methods_2fa.md @@ -1,10 +1,10 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Authentication methods that support 2FA -| Authentication Method | 설명 | Two-factor authentication support | -| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Built-in | Authentication is performed against user accounts that are stored on the {% data variables.product.prodname_ghe_server %} appliance. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization administrators can require 2FA to be enabled for members of the organization. |{% if currentVersion != "free-pro-team@latest" %} +| Authentication Method | 설명 | Two-factor authentication support | +| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Built-in | Authentication is performed against user accounts that are stored on the {% data variables.product.prodname_ghe_server %} appliance. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization administrators can require 2FA to be enabled for members of the organization. |{% if enterpriseServerVersions contains currentVersion %} | Built-in authentication with an identity provider | Authentication is performed against user accounts that are stored on the identity provider. | Dependant on the identity provider.{% endif %} -| LDAP | Allows integration with your company directory service for authentication. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization administrators can require 2FA to be enabled for members of the organization. | +| LDAP | Allows integration with your company directory service for authentication. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization administrators can require 2FA to be enabled for members of the organization. | | SAML | Authentication is performed on an external identity provider. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %} | CAS | Single sign-on service is provided by an external server. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %}{% endif %} diff --git a/translations/ko-KR/data/reusables/webhooks/webhooks-rest-api-links.md b/translations/ko-KR/data/reusables/webhooks/webhooks-rest-api-links.md new file mode 100644 index 0000000000..3882222b05 --- /dev/null +++ b/translations/ko-KR/data/reusables/webhooks/webhooks-rest-api-links.md @@ -0,0 +1,4 @@ +You can use the repository, organization, and app webhook REST APIs to create, update, delete, and ping webhooks. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}You can also use the REST API to change the configuration of the webhook. For example, you can modify the payload URL, content type, SSL verification, and secret. {% endif %}For more information, see: +- [Repository Webhooks REST API](/rest/reference/repos#webhooks) +- [Organization Webhooks REST API](/rest/reference/orgs#webhooks){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +- [GitHub App Webhooks REST API](/rest/reference/apps#webhooks){% endif %} diff --git a/translations/pt-BR/content/actions/creating-actions/creating-a-composite-run-steps-action.md b/translations/pt-BR/content/actions/creating-actions/creating-a-composite-run-steps-action.md index 4d8ab5337e..87d5f9ffaf 100644 --- a/translations/pt-BR/content/actions/creating-actions/creating-a-composite-run-steps-action.md +++ b/translations/pt-BR/content/actions/creating-actions/creating-a-composite-run-steps-action.md @@ -36,7 +36,7 @@ Antes de começar, você criará um repositório {% data variables.product.produ echo "Goodbye" ``` -3. From your terminal, make `goodbye.sh` executable. +3. No seu terminal, torne `goodbye.sh` executável. ```shell chmod +x goodbye.sh @@ -85,7 +85,7 @@ Antes de começar, você criará um repositório {% data variables.product.produ Para obter mais informações sobre como usar `github.action_path`, consulte "[`github context`](/actions/reference/context-and-expression-syntax-for-github-actions#github-context)". -1. No terminal, verifique no seu arquivo `action.yml`. +1. No seu terminal, verifique o seu arquivo `action.yml`. ```shell git add action.yml @@ -93,7 +93,7 @@ Antes de começar, você criará um repositório {% data variables.product.produ git push ``` -1. From your terminal, add a tag. This example uses a tag called `v1`. Para obter mais informações, consulte "[Sobre ações](/actions/creating-actions/about-actions#using-release-management-for-actions)". +1. No seu terminal, adicione uma tag. Este exemplo usa uma tag denominada `v1`. Para obter mais informações, consulte "[Sobre ações](/actions/creating-actions/about-actions#using-release-management-for-actions)". ```shell git tag -a -m "Description of this release" v1 @@ -104,7 +104,7 @@ Antes de começar, você criará um repositório {% data variables.product.produ O código de fluxo de trabalho a seguir usa a ação hello world completa que você fez em "[Criando uma ação arquivo de metadados](/actions/creating-actions/creating-a-composite-run-steps-action#creating-an-action-metadata-file)". -Copy the workflow code into a `.github/workflows/main.yml` file in another repository, but replace `actions/hello-world-composite-run-steps-action@v1` with the repository and tag you created. Você também pode substituir a entrada `who-to-greet` pelo seu nome. +Copie o código do fluxo de trabalho em um arquivo `.github/workflows/main.yml` em outro repositório, mas substitua `actions/hello-world-composite-run-steps-action@v1` pelo repositório e a tag que você criou. Você também pode substituir a entrada `who-to-greet` pelo seu nome. {% raw %} **.github/workflows/main.yml** diff --git a/translations/pt-BR/content/actions/creating-actions/creating-a-javascript-action.md b/translations/pt-BR/content/actions/creating-actions/creating-a-javascript-action.md index 3e920af82b..2626805293 100644 --- a/translations/pt-BR/content/actions/creating-actions/creating-a-javascript-action.md +++ b/translations/pt-BR/content/actions/creating-actions/creating-a-javascript-action.md @@ -262,4 +262,4 @@ No seu repositório, clique na aba **Ações** e selecione a última execução ![Uma captura de tela de sua ação em um fluxo de trabalho](/assets/images/help/repository/javascript-action-workflow-run-updated.png) {% else %} ![Uma captura de tela de sua ação em um fluxo de trabalho](/assets/images/help/repository/javascript-action-workflow-run.png) -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/pt-BR/content/actions/guides/building-and-testing-java-with-maven.md b/translations/pt-BR/content/actions/guides/building-and-testing-java-with-maven.md index a2c46a5af9..549704f853 100644 --- a/translations/pt-BR/content/actions/guides/building-and-testing-java-with-maven.md +++ b/translations/pt-BR/content/actions/guides/building-and-testing-java-with-maven.md @@ -30,7 +30,7 @@ Recomendamos que você tenha um entendimento básico da estrutura do Java e do M ### Introdução com um modelo de fluxo de trabalho do Maven -{% data variables.product.prodname_dotcom %} fornece um modelo de fluxo de trabalho Maven que funcionará para a maioria dos projetos Java baseados no Maven. Para obter mais informações, consulte o [modelo do fluxo de trabalho do Maven](https://github.com/actions/starter-workflows/blob/main/ci/maven.yml). +{% data variables.product.prodname_dotcom %} fornece um modelo de fluxo de trabalho Maven que funcionará para a maioria dos projetos Java baseados no Maven. Para obter mais informações, consulte o [Modelo do fluxo de trabalho do Maven](https://github.com/actions/starter-workflows/blob/main/ci/maven.yml). Para começar rapidamente, você pode escolher o modelo do Maven pré-configurado ao criar um novo fluxo de trabalho. Para obter mais informações, consulte o início rápido "[{% data variables.product.prodname_actions %}](/actions/quickstart)". diff --git a/translations/pt-BR/content/actions/guides/building-and-testing-nodejs.md b/translations/pt-BR/content/actions/guides/building-and-testing-nodejs.md index 1746a423e8..a7fa1605cc 100644 --- a/translations/pt-BR/content/actions/guides/building-and-testing-nodejs.md +++ b/translations/pt-BR/content/actions/guides/building-and-testing-nodejs.md @@ -33,7 +33,7 @@ O {% data variables.product.prodname_dotcom %} fornece um modelo de fluxo de tra Para iniciar rapidamente, adicione o modelo ao diretório `.github/workflows` do repositório. {% raw %} -```yaml +```yaml{:copy} Nome: Node.js CI em: [push] diff --git a/translations/pt-BR/content/actions/guides/publishing-docker-images.md b/translations/pt-BR/content/actions/guides/publishing-docker-images.md index 7b47044743..e7f9aa9fe3 100644 --- a/translations/pt-BR/content/actions/guides/publishing-docker-images.md +++ b/translations/pt-BR/content/actions/guides/publishing-docker-images.md @@ -50,7 +50,7 @@ Para fazer push para o Docker Hub, você deverá ter uma conta Docker Hub e ter As opções `build-push-action` necessárias para o Docker Hub são: -* `nome de usuário` e `senha`: Este é o seu nome de usuário e senha do Docker Hub. Recomendamos armazenar seu nome de usuário e senha do Docker Hub como segredos encriptados no repositório {% data variables.product.prodname_dotcom %} para que não sejam expostos no seu arquivo de fluxo de trabalho. Para obter mais informações, consulte "[Criando e usando segredos encriptados](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)". +* `nome de usuário` e `senha`: Este é o seu nome de usuário e senha do Docker Hub. Recomendamos armazenar seu nome de usuário e senha do Docker Hub como segredos encriptados no seu repositório de {% data variables.product.prodname_dotcom %} para que não sejam expostos no seu arquivo de fluxo de trabalho. Para obter mais informações, consulte "[Criando e usando segredos encriptados](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)". * `repositório`: Seu repositório do Docker Hub no formato `DOCKER-HUB-NAMESPACE/DOCKER-HUB-REPOSITORY`. {% raw %} diff --git a/translations/pt-BR/content/actions/guides/storing-workflow-data-as-artifacts.md b/translations/pt-BR/content/actions/guides/storing-workflow-data-as-artifacts.md index ba042a23d1..bf6b137692 100644 --- a/translations/pt-BR/content/actions/guides/storing-workflow-data-as-artifacts.md +++ b/translations/pt-BR/content/actions/guides/storing-workflow-data-as-artifacts.md @@ -74,7 +74,7 @@ Por exemplo, o seu repositório ou um aplicativo web pode conter arquivos SASS e | ``` -Esse exemplo mostra como criar um fluxo de trabalho para um projeto Node.js que `builds` (compila) o código no diretório `src` e executa os testes no diretório `tests`. Você pode partir do princípio que executar `npm test` produz um relatório de cobertura de código denominado `code-coverage.html`, armazenado no diretório `output/test/`. +Esse exemplo mostra como criar um fluxo de trabalho para um projeto Node.js que builds (compila) o código no diretório `src` e executa os testes no diretório `tests`. Você pode partir do princípio que executar `npm test` produz um relatório de cobertura de código denominado `code-coverage.html`, armazenado no diretório `output/test/`. O fluxo de trabalho faz o upload dos artefatos de produção no diretório `dist`, mas exclui todos os arquivos de markdown. Ele também e faz o upload do relatório de `code-coverage.html` como outro artefato. diff --git a/translations/pt-BR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/pt-BR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index 2a3a148714..8d59440c73 100644 --- a/translations/pt-BR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/translations/pt-BR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -91,7 +91,7 @@ Os sistemas operacionais a seguir são compatíveis com o aplicativo de execuç - macOS 10.13 (High Sierra) or versão posterior -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Comunicação entre executores auto-hospedados e {% data variables.product.prodname_dotcom %} diff --git a/translations/pt-BR/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md b/translations/pt-BR/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md index ddda813cb8..21ba4cd41a 100644 --- a/translations/pt-BR/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md +++ b/translations/pt-BR/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md @@ -50,14 +50,14 @@ Você pode adicionar executores auto-hospedados a uma empresa, onde podem ser at {% if currentVersion == "free-pro-team@latest" %} Para adicionar um executor auto-hospedado a uma conta corporativa, você deve ser proprietário da organização. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} Para adicionar um executor auto-hospedado no nível de empresa de {% data variables.product.product_location %}, você deve ser um administrador do site. {% endif %} {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/pt-BR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/translations/pt-BR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index 838a0bc8a6..fffc49dd6f 100644 --- a/translations/pt-BR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/translations/pt-BR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -57,7 +57,7 @@ Ao criar um grupo, é necessário escolher uma política que conceda acesso a to {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/pt-BR/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md b/translations/pt-BR/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md index a28c7f47f6..2443d482ce 100644 --- a/translations/pt-BR/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md +++ b/translations/pt-BR/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md @@ -62,7 +62,7 @@ Para remover um executor auto-hospedado de uma organização, você deve ser um {% if currentVersion == "free-pro-team@latest" %} Para remover um executor auto-hospedado de uma conta corporativa, você deve ser um proprietário corporativo. Recomendamos que você também tenha acesso à máquina do executor auto-hospedado. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} Para remover um executor auto-hospedado no nível da empresa de {% data variables.product.product_location %}, você deve ser um administrador do site. Recomendamos que você também tenha acesso à máquina do executor auto-hospedado. {% endif %} @@ -71,7 +71,7 @@ Para remover um executor auto-hospedado no nível da empresa de {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/pt-BR/content/actions/index.md b/translations/pt-BR/content/actions/index.md index 4826225e37..9ee7f49fb9 100644 --- a/translations/pt-BR/content/actions/index.md +++ b/translations/pt-BR/content/actions/index.md @@ -37,7 +37,7 @@ versions:
    -

    {% data ui.toc.getting_started %}

    +

    {% data ui.toc.guides %}

      {% for link in featuredLinks.gettingStarted %} @@ -68,34 +68,10 @@ versions:
    - -
    -
    - -
    {% octicon "bookmark" width="24" %}
    -

    Create actions

    -

    A complete guide to creating and sharing actions with the community.

    -     -
    -
    - -
    {% octicon "rocket" width="24" %}
    -

    Starter workflows

    -

    A collection of workflow files to help you get started with GitHub Actions.

    -     -
    -
    - -
    {% octicon "light-bulb" width="24" %}
    -

    GitHub Actions Marketplace

    -

    Explore community actions and supercharge your workflow.

    -     -
    -
    -

    Guias

    +

    Mais guias

    @@ -184,7 +160,7 @@ versions:

    Publishing Node.js packages

    Use GitHub Actions to push your Node.js package to GitHub Packages or npm.

    - Java + JavaScript/TypeScript CI
    @@ -196,5 +172,5 @@ versions:
    - Mais guias {% octicon "arrow-right" %} + Mostrar todos os guias {% octicon "arrow-right" %} diff --git a/translations/pt-BR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md b/translations/pt-BR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md index 2172d1ef1c..113166500d 100644 --- a/translations/pt-BR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md +++ b/translations/pt-BR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md @@ -290,7 +290,7 @@ Para obter mais informações, consulte "[Eventos que acionam fluxos de trabalho ### Variáveis e segredos -O GitLab CI/CD e {% data variables.product.prodname_actions %} são compatíveis com as variáveis de ambiente no pipeline u no arquivo de configuração do fluxo de trabalho e ao criar segredos usando o GitLab ou a interface de usuário de {% data variables.product.product_name %}. +O GitLab CI/CD e {% data variables.product.prodname_actions %} são compatíveis com as variáveis de ambiente no pipeline ou no arquivo de configuração do fluxo de trabalho e ao criar segredos usando o GitLab ou a interface de usuário de {% data variables.product.product_name %}. Para obter mais informações, consulte "[Variáveis de ambiente](/actions/reference/environment-variables)" e "[Segredos criptografados](/actions/reference/encrypted-secrets)". diff --git a/translations/pt-BR/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/translations/pt-BR/content/actions/learn-github-actions/security-hardening-for-github-actions.md index 057658578b..99a20f95f1 100644 --- a/translations/pt-BR/content/actions/learn-github-actions/security-hardening-for-github-actions.md +++ b/translations/pt-BR/content/actions/learn-github-actions/security-hardening-for-github-actions.md @@ -95,3 +95,40 @@ Como resultado, os executores auto-hospedados quase [nunca devem ser usados para Você também deve considerar o ambiente das máquinas de executores auto-hospedadas: - Que informação sensível reside na máquina configurada como um executor auto-hospedado? Por exemplo, chaves SSH privadas, tokens de acesso à API, entre outros. - A máquina tem acesso à rede a serviços sensíveis? Por exemplo, serviços de metadados do Azure ou AWS. A quantidade de informações confidenciais neste ambiente deve ser limitada ao mínimo, e você deve estar sempre ciente de que qualquer usuário capaz de invocar fluxos de trabalho terá acesso a esse ambiente. + +### Auditar eventos de {% data variables.product.prodname_actions %} + +Você pode usar o log de auditoria para monitorar tarefas administrativas em uma organização. O log de auditoria registra o tipo de ação, quando foi executado e qual conta de usuário realizou a ação. + +Por exemplo, você pode usar o log de auditoria para monitorar o evento de `action:org.update_actions_secret`, que controla as alterações nos segredos da organização: ![Entradas do log de auditoria](/assets/images/help/repository/audit-log-entries.png) + +As tabelas a seguir descrevem os eventos de {% data variables.product.prodname_actions %} que você pode encontrar no log de auditoria. Para obter mais informações sobre como usar o registro de auditoria, consulte [Revisar o log de auditoria para a sua organização](/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization#searching-the-audit-log)". + +#### Eventos para gerenciamento de segredo +| Ação | Descrição | +| ----------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.create_actions_secret` | Acionado quando um administrador da organização [cria um segredo de {% data variables.product.prodname_actions %}](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization). . | +| `action:org.remove_actions_secret` | Acionado quando um administrador da organização remove um segredo de {% data variables.product.prodname_actions %}. | +| `action:org.update_actions_secret` | Acionado quando um administrador da organização atualiza um segredo de {% data variables.product.prodname_actions %}. | +| `action:repo.create_actions_secret` | Acionado quando um administrador do repositório [cria um segredo de {% data variables.product.prodname_actions %}](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository). | +| `action:repo.remove_actions_secret` | Acionado quando um administrador do repositório remove um segredo de {% data variables.product.prodname_actions %}. | +| `action:repo.update_actions_secret` | Acionado quando um administrador do repositório atualiza um segredo de {% data variables.product.prodname_actions %}. | + +#### Eventos para executores auto-hospedados +| Ação | Descrição | +| ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.register_self_hosted_runner` | Acionado quando um proprietário da organização [registra um novo executor auto-hospedado](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). | +| `action:org.remove_self_hosted_runner` | Acionado quando um proprietário da organização [remove um executor auto-hospedado](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). | +| `action:repo.register_self_hosted_runner` | Acionado quando um administrador do repositório [registra um novo executor auto-hospedado](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). | +| `action:repo.remove_self_hosted_runner` | Acionado quando um administrador do repositório [remove um executor auto-hospedado](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). | + +#### Eventos para grupos de executores auto-hospedados +| Ação | Descrição | +| ----------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.runner_group_created` | Acionada quando um administrador da organização [cria um grupo de executores auto-hospedados](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). | +| `action:org.runner_group_removed` | Acionado quando um administrador da organização remove um grupo de executores auto-hospedados. | +| `action:org.runner_group_renamed` | Acionado quando um administrador da organização renomeia um grupo de executores auto-hospedados. | +| `action:org.runner_group_runners_added` | Acionada quando um administrador da organização [adiciona um executor auto-hospedado a um grupo](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). | +| `action:org.runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. | + + diff --git a/translations/pt-BR/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md b/translations/pt-BR/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md index 7675c2e579..8c5a7954cd 100644 --- a/translations/pt-BR/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md +++ b/translations/pt-BR/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md @@ -1,6 +1,6 @@ --- title: Desabilitar e habilitar um fluxo de trabalho -intro: Você pode desabilitar e reabilitar um fluxo de trabalho usando {% data variables.product.prodname_dotcom %} ou a API REST. +intro: 'Você pode desabilitar e reabilitar um fluxo de trabalho usando {% data variables.product.prodname_dotcom %} ou a API REST.' product: '{% data reusables.gated-features.actions %}' versions: free-pro-team: '*' diff --git a/translations/pt-BR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md b/translations/pt-BR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md index 13f31fd265..227e551f7c 100644 --- a/translations/pt-BR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md +++ b/translations/pt-BR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md @@ -38,4 +38,4 @@ Você também pode definir um período de retenção personalizado para artefato ### Localizar a data de expiração de um artefato Você pode usar a API para confirmar a data em que um artefato está agendado para ser excluído. Para obter mais informações, consulte o valor `expires_at` valor retornado por "[Listar artefatos para um repositório](/rest/reference/actions#artifacts). " -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/pt-BR/content/actions/managing-workflow-runs/using-workflow-run-logs.md b/translations/pt-BR/content/actions/managing-workflow-runs/using-workflow-run-logs.md index 1ef38c4f7b..39f2e7c610 100644 --- a/translations/pt-BR/content/actions/managing-workflow-runs/using-workflow-run-logs.md +++ b/translations/pt-BR/content/actions/managing-workflow-runs/using-workflow-run-logs.md @@ -60,12 +60,12 @@ Você pode fazer o download dos arquivos de registro da execução do seu fluxo {% data reusables.repositories.view-run-superlinter %} {% data reusables.repositories.navigate-to-job-superlinter %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -1. In the upper right corner, click -{% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} and select **Download log archive**. +1. No canto superior direito, clique em +{% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} e selecione **Fazer o download o arquivo de registro**. ![Menu suspenso Download logs (Baixar logs)](/assets/images/help/repository/download-logs-drop-down-updated.png) {% else %} -1. In the upper right corner, click -{% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} and select **Download log archive**. +1. No canto superior direito, clique em +{% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} e selecione **Fazer o download o arquivo de registro**. ![Menu suspenso Download logs (Baixar logs)](/assets/images/help/repository/download-logs-drop-down.png) {% endif %} @@ -82,5 +82,5 @@ Você pode excluir arquivos de registro da execução do seu fluxo de trabalho. 2. Para excluir os arquivos de registro, clique no botão **Excluir todos os registros** e revise a instrução de confirmação. ![Delete all logs](/assets/images/help/repository/delete-all-logs-updated.png)Após excluir os registros, o botão **Excluir todos os registros** será removido para indicar que não restaram arquivos de registro na execução do fluxo de trabalho. {% else %} 1. No canto superior direito, clique em {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}. ![Ícone horizontal do kebab](/assets/images/help/repository/workflow-run-kebab-horizontal-icon.png) -2. Para excluir os arquivos de registro, clique no botão **Excluir todos os registros** e revise a instrução de confirmação. ![Delete all logs](/assets/images/help/repository/delete-all-logs.png) After the logs have been deleted, the **Delete all logs** button is removed to indicate that no log files remain in the workflow run. +2. Para excluir os arquivos de registro, clique no botão **Excluir todos os registros** e revise a instrução de confirmação. ![Delete all logs](/assets/images/help/repository/delete-all-logs.png) Depois que os registros forem excluídos, o botão **Excluir todos os registros** é removido para indicar que nenhum arquivo de registro permanece na execução do fluxo de trabalho. {% endif %} diff --git a/translations/pt-BR/content/actions/quickstart.md b/translations/pt-BR/content/actions/quickstart.md index 0b381cfc28..1388f9bd77 100644 --- a/translations/pt-BR/content/actions/quickstart.md +++ b/translations/pt-BR/content/actions/quickstart.md @@ -21,7 +21,7 @@ Você só precisa de um repositório de {% data variables.product.prodname_dotco 1. Do seu repositório no {% data variables.product.prodname_dotcom %}, crie um novo arquivo no diretório `.github/workflows` denominado `superlinter.yml`. Para obter mais informações, consulte "[Criar arquivos](/github/managing-files-in-a-repository/creating-new-files)". 2. Copie o conteúdo de YAML a seguir para o arquivo `superlinter.yml`. **Observação:** Se seu branch-padrão não for `principal`, atualize o valor de `DEFAULT_BRANCH` para corresponder ao nome do branch-padrão do seu repositório. {% raw %} - ```yaml + ```yaml{:copy} name: Super-Linter # Run this workflow every time a new commit pushed to your repository diff --git a/translations/pt-BR/content/actions/reference/context-and-expression-syntax-for-github-actions.md b/translations/pt-BR/content/actions/reference/context-and-expression-syntax-for-github-actions.md index 0bc9771e71..fd52b14239 100644 --- a/translations/pt-BR/content/actions/reference/context-and-expression-syntax-for-github-actions.md +++ b/translations/pt-BR/content/actions/reference/context-and-expression-syntax-for-github-actions.md @@ -93,7 +93,7 @@ O contexto `github` context contém informações sobre a execução do fluxo de | `github.event_path` | `string` | O caminho para a carga completa do evento do webhook no executor. | | `github.head_ref` | `string` | `head_ref` ou branch de origem da pull request em uma execução de fluxo de trabalho. Essa propriedade só está disponível quando o evento que aciona a execução do fluxo de trabalho é uma `pull_request`. | | `github.job` | `string` | O [`job_id`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_id) do trabalho atual. | -| `github.ref` | `string` | Branch ou ref tag que acionou a execução do fluxo de trabalho. | +| `github.ref` | `string` | Branch ou ref tag que acionou a execução do fluxo de trabalho. Para branches, está no formato `refs/heads/`, e, para tags, está em `refs/tags/`. | | `github.repository` | `string` | Nome do repositório e o proprietário. Por exemplo, `Codertocat/Hello-World`. | | `github.repository_owner` | `string` | O nome do proprietário do repositório. Por exemplo, `Codertocat`. | | `github.run_id` | `string` | {% data reusables.github-actions.run_id_description %} diff --git a/translations/pt-BR/content/actions/reference/specifications-for-github-hosted-runners.md b/translations/pt-BR/content/actions/reference/specifications-for-github-hosted-runners.md index 7c9a854e15..7d3320c747 100644 --- a/translations/pt-BR/content/actions/reference/specifications-for-github-hosted-runners.md +++ b/translations/pt-BR/content/actions/reference/specifications-for-github-hosted-runners.md @@ -50,6 +50,7 @@ Cada máquina virtual tem os mesmos recursos de hardware disponíveis. {% data reusables.github-actions.supported-github-runners %} {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} Lista de registros de fluxo de trabalho do executor usado para executar um trabalho. Para obter mais informações, consulte "[Visualizar histórico de execução de fluxo de trabalho](/actions/managing-workflow-runs/viewing-workflow-run-history)". @@ -63,8 +64,10 @@ As ferramentas do software incluídas em executores hospedados em {% data variab * [Windows Server 2019](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md) * [Windows Server 2016](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md) * [MacOS 10.15](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md) +* [MacOS 11.0](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md) {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} Executores hospedados no {% data variables.product.prodname_dotcom %} incluem as ferramentas integradas padrão do sistema operacional, além dos pacotes listados nas referências acima. Por exemplo, os executores do Ubuntu e do macOS incluem `grep`, `find` e `which`, entre outras ferramentas-padrão. @@ -90,7 +93,7 @@ Executores do Windows e Ubuntu são hospedados no Azure e têm os mesmos interva A Microsoft atualiza os intervalos de endereços IP Azure semanalmente em um arquivo JSON que você pode baixar no site [Azure intervalos IP e tags de serviço - nuvem pública](https://www.microsoft.com/en-us/download/details.aspx?id=56519). Você pode usar esse intervalo de endereços IP se precisar de uma lista de permissão para evitar acesso não-autorizado em seus recursos internos. -O arquivo JSON contém um array chamado `values` (valores). Dentro desse array, você pode encontrar os endereços IP suportados em um objeto com `nome` e `id` da região Azure, por exemplo `"AzureCloud. astus2"`. +O arquivo JSON contém um array chamado `values` (valores). Dentro desse array, você pode encontrar os endereços IP suportados em um objeto com `name` e `id` da região Azure, por exemplo `"AzureCloud. astus2"`. Você pode encontrar os intervalos de endereços IP compatíveis no objeto `"addressPrefixes"`. Este é um exemplo resumido do arquivo JSON. @@ -123,11 +126,11 @@ Você pode encontrar os intervalos de endereços IP compatíveis no objeto `"add O {% data variables.product.prodname_dotcom %} executa ações e comandos de shell em diretórios específicos na máquina virtual. Os caminhos dos arquivos nas máquinas virtuais não são estáticos. Use as variáveis de ambiente que {% data variables.product.prodname_dotcom %} fornece para construir caminhos de arquivos para os diretórios `home`, `workspace` e `workflow`. -| Diretório | Variável de ambiente | Descrição | -| --------------------- | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `casa` | `HOME` | Contém dados relacionados ao usuário. Por exemplo, esse diretório pode conter credenciais de uma tentativa de login. | -| `área de trabalho` | `GITHUB_WORKSPACE` | As ações e comandos do shell executados neste diretório. Uma ação pode modificar o conteúdo desse diretório, que fica acessível nas ações subsequentes. | -| `workflow/event.json` | `GITHUB_EVENT_PATH` | A carga `POST` do evento webhook que acionou o fluxo de trabalho. O {% data variables.product.prodname_dotcom %} o rescreve sempre que uma ação é executada para isolar o conteúdo do arquivo entre as ações. | +| Diretório | Variável de ambiente | Descrição | +| --------------------- | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `home` | `HOME` | Contém dados relacionados ao usuário. Por exemplo, esse diretório pode conter credenciais de uma tentativa de login. | +| `workspace` | `GITHUB_WORKSPACE` | As ações e comandos do shell executados neste diretório. Uma ação pode modificar o conteúdo desse diretório, que fica acessível nas ações subsequentes. | +| `workflow/event.json` | `GITHUB_EVENT_PATH` | O payload do `POST` do evento webhook que acionou o fluxo de trabalho. O {% data variables.product.prodname_dotcom %} o rescreve sempre que uma ação é executada para isolar o conteúdo do arquivo entre as ações. | Para obter uma lista das variáveis de ambiente que {% data variables.product.prodname_dotcom %} cria para cada fluxo de trabalho, consulte "[Usar variáveis de ambiente](/github/automating-your-workflow-with-github-actions/using-environment-variables)". diff --git a/translations/pt-BR/content/actions/reference/usage-limits-billing-and-administration.md b/translations/pt-BR/content/actions/reference/usage-limits-billing-and-administration.md index a3a5ea800c..0f16ce7db8 100644 --- a/translations/pt-BR/content/actions/reference/usage-limits-billing-and-administration.md +++ b/translations/pt-BR/content/actions/reference/usage-limits-billing-and-administration.md @@ -70,7 +70,7 @@ Para obter mais informações, consulte: - [Configurar o período de retenção para {% data variables.product.prodname_actions %} para artefatos e registros na sua empresa](/github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account) {% endif %} -### Desativar ou limitar {% data variables.product.prodname_actions %} para o seu repositório ou organização +### Desabilitar ou limitar {% data variables.product.prodname_actions %} para o seu repositório ou organização {% data reusables.github-actions.disabling-github-actions %} diff --git a/translations/pt-BR/content/actions/reference/workflow-commands-for-github-actions.md b/translations/pt-BR/content/actions/reference/workflow-commands-for-github-actions.md index 002343cf6b..169068c62a 100644 --- a/translations/pt-BR/content/actions/reference/workflow-commands-for-github-actions.md +++ b/translations/pt-BR/content/actions/reference/workflow-commands-for-github-actions.md @@ -53,13 +53,15 @@ core.setOutput('SELECTED_COLOR', 'green'); Você pode usar o comando `set-output` no seu fluxo de trabalho para definir o mesmo valor: +{% raw %} ``` yaml - name: Set selected color run: echo '::set-output name=SELECTED_COLOR::green' id: random-color-generator - name: Get color - run: echo 'The selected color is' ${steps.random-color-generator.outputs.SELECTED_COLOR} + run: echo "The selected color is ${{ steps.random-color-generator.outputs.SELECTED_COLOR }}" ``` +{% endraw %} A tabela a seguir mostra quais funções do conjunto de ferramentas estão disponíveis dentro de um fluxo de trabalho: diff --git a/translations/pt-BR/content/actions/reference/workflow-syntax-for-github-actions.md b/translations/pt-BR/content/actions/reference/workflow-syntax-for-github-actions.md index 3087efbc82..8992fecfde 100644 --- a/translations/pt-BR/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/translations/pt-BR/content/actions/reference/workflow-syntax-for-github-actions.md @@ -946,7 +946,7 @@ jobs: #### **`jobs..container.image`** -Imagem Docker a ser usada como contêiner para executar a ação. O valor pode ser o nome da imagem do Docker Hub ou um {% if currentVersion != "free-pro-team@latest" e currentVersion ver_lt "enterprise-server@2.23" %}nome de registro público{% endif %}. +Imagem Docker a ser usada como contêiner para executar a ação. O valor pode ser o nome da imagem do Docker Hub ou um {% if enterpriseServerVersions contém currentVersion e currentVersion ver_lt "enterprise-server@2.23" %}nome de registro{% endif %} público. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..container.credentials`** @@ -1029,7 +1029,7 @@ serviços: #### **`jobs..services..image`** -Imagem Docker a ser usada como contêiner de serviço para executar a ação. O valor pode ser o nome da imagem do Docker Hub ou um {% if currentVersion != "free-pro-team@latest" e currentVersion ver_lt "enterprise-server@2.23" %}nome de registro público{% endif %}. +Imagem Docker a ser usada como contêiner de serviço para executar a ação. O valor pode ser o nome da imagem do Docker Hub ou um {% if enterpriseServerVersions contém currentVersion e currentVersion ver_lt "enterprise-server@2.23" %}nome de registro{% endif %} público. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..services..credentials`** diff --git a/translations/pt-BR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/translations/pt-BR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md index e2d5058e0c..195a537d7c 100644 --- a/translations/pt-BR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md +++ b/translations/pt-BR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md @@ -18,10 +18,13 @@ Você pode conectar {% data variables.product.product_location_enterprise %} a { Depois de conectar {% data variables.product.product_location_enterprise %} a {% data variables.product.prodname_dotcom_the_website %} e habilitar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot_short %}{% else %}alertas de segurança{% endif %} para dependências vulneráveis, os dados de vulnerabilidade serão sincronizados de {% data variables.product.prodname_dotcom_the_website %} para a sua instância uma vez por hora. Também é possível sincronizar os dados de vulnerabilidade manualmente a qualquer momento. Nenhum código ou informações sobre o código da {% data variables.product.product_location_enterprise %} são carregados para o {% data variables.product.prodname_dotcom_the_website %}. -{% if currentVersion ver_gt "enterprise-server@2. 1" %}Quando {% data variables.product.product_location_enterprise %} recebe informações sobre uma vulnerabilidade, ele identificará repositórios na sua instância que usam a versão afetada da dependência e enviará alertas de {% data variables.product.prodname_dependabot_short %} para proprietários e pessoas com acesso de administrador nesses repositórios. Eles podem personalizar a forma como recebem os alertas de {% data variables.product.prodname_dependabot_short %}. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)" +{% if currentVersion ver_gt "enterprise-server@2. 1" %}Quando {% data variables.product.product_location_enterprise %} recebe informações sobre uma vulnerabilidade, ele identifica repositórios na sua instância que usam a versão afetada da dependência e enviará alertas de {% data variables.product.prodname_dependabot_short %}. Você pode personalizar como receber alertas de {% data variables.product.prodname_dependabot_short %}. Para obter mais informações, consulte "[Configurar notificações para dependências vulneráveis](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)". {% endif %} -{% if currentVersion ver_lt "enterprise-server@2.21" or currentVersion == "enterprise-server@2. 1" %}Quando {% data variables.product.product_location_enterprise %} recebe informações sobre uma vulnerabilidade, ele identificará repositórios na sua instância que usam a versão afetada da dependência e enviará alertas de segurança a proprietários e pessoas com acesso de administrador nesses repositórios. É possível personalizar o recebimento dos alertas de segurança. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)" +{% if currentVersion == "enterprise-server@2. 1" %}Quando {% data variables.product.product_location_enterprise %} recebe informações sobre uma vulnerabilidade, ele identifica repositórios na sua instância que usam a versão afetada da dependência e envia alertas de segurança. Você pode personalizar a forma como recebe os alertas de segurança. Para obter mais informações, consulte "[Configurar notificações para dependências vulneráveis](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)". +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2. 1" %}Quando {% data variables.product.product_location_enterprise %} recebe informações sobre uma vulnerabilidade, ele identifica repositórios na sua instância que usam a versão afetada da dependência e envia alertas de segurança. Você pode personalizar a forma como recebe os alertas de segurança. Para obter mais informações, consulte "[Escolher o método de entrega das suas notificações](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications#choosing-the-delivery-method-for-security-alerts-for-vulnerable-dependencies)". {% endif %} {% if currentVersion ver_gt "enterprise-server@2.21" %} @@ -45,7 +48,14 @@ Antes de habilitar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% dat ``` shell $ ghe-dep-graph-enable ``` + {% note %} + + **Observação**: Para obter mais informações sobre como habilitar o acesso ao shell administrativo via SSH, veja "[Acessar o shell administrativo (SSH)](/enterprise/{{ currentVersion }}/admin/configuration/accessing-the-administrative-shell-ssh)". + + {% endnote %} + 3. Retornar para + {% data variables.product.prodname_ghe_server %}. {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} diff --git a/translations/pt-BR/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md b/translations/pt-BR/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md index 1d384693eb..acaa155a21 100644 --- a/translations/pt-BR/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md +++ b/translations/pt-BR/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md @@ -30,6 +30,15 @@ O tempo do failover dependerá do tempo necessário para promover manualmente a 5. Atualize o registro DNS para apontar para o endereço IP do appliance réplica. O tráfego é direcionado para o réplica após o término do período TTL. Se você estiver usando um balanceador de carga, verifique se ele está configurado para enviar tráfego para o réplica. 6. Avise aos usuários que eles podem voltar a trabalhar normalmente. 7. Se desejar, configure a replicação do novo primário para os appliances existentes e o primário anterior. Para obter mais informações, consulte "[Sobre a configuração de alta disponibilidade](/enterprise/{{ currentVersion }}/admin/guides/installation/about-high-availability-configuration/#utilities-for-replication-management)". +8. Appliances para os quais você não pretende configurar replicação faziam parte da configuração de alta disponibilidade antes da falha precisam ser removidos da configuração de alta disponibilidade por UUID. + - Nos appliances anteriores, obtenha seu UUID via `cat /data/user/common/uid`. + ```shell + $ cat /data/user/common/uuid + ``` + - No novo primário, remova os UUIDs usando `ghe-repl-teardown`. Substitua *`UUID`* por um UUID que você recuperou na etapa anterior. + ```shell + $ ghe-repl-teardown -u UUNID + ``` ### Leia mais diff --git a/translations/pt-BR/content/admin/enterprise-management/upgrade-requirements.md b/translations/pt-BR/content/admin/enterprise-management/upgrade-requirements.md index c8bb53fd4a..d53c0a0659 100644 --- a/translations/pt-BR/content/admin/enterprise-management/upgrade-requirements.md +++ b/translations/pt-BR/content/admin/enterprise-management/upgrade-requirements.md @@ -21,7 +21,7 @@ versions: ### Recomendações -- Inclua o mínimo possível de atualizações no seu processo. Por exemplo, em vez de atualizar do {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} para o {{ enterpriseVersions.supported[1] }} e depois para o {{ enterpriseVersions.latest }}, atualize do {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} para o {{ enterpriseVersions.latest }}. +- Inclua o mínimo possível de atualizações no seu processo. Por exemplo, em vez de atualizar do {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} para o {{ enterpriseServerReleases.supported[1] }} e depois para o {{ enterpriseServerReleases.latest }}, atualize do {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} para o {{ enterpriseServerReleases.latest }}. - Se a sua versão estiver muito defasada, atualize a {% data variables.product.product_location_enterprise %} para a versão mais atual disponível a cada etapa do processo. Ao usar a versão mais recente em cada atualização, você pode aproveitar as melhorias de desempenho e as correções de erros. Por exemplo, você poderia atualizar do {% data variables.product.prodname_enterprise %} 2.7 para o 2.8 e depois para o 2.10. No entanto, atualizar do {% data variables.product.prodname_enterprise %} 2.7 para o 2.9 e depois para o 2.10 usa uma versão mais recente na segunda etapa. - Ao atualizar, use a versão mais recente do patch. {% data reusables.enterprise_installation.enterprise-download-upgrade-pkg %} - Use uma instância de preparo para testar as etapas da atualização. Para obter mais informações, consulte "[Configurar instância de preparo](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-staging-instance/)". @@ -29,7 +29,7 @@ versions: ### Requisitos -- Você deve atualizar quando a versão do recurso estiver defasada por **no máximo** duas versões. Por exemplo, ao atualizar para o {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.latest }}, você deve estar nas versões {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[1] }} ou {{ enterpriseVersions.supported[2] }}. +- Você deve atualizar quando a versão do recurso estiver defasada por **no máximo** duas versões. Por exemplo, ao atualizar para o {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.latest }}, você deve estar nas versões {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[1] }} ou {{ enterpriseServerReleases.supported[2] }}. - {% data reusables.enterprise_installation.hotpatching-explanation %} - Um hotpatch pode causar tempo de inatividade se os serviços afetados (como kernel, MySQL ou Elasticsearch) exigirem reinicialização da VM ou do serviço. Você receberá uma notificação quando/se a reinicialização for necessária. Será possível reinicializar em outro momento. - Procure disponibilizar um armazenamento adicional na raiz durante a atualização, já que o hotpatching instala várias versões de alguns serviços até a conclusão da atualização. Caso não haja espaço suficiente, você receberá uma notificação das verificações preliminares. diff --git a/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md index d095af1049..efa6ba5d53 100644 --- a/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,7 +59,7 @@ Para problemas urgentes, fornecemos suporte em inglês 44 horas por dia, 7 dias O {% data variables.contact.enterprise_support %} observa esses feriados dos EUA. O {{ site.data.variables.contact.enterprise_support }} observa os feriados americanos, embora nossa equipe de suporte global esteja disponível para responder tíquetes urgentes. -| EUA Feriado | Data observada | +| EUA Feriado | Data de observação | | ----------------------- | ----------------------------- | | Fraternidade Universal | 1º de janeiro | | Martin Luther King, Jr. | 3ª segunda-feira de janeiro | diff --git a/translations/pt-BR/content/admin/enterprise-support/providing-data-to-github-support.md b/translations/pt-BR/content/admin/enterprise-support/providing-data-to-github-support.md index ae33cd606d..c1f8b8341a 100644 --- a/translations/pt-BR/content/admin/enterprise-support/providing-data-to-github-support.md +++ b/translations/pt-BR/content/admin/enterprise-support/providing-data-to-github-support.md @@ -99,10 +99,10 @@ Você pode usar estas etapas para criar e compartilhar um pacote de suporte se t #### Carregar um pacote de suporte usando sua conta corporativa -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} -4. Em "Ajuda {% data variables.product.prodname_enterprise %}", clique em **Fazer upload de um pacote de suporte**. ![Fazer upload de um link para pacote de suporte](/assets/images/enterprise/support/upload-support-bundle.png) +3. Na barra lateral esquerda, clique em **Enterprise licensing** (Licenciamento Empresarial). ![Aba "Licenciamento empresarial" na barra lateral de configurações da conta corporativa](/assets/images/help/enterprises/enterprise-licensing-tab.png) +4. Em "Ajuda de {% data variables.product.prodname_enterprise %}", clique em **Fazer upload de um pacote de suporte**. ![Fazer upload de um link para pacote de suporte](/assets/images/enterprise/support/upload-support-bundle.png) 5. Em "Selecione uma conta corporativa", selecione a conta associada ao pacote de suporte no menu suspenso. ![Escolher a conta corporativa do pacote de suporte](/assets/images/enterprise/support/support-bundle-account.png) 6. Em "Fazer upload de um pacote de suporte para {% data variables.contact.enterprise_support %}", selecione seu pacote de suporte, clique **Escolher arquivo** ou arraste seu arquivo de pacote de suporte para **Escolher arquivo**. ![Fazer upload de um arquivo para pacote de suporte](/assets/images/enterprise/support/choose-support-bundle-file.png) 7. Clique em **Fazer upload**. @@ -120,13 +120,13 @@ Você pode fazer upload diretamente de um pacote de suporte para o nosso servido ### Criar e compartilhar pacotes de suporte estendidos -Os pacotes de suporte incluem logs dos últimos dois dias, enquanto os pacotes de suporte _estendidos_ incluem logs dos últimos sete dias. Se os eventos que o {% data variables.contact.github_support %} está investigando tiverem ocorrido há mais de dois dias, poderemos solicitar que você compartilhe um pacote de suporte estendido. Você precisará do acesso SSH para baixar um pacote estendido, e não é possível baixar um pacote estendido no {% data variables.enterprise.management_console %}. +Os pacotes de suporte incluem logs dos últimos dois dias, enquanto os pacotes de suporte _estendidos_ incluem logs dos últimos sete dias. Se os eventos que o {% data variables.contact.github_support %} está investigando tiverem ocorrido há mais de dois dias, poderemos solicitar que você compartilhe um pacote de suporte estendido. Você precisará do acesso SSH para baixar um pacote estendido, e não é possível fazer o download de um pacote estendido no {% data variables.enterprise.management_console %}. -Para evitar que fiquem grandes demais, os pacotes só têm logs que não passaram por rotação nem compactação. A rotação de arquivos de log no {% data variables.product.prodname_ghe_server %} acontece em várias frequências (diária ou semanalmente) para diferentes arquivos, dependendo das expectativas de tamanho dos logs. +Para evitar que fiquem grandes demais, os pacotes só têm logs que não passaram por rotação nem compactação. A rotação de arquivos de registro no {% data variables.product.prodname_ghe_server %} acontece em várias frequências (diária ou semanalmente) para diferentes arquivos, dependendo das expectativas de tamanho dos registros. #### Criar um pacote de suporte estendido usando SSH -Você pode usar essas etapas para criar e compartilhar um pacote de suporte estendido se tiver acesso SSH ao seu appliance do {% data variables.product.prodname_ghe_server %} e se tiver acesso à internet. +Você pode usar essas etapas para criar e compartilhar um pacote de suporte estendido se tiver acesso SSH ao seu dispositivo do {% data variables.product.prodname_ghe_server %} e se você tiver acesso à internet. 1. Baixe o pacote de suporte estendido via SSH adicionando o sinalizador `-x` ao comando `ghe-support-bundle`: ```shell diff --git a/translations/pt-BR/content/admin/enterprise-support/submitting-a-ticket.md b/translations/pt-BR/content/admin/enterprise-support/submitting-a-ticket.md index 77f8724870..948c93145d 100644 --- a/translations/pt-BR/content/admin/enterprise-support/submitting-a-ticket.md +++ b/translations/pt-BR/content/admin/enterprise-support/submitting-a-ticket.md @@ -22,9 +22,9 @@ Depois de enviar sua solicitação de suporte e as informações opcionais de di ### Enviando um tíquete usando sua conta corporativa -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. Na barra lateral esquerda, clique em **Enterprise licensing** (Licenciamento Empresarial). ![Aba "Licenciamento empresarial" na barra lateral de configurações da conta corporativa](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Em "Ajuda {% data variables.product.prodname_enterprise %}", clique em Portal **{% data variables.contact.enterprise_support %}**. ![Link para navegar para o site de Suporte do Enterprise](/assets/images/enterprise/support/enterprise-support-link.png) 5. Clique em **Enviar um tíquete** ![Enviar um tíquete para a equipe de Suporte do Enterprise](/assets/images/enterprise/support/submit-ticket-button.png) {% data reusables.enterprise_enterprise_support.submit-support-ticket-first-section %} diff --git a/translations/pt-BR/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md b/translations/pt-BR/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md index 3297b3aca2..8690d46bec 100644 --- a/translations/pt-BR/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md +++ b/translations/pt-BR/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md @@ -34,7 +34,7 @@ Você pode preencher o cache da ferramenta do executor, executando um fluxo de t ### Preencher o cache de ferramentas para um executor auto-hospedado -1. Em {% data variables.product.prodname_dotcom_the_website %}, navegue até um repositório que você pode usar para executar um fluxo de trabalho de {% data variables.product.prodname_actions %}. +1. Em {% data variables.product.prodname_dotcom_the_website %}, acesse um repositório que você pode usar para executar um fluxo de trabalho de {% data variables.product.prodname_actions %}. 1. Crie um novo arquivo de fluxo de trabalho na pasta `.github/workflows` do repositório que faz o upload de um artefato que contém o cache da ferramenta do executor armazenado em {% data variables.product.prodname_dotcom %}. O exemplo a seguir demonstra um fluxo de trabalho que faz o upload do cache da ferramenta para um ambiente do Ubuntu 18.04, usando a ação `setup-node` com as versões 10 e 12 do Node.js. diff --git a/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md b/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md index d87d5a4f73..85c9619acc 100644 --- a/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md +++ b/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md @@ -25,8 +25,7 @@ Antes de iniciar a {% data variables.product.product_location_enterprise %} no G #### Tipos de máquina compatíveis O {% data variables.product.prodname_ghe_server %} é compatível nos seguintes tipos de máquina do Google Compute Engine (GCE). Para obter mais informações, consulte o [artigo sobre tipos de máquina do Google Cloud Platform](https://cloud.google.com/compute/docs/machine-types). -| -{% if currentVersion != "free-pro-team@latest" %} + | | Memória alta | | | ------------- | | | n1-highmem-4 | @@ -35,7 +34,6 @@ O {% data variables.product.prodname_ghe_server %} é compatível nos seguintes | | n1-highmem-32 | | | n1-highmem-64 | | | n1-highmem-96 | -{% endif %} #### Tipos de máquina recomendados diff --git a/translations/pt-BR/content/admin/overview/managing-your-github-enterprise-license.md b/translations/pt-BR/content/admin/overview/managing-your-github-enterprise-license.md index 41d8536fa1..19a975b6f0 100644 --- a/translations/pt-BR/content/admin/overview/managing-your-github-enterprise-license.md +++ b/translations/pt-BR/content/admin/overview/managing-your-github-enterprise-license.md @@ -30,11 +30,11 @@ Depois de comprar uma nova licença ou atualizar uma licença existente de {% da Caso queira renovar ou adicionar licenças de usuário com o {% data variables.product.prodname_enterprise %}, entre em contato com {% data variables.contact.contact_enterprise_sales %}. Seu novo arquivo de licença estará disponível para download logo após a conclusão do pedido. -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. Na barra lateral esquerda, clique em **Enterprise licensing** (Licenciamento Empresarial). ![Aba "Licenciamento empresarial" na barra lateral de configurações da conta corporativa](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Em "Enterprise Server Instances", clique em {% octicon "download" aria-label="The download icon" %} para fazer o download do seu arquivo de licença. ![Baixar licença do GitHub Enterprise Server](/assets/images/help/business-accounts/download-ghes-license.png) -5. Faça login no seu +5. Faça login na sua Instância de {% data variables.product.prodname_ghe_server %} como administrador do site. {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} @@ -46,9 +46,9 @@ Instância de {% data variables.product.prodname_ghe_server %} como administrado ### Exibir o uso de licenças -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. Na barra lateral esquerda, clique em **Enterprise licensing** (Licenciamento Empresarial). ![Aba "Licenciamento empresarial" na barra lateral de configurações da conta corporativa](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Revise sua licença atual de {% data variables.product.prodname_enterprise %}, bem como licenças de usuário consumidas e disponíveis. ### Sincronizar automaticamente o uso da licença de usuário com o {% data variables.product.prodname_ghe_cloud %} @@ -63,11 +63,12 @@ Para sincronizar manualmente o uso das licenças de usuário entre as duas impla {% data reusables.enterprise_site_admin_settings.business %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.license-tab %} -5. Em "Quick links" (Links rápidos), para baixar um arquivo com o uso da sua licença atual no {% data variables.product.prodname_ghe_server %}, clique em **Export license usage** (Exportar uso de licença). ![Exportar link de uso de licença](/assets/images/enterprise/business-accounts/export-license-usage-link.png) -6. Navegar para -{% data variables.product.prodname_ghe_cloud %}. -{% data reusables.enterprise-accounts.access-enterprise %} +5. Em "Links rápidos", para fazer o download de um arquivo que contém a sua licença atual em +{% data variables.product.prodname_ghe_server %}, clique em **Exportar uso de licença**. + ![Exportar link de uso de licença](/assets/images/enterprise/business-accounts/export-license-usage-link.png) +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +8. Na barra lateral esquerda, clique em **Enterprise licensing** (Licenciamento Empresarial). ![Aba "Licenciamento empresarial" na barra lateral de configurações da conta corporativa](/assets/images/help/enterprises/enterprise-licensing-tab.png) +{% data reusables.enterprise-accounts.license-tab %} 10. Em "Instâncias Enterprise Server", clique em **Add server usage** (Adicionar uso de servidor). ![Fazer upload do link de uso do GitHub Enterprise Server](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png) 11. Faça upload do arquivo JSON que você baixou do {% data variables.product.prodname_ghe_server %}.![Arrastar e soltar ou selecionar um arquivo para upload](/assets/images/help/business-accounts/upload-ghe-server-usage-file.png) diff --git a/translations/pt-BR/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md b/translations/pt-BR/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md index ba0b2492eb..9cebcfe870 100644 --- a/translations/pt-BR/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md +++ b/translations/pt-BR/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md @@ -11,7 +11,7 @@ Ao usar LDAP ou autenticação integrada, a autenticação de dois fatores é co {% data reusables.enterprise_user_management.external_auth_disables_2fa %} -Para obter mais informações, consulte [este gráfico sobre métodos de autenticação compatíveis com 2FA](/enterprise/{{ currentVersion }}/user/articles/about-two-factor-authentication/#authentication-methods-that-support-2fa). +Para obter mais informações, consulte "[Sobre a autenticação de dois fatores](/github/authenticating-to-github/about-two-factor-authentication)". ### Requisitos para exigir a autenticação de dois fatores diff --git a/translations/pt-BR/content/developers/apps/authenticating-with-github-apps.md b/translations/pt-BR/content/developers/apps/authenticating-with-github-apps.md index 35bb00954c..9ea77b868e 100644 --- a/translations/pt-BR/content/developers/apps/authenticating-with-github-apps.md +++ b/translations/pt-BR/content/developers/apps/authenticating-with-github-apps.md @@ -10,7 +10,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -92,7 +92,7 @@ Use o seu identificador de {% data variables.product.prodname_github_app %}(`YOU Após criar o JWT, defina-o no `Cabeçalho` da solicitação de API: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -H "Authorization: Bearer YOUR_JWT" -H "Accept: application/vnd.github.machine-man-preview+json" {% data variables.product.api_url_pre %}/app ``` @@ -127,7 +127,7 @@ Por padrão, os tokens de acesso de instalação são limitados em todos os repo Para criar um token de acesso de instalação, inclua o JWT [gerado acima](#jwt-payload) no cabeçalho de autorização na solicitação de API: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -X POST \ -H "Authorization: Bearer YOUR_JWT" \ @@ -147,7 +147,7 @@ A resposta incluirá seu token de acesso de instalação, a data de validade, as Para efetuar a autenticação com um token de acesso de instalação, inclua-o no cabeçalho de autorização na solicitação de API: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i \ -H "Authorization: token YOUR_INSTALLATION_ACCESS_TOKEN" \ diff --git a/translations/pt-BR/content/developers/apps/creating-a-github-app-from-a-manifest.md b/translations/pt-BR/content/developers/apps/creating-a-github-app-from-a-manifest.md index cfd8744a4e..d1d96529f7 100644 --- a/translations/pt-BR/content/developers/apps/creating-a-github-app-from-a-manifest.md +++ b/translations/pt-BR/content/developers/apps/creating-a-github-app-from-a-manifest.md @@ -162,7 +162,7 @@ Você deve concluir esta etapa do fluxo do manifesto do aplicativo GitHub em uma {% endnote %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% data reusables.pre-release-program.fury-pre-release %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/pt-BR/content/developers/apps/creating-ci-tests-with-the-checks-api.md b/translations/pt-BR/content/developers/apps/creating-ci-tests-with-the-checks-api.md index 96346b1dfa..c64367e276 100644 --- a/translations/pt-BR/content/developers/apps/creating-ci-tests-with-the-checks-api.md +++ b/translations/pt-BR/content/developers/apps/creating-ci-tests-with-the-checks-api.md @@ -154,17 +154,17 @@ end ``` {% else %} ``` ruby -# Criar uma nova execução de verificação com o status em fila +# Create a new check run with the status queued def create_check_run - # # No momento da gravação, o Octokit não é compatível ainda com a API de verificações, mas - # fornece métodos HTTP genéticos que você pode usar: + # # At the time of writing, Octokit does not support the Checks API yet, but + # it does provide generic HTTP methods you can use: # /v3/checks/runs/#create-a-check-run check_run = @installation_client.post( "repos/#{@payload['repository']['full_name']}/check-runs", { - # Este cabeçalho permite acesso beta à API de verificação - aceitar: 'application/vnd.github.antiope-preview+json', - # O nome da sua execução de verificação. + # This header allows for beta access to Checks API + accept: 'application/vnd.github.antiope-preview+json', + # The name of your check run. nome: 'Octo RuboCop', # A estrutura da carga difere dependendo da ocorrência de um evento de execução de verificação ou de conjunto de verificações. head_sha: @payload['check_run'].nil? ? @payload['check_suite']['head_sha'] : @payload['check_run']['head_sha'] @@ -196,7 +196,7 @@ Agora abra um pull request no repositório em que você instalou seu aplicativo. ![Execução de verificação enfileirada](/assets/images/github-apps/github_apps_queued_check_run.png) -Se você vir outros aplicativos na aba Verificações, isso significa que você tem outros aplicativos instalados no seu repositório que têm acesso de **leitura & gravação ** para verificações que estão inscritos em eventos **Conjunto de verificaçõessuite** e **Execução de verificações**. +Se você vir outros aplicativos na aba Verificações, isso significa que você tem outros aplicativos instalados no seu repositório que têm acesso de **leitura & gravação ** para verificações e que estão inscritos em eventos **Conjunto de verificações** e **Execução de verificações**. Ótimo! Você disse ao GitHub para criar uma execução de verificação. Você pode ver que o status da execução de verificação está definido como `enfileirado` ao lado de um ícone amarelo. Em seguida, você irá aguardar que o GitHub crie a execução de verificação e atualize seu status. @@ -204,14 +204,14 @@ Se você vir outros aplicativos na aba Verificações, isso significa que você Quando o seu método `create_check_run` é executado, ele pede ao GitHub para criar uma nova execução de verificação. Quando o Github terminar de criar a execução de verificação, você receberá o evento do webhook `check_run` com a ação `criada`. Esse evento é o sinal para começar a executar a verificação. -Você vai atualizar o manipulador do evento para procurar a ação `criada`. Enquanto você está atualizando o manipulador de eventos, você pode adicionar uma condição para a ação `ressolicitada`. Quando alguém executa novamente um único teste no GitHub clicando no botão "Reexecutar", o GitHub envia o evento da execução de verificação `ressolicitado` para o seu aplicativo. Quando a execução de uma verificação `ressolicitada`, você irá iniciar todo o processo e criar uma nova execução de verificação. +Você vai atualizar o manipulador do evento para procurar a ação `criada`. Enquanto você está atualizando o manipulador de eventos, você pode adicionar uma condição para a ação `ressolicitada`. Quando alguém executa novamente um único teste no GitHub clicando no botão "Reexecutar", o GitHub envia o evento da execução de verificação `ressolicitado` para o seu aplicativo. Quando a execução de uma verificação é `ressolicitada`, você irá iniciar todo o processo e criar uma nova execução de verificação. -Para incluir uma condição para o evento `check_run` no encaminhamento `post '/event_handler'`, adicione o seguinte código em `solicitação de caso.env['HTTP_X_GITHUB_EVENT']`: +Para incluir uma condição para o evento `check_run` no encaminhamento `post '/event_handler'`, adicione o seguinte código em `case request.env['HTTP_X_GITHUB_EVENT']`: ``` ruby when 'check_run' - # Verifica se o evento está sendo enviado para este aplicativo - se @payload['check_run']['app']['id'].to_s === APP_IDENTIFIER + # Check that the event is being sent to this app + if @payload['check_run']['app']['id'].to_s === APP_IDENTIFIER case @payload['action'] when 'created' initiate_check_run @@ -231,11 +231,11 @@ Vamos criar o método `initiate_check_run` e atualizar o status da execução de {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} ``` ruby -# Iniciar o processo de CI +# Start the CI process def initiate_check_run - # Uma vez criada a execução de verificação, você irá atualizar o status da verificação de execução - # para 'in_progress' e executar o processo de CI. Após a conclusão da CI, você - # irá atualizar o status da execução de verificação para "concluído" e irá adicionar os resultados de CI. + # Once the check run is created, you'll update the status of the check run + # to 'in_progress' and run the CI process. When the CI finishes, you'll + # update the check run status to 'completed' and add the CI results. # Octokit doesn't yet support the Checks API, but it does provide generic # HTTP methods you can use: @@ -267,20 +267,20 @@ end ``` {% else %} ``` ruby -# Iniciar o processo de CI +# Start the CI process def initiate_check_run - # Uma vez criada a execução de verificação, você irá atualizar o status da verificação de execução - # para 'in_progress' e executar o processo de CI. Após a conclusão da CI, você - # irá atualizar o status da execução de verificação para "concluído" e irá adicionar os resultados de CI. + # Once the check run is created, you'll update the status of the check run + # to 'in_progress' and run the CI process. When the CI finishes, you'll + # update the check run status to 'completed' and add the CI results. - # O Octokit ainda não é compatível com a a API de verificações, mas fornece métodos HTTP genéticos - # que você pode usar: + # Octokit doesn't yet support the Checks API, but it does provide generic + # HTTP methods you can use: # /v3/checks/runs/#update-a-check-run updated_check_run = @installation_client.patch( "repos/#{@payload['repository']['full_name']}/check-runs/#{@payload['check_run']['id']}", { - accept: 'application/vnd.github.antiope-preview+json', # Este cabeçalho é necessário para o acesso beta à API de verificação - nome: 'Octo RuboCop', + accept: 'application/vnd.github.antiope-preview+json', # This header is necessary for beta access to Checks API + name: 'Octo RuboCop', status: 'in_progress', started_at: Time.now.utc.iso8601 } @@ -288,15 +288,15 @@ def initiate_check_run # ***** RUN A CI TEST ***** - # Marque a execução de verificação como concluída! + # Mark the check run as complete! updated_check_run = @installation_client.patch( "repos/#{@payload['repository']['full_name']}/check-runs/#{@payload['check_run']['id']}", { - # Este cabeçalho é necessário para o acesso beta à API deverificação - aceita: 'application/vnd.github.antiope-preview+json', - nome: 'Octo RuboCop', + # This header is necessary for beta access to Checks API + accept: 'application/vnd.github.antiope-preview+json', + name: 'Octo RuboCop', status: 'completed', - conclusão: 'success', + conclusion: 'success', completed_at: Time.now.utc.iso8601 } ) @@ -304,9 +304,9 @@ end ``` {% endif %} -O código acima chama o ponto final da API "[Atualizar uma execução de verificação](/v3/checks/runs/#update-a-check-run)" usando o método genérico [`patch` HTTP](http://octokit.github.io/octokit.rb/Octokit/Connection.html#patch-instance_method) para atualizar a verificação que você já criou. +O código acima chama o ponto de extremidade da API "[Atualizar uma execução de verificação](/v3/checks/runs/#update-a-check-run)" usando o método genérico [`patch` HTTP](http://octokit.github.io/octokit.rb/Octokit/Connection.html#patch-instance_method) para atualizar a execução de verificação que você já criou. -Veja o que este código está fazendo. Primeiro, ele atualiza o status de verificação de execução para `in_progress` e define o tempo do `started_at` para o tempo atual. Na [Parte 2](#part-2-creating-the-octo-rubocop-ci-test) deste início rápido, você irá adicionar cum ódigo que inicia um teste de CI real em `***** EXECUTAR UM TEST DE CI *****`. Por enquanto, você sairá da seção como um espaço reservado, para que o código que o segue apenas simule que o processo de CI seja bem-sucedido e todos os testes sejam aprovados. Finalmente, o código atualiza o status da execução de verificação novamente para `concluído`. +Veja o que este código está fazendo. Primeiro, ele atualiza o status de verificação de execução para `in_progress` e define o tempo do `started_at` para o tempo atual. Na [Parte 2](#part-2-creating-the-octo-rubocop-ci-test) deste início rápido, você irá adicionar um código que inicia um teste de CI real em `***** EXECUTAR UM TEST DE CI *****`. Por enquanto, você sairá da seção como um espaço reservado, para que o código que o segue apenas simule que o processo de CI seja bem-sucedido e todos os testes sejam aprovados. Finalmente, o código atualiza o status da execução de verificação novamente para `concluído`. Você observará na documentação "[Atualizar uma execução de verificação](/v3/checks/runs/#update-a-check-run)" que, quando você fornece um status de `concluído`, os parâmetros `conclusão` e `completed_at` são necessários. A conclusão `` resume o resultado de uma verificação de resultado e pode ser `sucesso`, `falha`, `neutro`, `cancelado`, `timed_out` ou `action_required`. Você irá definir a conclusão como `sucesso`, o tempo `completed_at` como a hora atual e o status como `concluído`. @@ -316,7 +316,7 @@ Você também pode fornecer mais informações sobre o que a sua verificação e $ ruby template_server.rb ``` -Vá para seu pull request aberta e clique na aba **Verificações**. Clique no botão "Executar tudo novamente" no canto superior esquerdo. Você deverá ver a execução da verificação mover de `pendente` para `in_progress` e terminar com `sucesso`: +Vá para seu pull request aberto e clique na aba **Verificações**. Clique no botão "Executar tudo novamente" no canto superior esquerdo. Você deverá ver a execução da verificação mover de `pendente` para `in_progress` e terminar com `sucesso`: ![Execução de verificação concluída](/assets/images/github-apps/github_apps_complete_check_run.png) @@ -353,10 +353,10 @@ Vamos começar! Estas são as etapas que você concluirá nesta seção: Você pode passar arquivos específicos ou diretórios inteiros para o RuboCop verificar. Nesse início rápido, você irá executar o RuboCop em um diretório inteiro. Como RuboCop verifica apenas códigos Ruby, será necessário pelo menos um arquivo Ruby no seu repositório que contém erros. O arquivo de exemplo fornecido abaixo contém alguns erros. Adicione este exemplo de arquivo Ruby ao repositório onde seu aplicativo está instalado (certifique-se de nomear o arquivo com uma extensão `.rb`, como em `myfile.rb`): ```ruby -# A classe do Octocat informa os diferentes tipos do Octocat +# The Octocat class tells you about different breeds of Octocat class Octocat def initialize(name, *breeds) - # Variáveis da instânciavariables + # Instance variables @name = name @breeds = breeds end @@ -374,7 +374,7 @@ m.display ### Etapa 2.2. Clonar um repositório -O RuboCop está disponível como um utilitário da linha de comando. Isso significa que o seu aplicativo GitHub deverá clonar uma cópia local do repositório no servidor da CI para que RuboCop possa analisar os arquivos. Para executar operações do Git no seu aplicativo Ruby, você pode usar a gem de [ruby-git](https://github.com/ruby-git/ruby-git). +O RuboCop está disponível como um utilitário da linha de comando. Isso significa que o seu aplicativo GitHub deverá clonar uma cópia local do repositório no servidor da CI para que RuboCop possa analisar os arquivos. Para executar operações do Git no seu aplicativo Ruby, você pode usar o gem de [ruby-git](https://github.com/ruby-git/ruby-git). O `Gemfile` no repositório `building-a-checks-api-ci-server` já inclui a gem de ruby-git, e você o instalou quando executou a `instalação em conjunto` nas [etapas requisitadas](#prerequisites). Para usar a gem, adicione este código à parte superior do seu arquivo `template_server.rb`: @@ -396,15 +396,15 @@ git clone https://x-access-token:@github.com//.git O código acima clone um repositório por HTTP. Isto exige o nome completo do repositório, que inclui o proprietário do repositório (usuário ou organização) e o nome do repositório. Por exemplo, o nome completo do repositório [octocat Hello-World](https://github.com/octocat/Hello-World) é `octocat/hello-world`. -Depois que seu aplicativo clonar repositório, ele deverá resgatar as alterações mais recentes do código fazer checkout do Git ref específico. O código para fazer tudo isto encaixa-se perfeitamente no seu próprio método. Para realizar essas operações, o método precisa do nome e nome completo do repositório e que o ref faça checkout. O ref pode ser um commit SHA, branch ou tag. Adicione o método a seguir à seção do método auxiliar no `template_server.rb`: +Depois que seu aplicativo clonar o repositório, ele deverá resgatar as alterações mais recentes do código fazer checkout do Git ref específico. O código para fazer tudo isto encaixa-se perfeitamente no seu próprio método. Para realizar essas operações, o método precisa do nome e nome completo do repositório e que o ref faça checkout. O ref pode ser um commit SHA, branch ou tag. Adicione o método a seguir à seção do método auxiliar no `template_server.rb`: ``` ruby -# Clona o repositório para o diretório de trabalho atual, atualiza o -# conteúdo usando o pull do Git e faz o check out do ref. +# Clones the repository to the current working directory, updates the +# contents using Git pull, and checks out the ref. # # full_repo_name - The owner and repo. Ex: octocat/hello-world -# repositório - O nome do repositório -# ref - O commit SHA do branch ou tag a fazer checkout +# repository - The repository name +# ref - The branch, commit SHA, or tag to check out def clone_repository(full_repo_name, repository, ref) @git = Git.clone("https://x-access-token:#{@installation_token.to_s}@github.com/#{full_repo_name}.git", repository) pwd = Dir.getwd() @@ -439,7 +439,7 @@ O código acima obtém o nome completo do repositório e o SHA principal do comm O código a seguir executa RuboCop e salva os erros do código de estilo no formato JSON. Adicione este código abaixo da chamada para `clone_repository` que você adicionou na [etapa anterior](#step-22-cloning-the-repository) e acima do código que atualiza a execução de verificação para concluir. ``` ruby -# Execute RuboCop em todos os arquivos do repositório +# Run RuboCop on all files in the repository @report = `rubocop '#{repository}' --format json` logger.debug @report `rm -rf #{repository}` @@ -479,7 +479,7 @@ Você deve ver os erros de linting na saída de depuração, embora não sejam i "offenses": [ { "severity": "convention", - "message": "Style/StringLiterals: Prefira strings com aspas simples quando você não precisar de interpolação de strings ou símbolos especiais.", + "message": "Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.", "cop_name": "Style/StringLiterals", "corrected": false, "location": { @@ -494,7 +494,7 @@ Você deve ver os erros de linting na saída de depuração, embora não sejam i }, { "severity": "convention", - "message": "Style/StringLiterals: Prefira strings com aspas simples quando você não precisar de interpolação de strings ou símbolos especiais.", + "message": "Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.", "cop_name": "Style/StringLiterals", "corrected": false, "location": { @@ -524,35 +524,35 @@ A variável `@output` contém os resultados do JSON analisados do relatório do A API de verificação permite que você crie anotações para linhas específicas do código. Ao criar ou atualizar uma execução de verificação, você pode adicionar anotações. Neste início rápido, você está [atualizando a execução de verificações](/v3/checks/runs/#update-a-check-run) com anotações. -A API de verificação limita o número de anotações a um máximo de 50 por solicitação de API. Para criar mais de 50 anotações, você deve fazer várias solicitações para o ponto final [Atualizar uma execução de verificação](/v3/checks/runs/#update-a-check-run). Por exemplo, para criar 105 anotações você deve chamar o ponto final [Atualizar uma execução de verificação](/v3/checks/runs/#update-a-check-run) três vezes. Cada uma das duas primeiras solicitações teria 50 anotações e a terceira solicitação incluiria as cinco anotações restantes. Cada vez que você atualizar a execução de verificação, as anotações são anexadas à lista de anotações que já existem para a execução de verificação. +A API de verificação limita o número de anotações a um máximo de 50 por solicitação de API. Para criar mais de 50 anotações, você deve fazer várias solicitações para o ponto de extremidade [Atualizar uma execução de verificação](/v3/checks/runs/#update-a-check-run). Por exemplo, para criar 105 anotações você deve chamar o ponto de extremidade[Atualizar uma execução de verificação](/v3/checks/runs/#update-a-check-run) três vezes. Cada uma das duas primeiras solicitações teria 50 anotações e a terceira solicitação incluiria as cinco anotações restantes. Cada vez que você atualizar a execução de verificação, as anotações são anexadas à lista de anotações que já existem para a execução de verificação. -Uma execução de verificação espera anotações como um array de objetos. Cada objeto de anotação deve incluir o `caminho`, `start_line`,, `end_line`, `annotation_level` e `mensagem`. O RuboCop também fornece `start_column` e `end_column`. Portanto, você pode incluir esses parâmetros opcionais na anotação. As anotações são compatíveis apenas com `start_column` e `end_column` na mesma linha. Para obter mais informações, consulte a documentação de referência do [`anotações` objeto](/v3/checks/runs/#annotations-object-1). +Uma execução de verificação espera anotações como um array de objetos. Cada objeto de anotação deve incluir o `caminho`, `start_line`,, `end_line`, `annotation_level` e `mensagem`. O RuboCop também fornece `start_column` e `end_column`. Portanto, você pode incluir esses parâmetros opcionais na anotação. As anotações são compatíveis apenas com `start_column` e `end_column` na mesma linha. Para obter mais informações, consulte a documentação de referência do [`objeto` anotações](/v3/checks/runs/#annotations-object-1). Você irá extrair as informações necessárias do RuboCop para criar cada anotação. Acrescente o seguinte código ao código que você adicionou na [seção anterior](#step-23-running-rubocop): ``` ruby -anotações = [] -# Você pode criar um máximo de 50 anotações por solicitação para as verificações -# API. Para adicionar mais de 50 anotações, use a API "Atualizar uma execução de verificação" -# ponto final. Este código de exemplo limita o número de anotações a 50. -# Consulte /v3/checks/runs/#update-a-check-run -# para obter informações. +annotations = [] +# You can create a maximum of 50 annotations per request to the Checks +# API. To add more than 50 annotations, use the "Update a check run" API +# endpoint. Este código de exemplo limita o número de anotações a 50. +# See /v3/checks/runs/#update-a-check-run +# for details. max_annotations = 50 -# O RuboCop relata o número de erros encontrados em "offense_count" +# RuboCop reports the number of errors found in "offense_count" if @output['summary']['offense_count'] == 0 - conclusão= 'success' -ou - conclusão= 'neutral' + conclusion = 'success' +else + conclusion = 'neutral' @output['files'].each do |file| - # Analise somente ofensas para arquivos no repositório deste aplicativo + # Only parse offenses for files in this app's repository file_path = file['path'].gsub(/#{repository}\//,'') annotation_level = 'notice' - # Analisa cada ofensa para obter informações e a localização + # Parse each offense to get details and location file['offenses'].each do |offense| - # Limita o número de anotações a 50 + # Limit the number of annotations to 50 next if max_annotations == 0 max_annotations -= 1 @@ -562,17 +562,17 @@ ou end_column = offense['location']['last_column'] message = offense['message'] - # Cria uma nova anotação para cada erro - anotação= { - caminho: file_path, + # Create a new annotation for each error + annotation = { + path: file_path, start_line: start_line, end_line: end_line, start_column: start_column, end_column: end_column, annotation_level: annotation_level, - mensagem: message + message: message } - # As anotações são compatíveis apenas com colunas iniciais e finais na mesma linha + # Annotations only support start and end columns on the same line if start_line == end_line annotation.merge({start_column: start_column, end_column: end_column}) end @@ -589,7 +589,7 @@ Quando o `offense_count` é zero, o teste de CI é um `sucesso`. Se houver erros Quando os erros são relatados, o código acima afirma por meio da array de `arquivos` no relatório do RuboCop. Para cada arquivo, ele extrai o caminho do arquivo e define o nível de anotação como `aviso`. Você pode ir além e definir os níveis específicos de aviso para cada tipo de [RuboCop Cop](https://rubocop.readthedocs.io/en/latest/cops/), mas simplificar as coisas neste início rápido, todos os erros são definidos para um nível de `aviso`. -Este código também é afirmado por meio de cada erro no array de `ofensas` e coleta o local da mensagem de erro e de abuso. Após extrair as informações necessárias, o código cria uma anotação para cada erro e a armazena no array de `anotações`. Uma vez que as anotações são compatíveis apenas com colunas iniciais e finais na mesma linha, `start_column` e `end_column` só são adicionados ao objeto `anotação` se os valores da linha inicial e final forem iguais. +Este código também é afirmado por meio de cada erro no array de `ofensas` e coleta o local da mensagem de erro e de ofensa. Após extrair as informações necessárias, o código cria uma anotação para cada erro e a armazena no array de `anotações`. Uma vez que as anotações são compatíveis apenas com colunas iniciais e finais na mesma linha, `start_column` e `end_column` só são adicionados ao objeto `anotação` se os valores da linha inicial e final forem iguais. Esse código ainda não cria uma anotação para a execução de verificação. Você irá adicionar esse código na próxima seção. @@ -600,7 +600,7 @@ Cada execução de verificação no GitHub contém um objeto de `saída` que inc Para o `resumo`, este exemplo usa a informação de resumo do RuboCop e adiciona algumas novas linhas (`\n`) para formatar a saída. É possível personalizar o que você adiciona ao parâmetro `texto`, mas este exemplo define o parâmetro `texto` para a versão do RuboCop. Para definir o `resumo` e o `texto`, adicione este código ao código que você adicionou na [seção anterior](#step-24-collecting-rubocop-errors): ``` ruby -# Resumo da execução de verificação atualizada e parâmetros de texto +# Updated check run summary and text parameters summary = "Octo RuboCop summary\n-Offense count: #{@output['summary']['offense_count']}\n-File count: #{@output['summary']['target_file_count']}\n-Target file count: #{@output['summary']['inspected_file_count']}" text = "Octo RuboCop version: #{@output['metadata']['rubocop_version']}" ``` @@ -609,7 +609,7 @@ Agora você tem todas as informações de que precisa para atualizar sua execuç {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} ``` ruby -# Marque a verificação como concluída! +# Mark the check run as complete! updated_check_run = @installation_client.patch( "repos/#{@payload['repository']['full_name']}/check-runs/#{@payload['check_run']['id']}", { @@ -623,25 +623,25 @@ updated_check_run = @installation_client.patch( ``` {% else %} ``` ruby -# Marque a verificação como concluída! +# Mark the check run as complete! updated_check_run = @installation_client.patch( "repos/#{@payload['repository']['full_name']}/check-runs/#{@payload['check_run']['id']}", { - aceitar: 'application/vnd.github.antiope-preview+json', # Este cabeçalho é necessário para o acesso beta à API de verificação - nome: 'Octo RuboCop', + accept: 'application/vnd.github.antiope-preview+json', # This header is necessary for beta access to Checks API + name: 'Octo RuboCop', status: 'completed', - conclusão: 'success', + conclusion: 'success', completed_at: Time.now.utc.iso8601 } ) ``` {% endif %} -Você deverá atualizar esse código para usar a variável de `Conclusão` definida com base nos resultados do RuboCop (para `sucesso` Ou `neutro`). Você pode atualizar o código com o seguinte: +Você deverá atualizar esse código para usar a variável de `conclusão` definida com base nos resultados do RuboCop (para `sucesso` ou `neutro`). Você pode atualizar o código com o seguinte: {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} ``` ruby -# Marque a verificação como concluída! E, se houver avisos, compartilhe-os. +# Mark the check run as complete! E, se houver avisos, compartilhe-os. updated_check_run = @installation_client.patch( "repos/#{@payload['repository']['full_name']}/check-runs/#{@payload['check_run']['id']}", { @@ -666,25 +666,25 @@ updated_check_run = @installation_client.patch( ``` {% else %} ``` ruby -# Marque a verificação como concluída! E, se houver avisos, compartilhe-os. +# Mark the check run as complete! E, se houver avisos, compartilhe-os. updated_check_run = @installation_client.patch( "repos/#{@payload['repository']['full_name']}/check-runs/#{@payload['check_run']['id']}", { - aceitar: 'application/vnd.github.antiope-preview+json', - nome: 'Octo RuboCop', + accept: 'application/vnd.github.antiope-preview+json', + name: 'Octo RuboCop', status: 'completed', - conclusão: conclusion, + conclusion: conclusion, completed_at: Time.now.utc.iso8601, - saída: { - título: 'Octo RuboCop', - resumo: summary, - texto: text, - anotações: annotations + output: { + title: 'Octo RuboCop', + summary: summary, + text: text, + annotations: annotations }, - ações: [{ - etiqueta: 'Fix this', - descrição: 'Fixar automaticamente todas os avisos do linter.', - identificador: 'fix_rubocop_notices' + actions: [{ + label: 'Fix this', + description: 'Automatically fix all linter notices.', + identifier: 'fix_rubocop_notices' }] } ) @@ -735,8 +735,8 @@ Quando alguém clica no botão "Corrija isso", seu aplicativo recebe o [webhook Na [Etapa 1.4. Ao atualizar uma verificação, ](#step-14-updating-a-check-run) você atualizou o seu `event_handler` para lidar com a procura de ações no evento `check_run`. Você já tem uma afirmação de caso para lidar com os tipos de ação `criado` e `ressolicitado`: ``` ruby -quando 'check_run' - # Verifica se o evento está sendo enviado para este aplicativo +when 'check_run' + # Check that the event is being sent to this app if @payload['check_run']['app']['id'].to_s === APP_IDENTIFIER case @payload['action'] when 'created' @@ -757,21 +757,21 @@ quando 'requested_action' Este código chama um novo método que irá lidar com todos os eventos `requested_action` para seu aplicativo. Adicione o seguinte método à seção de métodos auxiliares do seu código: ``` ruby -# Lida com o evento execução de verificação `requested_action` -# Consulte /webhooks/event-payloads/#check_run +# Handles the check run `requested_action` event +# See /webhooks/event-payloads/#check_run def take_requested_action full_repo_name = @payload['repository']['full_name'] - repositório = @payload['repository']['name'] + repository = @payload['repository']['name'] head_branch = @payload['check_run']['check_suite']['head_branch'] - se (@payload['requested_action']['identifier'] == 'fix_rubocop_notices') + if (@payload['requested_action']['identifier'] == 'fix_rubocop_notices') clone_repository(full_repo_name, repository, head_branch) - # Define o nome de usuário e o e-mail do seu commit + # Sets your commit username and email address @git.config('user.name', ENV['GITHUB_APP_USER_NAME']) @git.config('user.email', ENV['GITHUB_APP_USER_EMAIL']) - # Corrige os erros de estilo do RuboCop automaticamente + # Automatically correct RuboCop style errors @report = `rubocop '#{repository}/*' --format json --auto-correct` pwd = Dir.getwd() @@ -781,7 +781,7 @@ def take_requested_action @git.push("https://x-access-token:#{@installation_token.to_s}@github.com/#{full_repo_name}.git", head_branch) rescue # Nothing to commit! - coloca 'Nothing to commit' + puts 'Nothing to commit' end Dir.chdir(pwd) `rm -rf '#{repository}'` @@ -815,18 +815,18 @@ Você pode encontrar o código concluído para o aplicativo que você acabou de ### Etapa 2.7. Dicas de segurança -O modelo de código do aplicativo GitHub já possui um método para verificar os as cargas do webhook de entrada para garantir que sejam de uma fonte confiável. Se você não estiver validando as cargas do webhook, você deverá garantir que, quando nomes do repositório estiverem incluídos na carga do webhook, este não conterá comandos arbitrários que possam ser usados maliciosamente. O código abaixo valida que o nome do repositório contém apenas caracteres alfabéticos latinos, hifens e sublinhados. Para dar um exemplo completo, o código completo completo `server.rb` disponível no [repositório complementar](https://github.com/github-developer/creating-ci-tests-with-the-checks-api) para este início rápido inclui tanto o método de validação de recebimento das cargas do webhook quanto esta verificação do nome do repositório. +O modelo de código do aplicativo GitHub já possui um método para verificar as cargas do webhook de entrada para garantir que sejam de uma fonte confiável. Se você não estiver validando as cargas do webhook, você deverá garantir que, quando nomes do repositório estiverem incluídos na carga do webhook, este não conterá comandos arbitrários que possam ser usados maliciosamente. O código abaixo valida que o nome do repositório contém apenas caracteres alfabéticos latinos, hifens e sublinhados. Para dar um exemplo completo, o código completo completo `server.rb` disponível no [repositório complementar](https://github.com/github-developer/creating-ci-tests-with-the-checks-api) para este início rápido inclui tanto o método de validação de recebimento das cargas do webhook quanto esta verificação do nome do repositório. ``` ruby -# Este exemplo de início rápido usa o nome do repositório no webhook com -# utilitários de linha de comando. Por motivos de segurança você deve validar o -# nome do repositório para garantir que um ator ruim não tente executar -# comandos arbitrários ou injetar nomes de repositório falsos. Se um nome de repositório +# This quickstart example uses the repository name in the webhook with +# command-line utilities. For security reasons, you should validate the +# repository name to ensure that a bad actor isn't attempting to execute +# arbitrary commands or inject false repository names. Se um nome de repositório # for fornecido no webhook, certifique-se de que consiste apenas de # caracteres alfabéticos latinos `-`, e `_`. -a menos que @payload['repositório'].nil? +unless @payload['repository'].nil? halt 400 if (@payload['repository']['name'] =~ /[0-9A-Za-z\-\_]+/).nil? -fim +end ``` ### Solução de Problemas diff --git a/translations/pt-BR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/translations/pt-BR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md index 95d7ec2ffc..9aa4f1b0ee 100644 --- a/translations/pt-BR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md +++ b/translations/pt-BR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md @@ -136,7 +136,7 @@ For more information about authorizing users using the device flow, see "[Author ### Check which installation's resources a user can access -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -422,7 +422,7 @@ While most of your API interaction should occur using your server-to-server inst * [Convert an organization member to outside collaborator](/v3/orgs/outside_collaborators/#convert-an-organization-member-to-outside-collaborator) * [Remove outside collaborator from an organization](/v3/orgs/outside_collaborators/#remove-outside-collaborator-from-an-organization) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Organization Pre Receive Hooks * [List pre-receive hooks for an organization](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-an-organization) @@ -460,7 +460,7 @@ While most of your API interaction should occur using your server-to-server inst * [List teams](/v3/teams/#list-teams) * [Create a team](/v3/teams/#create-a-team) * [Get a team by name](/v3/teams/#get-a-team-by-name) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} * [Get a team](/v3/teams/#get-a-team) {% endif %} * [Update a team](/v3/teams/#update-a-team) @@ -762,7 +762,7 @@ While most of your API interaction should occur using your server-to-server inst * [Get GitHub Pages build](/rest/reference/repos#get-github-pages-build) * [Get latest pages build](/rest/reference/repos#get-latest-pages-build) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Repository Pre Receive Hooks * [List pre-receive hooks for a repository](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-a-repository) diff --git a/translations/pt-BR/content/developers/apps/installing-github-apps.md b/translations/pt-BR/content/developers/apps/installing-github-apps.md index e4bfd3a320..0a954cbc05 100644 --- a/translations/pt-BR/content/developers/apps/installing-github-apps.md +++ b/translations/pt-BR/content/developers/apps/installing-github-apps.md @@ -52,7 +52,7 @@ Essas etapas pressupõem que você [criou um {% data variables.product.prodname_ Você pode simplificar o processo de autorização concluindo-o durante a instalação do aplicativo. Para fazer isso, selecione **Solicitar autorização de usuário (OAuth) durante a instalação** ao criar ou modificar seu aplicativo no GitHub. Consulte "[Criando um aplicativo GitHub](/apps/building-github-apps/creating-a-github-app/)" para saber mais. -Assim que alguém tiver instalado seu aplicativo, você deverá obter um token de acesso para o usuário. Veja as etapas 2 e 3 em "[Identificando usuários em seu site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" para saber mais. +Assim que alguém tiver instalado seu aplicativo, você deverá obter um token de acesso para o usuário. See steps 2 and 3 in "[Identifying users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. ### Preservar o estado do aplicativo durante a instalação Você pode fornecer um parâmetro de `estado` na URL de instalação de um aplicativo para preservar o estado da página do aplicativo e fazer com que as pessoas retornem para seu estado após efetuarem a instalação, autenticação ou aceitarem as atualizações no seu aplicativo GitHub. Por exemplo, você poderia usar o `estado` para correlacionar uma instalação a um usuário ou conta. diff --git a/translations/pt-BR/content/developers/apps/scopes-for-oauth-apps.md b/translations/pt-BR/content/developers/apps/scopes-for-oauth-apps.md index ff5b4dc331..9a74ae87c2 100644 --- a/translations/pt-BR/content/developers/apps/scopes-for-oauth-apps.md +++ b/translations/pt-BR/content/developers/apps/scopes-for-oauth-apps.md @@ -38,7 +38,7 @@ X-Accepted-OAuth-Scopes: user Name | Description -----|-----------| -**`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if currentVersion != "free-pro-team@latest" %} +**`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if enterpriseServerVersions contains currentVersion %} **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/v3/enterprise-admin).{% endif %} **`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects.  `repo:status`| Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. @@ -71,7 +71,7 @@ Name | Description **`admin:gpg_key`** | Fully manage GPG keys.  `write:gpg_key`| Create, list, and view details for GPG keys.  `read:gpg_key`| List and view details for GPG keys.{% if currentVersion == "free-pro-team@latest" %} -**`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository.{% endif %} +**`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes, see https://docs.github.com/en/free-pro-team@latest/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token for details.{% endif %} {% note %} diff --git a/translations/pt-BR/content/developers/github-marketplace/about-github-marketplace.md b/translations/pt-BR/content/developers/github-marketplace/about-github-marketplace.md index 58f2be36f8..bde4ed44e8 100644 --- a/translations/pt-BR/content/developers/github-marketplace/about-github-marketplace.md +++ b/translations/pt-BR/content/developers/github-marketplace/about-github-marketplace.md @@ -14,7 +14,7 @@ versions: {% data reusables.actions.actions-not-verified %} -Para saber mais sobre a publicação do {% data variables.product.prodname_actions %} no {% data variables.product.prodname_marketplace %}, consulte "[{% data variables.product.prodname_actions %} no {% data variables.product.prodname_marketplace %}](/marketplace/actions/)". +Para saber mais sobre publicação de {% data variables.product.prodname_actions %} em {% data variables.product.prodname_marketplace %}, consulte "[Publicar ações no GitHub Marketplace](/actions/creating-actions/publishing-actions-in-github-marketplace)". ### Aplicativos diff --git a/translations/pt-BR/content/developers/overview/replacing-github-services.md b/translations/pt-BR/content/developers/overview/replacing-github-services.md index 60aebb918f..03a9e78eac 100644 --- a/translations/pt-BR/content/developers/overview/replacing-github-services.md +++ b/translations/pt-BR/content/developers/overview/replacing-github-services.md @@ -29,7 +29,7 @@ Como uma alternativa ao serviço de e-mail, agora você pode começar a usar not P GitHub Services (às vezes referido como Hooks de Serviço) é o método legado de integração, em que o GitHub hospedou uma parte dos serviços do nosso integrador por meio do [repositório `github-services`](https://github.com/github/github-services). Ações executadas no GitHub acionam esses serviços e você pode usá-los para acionar ações fora do GitHub. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Encontrar repositórios que usam o GitHub Services Fornecemos um script de linha de comando que ajuda a identificar quais repositórios usam o GitHub Services. Para obter mais informações, consulte [ghe-legacy-github-services-report](/enterprise/{{currentVersion}}/admin/articles/command-line-utilities/#ghe-legacy-github-services-report).{% endif %} diff --git a/translations/pt-BR/content/developers/webhooks-and-events/about-webhooks.md b/translations/pt-BR/content/developers/webhooks-and-events/about-webhooks.md index 64b973bcf5..cc5ab95fdd 100644 --- a/translations/pt-BR/content/developers/webhooks-and-events/about-webhooks.md +++ b/translations/pt-BR/content/developers/webhooks-and-events/about-webhooks.md @@ -11,9 +11,9 @@ versions: Webhooks allow you to build or set up integrations, such as [{% data variables.product.prodname_github_app %}s](/apps/building-github-apps/) or [{% data variables.product.prodname_oauth_app %}s](/apps/building-oauth-apps/), which subscribe to certain events on GitHub.com. When one of those events is triggered, we'll send a HTTP POST payload to the webhook's configured URL. Webhooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server. You're only limited by your imagination. -Webhooks can be installed on{% if currentVersion != "free-pro-team@latest" %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. +Webhooks can be installed on{% if enterpriseServerVersions contains currentVersion %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. -You can create up to {% if currentVersion != "free-pro-team@latest" %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if currentVersion != "free-pro-team@latest" %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} +You can create up to {% if enterpriseServerVersions contains currentVersion %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if enterpriseServerVersions contains currentVersion %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} ### Events diff --git a/translations/pt-BR/content/developers/webhooks-and-events/creating-webhooks.md b/translations/pt-BR/content/developers/webhooks-and-events/creating-webhooks.md index 1ce13a4efd..329bdd82b8 100644 --- a/translations/pt-BR/content/developers/webhooks-and-events/creating-webhooks.md +++ b/translations/pt-BR/content/developers/webhooks-and-events/creating-webhooks.md @@ -14,6 +14,9 @@ Agora que entendemos [os conceitos básicos de webhooks][webhooks-overview], vam Criar um webhook é um processo de duas etapas. Primeiro, você deverá configurar como deseja que seu webhook se comporte através do {% data variables.product.product_name %} - quais eventos devem ser ouvidos. Em seguida, você irá configurar seu servidor para receber e gerenciar a carga. + +{% data reusables.webhooks.webhooks-rest-api-links %} + ### Configurar um Webhook É possível instalar webhooks em uma organização ou em um repositório específico. diff --git a/translations/pt-BR/content/developers/webhooks-and-events/issue-event-types.md b/translations/pt-BR/content/developers/webhooks-and-events/issue-event-types.md index f10d6deafc..d40d8a2edb 100644 --- a/translations/pt-BR/content/developers/webhooks-and-events/issue-event-types.md +++ b/translations/pt-BR/content/developers/webhooks-and-events/issue-event-types.md @@ -347,7 +347,7 @@ O problema ou pull request foi bloqueado. #### Propriedades do objeto do evento -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -713,7 +713,7 @@ O problema estava desbloqueado. #### Propriedades do objeto do evento -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/pt-BR/content/developers/webhooks-and-events/securing-your-webhooks.md b/translations/pt-BR/content/developers/webhooks-and-events/securing-your-webhooks.md index 1035e10af1..612fd7f197 100644 --- a/translations/pt-BR/content/developers/webhooks-and-events/securing-your-webhooks.md +++ b/translations/pt-BR/content/developers/webhooks-and-events/securing-your-webhooks.md @@ -12,6 +12,7 @@ versions: Assim que seu servidor estiver configurado para receber cargas, ele ouvirá qualquer carga enviada para o ponto de extremidade que você configurou. Por motivos de segurança, você provavelmente vai querer limitar os pedidos para aqueles provenientes do GitHub. Existem algumas maneiras de fazer isso. Você poderia, por exemplo, optar por permitir solicitações do endereço IP do GitHub. No entanto, um método muito mais fácil é configurar um token secreto e validar a informação. +{% data reusables.webhooks.webhooks-rest-api-links %} ### Definir seu token secreto @@ -33,7 +34,7 @@ $ export SECRET_TOKEN=your_token ### Validar cargas do GitHub -Quando seu token secreto está definido, {% data variables.product.product_name %} use-o para criar uma assinatura de hash com cada carga. Esta assinatura de hash está incluída com os cabeçalhos de cada solicitação como {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 2" ou versão atual == "private-instances@latest" %}`X-Hub-Signature-256`{% else if currentVersion ver_lt "enterprise-server@2.23" %}`X-Hub-Signature`{% endif %}. +Quando seu token secreto está definido, {% data variables.product.product_name %} o utiliza para criar uma assinatura de hash com cada carga. Esta assinatura de hash está incluída com os cabeçalhos de cada solicitação como {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 2" ou versão atual == "private-instances@latest" %}`X-Hub-Signature-256`{% else if currentVersion ver_lt "enterprise-server@2.23" %}`X-Hub-Signature`{% endif %}. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} {% note %} diff --git a/translations/pt-BR/content/developers/webhooks-and-events/testing-webhooks.md b/translations/pt-BR/content/developers/webhooks-and-events/testing-webhooks.md index a248aec068..a571fb97d8 100644 --- a/translations/pt-BR/content/developers/webhooks-and-events/testing-webhooks.md +++ b/translations/pt-BR/content/developers/webhooks-and-events/testing-webhooks.md @@ -13,7 +13,7 @@ Agora que você [configurou seu servidor local](/webhooks/configuring/), você p ### Listar as entregas recentes -Cada webhook tem sua própria seção "Entregas Recentes", que lista, de forma resumida, se uma implementação foi bem-sucedida (sinal verde) ou falhou (x vermelho). Você também pode identificar quando se tentou cada entrega. +Cada webhook tem sua própria seção "Entregas Recentes", que lista, se uma entrega foi bem sucedida (verificação verde) ou falhou (vermelho x). Você também pode identificar quando se tentou cada entrega. {% data variables.product.product_name %} mantém um registro de cada entrega de webhook para {% if currentVersion == "free-pro-team@latest" %} 30 {% else %} 8 {% endif %} dias. diff --git a/translations/pt-BR/content/developers/webhooks-and-events/webhook-events-and-payloads.md b/translations/pt-BR/content/developers/webhooks-and-events/webhook-events-and-payloads.md index 8493562c89..896d116a59 100644 --- a/translations/pt-BR/content/developers/webhooks-and-events/webhook-events-and-payloads.md +++ b/translations/pt-BR/content/developers/webhooks-and-events/webhook-events-and-payloads.md @@ -47,7 +47,7 @@ As cargas de HTTP POST que são entregues no ponto de extremidade da URL configu | Header | Descrição | | ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | `X-GitHub-Event` | Nome do evento que ativou a entrega. | -| `X-GitHub-Delivery` | Um [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) para identificar a entrega.{% if currentVersion != "free-pro-team@latest" %} +| `X-GitHub-Delivery` | Um [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) para identificar a entrega.{% if enterpriseServerVersions contains currentVersion %} | `X-GitHub-Enterprise-Version` | A versão da instância do {% data variables.product.prodname_ghe_server %} que enviou a carga do HTTP POST. | | `X-GitHub-Enterprise-Host` | O nome de host da instância do {% data variables.product.prodname_ghe_server %} que enviou a carga HTTP POST.{% endif %}{% if currentVersion != "private-instances@latest" %} | `X-Hub-Signature` | Este cabeçalho é enviado se o webhook for configurado com um [`secreto`](/v3/repos/hooks/#create-hook-config-params). Este é o resumo hexadecimal HMAC do texto da solicitação e é gerado usando a função hash SHA-1 e o `segredo` como a `chave` HMAC.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} `X-Hub-Signature` é fornecido para compatibilidade com integrações existentes, e recomendamos que você use um `X-Hub-Signature-256` mais seguro.{% endif %}{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -61,7 +61,7 @@ Além disso, o `User-Agent` para as solicitações terá o prefixo `GitHub-Hooks > POST /payload HTTP/1.1 > Host: localhost:4567 -> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if currentVersion != "free-pro-team@latest" %} +> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: 2.15.0 > X-GitHub-Enterprise-Host: example.com{% endif %}{% if currentVersion != "private-instances@latest" %} > X-Hub-Signature: sha1=7d38cdd689735b008b3c702edd92eea23791c5f6{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -332,7 +332,7 @@ Apenas os {% data variables.product.prodname_github_app %}s podem receber este e {{ webhookPayloadsForCurrentVersion.deployment_status }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### enterprise @@ -340,7 +340,7 @@ Apenas os {% data variables.product.prodname_github_app %}s podem receber este e #### Disponibilidade -- Webhooks do GitHub Enterprise. Para obter mais informações, consulte "[Webhooks globais](/rest/reference/enterprise-admin#global-webhooks/)". +- Webhooks do GitHub Enterprise. Para mais informações, consulte "[Webhooks globais](/rest/reference/enterprise-admin#global-webhooks/)." #### Objeto da carga do webhook @@ -756,7 +756,7 @@ Para obter uma descrição detalhada desta carga e da carga para cada tipo de `a #### Disponibilidade -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} - Os webhooks do GitHub Enterprise recebem apenas eventos `criados` e `excluídos`. Para mais informações, consulte "[Webhooks globais](/rest/reference/enterprise-admin#global-webhooks/).{% endif %} - Os webhooks da organização recebem apenas os eventos `excluídos`, `adicionados`, `removidos`, `renomeado` e `convidados` - Os {% data variables.product.prodname_github_app %}s com a permissão membros` @@ -1072,13 +1072,17 @@ As entregas para eventos `review_requested` e `review_request_removed` terão um | `antes` | `string` | O SHA do último commit em `ref` antes do push. | | `depois` | `string` | O SHA do último commit no `ref` após o push. | | `commits` | `array` | Um array de objetos de commit, que descreve os commits carregados. (O array inclui um máximo de 20 commits. Se necessário, você poderá usar a [API de commits](/v3/repos/commits/) para recuperar commits adicionais. Este limite é aplicado apenas aos eventos da linha do tempo e não é aplicado às entregas do webhook.) | -| `commits[][sha]` | `string` | O SHA do commit. | +| `commits[][id]` | `string` | O SHA do commit. | +| `commits[][timestamp]` | `string` | O carimbo de tempo ISO 8601 do commit. | | `commits[][message]` | `string` | A mensagem do commit. | | `commits[][author]` | `objeto` | O autor do git do commit. | | `commits[][author][name]` | `string` | O nome do autor do git. | | `commits[][author][email]` | `string` | O endereço de e-mail do autor do git. | | `commits[][url]` | `url` | URL que aponta para o recurso de commit de API. | | `commits[][distinct]` | `boolean` | Se este compromisso é diferente de qualquer outro que tenha sido carregado anteriormente. | +| `commits[][added]` | `array` | Um array de arquivos adicionados no commit. | +| `commits[][modified]` | `array` | Um array de arquivos modificados pelo commit. | +| `commits[][removed]` | `array` | Um array de arquivos removidos no commit. | | `pusher` | `objeto` | O usuário que fez o push dos commits. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} @@ -1140,7 +1144,7 @@ Este evento ocorre quando um {% data variables.product.prodname_github_app %} en | Tecla | Tipo | Descrição | | ------ | -------- | ---------------------------------------------------------------------------------- | -| `Ação` | `string` | A ação que foi executada. Este pode ser um dos seguintes:
    • `created` - Um repositório foi criado.
    • `deleted` - Um repositório foi excluído. Este tipo de evento está disponível apenas para [hooks de organização](/rest/reference/orgs#webhooks/)
    • `archived` - Um repositório está arquivado.
    • `unarchived` - Um repositório não está arquivado.
      • {% if currentVersion != "free-pro-team@latest" %}
    • `anonymous_access_enabled` - Um repositório está [habilitado para acesso anônimo do Git](/v3/previews/#anonymous-git-access-to-repositories), `anonymous_access_disabled` - Um repositório está [desabilitado para acesso anônimo do Git](/v3/previews/#anonymous-git-access-to-repositories)
      • {% endif %}
    • `edited` - As informações de um repositório são editadas.
    • `renamed` - Um repositório é renomeado.
    • `transferred` - Um repositório é transferido.
    • `publicized` - Um repositório é publicado.
    • `privatizado` - Um repositório é privatizado.
    | +| `Ação` | `string` | A ação que foi executada. Este pode ser um dos seguintes:
    • `created` - Um repositório foi criado.
    • `deleted` - Um repositório foi excluído. Este tipo de evento está disponível apenas para [hooks de organização](/rest/reference/orgs#webhooks/)
    • `archived` - Um repositório está arquivado.
    • `unarchived` - Um repositório não está arquivado.
      • {% if enterpriseServerVersions contains currentVersion %}
    • `anonymous_access_enabled` - Um repositório está [habilitado para acesso anônimo do Git](/v3/previews/#anonymous-git-access-to-repositories), `anonymous_access_disabled` - Um repositório está [desabilitado para acesso anônimo do Git](/v3/previews/#anonymous-git-access-to-repositories)
      • {% endif %}
    • `edited` - As informações de um repositório são editadas.
    • `renamed` - Um repositório é renomeado.
    • `transferred` - Um repositório é transferido.
    • `publicized` - Um repositório é publicado.
    • `privatizado` - Um repositório é privatizado.
    | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -1354,14 +1358,14 @@ Você só pode criar um webhook de patrocínio em {% data variables.product.prod {{ webhookPayloadsForCurrentVersion.team_add }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### usuário Quando um usuário é `criado` ou `excluído`. #### Disponibilidade -- Webhooks do GitHub Enterprise. Para obter mais informações, consulte "[Webhooks globais](/rest/reference/enterprise-admin#global-webhooks/)". +- Webhooks do GitHub Enterprise. Para mais informações, consulte "[Webhooks globais](/rest/reference/enterprise-admin#global-webhooks/)." #### Exemplo de carga de webhook diff --git a/translations/pt-BR/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md b/translations/pt-BR/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md index 2f6ef8691c..52e8eb6063 100644 --- a/translations/pt-BR/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md +++ b/translations/pt-BR/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md @@ -12,7 +12,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" %}{% data reusables.notifications.outbound_email_tip %}{% endif %} +{% if enterpriseServerVersions contains currentVersion %}{% data reusables.notifications.outbound_email_tip %}{% endif %} Cada notificação de e-mail para um push no repositório lista os novos commits e os vincula a um diff contendo apenas esses commits. Na notificação de e-mail, você verá: diff --git a/translations/pt-BR/content/github/administering-a-repository/about-github-dependabot-version-updates.md b/translations/pt-BR/content/github/administering-a-repository/about-github-dependabot-version-updates.md index 3f3f7b03d8..1c55848873 100644 --- a/translations/pt-BR/content/github/administering-a-repository/about-github-dependabot-version-updates.md +++ b/translations/pt-BR/content/github/administering-a-repository/about-github-dependabot-version-updates.md @@ -17,7 +17,7 @@ Você habilita o {% data variables.product.prodname_dependabot_version_updates % Quando {% data variables.product.prodname_dependabot_short %} identifica uma dependência desatualizada, ele cria uma pull request para atualizar o manifesto para a última versão da dependência. Para dependências de vendor, {% data variables.product.prodname_dependabot_short %} levanta um pull request para substituir diretamente a dependência desatualizada pela nova versão. Você verifica se os seus testes passam, revisa o changelog e lança observações incluídas no resumo do pull request e, em seguida, faz a mesclagem. Para obter detalhes, consulte "[Habilitando e desabilitando atualizações da versão](/github/administering-a-repository/enabling-and-disabling-version-updates)." -Se você habilitar atualizações de segurança, {% data variables.product.prodname_dependabot %} também promove pull requests para atualizar dependências vulneráveis. Para obter mais informações, consulte "[Configurando {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +Se você habilitar atualizações de segurança, {% data variables.product.prodname_dependabot %} também promove pull requests para atualizar dependências vulneráveis. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)". {% data reusables.dependabot.dependabot-tos %} diff --git a/translations/pt-BR/content/github/administering-a-repository/about-required-commit-signing.md b/translations/pt-BR/content/github/administering-a-repository/about-required-commit-signing.md index 1caf99d276..f611410edb 100644 --- a/translations/pt-BR/content/github/administering-a-repository/about-required-commit-signing.md +++ b/translations/pt-BR/content/github/administering-a-repository/about-required-commit-signing.md @@ -11,7 +11,7 @@ versions: Se você aplicou proteções de branch no repositório, será possível configurar a assinatura de commit obrigatória. Para obter mais informações, consulte "[Configurar branches protegidos](/articles/configuring-protected-branches/)". -Ao habilitar o login de commit necessário em um branch, os contribuidores de {% if currentVersion == "free-pro-team@latest" %}e bots{% endif %} só podem fazer push de commits que foram assinados e verificados no branch. Para obter mais informações, consulte "[Sobre verificação de assinatura commit](/articles/about-commit-signature-verification)". +Ao habilitar a assinatura de commit obrigatória em um branch, os contribuidores {% if currentVersion == "free-pro-team@latest" %}e bots{% endif %} só podem fazer push de commits que foram assinados e verificados no branch. Para obter mais informações, consulte "[Sobre verificação de assinatura commit](/articles/about-commit-signature-verification)". Você sempre pode fazer push de commits locais para o branch se os commits forem assinados e verificados. {% if currentVersion == "free-pro-team@latest" %}Você também pode fazer merge de commits assinados e verificados no branch usando um pull request em {% data variables.product.product_name %}. No entanto, você não pode realizar a combinação por squash e fazer o merge de um pull request no branch em {% data variables.product.product_name %} a menos que você seja o autor do pull request.{% else %}No entanto, você não pode fazer merge de pull requests no branch em {% data variables.product.product_name %}.{% endif %} Você pode {% if currentVersion == "free-pro-team@latest" %}fazer combinação por squash e {% endif %} fazer merge de pull requests localmente. Para obter mais informações, consulte "[Verificar de pull requests localmente](/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally). {% if currentVersion == "free-pro-team@latest" %} Para obter mais informações sobre métodos de merge, consulte "[Sobre métodos de merge em {% data variables.product.prodname_dotcom %}](/github/administering-a-repository/about-merge-methods-on-github).{% endif %} diff --git a/translations/pt-BR/content/github/administering-a-repository/about-securing-your-repository.md b/translations/pt-BR/content/github/administering-a-repository/about-securing-your-repository.md index 9d67144de8..ac6eccab07 100644 --- a/translations/pt-BR/content/github/administering-a-repository/about-securing-your-repository.md +++ b/translations/pt-BR/content/github/administering-a-repository/about-securing-your-repository.md @@ -21,9 +21,13 @@ O primeiro passo para proteger um repositório é configurar quem pode ver e mod Discute em particular e corrige vulnerabilidades de segurança no código do seu repositório. Em seguida, você pode publicar uma consultoria de segurança para alertar a sua comunidade sobre a vulnerabilidade e incentivá-los a fazer a atualização. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)". -- **Alertas de {% data variables.product.prodname_dependabot_short %}** +- **{% data variables.product.prodname_dependabot_short %} alerts and security updates** - Ver alertas sobre dependências conhecidas por conter vulnerabilidades de segurança e escolher se deseja gerar pull requests para atualizar essas dependências automaticamente. Para obter mais informações, consulte "[Visualizar e atualizar dependências vulneráveis no seu repositório](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" e "[Configurar {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)". + Ver alertas sobre dependências conhecidas por conter vulnerabilidades de segurança e escolher se deseja gerar pull requests para atualizar essas dependências automaticamente. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." + +- **{% data variables.product.prodname_dependabot_short %} version updates** + + Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. Para obter mais informações, consulte "[Sobre o {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot-version-updates)". - **Alertas de {% data variables.product.prodname_code_scanning_capc %}** diff --git a/translations/pt-BR/content/github/administering-a-repository/classifying-your-repository-with-topics.md b/translations/pt-BR/content/github/administering-a-repository/classifying-your-repository-with-topics.md index 1adf59df66..f2eb90a25e 100644 --- a/translations/pt-BR/content/github/administering-a-repository/classifying-your-repository-with-topics.md +++ b/translations/pt-BR/content/github/administering-a-repository/classifying-your-repository-with-topics.md @@ -27,7 +27,7 @@ You can search for repositories that are associated with a particular topic. For ### Adding topics to your repository -{% data reusables.repositories.navigate-to-repo %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% data reusables.repositories.navigate-to-repo %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. Under your repository description, click **Add topics**. ![Add topics link on a repository's main page](/assets/images/help/repository/add-topics-link.png) 3. Type the topic you want to add to your repository, then type a space. diff --git a/translations/pt-BR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md b/translations/pt-BR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md index a54314f5da..a7539933f9 100644 --- a/translations/pt-BR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md +++ b/translations/pt-BR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md @@ -545,12 +545,6 @@ updates: Use a opção `vendor` para dizer {% data variables.product.prodname_dependabot_short %} para dependências de vendor ao atualizá-las. -{% note %} - -Atualmente, {% data variables.product.prodname_dependabot_short %} é compatível apenas com as dependências de vendoring para o Bundler. - -{% endnote %} - ```yaml # Configure version updates for both dependencies defined in manifests and vendored dependencies @@ -564,7 +558,13 @@ updates: interval: "weekly" ``` -{% data variables.product.prodname_dependabot_short %} atualiza apenas as dependências de vendor localizadas em diretórios específicos em um repositório. Para o Bundler, as dependências devem estar no diretório _vendor/cache_. Outros caminhos de arquivo não são compatíveis. Para obter mais informações, consulte a documentação [`cache do bundle`](https://bundler.io/man/bundle-cache.1.html). +{% data variables.product.prodname_dependabot_short %} atualiza apenas as dependências de vendor localizadas em diretórios específicos em um repositório. + +| Gerenciador de pacotes | Caminho de arquivo necessário para dependências delegadas | Mais informações | +| ---------------------- | ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- | +| `bundler` | As dependências devem estar no diretório _vendor/cache_.
    Outros caminhos de arquivo não são compatíveis. | [documentação de `bundle cache`](https://bundler.io/man/bundle-cache.1.html) | +| `gomod` | Nenhuma exigência de caminho (as dependências geralmente estão localizadas no diretório do _vendor_ do diretório) | [documentação de `go mod vendor`](https://golang.org/ref/mod#go-mod-vendor) | + ### `versioning-strategy` diff --git a/translations/pt-BR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/translations/pt-BR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md index 1fbefd369a..ee18fd8c4c 100644 --- a/translations/pt-BR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md +++ b/translations/pt-BR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md @@ -17,7 +17,7 @@ versions: Como alternativa, você pode habilitar o {% data variables.product.prodname_actions %} em seu repositório, mas limitar as ações que um fluxo de trabalho pode ser executado. {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### Gerenciando as permissões do {% data variables.product.prodname_actions %} para o seu repositório diff --git a/translations/pt-BR/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md b/translations/pt-BR/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md index 3cb9b4f7eb..73d9b1a99e 100644 --- a/translations/pt-BR/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md +++ b/translations/pt-BR/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md @@ -15,7 +15,7 @@ By default, force pushes are blocked on all protected branches. When you enable Enabling force pushes will not override any other branch protection rules. For example, if a branch requires a linear commit history, you cannot force push merge commits to that branch. -{% if currentVersion != "free-pro-team@latest" %}You cannot enable force pushes for a protected branch if a site administrator has blocked force pushes to all branches in your repository. For more information, see "[Blocking force pushes to repositories owned by a user account or organization](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)." +{% if enterpriseServerVersions contains currentVersion %}You cannot enable force pushes for a protected branch if a site administrator has blocked force pushes to all branches in your repository. For more information, see "[Blocking force pushes to repositories owned by a user account or organization](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)." If a site administrator has blocked force pushes to the default branch only, you can still enable force pushes for any other protected branch.{% endif %} diff --git a/translations/pt-BR/content/github/administering-a-repository/index.md b/translations/pt-BR/content/github/administering-a-repository/index.md index 75e5752617..4981136b75 100644 --- a/translations/pt-BR/content/github/administering-a-repository/index.md +++ b/translations/pt-BR/content/github/administering-a-repository/index.md @@ -26,7 +26,7 @@ versions: {% link_in_list /viewing-deployment-activity-for-your-repository %} {% link_in_list /managing-the-forking-policy-for-your-repository %} - + {% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-repository %} {% link_in_list /disabling-or-limiting-github-actions-for-a-repository %} {% link_in_list /managing-git-lfs-objects-in-archives-of-your-repository %} diff --git a/translations/pt-BR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/translations/pt-BR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md index b57eb52f95..64bb6356ea 100644 --- a/translations/pt-BR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md +++ b/translations/pt-BR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md @@ -9,9 +9,9 @@ versions: ### Sobre pull requests {% data variables.product.prodname_dependabot %} -O {% data variables.product.prodname_dependabot %} gera pull requests para atualizar dependências. Dependendo de como seu repositório está configurado, o {% data variables.product.prodname_dependabot_short %} pode gerar pull requests para atualizações de versão e/ou para atualizações de segurança. Você gerencia essas pull requests da mesma forma que qualquer outra pull request, mas também existem alguns comandos extras disponíveis. Para obter mais informações sobre habilitar atualizações de dependência {% data variables.product.prodname_dependabot %}, consulte "[Configurando {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" e "[Habilitando e desabilitando atualizações de versão](/github/administering-a-repository/enabling-and-disabling-version-updates)." +{% data reusables.dependabot.pull-request-introduction %} -Quando o {% data variables.product.prodname_dependabot %} cria uma pull request, você é notificado pelo método escolhido para o repositório. Cada pull request contém informações detalhadas sobre a alteração proposta, retiradas do sistema de gerenciamento de pacotes. Essas pull requests seguem as verificações e testes normais definidas no seu repositório. Além disso, onde informações suficientes estão disponíveis, você verá uma pontuação de compatibilidade. Isso também pode ajudá-lo a decidir se deve ou não mesclar a alteração. Para obter mais informações sobre esta pontuação, consulte "[Configurando {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +Quando o {% data variables.product.prodname_dependabot %} cria uma pull request, você é notificado pelo método escolhido para o repositório. Each pull request contains detailed information about the proposed change, taken from the package manager. Essas pull requests seguem as verificações e testes normais definidas no seu repositório. Além disso, onde informações suficientes estão disponíveis, você verá uma pontuação de compatibilidade. Isso também pode ajudá-lo a decidir se deve ou não mesclar a alteração. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." Se você tem muitas dependências para gerenciar, você pode querer personalizar a configuração para cada gerenciador de pacotes para que as pull requests tenham revisores, responsáveis e etiquetas específicos. Para obter mais informações, consulte "[Personalizar atualizações de dependência](/github/administering-a-repository/customizing-dependency-updates)". diff --git a/translations/pt-BR/content/github/administering-a-repository/setting-repository-visibility.md b/translations/pt-BR/content/github/administering-a-repository/setting-repository-visibility.md index 17a75233fb..8406bead5b 100644 --- a/translations/pt-BR/content/github/administering-a-repository/setting-repository-visibility.md +++ b/translations/pt-BR/content/github/administering-a-repository/setting-repository-visibility.md @@ -23,7 +23,7 @@ Recomendamos revisar as seguintes advertências antes de alterar a visibilidade {% if currentVersion == "free-pro-team@latest" %}* Se você estiver usando {% data variables.product.prodname_free_user %} para contas de usuários ou organizações, alguns recursos não estarão disponíveis no repositório depois que você alterar a visibilidade para privada. {% data reusables.gated-features.more-info %} * Qualquer site publicado do {% data variables.product.prodname_pages %} terá sua publicação cancelada automaticamente. Se você adicionou um domínio personalizado ao site do {% data variables.product.prodname_pages %}, deverá remover ou atualizar os registros de DNS antes de tornar o repositório privado para evitar o risco de uma aquisição de domínio. Para obter mais informações, consulte "[Gerenciar um domínio personalizado para seu site do {% data variables.product.prodname_pages %}](/articles/managing-a-custom-domain-for-your-github-pages-site)". * O {% data variables.product.prodname_dotcom %} não incluirá mais o repositório no {% data variables.product.prodname_archive %}. Para obter mais informações, consulte "[Sobre como arquivar conteúdo e dados no {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)".{% endif %} - {% if currentVersion != "free-pro-team@latest" %}* Anonymous Git read access is no longer available. Para obter mais informações, consulte "[Habilitar acesso de leitura anônimo do Git para um repositório](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)".{% endif %} + {% if enterpriseServerVersions contains currentVersion %}* Acesso de leitura anônimo do Git não está mais disponível. Para obter mais informações, consulte "[Habilitar acesso de leitura anônimo do Git para um repositório](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)".{% endif %} #### Tornar um repositório público diff --git a/translations/pt-BR/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md b/translations/pt-BR/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md index 74702ebea7..1f5fa98315 100644 --- a/translations/pt-BR/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md +++ b/translations/pt-BR/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md @@ -14,7 +14,7 @@ versions: {% endnote %} -Se o fluxo de trabalho de implantação de um repositório estiver integrado ao {% data variables.product.product_name %} por meio da API de implantações ou de um app do [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment), pessoas com acesso de leitura ao repositório poderão ter uma visão geral de todas as implantações atuais e ver um log de atividades de implantação passadas. Para obter mais informações, consulte "[Deployments](/rest/reference/repos#deployments)" (Implantações). +Se o fluxo de trabalho de implantação de um repositório estiver integrado ao {% data variables.product.product_name %} por meio da API de implantações ou de um app do [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment), pessoas com acesso de leitura ao repositório poderão ter uma visão geral de todas as implantações atuais e ver um log de atividades de implantação passadas. Para obter mais informações, consulte "[Implantações](/rest/reference/repos#deployments)". Também é possível ver informações de implantação na guia "Conversation" (Conversa) de uma pull request. diff --git a/translations/pt-BR/content/github/authenticating-to-github/generating-a-new-gpg-key.md b/translations/pt-BR/content/github/authenticating-to-github/generating-a-new-gpg-key.md index fc00e6cf3c..9c13eddbdc 100644 --- a/translations/pt-BR/content/github/authenticating-to-github/generating-a-new-gpg-key.md +++ b/translations/pt-BR/content/github/authenticating-to-github/generating-a-new-gpg-key.md @@ -29,7 +29,7 @@ versions: ```shell $ gpg --default-new-key-algo rsa4096 --gen-key ``` -4. No prompt, especifique o tipo de tecla que você quer ou pressione `Enter` para aceitar o padrão `RSA e DSA`. +4. No prompt, especifique o tipo de chave desejada ou pressione `Enter` para aceitar o `RSA e RSA` padrão. 5. Insira o tamanho de chave desejado. Sua chave deve ter, no mínimo, `4096` bits. 6. Digite o prazo de validade da chave. Pressione `Enter` para estipular a seleção padrão, indicando que chave não expira. 7. Verifique se suas seleções estão corretas. diff --git a/translations/pt-BR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/pt-BR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index c43ad06c94..f225fe1a38 100644 --- a/translations/pt-BR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/pt-BR/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,7 +9,7 @@ versions: free-pro-team: '*' --- -Estas são as impressões digitais da chave pública do {% data variables.product.prodname_dotcom %}: +These are {% data variables.product.prodname_dotcom %}'s public key fingerprints: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/pt-BR/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md b/translations/pt-BR/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md index 697f8f1e69..7926476337 100644 --- a/translations/pt-BR/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md +++ b/translations/pt-BR/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md @@ -134,7 +134,7 @@ Para demonstrar como o `git filter-branch` funciona, mostraremos como remover o {% endnote %} -## Evitar commits acidentais no futuro +### Evitar commits acidentais no futuro Há alguns truques simples para evitar fazer commit de coisas não desejadas: @@ -145,5 +145,5 @@ Há alguns truques simples para evitar fazer commit de coisas não desejadas: ### Leia mais -- [Página principal do `git filter-branch`](https://git-scm.com/docs/git-filter-branch) +- [man page de `git filter-branch`](https://git-scm.com/docs/git-filter-branch) - [Pro Git: Ferramentas do Git - Reescrevendo o Histórico](https://git-scm.com/book/en/Git-Tools-Rewriting-History) diff --git a/translations/pt-BR/content/github/authenticating-to-github/reviewing-your-security-log.md b/translations/pt-BR/content/github/authenticating-to-github/reviewing-your-security-log.md index 38e9334771..976a5ad542 100644 --- a/translations/pt-BR/content/github/authenticating-to-github/reviewing-your-security-log.md +++ b/translations/pt-BR/content/github/authenticating-to-github/reviewing-your-security-log.md @@ -48,7 +48,7 @@ Actions listed in your security log are grouped within the following categories: | `project` | Contains all activities related to project boards. | `public_key` | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). | `repo` | Contains all activities related to the repositories you own.{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to {% data variables.product.prodname_sponsors %} and sponsor buttons (see "[About {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)" and "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} +| `sponsors` | Contains all events related to {% data variables.product.prodname_sponsors %} and sponsor buttons (see "[About {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)" and "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion %} | `team` | Contains all activities related to teams you are a part of.{% endif %} | `two_factor_authentication` | Contains all activities related to [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa). | `user` | Contains all activities related to your account. @@ -142,7 +142,7 @@ A description of the events within these categories is listed below. | access | Triggered when you a repository you own is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). | add_member | Triggered when a {% data variables.product.product_name %} user is {% if currentVersion == "free-pro-team@latest" %}[invited to have collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% else %}[given collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% endif %} to a repository. | add_topic | Triggered when a repository owner [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. -| archived | Triggered when a repository owner [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} +| archived | Triggered when a repository owner [archives a repository](/articles/about-archiving-repositories).{% if enterpriseServerVersions contains currentVersion %} | config.disable_anonymous_git_access | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | config.enable_anonymous_git_access | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | config.lock_anonymous_git_access | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). @@ -191,7 +191,7 @@ A description of the events within these categories is listed below. | revoke | Triggered when you revoke a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} #### The `team` category diff --git a/translations/pt-BR/content/github/building-a-strong-community/adding-a-license-to-a-repository.md b/translations/pt-BR/content/github/building-a-strong-community/adding-a-license-to-a-repository.md index 5915531a11..febea468b5 100644 --- a/translations/pt-BR/content/github/building-a-strong-community/adding-a-license-to-a-repository.md +++ b/translations/pt-BR/content/github/building-a-strong-community/adding-a-license-to-a-repository.md @@ -32,7 +32,7 @@ As licenças de código aberto permitem que outras pessoas usem, alterem e distr {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.files.add-file %} diff --git a/translations/pt-BR/content/github/building-a-strong-community/creating-a-default-community-health-file.md b/translations/pt-BR/content/github/building-a-strong-community/creating-a-default-community-health-file.md index ab58d57f7b..5b444bb16a 100644 --- a/translations/pt-BR/content/github/building-a-strong-community/creating-a-default-community-health-file.md +++ b/translations/pt-BR/content/github/building-a-strong-community/creating-a-default-community-health-file.md @@ -42,7 +42,7 @@ Você não pode criar um arquivo de licença padrão. Os arquivos de licença de {% data reusables.repositories.create_new %} 2. Use o menu suspenso **Proprietário** e selecione a organização{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 9" %} ou conta de usuário{% endif %} para a qual você deseja criar arquivos-padrão. ![Menu suspenso Owner (Proprietário)](/assets/images/help/repository/create-repository-owner.png) 3. Digite **.github** como o nome para seu repositório e uma descrição opcional. ![Campo Create repository (Criar repositório)](/assets/images/help/repository/default-file-repository-name.png) -4. Make sure the repository status is set to **Public** (a repository for default files cannot be private). ![Botões de opção para selecionar status privado ou público](/assets/images/help/repository/create-repository-public-private.png) +4. Certifique-se de que o status do repositório está definido como **Público** (um repositório-padrão para arquivos não pode ser privado). ![Botões de opção para selecionar status privado ou público](/assets/images/help/repository/create-repository-public-private.png) {% data reusables.repositories.initialize-with-readme %} {% data reusables.repositories.create-repo %} 7. No repositório, crie um dos arquivos compatíveis de integridade da comunidade. Os modelos de problema{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 9" %} e o seu arquivo de configuração{% endif %} devem estar em uma pasta denominada `.github/ISSUE_TEMPLATE`. Todos os outros arquivos compatíveis devem estar na raiz do repositório. Para obter mais informações, consulte "[Criar arquivos](/articles/creating-new-files/)". diff --git a/translations/pt-BR/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md b/translations/pt-BR/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md index 002329bf85..e7f41262d6 100644 --- a/translations/pt-BR/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md +++ b/translations/pt-BR/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md @@ -28,7 +28,7 @@ assignees: octocat ``` {% note %} -**Observação:** Você deve colocar caracteres reservados YAML, como `:` entre aspas. Por exemplo, `":bug: Bug"`. +**Nota:** Se um valor da matéria frontal incluir um caractere reservado em YAML como `:`, você deverá colocar todo o valor entre aspas. Por exemplo, `":bug: Bug"` ou `":new: triagem necessária, :bug: bug"`. {% endnote %} diff --git a/translations/pt-BR/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md b/translations/pt-BR/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md index 4020e9b49b..44ff772a73 100644 --- a/translations/pt-BR/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md +++ b/translations/pt-BR/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md @@ -22,7 +22,7 @@ Você pode desbloquear um usuário nas configurações da sua conta ou na págin ### Desbloquear usuários na página de perfil deles {% data reusables.profile.user_profile_page_navigation %} -2. Na barra lateral esquerda, na foto de perfil do usuário, clique em **Unblock or report user** (Desbloquear ou denunciar usuário). ![Link Unblock or report user (Desbloquear ou denunciar usuário)](/assets/images/help/profile/profile-unblock-or-report-user.png) +2. Na barra lateral esquerda, abaixo da imagem de perfil do usuário, clique em {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} e, em seguida, clique em **Desbloquear ou relatar usuário**. ![Link Unblock or report user (Desbloquear ou denunciar usuário)](/assets/images/help/profile/profile-unblock-or-report-user.png) 3. Clique em **Unblock user** (Desbloquear usuário). ![Caixa de diálogo modal com opção para desbloquear o usuário ou denunciar um abuso](/assets/images/help/profile/profile-unblockuser.png) {% tip %} diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md index e47d2fb323..064b5c2cd9 100644 --- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md +++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md @@ -53,6 +53,13 @@ Ao criar uma pull request, você pode optar por criar uma que já está pronta p {% data reusables.pull_requests.mark-ready-review %} Você pode converter uma pull request em rascunho a qualquer momento. Para obter mais informações, consulte "[Alterar o stage de uma pull request](/articles/changing-the-stage-of-a-pull-request)". +### Diferenças entre commits em páginas de comparação e pull request + +As páginas de comparação e pull request usam métodos diferentes para calcular o diff para os arquivos alterados: + +- As páginas de comparação mostram a diferença entre a ponta do ref principal e o ancestral comum atual (ou seja, a base de merge) do ref principal e de base. +- As páginas de pull request mostram a diferença entre a ponta do ref principal e o ancestral comum do ref principal e de base no momento em que o pull request foi criado. Consequentemente, a base de merge utilizada para a comparação pode ser diferente. + ### Leia mais - "[pull request](/articles/github-glossary/#pull-request)" no glossário do {% data variables.product.prodname_dotcom %} diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md index 6927bda70c..b271ebbe29 100644 --- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md +++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md @@ -20,6 +20,12 @@ versions: 4. No menu suspenso do branch base, selecione o branch base em relação ao qual deseja [comparar as alterações](/github/committing-changes-to-your-project/comparing-commits#comparing-branches). ![Menu suspenso do branch base ](/assets/images/help/pull_requests/pull-request-edit-base-branch.png) 5. Leia as informações sobre como alterar o branch base e clique em **Change base** (Alterar base). ![Botão de confirmação de alteração do branch base ](/assets/images/help/pull_requests/pull-request-base-branch-confirm.png) +{% tip %} + +**Dica:** Ao abrir um pull request, {% data variables.product.product_name %} definirá a base para o commit das referências de branches. Se o branch for atualizado no futuro, {% data variables.product.product_name %} não irá atualizar o commit do branch de base. + +{% endtip %} + ### Leia mais - "[Criar uma pull request](/articles/creating-a-pull-request)" diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md index 95ca378e1e..0d6e6b63f5 100644 --- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md +++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md @@ -1,6 +1,6 @@ --- title: Collaborating on repositories with code quality features -intro: 'Workflow quality features like statuses, {% if currentVersion != "free-pro-team@latest" %}pre-receive hooks, {% endif %}protected branches, and required status checks help collaborators make contributions that meet conditions set by organization and repository administrators.' +intro: 'Workflow quality features like statuses, {% if enterpriseServerVersions contains currentVersion %}pre-receive hooks, {% endif %}protected branches, and required status checks help collaborators make contributions that meet conditions set by organization and repository administrators.' mapTopic: true redirect_from: - /articles/collaborating-on-repositories-with-code-quality-features-enabled/ diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/index.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/index.md index 1cef4612d6..19095e00d6 100644 --- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/index.md +++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/index.md @@ -28,7 +28,7 @@ versions: {% link_in_list /what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility %} {% topic_link_in_list /collaborating-on-repositories-with-code-quality-features %} {% link_in_list /about-status-checks %} - + {% link_in_list /working-with-pre-receive-hooks %} {% topic_link_in_list /proposing-changes-to-your-work-with-pull-requests %} diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md index 1b9ed3f8d8..1ee0772fd0 100644 --- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md +++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md @@ -10,7 +10,7 @@ versions: You can only resolve merge conflicts on {% data variables.product.product_name %} that are caused by competing line changes, such as when people make different changes to the same line of the same file on different branches in your Git repository. For all other types of merge conflicts, you must resolve the conflict locally on the command line. For more information, see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line/)." -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If a site administrator disables the merge conflict editor for pull requests between repositories, you cannot use the conflict editor on {% data variables.product.product_name %} and must resolve merge conflicts on the command line. For example, if the merge conflict editor is disabled, you cannot use it on a pull request between a fork and upstream repository. {% endif %} @@ -31,7 +31,7 @@ If a site administrator disables the merge conflict editor for pull requests bet {% tip %} - **Tip:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line)." + **Tip:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% if enterpriseServerVersions contains currentVersion %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line)." {% endtip %} {% data reusables.pull_requests.decide-how-to-resolve-competing-line-change-merge-conflict %} diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md index a2c2477448..73001a044f 100644 --- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md +++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md @@ -20,16 +20,16 @@ Para poder sincronizar a bifurcação com o repositório upstream, você deve [c > remote: Total 62 (delta 27), reused 44 (delta 9) > Unpacking objects: 100% (62/62), done. > From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY - > * [new branch] master -> upstream/master + > * [new branch] main -> upstream/main ``` -4. Faça checkout do branch `master` local da bifurcação. +4. Check out your fork's local `main` branch. ```shell - $ git checkout master - > Switched to branch 'master' + $ git checkout main + > Switched to branch 'main' ``` -5. Faça merge das alterações de `upstream/master` para o branch `master` local. Isso coloca o branch `master` da bifurcação em sincronia com o repositório upstream, sem perder as alterações locais. +5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes. ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating a422352..5fdff0f > Fast-forward > README | 9 ------- @@ -39,7 +39,7 @@ Para poder sincronizar a bifurcação com o repositório upstream, você deve [c > create mode 100644 README.md ``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward": ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating 34e91da..16c56ad > Fast-forward > README.md | 5 +++-- diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index bd0b2405f6..21e2652bfc 100644 --- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -29,7 +29,7 @@ Se um repositório público passa a ser privado, as bifurcações públicas dele Ou seja, as bifurcações de um repositório público permanecerão públicas na própria rede de repositório separada, mesmo depois que o repositório principal se tornar privado. Isso permite que os proprietários da bifurcação continuem trabalhando e colaborando sem interrupção. Se as bifurcações públicas não tiverem sido movidas para uma rede separada dessa forma, os proprietários dessas bifurcações precisarão obter as [permissões de acesso](/articles/access-permissions-on-github) apropriadas para fazer pull de alterações do repositório principal (agora privado) e enviar pull requests para ele, ainda que antes não precisassem dessas permissões. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Se um repositório público tiver acesso de leitura anônimo do Git habilitado e o repositório passar a ser privado, todas as bifurcações do repositório perderão o acesso de leitura anônimo do Git e retornarão à configuração padrão desabilitada. Se um repositório bifurcado passar a ser público, os administradores dele poderão reabilitar o acesso de leitura anônimo do Git. Para obter mais informações, consulte "[Habilitar acesso de leitura anônimo do Git para um repositório](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)". {% endif %} diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/working-with-pre-receive-hooks.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/working-with-pre-receive-hooks.md index 7bce508075..536216cd5a 100644 --- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/working-with-pre-receive-hooks.md +++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/working-with-pre-receive-hooks.md @@ -21,7 +21,7 @@ Total 3 (delta 0), reused 0 (delta 0) remote: always_reject.sh: failed with exit status 1 remote: error: rejecting all pushes To https://54.204.174.51/hodor/nope.git - ! [remote rejected] master -> master (pre-receive hook declined) + ! [remote rejected] main -> main (pre-receive hook declined) error: failed to push some refs to 'https://54.204.174.51/hodor/nope.git' ``` diff --git a/translations/pt-BR/content/github/committing-changes-to-your-project/changing-a-commit-message.md b/translations/pt-BR/content/github/committing-changes-to-your-project/changing-a-commit-message.md index ba8395fc14..dc18165c3b 100644 --- a/translations/pt-BR/content/github/committing-changes-to-your-project/changing-a-commit-message.md +++ b/translations/pt-BR/content/github/committing-changes-to-your-project/changing-a-commit-message.md @@ -13,9 +13,9 @@ versions: Você pode alterar a mensagem do commit mais recente usando o comando `git commit --amend`. -No Git, o texto da mensagem do commit faz parte do commit. Alterar a mensagem do commit mudará a ID do commit, isto é, a soma de verificação SHA1 que nomeia o commit. Efetivamente, você está criando um commit que substitui o antigo. +No Git, o texto da mensagem do commit faz parte do commit. Alterar a mensagem do commit mudará o ID do commit, isto é, a soma de verificação SHA1 que nomeia o commit. Efetivamente, você está criando um commit que substitui o antigo. -### Não foi feito push online do commit +### Não foi feito push on-line do commit Se o commit existir em seu repositório local e não tiver sido publicado no {% data variables.product.product_location %}, você poderá corrigir a mensagem do commit com o comando `git commit --amend`. @@ -106,13 +106,13 @@ Para obter mais informações sobre rebase interativo, consulte a seção sobre {% tip %} -Tal como antes, corrigir a mensagem do commit resultará em um novo commit com uma nova ID. No entanto, nesse caso, cada commit que segue o commit corrigido também obterá uma nova ID, pois cada commit também contém a id de seu principal. +Tal como antes, corrigir a mensagem do commit resultará em um novo commit com um novo ID. No entanto, nesse caso, cada commit que segue o commit corrigido também obterá um novo ID, pois cada commit também contém o id de seu principal. {% endtip %} {% warning %} -Se você incluiu informações confidenciais em uma mensagem do commit, forçar o push de um commit com um commit corrigido pode não remover o commit original do {% data variables.product.product_name %}. O commit antigo não fará parte de um clone subsequente. No entanto, ele ainda poderá ser armazenado no cache do {% data variables.product.product_name %} e ser acessado por meio da ID do commit. Você deve contatar o {% data variables.contact.contact_support %} com a ID do commit antigo para que ele seja apagado do repositório remoto. +Se você incluiu informações confidenciais em uma mensagem do commit, forçar o push de um commit com um commit corrigido pode não remover o commit original do {% data variables.product.product_name %}. O commit antigo não fará parte de um clone subsequente. No entanto, ele ainda poderá ser armazenado no cache do {% data variables.product.product_name %} e ser acessado por meio do ID do commit. Você deve contatar o {% data variables.contact.contact_support %} com o ID do commit antigo para que ele seja apagado do repositório remoto. {% endwarning %} diff --git a/translations/pt-BR/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md b/translations/pt-BR/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md index 079e81663f..7176500a25 100644 --- a/translations/pt-BR/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md +++ b/translations/pt-BR/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md @@ -1,6 +1,6 @@ --- title: Creating a commit with multiple authors -intro: 'You can attribute a commit to more than one author by adding one or more `Co-authored-by` trailers to the commit''s message. Co-authored commits are visible on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} and can be included in the profile contributions graph and the repository''s statistics{% endif %}.' +intro: 'You can attribute a commit to more than one author by adding one or more `Co-authored-by` trailers to the commit''s message. Co-authored commits are visible on {% data variables.product.product_name %}{% if enterpriseServerVersions contains currentVersion %} and can be included in the profile contributions graph and the repository''s statistics{% endif %}.' redirect_from: - /articles/creating-a-commit-with-multiple-authors versions: @@ -68,7 +68,7 @@ After you've made changes in a file using the web editor on {% data variables.pr The new commit and message will appear on {% data variables.product.product_location %}. ### Further reading -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} - "[Viewing contributions on your profile](/articles/viewing-contributions-on-your-profile)" - "[Why are my contributions not showing up on my profile?](/articles/why-are-my-contributions-not-showing-up-on-my-profile)"{% endif %} - "[Viewing a summary of repository activity](/articles/viewing-a-summary-of-repository-activity)" diff --git a/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md b/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md index d8c3f2ea37..8eae27e8ae 100644 --- a/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md +++ b/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md @@ -10,7 +10,7 @@ versions: When you create a repository, you can choose to make the repository public or private. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you're creating the repository in an organization{% if currentVersion == "free-pro-team@latest" %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %} -{% if currentVersion != "free-pro-team@latest" %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if currentVersion != "free-pro-team@latest" %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to {% if currentVersion == "free-pro-team@latest" %}members of your enterprise account{% else %}members of any organization on your instance{% endif %}. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} +{% if enterpriseServerVersions contains currentVersion %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if enterpriseServerVersions contains currentVersion %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to members of your enterprise. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} Organization owners always have access to every repository created in an organization. For more information, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." diff --git a/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md b/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md index 5364873fbe..9d4131276c 100644 --- a/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md +++ b/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md @@ -1,6 +1,6 @@ --- title: Backing up a repository -intro: 'You can use{% if currentVersion != "free-pro-team@latest" %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' +intro: 'You can use{% if enterpriseServerVersions contains currentVersion %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' redirect_from: - /articles/backing-up-a-repository versions: @@ -30,7 +30,7 @@ When you clone a repository or wiki, only Git data, such as project files and co - [Projects](/v3/projects/#list-repository-projects) {% endif %} -Once you have {% if currentVersion != "free-pro-team@latest" %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). +Once you have {% if enterpriseServerVersions contains currentVersion %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). {% if currentVersion == "free-pro-team@latest" %} ### Third-party backup tools diff --git a/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md b/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md index 985918901d..7fe2328494 100644 --- a/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md +++ b/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md @@ -1,6 +1,7 @@ --- title: Creating a template repository intro: 'You can make an existing repository a template, so you and others can generate new repositories with the same directory structure{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}, branches,{% endif %} and files.' +permissions: 'Anyone with admin permissions to a repository can make the repository a template.' redirect_from: - /articles/creating-a-template-repository versions: @@ -8,7 +9,11 @@ versions: enterprise-server: '*' --- -Anyone with admin permissions to a repository can make the repository a template. +{% note %} + +**Note**: Your template repository cannot include files stored using {% data variables.large_files.product_name_short %}. + +{% endnote %} To create a template repository, you must create a repository, then make the repository a template. For more information about creating a repository, see "[Creating a new repository](/articles/creating-a-new-repository)." @@ -16,5 +21,5 @@ After you make your repository a template, anyone with access to the repository {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -3. Select **Template repository**. +1. Select **Template repository**. ![Checkbox to make a repository a template](/assets/images/help/repository/template-repository-checkbox.png) diff --git a/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md b/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md index 7dbef3c63f..45aab42a1d 100644 --- a/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md +++ b/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md @@ -42,7 +42,7 @@ Se o repositório pertencer a uma organização e você estiver usando uma chave Para obter mais informações, consulte [Adicionar uma nova chave SSH à sua conta GitHub](/articles/adding-a-new-ssh-key-to-your-github-account). -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Verifique se sua instância está em modo privado diff --git a/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md b/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md index a219262354..fed9f964eb 100644 --- a/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md +++ b/translations/pt-BR/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md @@ -70,7 +70,7 @@ Quando for solicitado um nome e senha, certifique-se de usar uma conta que tenha {% tip %} -**Dica**: Se você não desejar inserir suas credenciais toda vez que interagir com o repositório remoto, você poderá ativar o [armazenamento de credenciais](/github/using-git/caching-your-github-credentials-in-git). +**Dica**: Se você não desejar inserir suas credenciais toda vez que interagir com o repositório remoto, você poderá ativar o [armazenamento de credenciais](/github/using-git/caching-your-github-credentials-in-git). Se você já está usando o cache de credenciais, certifique-se de que o seu computador tem as credenciais corretas armazenadas em cache. Credenciais incorretas ou desatualizadas causarão falha na autenticação. {% endtip %} diff --git a/translations/pt-BR/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md b/translations/pt-BR/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md index c0f7c3d3f2..f57f1a1747 100644 --- a/translations/pt-BR/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md +++ b/translations/pt-BR/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md @@ -10,7 +10,7 @@ versions: ### Ferramentas de edição -Para otimizar seu fluxo de trabalho, é possível conectar-se a repositórios {% data variables.product.product_name %} em ferramentas de edição de terceiros, como Atom, Unity e Visual Studio. +Você pode conectar-se aos repositórios de {% data variables.product.product_name %} de ferramentas de editores de terceiros, como o Atom, Unity e o Visual Studio. #### {% data variables.product.product_name %} para Atom @@ -30,8 +30,12 @@ A extensão {% data variables.product.product_name %} para Visual Studio, permit ### Ferramentas de gerenciamento de projetos -Para agilizar o fluxo de trabalho, você pode integrar sua conta pessoal {% data variables.product.product_name %} ou organização a ferramentas de gerenciamento de projetos de terceiros, como o Jira. +Você pode integrar sua conta pessoal de {% data variables.product.product_name %} ou organização com ferramentas de gerenciamento de projetos de terceiros, como o Jira ou Slack. #### Integração Jira Cloud e {% data variables.product.product_name %}.com -É possível integrar o Jira Cloud à sua conta pessoal ou de sua organização para analisar commits e pull requests e criar metadados e hyperlinks relevantes em qualquer problema mencionado no Jira. +É possível integrar o Jira Cloud à sua conta pessoal ou de sua organização para analisar commits e pull requests e criar metadados e hyperlinks relevantes em qualquer problema mencionado no Jira. Para obter mais informações, visite o [aplicativo de integração do Jira](https://github.com/marketplace/jira-software-github) no marketplace. + +#### Integração com Slack e {% data variables.product.product_name %} + +Você pode integrar o Slack à sua conta pessoal ou da organização para assinar notificações, fechar ou abrir problemas e fornecer referências ricas para problemas e pull requests sem sair do Slack. Para obter mais informações, visite o [aplicativo de integração do Slack](https://github.com/marketplace/slack-github) no Marketplace. diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md index cdb4640984..8c301c8f1a 100644 --- a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md @@ -22,5 +22,5 @@ Você pode usar {% data variables.product.prodname_code_scanning %} webhooks par ### Leia mais * "[Sobre {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" -* "[Usar {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} com seu sistema de CI existente +* "[Usar {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} com seu sistema CI existente](/github/finding-security-vulnerabilities-and-errors-in-your-code/using-codeql-code-scanning-with-your-existing-ci-system)" * "[Suporte do SARIF para {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning)" diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md index af2300e7a3..0cc08d5b3c 100644 --- a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md @@ -48,7 +48,7 @@ By default, the {% data variables.product.prodname_codeql_workflow %} uses the ` #### Scanning pull requests -The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on the `HEAD` commit of a pull request against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} +The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on pull requests targeted against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} For more information about the `pull_request` event, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags)." @@ -150,8 +150,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - with: - fetch-depth: 2 - name: Set up Python uses: actions/setup-python@v2 with: @@ -165,8 +163,6 @@ jobs: # Set the `CODEQL-PYTHON` environment variable to the Python executable # that includes the dependencies echo "::set-env name=CODEQL_PYTHON::$(which python)" - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md index f4cabb2462..897fc3a74f 100644 --- a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md @@ -42,7 +42,7 @@ You decide how you generate {% data variables.product.prodname_code_scanning %} ![Choose where to commit](/assets/images/help/repository/start-commit-choose-where-to-commit.png) 8. Click **Commit new file** or **Propose new file**. -In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch or any protected branches. As a result, {% data variables.product.prodname_code_scanning %} will now commence. +In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch. As a result, {% data variables.product.prodname_code_scanning %} will now commence. ### Viewing the logging output from {% data variables.product.prodname_code_scanning %} @@ -90,7 +90,7 @@ After {% data variables.product.prodname_code_scanning %} has analyzed the code There are other situations where there may be no analysis for the latest commit to the base branch for a pull request. These include: -* The pull request has been raised against a branch other than the default branch or a protected branch, and this branch hasn't been analyzed. +* The pull request has been raised against a branch other than the default branch, and this branch hasn't been analyzed. To check whether a branch has been scanned, go to the {% data variables.product.prodname_code_scanning_capc %} page, click the **Branch** drop-down and select the relevant branch. diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md index 873f202e7a..15e5332649 100644 --- a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md @@ -1,5 +1,6 @@ --- title: Encontrar vulnerabilidades e erros de segurança no seu código +shortTitle: Encontrar vulnerabilidades e erros de codificação product: '{% data reusables.gated-features.code-scanning %}' redirect_from: - /github/managing-security-vulnerabilities/finding-security-vulnerabilities-in-your-projects-code @@ -18,6 +19,7 @@ versions: {% link_in_list /configuring-code-scanning %} {% link_in_list /configuring-the-codeql-workflow-for-compiled-languages %} {% link_in_list /troubleshooting-the-codeql-workflow %} + {% link_in_list /running-codeql-code-scanning-in-a-container %} {% topic_link_in_list /managing-results-from-code-scanning %} {% link_in_list /about-integration-with-code-scanning %} {% link_in_list /uploading-a-sarif-file-to-github %} diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md index aaac7cc98d..3d6cc952dc 100644 --- a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md @@ -1,7 +1,7 @@ --- title: Gerenciar alertas de verificação de código para o seu repositório shortTitle: Gerenciando alertas -intro: 'Você pode visualizar, corrigir e fechar alertas de possíveis vulnerabilidades ou erros no código do seu projeto.' +intro: 'You can view, fix, {% if currentVersion == "enterprise-server@2.22" %}or close{% else %}dismiss, or delete{% endif %} alerts for potential vulnerabilities or errors in your project''s code.' product: '{% data reusables.gated-features.code-scanning %}' permissions: 'As pessoas com permissão de gravação em um repositório podem gerenciar alertas de {% data variables.product.prodname_code_scanning %} do repositório.' versions: @@ -37,25 +37,89 @@ Qualquer pessoa com permissão de leitura para um repositório pode ver alertas {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} -{% data reusables.code-scanning.click-alert-in-list %} -5. Opcionalmente, se o alerta destacar um problema com o fluxo de dados, clique em **Mostrar caminhos** para exibir o caminho da fonte de dados até o destino onde é usado. ![Exemplo de alerta de fluxo de dados](/assets/images/help/repository/code-scanning-show-paths.png) +1. Em "{% data variables.product.prodname_code_scanning_capc %}", clique no alerta que você gostaria de explorar. ![Resumo dos alertas](/assets/images/help/repository/code-scanning-click-alert.png) +1. Opcionalmente, se o alerta destacar um problema com o fluxo de dados, clique em **Mostrar caminhos** para exibir o caminho da fonte de dados até o destino onde é usado. ![O link "Exibir caminhos" em um alerta](/assets/images/help/repository/code-scanning-show-paths.png) +1. Alertas da análise de {% data variables.product.prodname_codeql %} incluem uma descrição do problema. Clique em **Mostrar mais** para obter orientação sobre como corrigir seu código. ![Detalhes para um alerta](/assets/images/help/repository/code-scanning-alert-details.png) ### Corrigir um alerta Qualquer pessoa com permissão de gravação para um repositório pode corrigir um alerta, fazendo o commit de uma correção do código. Se o repositório tiver {% data variables.product.prodname_code_scanning %} agendado para ser executado em pull requests, recomenda-se registrar um pull request com sua correção. Isso ativará a análise de {% data variables.product.prodname_code_scanning %} referente às alterações e irá testar se sua correção não apresenta nenhum problema novo. Para obter mais informações, consulte "[Configurar {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)" e " "[Testar alertas de {% data variables.product.prodname_code_scanning %} em pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)". +Se você tem permissão de escrita em um repositório, você pode visualizar alertas corrigidos, vendo o resumo de alertas e clicando em **Fechado**. Para obter mais informações, consulte "[Visualizar um alerta](#viewing-an-alert). The "Closed" list shows fixed alerts and alerts that users have {% if currentVersion == "enterprise-server@2.22" %}closed{% else %}dismissed{% endif %}. + +Alertas podem ser corrigidos em um branch, mas não em outro. Você pode usar o menu suspenso "Branch", no resumo dos alertas, para verificar se um alerta é corrigido em um branch específico. + +![Filtrar alertas por branch](/assets/images/help/repository/code-scanning-branch-filter.png) + +{% if currentVersion == "enterprise-server@2.22" %} + ### Fechar um alerta Fechar um alerta é uma maneira de resolver um alerta que você considera que não precisa ser corrigido. {% data reusables.code-scanning.close-alert-examples %} +{% else %} + +### Ignorar ou excluir alertas + +Há duas formas de fechar um alerta. Você pode corrigir o problema no código ou pode ignorar o alerta. Alternatively, if you have admin permissions for the repository, you can delete alerts. Excluir alertas é útil em situações em que você habilitou uma ferramenta {% data variables.product.prodname_code_scanning %} e, em seguida, decidiu removê-la ou em situações em que você habilitou a análise de {% data variables.product.prodname_codeql %} com um conjunto de consultas maior do que você deseja continuar usando, e, em seguida, você removeu algumas consultas da ferramenta. Em ambos os casos, excluir alertas permite limpar os seus resultados de {% data variables.product.prodname_code_scanning %}. Você pode excluir alertas da lista de resumo dentro da aba **Segurança**. + +Ignorar um alerta é uma maneira de fechar um alerta que você considera que não precisa ser corrigido. {% data reusables.code-scanning.close-alert-examples %} Você pode ignorar alertas de anotações de {% data variables.product.prodname_code_scanning %} no código ou da lista de resumo dentro na aba **Segurança**. + +Ao descartar um alerta: + +- Ele é ignorado em todos os branches. +- O alerta é removido do número de alertas atuais para o seu projeto. +- O alerta é movido para a lista "Fechado" no resumo dos alertas, onde você pode reabri-lo, se necessário. +- O motivo pelo qual você fechou o alerta foi gravado. +- Da próxima vez que {% data variables.product.prodname_code_scanning %} for executado, o mesmo código não gerará um alerta. + +Ao excluir um alerta: + +- Ele é excluído em todos os branches. +- O alerta é removido do número de alertas atuais para o seu projeto. +- Ele _não é_ adicionado à lista "Fechado" no resumo dos alertas. +- Se o código que gerou o alerta permanecer o mesmo, e a mesma ferramenta {% data variables.product.prodname_code_scanning %} for executada novamente sem qualquer alteração de configuração, o alerta será exibido novamente nos resultados das análises. + +Para ignorar ou excluir alertas: + +{% endif %} + {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} +{% if currentVersion == "enterprise-server@2.22" %} {% data reusables.code-scanning.click-alert-in-list %} -5. Selecione o menu suspenso de Fechar e clique em um motivo para fechar o alerta. ![Escolher o motivo para fechar o alerta no menu suspenso Fechar](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) +1. Select the **Close** drop-down menu and click a reason for closing the alert. + ![Escolher o motivo para fechar o alerta no menu suspenso Fechar](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) {% data reusables.code-scanning.false-positive-fix-codeql %} +{% else %} + +1. If you have admin permissions for the repository, and you want to delete alerts for this {% data variables.product.prodname_code_scanning %} tool, select some or all of the check boxes and click **Delete**. + + ![Excluir alertas](/assets/images/help/repository/code-scanning-delete-alerts.png) + + Opcionalmente, você pode usar os filtros para exibir um subconjunto de alertas e, em seguida, excluir todos os alertas de correspondência de uma só vez. Por exemplo, se você removeu uma consulta da análise de {% data variables.product.prodname_codeql %}, você pode usar o filtro "Regra" para listar apenas os alertas dessa consulta e, em seguida, selecionar e apagar todos esses alertas. + + ![Filtrar alertas por regra](/assets/images/help/repository/code-scanning-filter-by-rule.png) + +1. Se você deseja ignorar um alerta, é importante explorar primeiro o alerta para que você possa escolher o motivo correto para ignorá-lo. Clique no alerta que você deseja explorar. + + ![Abrir um alerta da lista de resumo](/assets/images/help/repository/code-scanning-click-alert.png) + +1. Revise o alerta e clique em **Ignorar** e escolha um motivo para fechar o alerta. ![Escolher um motivo para ignorar um alerta](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + + {% data reusables.code-scanning.choose-alert-dismissal-reason %} + + {% data reusables.code-scanning.false-positive-fix-codeql %} + +#### Ignorar múltiplos alertas de uma vez + +Se um projeto tem vários alertas que você deseja ignorar pelo mesmo motivo, você pode ignorá-los em massa do resumo de alertas. Normalmente, você pode querer filtrar a lista e, em seguida, ignorar todos os alertas correspondentes. Por exemplo, você pode querer ignorar todos os alertas atuais no projeto que foram marcados para uma vulnerabilidade específica de Enumeração de Fraqueza Comum (CWE). + +{% endif %} + ### Leia mais - "[Triar alertas de {% data variables.product.prodname_code_scanning %} em pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)" diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md new file mode 100644 index 0000000000..832b143ee8 --- /dev/null +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md @@ -0,0 +1,69 @@ +--- +title: Executar a varredura de código CodeQL em um contêiner +shortTitle: '{% data variables.product.prodname_code_scanning_capc %} em um contêiner' +intro: 'Você pode executar {% data variables.product.prodname_code_scanning %} em um contêiner garantindo que todos os processos sejam executados no mesmo container.' +product: '{% data reusables.gated-features.code-scanning %}' +versions: + free-pro-team: '*' + enterprise-server: '>=2.22' +--- + +{% data reusables.code-scanning.beta %} + +### Sobre {% data variables.product.prodname_code_scanning %} com uma compilação de contêiner + +Se você estiver configurando {% data variables.product.prodname_code_scanning %} para um idioma compilado e estiver criando o código em um ambiente de contêiner, a análise pode falhar com a mensagem de erro "Nenhum código fonte foi visto durante a compilação." Isso indica que {% data variables.product.prodname_codeql %} não conseguiu monitorar seu código da forma como foi compilado. + +Você precisa executar {% data variables.product.prodname_codeql %} no mesmo contêiner em que você cria o seu código. Isto se aplica independentemente de você usar {% data variables.product.prodname_codeql_runner %} ou {% data variables.product.prodname_actions %}. Se você estiver usando {% data variables.product.prodname_codeql_runner %}, execute-o no contêiner onde seu código é criado. Para obter mais informações sobre o {% data variables.product.prodname_codeql_runner %}, consulte "[Executar {% data variables.product.prodname_codeql %} no seu sistema de CI](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-code-scanning-in-your-ci-system)". Se estiver usando {% data variables.product.prodname_actions %}, configure seu fluxo de trabalho para executar todas as ações no mesmo contêiner. Para obter mais informações, consulte "[Exemplo de fluxo de trabalho](#example-workflow)". + +### Dependências + +Você pode ter dificuldade para executar {% data variables.product.prodname_code_scanning %} se o contêiner que você está usando estiver com certas dependências ausentes (por exemplo, o Git deve ser instalado e adicionado à variável PATH). Se você encontrar problemas de dependência, revise a lista de software geralmente incluída nos ambientes virtuais de {% data variables.product.prodname_dotcom %}. Para obter mais informações, consulte os arquivos de `readme` específicos da versão nesses locais: + +* Linux: https://github.com/actions/virtual-environments/tree/main/images/linux +* MacOS: https://github.com/actions/virtual-environments/tree/main/images/macos +* Windows: https://github.com/actions/virtual-environments/tree/main/images/win + +### Exemplo de fluxo de trabalho + +Este fluxo de trabalho de amostra usa {% data variables.product.prodname_actions %} para executar a análise de {% data variables.product.prodname_codeql %} em um ambiente de contêiner. O valor do `container.image` identifica o contêiner a ser usado. Neste exemplo, a imagem é denominada `codeql-container`, com uma tag de `f0f91db`. Para obter mais informações, consulte "[Sintaxe de fluxo de trabalho para o {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)". + +``` yaml +name: "{% data variables.product.prodname_codeql %}" + +on: + push: + branches: [main] + pull_request: + branches: [main] + schedule: + - cron: '0 0 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: [java] + + # Specify the container in which actions will run + container: + image: codeql-container:f0f91db + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Initialize {% data variables.product.prodname_codeql %} + uses: github/codeql-action/init@v1 + with: + languages: {% raw %}${{ matrix.language }}{% endraw %} + - name: Build + run: | + ./configure + make + - name: Perform {% data variables.product.prodname_codeql %} Analysis + uses: github/codeql-action/analyze@v1 +``` diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md index 5b7faf0e62..30b3bdd81f 100644 --- a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md @@ -9,6 +9,7 @@ versions: free-pro-team: '*' enterprise-server: '>=2.22' --- + {% data reusables.code-scanning.beta-codeql-runner %} {% data reusables.code-scanning.beta %} @@ -65,7 +66,7 @@ The options for providing access to the {% data variables.product.prodname_codeq 1. Allow the CI servers access to {% data variables.product.prodname_dotcom_the_website %} so that the {% data variables.product.prodname_codeql_runner %} can download the bundle automatically. 1. Manually download/extract the bundle, store it with other central resources, and use the `--codeql-path` flag to specify the location of the bundle in calls to initialize the {% data variables.product.prodname_codeql_runner %}. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} 1. You can mirror the `github/codeql-action` repository on {% data variables.product.product_location %}. Unless you specify the `--codeql-path` flag, the runner automatically checks for the bundle in this location and on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} ### Calling the {% data variables.product.prodname_codeql_runner %} @@ -75,7 +76,7 @@ You should call the {% data variables.product.prodname_codeql_runner %} from the 1. `init` required to initialize the runner and create a {% data variables.product.prodname_codeql %} database for each language to be analyzed. These databases are populated and analyzed by subsequent commands. 1. `analyze` required to populate the {% data variables.product.prodname_codeql %} databases, analyze them, and upload results to {% data variables.product.product_location %}. -For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}. +For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if enterpriseServerVersions contains currentVersion %} or mirrored on {% data variables.product.product_location %}{% endif %}. You can configure where the {% data variables.product.prodname_codeql_runner %} stores the CodeQL bundle for future analysis on a server using the `--tools-dir` flag and where it stores temporary files during analysis using `--temp-dir`. @@ -109,7 +110,7 @@ This example runs {% data variables.product.prodname_codeql %} analysis on a Lin > Successfully uploaded results ``` -The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if enterpriseServerVersions contains currentVersion %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." #### Compiled language example diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md index 6030b3a435..49535badc3 100644 --- a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md @@ -36,6 +36,8 @@ Se o seu arquivo SARIF não incluir `partialFingerprints`, o campo `partialFinge ### Validar seu arquivo SARIF + + Você pode marcar um arquivo SARIF compatível com {% data variables.product.prodname_code_scanning %} testando-o com as regras de ingestão de {% data variables.product.prodname_dotcom %}. Para obter mais informações, acesse o [validador do Microsoft SARIF](https://sarifweb.azurewebsites.net/). ### Propriedades compatíveis do arquivo de saída SARIF diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md index 126fbaa529..2463ff9713 100644 --- a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md @@ -13,11 +13,11 @@ versions: ### Sobre os resultados de {% data variables.product.prodname_code_scanning %} em pull requests -Em repositórios onde {% data variables.product.prodname_code_scanning %} está configurado como uma verificação de pull request, {% data variables.product.prodname_code_scanning %} verifica o código no pull request. Por padrão, isso é limitado a pull requests que visam o branch-padrão ou os branches protegidos, mas você pode alterar esta configuração em {% data variables.product.prodname_actions %} ou em um sistema de CI/CD de terceiros. Se o merge das alterações introduziria novos alertas de {% data variables.product.prodname_code_scanning %} no branch de destino, estes serão relatados como resultados de verificação no pull request. Os alertas também são exibidos como anotações na aba **Arquivos alterados** do pull request. Se você tiver permissão de gravação no repositório, você poderá ver qualquer alerta de {% data variables.product.prodname_code_scanning %} existente na aba **Segurança**. Para obter informações sobre os alertas do repositório, consulte "[Gerenciar alertas de {% data variables.product.prodname_code_scanning %} do repositório](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)". +Em repositórios onde {% data variables.product.prodname_code_scanning %} está configurado como uma verificação de pull request, {% data variables.product.prodname_code_scanning %} verifica o código no pull request. By default, this is limited to pull requests that target the default branch, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. Se o merge das alterações introduziria novos alertas de {% data variables.product.prodname_code_scanning %} no branch de destino, estes serão relatados como resultados de verificação no pull request. Os alertas também são exibidos como anotações na aba **Arquivos alterados** do pull request. Se você tiver permissão de gravação no repositório, você poderá ver qualquer alerta de {% data variables.product.prodname_code_scanning %} existente na aba **Segurança**. Para obter informações sobre os alertas do repositório, consulte "[Gerenciar alertas de {% data variables.product.prodname_code_scanning %} do repositório](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)". -Se {% data variables.product.prodname_code_scanning %} tiver algum resultado com uma gravidade de `erro`, ocorre uma falha na verificação e o erro é relatado nos resultados de verificação. Se todos os resultados encontrados por {% data variables.product.prodname_code_scanning %} tiverem gravidades menores, os alertas são tratados como avisos ou notas e a verificação é considerada bem-sucedida. Se seu pull request for direcionado a um branch protegido, e o proprietário do repositório tiver configurado as verificações de status necessárias, você deverá corrigir ou fechar todos alertas de erro antes que o pull request possa ser mesclado. Para obter mais informações, consulte "[Sobre verificações de status obrigatórias](/github/administering-a-repository/about-required-status-checks)". +Se {% data variables.product.prodname_code_scanning %} tiver algum resultado com uma gravidade de `erro`, ocorre uma falha na verificação e o erro é relatado nos resultados de verificação. Se todos os resultados encontrados por {% data variables.product.prodname_code_scanning %} tiverem gravidades menores, os alertas são tratados como avisos ou notas e a verificação é considerada bem-sucedida. If your pull request targets a protected branch that has been enabled for {% data variables.product.prodname_code_scanning %}, and the repository owner has configured required status checks, then you must either fix or {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} all error alerts before the pull request can be merged. Para obter mais informações, consulte "[Sobre verificações de status obrigatórias](/github/administering-a-repository/about-required-status-checks)". -![Exemplo de status de verificação de pull request com alerta de {% data variables.product.prodname_code_scanning %}](/assets/images/help/repository/code-scanning-check-failure.png) +![Ocorreu uma falha na verificação de {% data variables.product.prodname_code_scanning %} em um pull request](/assets/images/help/repository/code-scanning-check-failure.png) ### Sobre {% data variables.product.prodname_code_scanning %} como uma verificação de pull request @@ -29,20 +29,38 @@ Se o repositório usar a {% data variables.product.prodname_codeql_workflow %} u Quando você olha para a aba **Arquivos alterados** para um pull request, você vê anotações para todas as linhas de código que acionaram o alerta. -![Exemplo de alerta de {% data variables.product.prodname_code_scanning %} exibido como uma anotação na visualização "Arquivos alterados" de um pull request](/assets/images/help/repository/code-scanning-pr-annotation.png) +![Alerta de anotação em um diff de pull request](/assets/images/help/repository/code-scanning-pr-annotation.png) Algumas anotações contêm links com contexto extra para o alerta. No exemplo acima, da análise de {% data variables.product.prodname_codeql %}, você pode clicar em **valor fornecido pelo usuário** para ver onde os dados não confiáveis entram no fluxo de dados (isso é referido como a fonte). Neste caso, você pode visualizar o caminho completo da fonte até o código que usa os dados (o destino), clicando em **Mostrar caminhos**. Isto faz com que seja fácil verificar se os dados não são confiáveis ou se a análise não reconheceu uma etapa de sanitização de dados entre a fonte e o destino. Para obter informações sobre a análise do fluxo de dados usando {% data variables.product.prodname_codeql %}, consulte "[Sobre a análise do fluxo de dados](https://help.semmle.com/QL/learn-ql/intro-to-data-flow.html)". Para obter mais informações sobre um alerta, clique em **Mostrar mais informações** na anotação. Isso permite que você veja todos os contextos e metadados fornecidos pela ferramenta em uma exibição de alerta. No exemplo abaixo, você pode ver tags que mostram a gravidade, o tipo e as enumerações de fraquezas comuns relevantes (CWEs) para o problema. A vista mostra também quais commits introduziram o problema. -Alertas de algumas ferramentas, como {% data variables.product.prodname_codeql %}, também incluem uma descrição e um link **Mostrar mais** para orientação sobre como corrigir o problema no código. +Na visualização detalhada de um alerta, algumas ferramentas de {% data variables.product.prodname_code_scanning %}, como a análise de {% data variables.product.prodname_codeql %} também incluem uma descrição do problema e um link **Mostrar mais** para obter orientações sobre como corrigir seu código. -![Exemplo de "Mostrar mais informações" para uma alerta de {% data variables.product.prodname_code_scanning %} em um pull request](/assets/images/help/repository/code-scanning-pr-alert.png) +![Descrição do alerta e link para mostrar mais informações](/assets/images/help/repository/code-scanning-pr-alert.png) -### Resolver um alerta no seu pull request +### {% if currentVersion == "enterprise-server@2.22" %}Resolving{% else %}Fixing{% endif %} an alert on your pull request -Qualquer pessoa com permissão de gravação em um repositório pode resolver alertas em um pull request. Se você fizer commit de alterações na solicitação do pull request, isto acionará uma nova execução das verificações do pull request. Se suas alterações corrigirem o problema, o alerta será resolvido e a anotação removida. +Qualquer pessoa com permissão de gravação em um repositório pode corrigir um alerta de {% data variables.product.prodname_code_scanning %} identificado em um pull request. Se você fizer commit de alterações na solicitação do pull request, isto acionará uma nova execução das verificações do pull request. Se suas alterações corrigirem o problema, o alerta será fechado e a anotação removida. + +{% if currentVersion == "enterprise-server@2.22" %} Se você não considerar que um alerta deve ser corrigido, você poderá fechar o alerta manualmente. {% data reusables.code-scanning.close-alert-examples %} O botão **Fechar** está disponível nas anotações e no modo de exibição de alertas se você tiver permissão de gravação no repositório. {% data reusables.code-scanning.false-positive-fix-codeql %} + +{% else %} + +### Ignorar um alerta no seu pull request + +Uma forma alternativa de fechar um alerta é ignorá-lo. Você pode descartar um alerta se não acha que ele precisa ser corrigido. {% data reusables.code-scanning.close-alert-examples %} Se você tem permissão de gravação no repositório, o botão **Ignorar** estará disponível nas anotações de código e no resumo de alertas. Ao clicar em **Ignorar** será solicitado que você escolha um motivo para fechar o alerta. + +![Escolher um motivo para ignorar um alerta](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + +{% data reusables.code-scanning.choose-alert-dismissal-reason %} + +{% data reusables.code-scanning.false-positive-fix-codeql %} + +Para obter mais informações sobre alertas ignorados, consulte "[Gerenciar alertas de {% data variables.product.prodname_code_scanning %} para o seu repositório](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#dismissing-or-deleting-alerts)". + +{% endif %} \ No newline at end of file diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md index 62c9477e48..e5e86c2b05 100644 --- a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md @@ -49,4 +49,4 @@ Se o comando `analisar` para o {% data variables.product.prodname_codeql_runner {% endnote %} -1. O código é criado em um contêiner ou em uma máquina separada. Se você usar uma criação em contêiner ou se você externalizar a criação para outra máquina, certifique-se de executar {% data variables.product.prodname_codeql_runner %} no contêiner ou na máquina onde a tarefa de criação ocorrer. +1. O código é criado em um contêiner ou em uma máquina separada. Se você usar uma criação em contêiner ou se você externalizar a criação para outra máquina, certifique-se de executar {% data variables.product.prodname_codeql_runner %} no contêiner ou na máquina onde a tarefa de criação ocorrer. Para obter mais informações, consulte "[Executar a varredura de código do CodeQL em um contêiner](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)". diff --git a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md index f42dbb3db6..3ddc1056fa 100644 --- a/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md +++ b/translations/pt-BR/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md @@ -1,7 +1,7 @@ --- -title: Troubleshooting the CodeQL workflow -shortTitle: Troubleshooting CodeQL -intro: 'If you''re having problems with {% data variables.product.prodname_code_scanning %}, you can troubleshoot by using these tips for resolving issues.' +title: Solucionar problemas no fluxo de trabalho do CodeQL +shortTitle: Solucionar problemas do CodeQL +intro: 'Se você estiver tendo problemas com {% data variables.product.prodname_code_scanning %}, você usar estas dicas para resolver problemas.' product: '{% data reusables.gated-features.code-scanning %}' redirect_from: - /github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-code-scanning @@ -12,15 +12,15 @@ versions: {% data reusables.code-scanning.beta %} -### Automatic build for a compiled language fails +### Ocorreu uma falha durante a criação automática para uma linguagem compilada -If an automatic build of code for a compiled language within your project fails, try the following troubleshooting steps. +Se ocorrer uma falha na uma criação automática de código para uma linguagem compilada dentro de seu projeto, tente as seguintes etapas para a solução de problemas. -- Remove the `autobuild` step from your {% data variables.product.prodname_code_scanning %} workflow and add specific build steps. For information about editing the workflow, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#editing-a-code-scanning-workflow)." For more information about replacing the `autobuild` step, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." +- Remova a etapa de `autobuild` do seu fluxo de trabalho de {% data variables.product.prodname_code_scanning %} e adicione etapas de criação específicas. Para obter informações sobre a edição do fluxo de trabalho, consulte "[Configurar {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#editing-a-code-scanning-workflow)". Para obter mais informações sobre a substituição da etapa `autobuild`, consulte "[Configurar o fluxo de trabalho de {% data variables.product.prodname_codeql %} para linguagens compiladas](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." -- If your workflow doesn't explicitly specify the languages to analyze, {% data variables.product.prodname_codeql %} implicitly detects the supported languages in your code base. In this configuration, out of the compiled languages C/C++, C#, and Java, {% data variables.product.prodname_codeql %} only analyzes the language with the most source files. Edit the workflow and add a build matrix specifying the languages you want to analyze. The default CodeQL analysis workflow uses such a matrix. +- Se seu fluxo de trabalho não especificar explicitamente linguagens para analisar, {% data variables.product.prodname_codeql %} irá detectar implicitamente as linguagens compiladas na sua base de código. Nesta configuração, das linguagens compiladas de C/C++, C#, e Java, {% data variables.product.prodname_codeql %} analisa apenas a linguagem com mais arquivos-fonte. Edite o fluxo de trabalho e adicione uma matriz de compilação especificando as linguagens que você deseja analisar. O fluxo de trabalho de análise do CodeQL padrão usa essa matriz. - The following extracts from a workflow show how you can use a matrix within the job strategy to specify languages, and then reference each language within the "Initialize {% data variables.product.prodname_codeql %}" step: + Os seguintes extratos de um fluxo de trabalho mostram como usar uma matriz dentro da estratégia de trabalho para especificar linguagens e, em seguida, fazer referência a cada linguagem dentro da etapa "Inicializar {% data variables.product.prodname_codeql %}: ```yaml jobs: @@ -38,88 +38,91 @@ If an automatic build of code for a compiled language within your project fails, with: languages: {% raw %}${{ matrix.language }}{% endraw %} ``` - - For more information about editing the workflow, see "[Configuring code scanning](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)." -### No code found during the build + Para obter mais informações sobre a edição do fluxo de trabalho, consulte "[Configurar a varredura de código](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)". -If your workflow fails with an error `No source code was seen during the build` or `The process '/opt/hostedtoolcache/CodeQL/0.0.0-20200630/x64/codeql/codeql' failed with exit code 32`, this indicates that {% data variables.product.prodname_codeql %} was unable to monitor your code. Several reasons can explain such a failure: +### Nenhum código encontrado durante a criação -1. Automatic language detection identified a supported language, but there is no analyzable code of that language in the repository. A typical example is when our language detection service finds a file associated with a particular programming language like a `.h`, or `.gyp` file, but no corresponding executable code is present in the repository. To solve the problem, you can manually define the languages you want to analyze by updating the list of languages in the `language` matrix. For example, the following configuration will analyze only Go, and JavaScript. +Se seu fluxo de trabalho falhar com um erro `Nenhum código fonte foi visto durante a criação` ou `O processo '/opt/hostedtoolcache/CodeQL/0. .0-20200630/x64/codeql/codeql' falhou com o código de saída 32`, isto indica que {% data variables.product.prodname_codeql %} não foi capaz de monitorar o seu código. Há várias explicações para essa falha: - ```yaml - strategy: +1. A detecção automática da linguagem identificou uma linguagem compatível, mas não há código analisável dessa linguagem no repositório. Um exemplo típico é quando nosso serviço de detecção de linguagem encontra um arquivo associado a uma determinada linguagem de programação, como um arquivo `.h`, or `.gyp`, mas nenhum código executável correspondente está presente no repositório. Para resolver o problema, você pode definir manualmente as linguagens que você deseja analisar atualizando a lista de linguagens na matriz de linguagem`. Por exemplo, a configuração a seguir analisará somente Go, e JavaScript. +
      strategy:
     fail-fast: false
     matrix:
       # Override automatic language detection by changing the list below
       # Supported options are:
       # ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
       language: ['go', 'javascript']
-  ```
-For more information, see the workflow extract in "[Automatic build for a compiled language fails](#automatic-build-for-a-compiled-language-fails)" above.
-1. Your {% data variables.product.prodname_code_scanning %} workflow is analyzing a compiled language (C, C++, C#, or Java), but the code was not compiled. By default, the {% data variables.product.prodname_codeql %} analysis workflow contains an `autobuild` step, however, this step represents a best effort process, and may not succeed in building your code, depending on your specific build environment. Compilation may also fail if you have removed the `autobuild` step and did not include build steps manually.  For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)."
-1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but portions of your build are cached to improve performance (most likely to occur with build systems like Gradle or Bazel). Since {% data variables.product.prodname_codeql %} observes the activity of the compiler to understand the data flows in a repository, {% data variables.product.prodname_codeql %} requires a complete build to take place in order to perform analysis. 
-1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but compilation does not occur between the `init` and `analyze` steps in the workflow. {% data variables.product.prodname_codeql %} requires that your build happens in between these two steps in order to observe the activity of the compiler and perform analysis. 
-1. Your compiled code (in C, C++, C#, or Java) was compiled successfully, but {% data variables.product.prodname_codeql %} was unable to detect the compiler invocations. The most common causes are certain configuration options like running your build process in a container, if you're building using a distributed build system external to {% data variables.product.prodname_actions %} using a daemon process, or if {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. 
+`
    +Para obter mais informações, consulte a extração de fluxo de trabalho em "[Criação automática para falhas de linguagem compilada](#automatic-build-for-a-compiled-language-fails)" acima. +1. O seu fluxo de trabalho de {% data variables.product.prodname_code_scanning %} está analisando uma linguagem compilada (C, C++, C#, ou Java), mas o código não foi compilado. Por padrão, o fluxo de trabalho da análise do {% data variables.product.prodname_codeql %} contém uma etapa `autobuild`. No entanto, esta etapa representa um melhor processo de esforço, e pode não ter sucesso na criação do seu código, dependendo do seu ambiente de criação específico. Também pode ocorrer uma falha na criação se você removeu a etapa de `autobuild` e não incluiu as etapas de criação manualmente. Para obter mais informações sobre a especificação de etapas de criação, consulte "[Configurar o fluxo de trabalho do {% data variables.product.prodname_codeql %} para linguagens compiladas](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)". +1. O seu fluxo de trabalho está analisando uma linguagem compilada (C, C++, C#, ou Java), mas partes de sua compilação são armazenadas em cache para melhorar o desempenho (é mais provável que ocorra com sistemas de criação como o Gradle ou Bazel). Uma vez que o {% data variables.product.prodname_codeql %} observa a atividade do compilador para entender os fluxos de dados em um repositório, {% data variables.product.prodname_codeql %} exige uma compilação completa para realizar a análise. +1. O seu fluxo de trabalho está analisando uma linguagem compilada (C, C++, C#, ou Java), mas a compilação não ocorre entre as etapas `init` e `analisar` no fluxo de trabalho. O {% data variables.product.prodname_codeql %} exige que a sua compilação aconteça entre essas duas etapas para observar a atividade do compilador e realizar a análise. +1. Seu código compilado (em C, C++, C#, ou Java) foi compilado com sucesso, mas o {% data variables.product.prodname_codeql %} não conseguiu detectar as chamadas do compilador. As causas mais comuns são: - For C# projects using either `dotnet build` or `msbuild` which target .NET Core 2, you should specify `/p:UseSharedCompilation=false` in your workflow's `run` step, when you build your code. The `UseSharedCompilation` flag isn't necessary for .NET Core 3.0 and later. - - For example, the following configuration for C# will pass the flag during the first build step. + * Executar seu processo de criação em um contêiner separado para {% data variables.product.prodname_codeql %}. Para obter mais informações, consulte "[Executar a varredura de código do CodeQL em um contêiner](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)". + * Criar usando um sistema de compilação distribuído externo às Ações GitHub, usando um processo de daemon. + * {% data variables.product.prodname_codeql %} não está ciente do compilador específico que você está usando. + + Para projetos de C# usando `dotnet build` ou `msbuild` qual abordam .NET Core 2, você deverá especificar `/p:UseSharedCompilation=false` na sua etapa de `execução` do fluxo de trabalho ao criar o seu código. O sinalizador `UseSharedCompilation` não é necessário para o .NET Core 3.0 ou versão superior. + + Por exemplo, a seguinte configuração para C# irá passar o sinalizador durante a primeira etapa de criação. ``` yaml - run: | dotnet build /p:UseSharedCompilation=false ``` - If you encounter another problem with your specific compiler or configuration, contact {% data variables.contact.contact_support %}. + Se você encontrar outro problema com seu compilador específico ou configuração, entre em contato com {% data variables.contact.contact_support %}. -For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." +Para obter mais informações sobre a especificação de etapas de criação, consulte "[Configurar o fluxo de trabalho do {% data variables.product.prodname_codeql %} para linguagens compiladas](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)". -### Portions of my repository were not analyzed using `autobuild` +### Partes do meu repositório não foram analisadas usando `build automático` -The {% data variables.product.prodname_codeql %} `autobuild` feature uses heuristics to build the code in a repository, however, sometimes this approach results in incomplete analysis of a repository. For example, when multiple `build.sh` commands exist in a single repository, the analysis may not complete since the `autobuild` step will only execute one of the commands. The solution is to replace the `autobuild` step with build steps which build all of the source code which you wish to analyze. For more information, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." +O recurso de {% data variables.product.prodname_codeql %} `autobuild` usa heurística para criar o código em um repositório. No entanto, às vezes, essa abordagem resulta em uma análise incompleta de um repositório. Por exemplo, quando uma compilação múltipla de `build.sh` existe em um único repositório, é possível que a análise não seja concluída, já que a etapa `autobuild` executará apenas um dos comandos. A solução é substituir a etapa `autobuild` pelas etapas de criação que criam todo o código-fonte que você deseja analisar. Para obter mais informações, consulte "[Configurar o fluxo de trabalho do {% data variables.product.prodname_codeql %} para linguagens compiladas](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)". -### Error: "Server error" +### Error: "Erro do servidor" -If the run of a workflow for {% data variables.product.prodname_code_scanning %} fails due to a server error, try running the workflow again. If the problem persists, contact {% data variables.contact.contact_support %}. +Se a execução de um fluxo de trabalho para {% data variables.product.prodname_code_scanning %} falhar devido a um erro no servidor, tente executar o fluxo de trabalho novamente. Se o problema persistir, entre em contato com {% data variables.contact.contact_support %}. -### Error: "Out of disk" or "Out of memory" +### Erro: "Fora do disco" ou "Sem memória" +Em projetos muito grandes, -On very large projects, {% data variables.product.prodname_codeql %} may run out of disk or memory on the runner. -{% if currentVersion == "free-pro-team@latest" %}If you encounter this issue on a hosted {% data variables.product.prodname_actions %} runner, contact {% data variables.contact.contact_support %} so that we can investigate the problem. -{% else %}If you encounter this issue, try increasing the memory on the runner.{% endif %} +{% data variables.product.prodname_codeql %} pode ficar sem disco ou memória no executor. +{% if currentVersion == "free-pro-team@latest" %}Se encontrar esse problema em um executor de {% data variables.product.prodname_actions %} hospedado, entre em contato com {% data variables.contact.contact_support %} para que possamos investigar o problema. +{% else %}Se você encontrar esse problema, tente aumentar a memória no executor.{% endif %} -### The build takes too long +### A criação demora muito tempo -If your build with {% data variables.product.prodname_codeql %} analysis takes too long to run, there are several approaches you can try to reduce the build time. +Se a sua criação com a análise de {% data variables.product.prodname_codeql %} demorar muito para ser executada, existem várias abordagens que você pode tentar para reduzir o tempo de criação. -#### Increase the memory or cores +#### Usar criações da matriz para paralelizar a análise -If you use self-hosted runners to run {% data variables.product.prodname_codeql %} analysis, you can increase the memory or the number of cores on those runners. +Se você usar executores auto-hospedados para executar a análise do {% data variables.product.prodname_codeql %}, você poderá aumentar a memória ou o número de núcleos nesses executores. -#### Use matrix builds to parallelize the analysis +#### Usar criações da matriz para paralelizar a análise -The default {% data variables.product.prodname_codeql_workflow %} uses a build matrix of languages, which causes the analysis of each language to run in parallel. If you have specified the languages you want to analyze directly in the "Initialize CodeQL" step, analysis of each language will happen sequentially. To speed up analysis of multiple languages, modify your workflow to use a matrix. For more information, see the workflow extract in "[Automatic build for a compiled language fails](#automatic-build-for-a-compiled-language-fails)" above. +O {% data variables.product.prodname_codeql_workflow %} padrão usa uma matriz de criação de linguagens, o que faz com que a análise de cada linguagem seja executada em paralelo. Se você especificou as linguagens que deseja analisar diretamente na etapa "Inicializar CodeQL", a análise de cada linguagem acontecerá sequencialmente. Para acelerar a análise de várias linguagens, modifique o seu fluxo de trabalho para usar uma matriz. Para obter mais informações, consulte a extração de fluxo de trabalho em "[Criação automática para falhas de linguagem compilada](#automatic-build-for-a-compiled-language-fails)" acima. -#### Reduce the amount of code being analyzed in a single workflow +#### Reduz a quantidade de código em análise em um único fluxo de trabalho -Analysis time is typically proportional to the amount of code being analyzed. You can reduce the analysis time by reducing the amount of code being analyzed at once, for example, by excluding test code, or breaking analysis into multiple workflows that analyze only a subset of your code at a time. +O tempo de análise é tipicamente proporcional à quantidade de código em análise. Você pode reduzir o tempo de análise reduzindo a quantidade de código em análise de uma vez, por exemplo, excluindo o código de teste, ou dividindo a análise em vários fluxos de trabalho que analisam apenas um subconjunto do seu código por vez. -For compiled languages like Java, C, C++, and C#, {% data variables.product.prodname_codeql %} analyzes all of the code which was built during the workflow run. To limit the amount of code being analyzed, build only the code which you wish to analyze by specifying your own build steps in a `run` block. You can combine specifying your own build steps with using the `paths` or `paths-ignore` filters on the `pull_request` and `push` events to ensure that your workflow only runs when specific code is changed. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestpaths)." +Para linguagens compiladas como Java, C, C++ e C#, o {% data variables.product.prodname_codeql %} analisa todo o código construído durante a execução do fluxo de trabalho. Para limitar a quantidade de código em análise, crie apenas o código que você deseja analisar especificando suas próprias etapas de criação em um bloco `Executar`. Você pode combinar a especificação das suas próprias etapas de criação ao usar os filtros `caminhos` ou `paths-ignore` nos eventos `pull_request` e `push` para garantir que o seu fluxo de trabalho só será executado quando o código específico for alterado. Para obter mais informações, consulte "[Sintaxe de fluxo de trabalho para o {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestpaths)". -For interpreted languages like Go, JavaScript, Python, and TypeScript, that {% data variables.product.prodname_codeql %} analyzes without a specific build, you can specify additional configuration options to limit the amount of code to analyze. For more information, see "[Specifying directories to scan](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#specifying-directories-to-scan)." +Para linguagens interpretadas como Go, JavaScript, Python e TypeScript, que {% data variables.product.prodname_codeql %} analisa sem uma criação específica, você pode especificar opções de configuração adicionais para limitar a quantidade de código a ser analisado. Para obter mais informações, consulte "[Especificar diretórios a serem varridos](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#specifying-directories-to-scan)". -If you split your analysis into multiple workflows as described above, we still recommend that you have at least one workflow which runs on a `schedule` which analyzes all of the code in your repository. Because {% data variables.product.prodname_codeql %} analyzes data flows between components, some complex security behaviors may only be detected on a complete build. +Se você dividir sua análise em vários fluxos de trabalho, conforme descrito acima, ainda assim recomendamos que você tenha pelo menos um fluxo de trabalho que seja executado em um `agendamento` que analise todo o código no seu repositório. Já que o {% data variables.product.prodname_codeql %} analisa os fluxos de dados entre os componentes, alguns comportamentos de segurança complexos só podem ser detectados em uma criação completa. -#### Run only during a `schedule` event +#### Executar somente durante um evento de agendamento` -If your analysis is still too slow to be run during `push` or `pull_request` events, then you may want to only trigger analysis on the `schedule` event. For more information, see "[Events](/actions/learn-github-actions/introduction-to-github-actions#events)." +

    Se sua análise ainda é muito lenta para ser executada durante eventos push` ou `pull_request`, você poderá acionar apenas a análise no evento `agendamento`. Para obter mais informações, consulte "[Eventos](/actions/learn-github-actions/introduction-to-github-actions#events)".

    {% if currentVersion == "free-pro-team@latest" %} -### Results differ between analysis platforms +### Os resultados diferem entre as plataformas de análise -If you are analyzing code written in Python, you may see different results depending on whether you run the {% data variables.product.prodname_codeql_workflow %} on Linux, macOS, or Windows. +Se você estiver analisando o código escrito no Python, você poderá ver resultados diferentes dependendo se você executa o {% data variables.product.prodname_codeql_workflow %} no Linux, macOS ou Windows. -On GitHub-hosted runners that use Linux, the {% data variables.product.prodname_codeql_workflow %} tries to install and analyze Python dependencies, which could lead to more results. To disable the auto-install, add `setup-python-dependencies: false` to the "Initialize CodeQL" step of the workflow. For more information about configuring the analysis of Python dependencies, see "[Analyzing Python dependencies](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#analyzing-python-dependencies)." +Nos executores hospedados no GitHub que usam o Linux, o {% data variables.product.prodname_codeql_workflow %} tenta instalar e analisar as dependências do Python, o que pode gerar mais resultados. Para desabilitar a instalação automática, adicione `setup-python-dependencies: false` à etapa "Inicializar CodeQL" do fluxo de trabalho. Para obter mais informações sobre a configuração da análise de dependências do Python, consulte "[Analisar as dependências do Python](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#analyzing-python-dependencies)". -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/pt-BR/content/github/getting-started-with-github/githubs-products.md b/translations/pt-BR/content/github/getting-started-with-github/githubs-products.md index 06bb3eaa00..3e0d2602b0 100644 --- a/translations/pt-BR/content/github/getting-started-with-github/githubs-products.md +++ b/translations/pt-BR/content/github/getting-started-with-github/githubs-products.md @@ -96,7 +96,7 @@ O {% data variables.product.prodname_ghe_one %} inclui [{% data variables.produc - {% data variables.contact.github_support %} {% data variables.product.premium_plus_support_plan %} - {% data variables.product.prodname_insights %} -- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" e "[Sobre {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta).{% endif %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} +- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" e "[Sobre {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta).{% endif %}{% if enterpriseServerVersions contém currentVersion e currentVersion ver_gt "enterprise-server@2.21" %}. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} - [{% data variables.product.prodname_learning %} para organizações](https://lab.github.com/organizations) Para obter mais informações sobre a inscrição em {% data variables.product.prodname_ghe_one %}, entre em contato com a equipe de vendas do [{% data variables.product.product_name %}](https://enterprise.github.com/contact). diff --git a/translations/pt-BR/content/github/getting-started-with-github/supported-browsers.md b/translations/pt-BR/content/github/getting-started-with-github/supported-browsers.md index 0d8c6d938f..fbd134dbf1 100644 --- a/translations/pt-BR/content/github/getting-started-with-github/supported-browsers.md +++ b/translations/pt-BR/content/github/getting-started-with-github/supported-browsers.md @@ -4,7 +4,7 @@ redirect_from: - /articles/why-doesn-t-graphs-work-with-ie-8/ - /articles/why-don-t-graphs-work-with-ie8/ - /articles/supported-browsers -intro: 'Nós projetamos o {% data variables.product.product_name %} para ser compatível com os navegadores web mais recentes. Nós suportamos as versões atuais de [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple. om/safari/), {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.16" %}Internet Explorer 11, {% endif %}and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' +intro: 'Nós projetamos o {% data variables.product.product_name %} para ser compatível com os navegadores web mais recentes. Oferecemos suporte às versões atuais de [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/) e [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' versions: free-pro-team: '*' enterprise-server: '*' diff --git a/translations/pt-BR/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md b/translations/pt-BR/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md index f292767d3f..d81a78c333 100644 --- a/translations/pt-BR/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md +++ b/translations/pt-BR/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md @@ -29,7 +29,7 @@ versions: 3. Altere o diretório de trabalho atual referente ao seu projeto local. 4. Inicialize o diretório local como um repositório Git. ```shell - $ git init + $ git init -b main ``` 5. Adicione os arquivos ao novo repositório local. Isso faz stage deles para o primeiro commit. ```shell @@ -67,7 +67,7 @@ versions: 3. Altere o diretório de trabalho atual referente ao seu projeto local. 4. Inicialize o diretório local como um repositório Git. ```shell - $ git init + $ git init -b main ``` 5. Adicione os arquivos ao novo repositório local. Isso faz stage deles para o primeiro commit. ```shell @@ -105,7 +105,7 @@ versions: 3. Altere o diretório de trabalho atual referente ao seu projeto local. 4. Inicialize o diretório local como um repositório Git. ```shell - $ git init + $ git init -b main ``` 5. Adicione os arquivos ao novo repositório local. Isso faz stage deles para o primeiro commit. ```shell diff --git a/translations/pt-BR/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md b/translations/pt-BR/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md index 1b8b0f1c49..9e2796cfd3 100644 --- a/translations/pt-BR/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md +++ b/translations/pt-BR/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md @@ -19,7 +19,7 @@ Os arquivos que você adiciona a um repositório por meio do navegador são limi {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. Abaixo do nome do repositório, clique em **Upload files** (Fazer upload de arquivos). ![Butão Upload files (Fazer upload de arquivos)](/assets/images/help/repository/upload-files-button.png) {% else %} 2. Acima da lista de arquivos, usando o menu suspenso **Adicionar arquivo** clique em **Fazer upload de arquivos**. !["Fazer upload de arquivos" no menu suspenso "Adicionar arquivo"](/assets/images/help/repository/upload-files-button.png) diff --git a/translations/pt-BR/content/github/managing-files-in-a-repository/navigating-code-on-github.md b/translations/pt-BR/content/github/managing-files-in-a-repository/navigating-code-on-github.md index a8ce9f7a4c..6cd7ac646d 100644 --- a/translations/pt-BR/content/github/managing-files-in-a-repository/navigating-code-on-github.md +++ b/translations/pt-BR/content/github/managing-files-in-a-repository/navigating-code-on-github.md @@ -10,6 +10,7 @@ versions: ### Sobre a navegação do código no {% data variables.product.prodname_dotcom %} As funções de navegar por código usam a biblioteca de código aberto [`semântica`](https://github.com/github/semantic). As linguagens a seguir são compatíveis: +- C# - CodeQL - Go - Java diff --git a/translations/pt-BR/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md b/translations/pt-BR/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md index b289b73483..1ddb6462e6 100644 --- a/translations/pt-BR/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md +++ b/translations/pt-BR/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md @@ -9,9 +9,9 @@ versions: --- -Os recursos interativos do notebook, como plots personalizados de JavaScript, não funcionam no seu repositório no {% data variables.product.product_location %}. Para ver um exemplo, consulte [*Linking and Interactions.ipynb*](https://github.com/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb). +Os recursos interativos do notebook, como plots personalizados de JavaScript, não funcionam no seu repositório no {% data variables.product.product_location %}. Para ver um exemplo, consulte [*Linking e Interactions.ipynb*](https://github.com/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb). -Para exibir o Jupyter Notebook com conteúdo JavaScript renderizado ou compartilhar arquivos do seu notebook com outras pessoas, use [nbviewer](https://nbviewer.jupyter.org/). Para ver um exemplo, consulte [*Linking and Interactions.ipynb*](https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb) renderizado no nbviewer. +Para exibir o Jupyter Notebook com conteúdo JavaScript renderizado ou compartilhar arquivos do seu notebook com outras pessoas, use [nbviewer](https://nbviewer.jupyter.org/). Para ver um exemplo, consulte [*Linking e Interactions.ipynb*](https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb) representados no nbviewer. Para exibir uma versão totalmente interativa do Jupyter Notebook, configure um servidor de notebook localmente. Para obter mais informações, consulte a [documentação oficial do Jupyter](http://jupyter.readthedocs.io/en/latest/index.html). diff --git a/translations/pt-BR/content/github/managing-large-files/about-git-large-file-storage.md b/translations/pt-BR/content/github/managing-large-files/about-git-large-file-storage.md index 81c3b123ee..ffd9421511 100644 --- a/translations/pt-BR/content/github/managing-large-files/about-git-large-file-storage.md +++ b/translations/pt-BR/content/github/managing-large-files/about-git-large-file-storage.md @@ -41,11 +41,13 @@ size 84977953 Ele rastreia a `version` (versão) do {% data variables.large_files.product_name_short %} que você está usando, seguida por um identificador exclusivo para o arquivo (`oid`). Ele também armazena o `size` (tamanho) do arquivo final. -{% tip %} +{% note %} -**Dica**: o {% data variables.large_files.product_name_short %} não pode ser usado com os sites do {% data variables.product.prodname_pages %}. +**Atenção**: +- {% data variables.large_files.product_name_short %} não pode ser usado com sites de {% data variables.product.prodname_pages %}. +- {% data variables.large_files.product_name_short %} não pode ser usado com repositórios de modelos. -{% endtip %} +{% endnote %} ### Leia mais diff --git a/translations/pt-BR/content/github/managing-large-files/conditions-for-large-files.md b/translations/pt-BR/content/github/managing-large-files/conditions-for-large-files.md index 1331e8abd0..6393d99d08 100644 --- a/translations/pt-BR/content/github/managing-large-files/conditions-for-large-files.md +++ b/translations/pt-BR/content/github/managing-large-files/conditions-for-large-files.md @@ -16,4 +16,4 @@ Se você tentar adicionar ou atualizar um arquivo maior do que {% data variables ### Pushes bloqueados para arquivos grandes -{% if currentVersion != "free-pro-team@latest" %}Por padrão, blocos do {% endif %}{% data variables.product.product_name %} fazem pushes que excedem {% data variables.large_files.max_github_size %}. {% if currentVersion != "free-pro-team@latest" %}No entanto, um administrador do site pode configurar um limite diferente para a sua instância de {% data variables.product.prodname_ghe_server %}. Para obter mais informações, consulte "[Definir limites de push do Git](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits)".{% endif %} +{% if enterpriseServerVersions contains currentVersion %}Por padrão, {% endif %}{% data variables.product.product_name %} bloqueia pushes que excedem {% data variables.large_files.max_github_size %}. {% if enterpriseServerVersions contains currentVersion %}No entanto, um administrador do site pode configurar um limite diferente para sua instância do {% data variables.product.prodname_ghe_server %}. Para obter mais informações, consulte "[Definir limites de push do Git](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits)".{% endif %} diff --git a/translations/pt-BR/content/github/managing-large-files/configuring-git-large-file-storage.md b/translations/pt-BR/content/github/managing-large-files/configuring-git-large-file-storage.md index dc493198df..22e36706ed 100644 --- a/translations/pt-BR/content/github/managing-large-files/configuring-git-large-file-storage.md +++ b/translations/pt-BR/content/github/managing-large-files/configuring-git-large-file-storage.md @@ -13,7 +13,7 @@ Se houver arquivos no seu repositório com os quais deseja usar o {% data variab {% data reusables.large_files.resolving-upload-failures %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index 0ce617f2fd..5f052b8a24 100644 --- a/translations/pt-BR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -1,6 +1,6 @@ --- -title: About alerts for vulnerable dependencies -intro: '{% data variables.product.product_name %} sends {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} when we detect vulnerabilities affecting your repository.' +title: Sobre alertas para dependências vulneráveis +intro: '{% data variables.product.product_name %} envia {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}alertas de segurança{% endif %} quando detectarmos vulnerabilidades que afetam o repositório.' redirect_from: - /articles/about-security-alerts-for-vulnerable-dependencies - /github/managing-security-vulnerabilities/about-security-alerts-for-vulnerable-dependencies @@ -9,103 +9,80 @@ versions: enterprise-server: '*' --- -### About vulnerable dependencies +### Sobre as dependências vulneráveis {% data reusables.repositories.a-vulnerability-is %} -When your code depends on a package that has a security vulnerability, this vulnerable dependency can cause a range of problems for your project or the people who use it. +Quando o seu código depende de um pacote que tenha uma vulnerabilidade de segurança, essa dependência vulnerável pode causar uma série de problemas para o seu projeto ou para as pessoas que o usam. -### Detection of vulnerable dependencies +### Detecção de dependências vulneráveis - {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %} detects vulnerable dependencies and sends {% data variables.product.prodname_dependabot_short %} alerts{% else %}{% data variables.product.product_name %} detects vulnerable dependencies and sends security alerts{% endif %} when: + {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot %} detecta dependências vulneráveis e envia {% data variables.product.prodname_dependabot_short %} alertas{% else %}{% data variables.product.product_name %} detecta dependências vulneráveis e envia alertas de segurança{% endif %} quando: {% if currentVersion == "free-pro-team@latest" %} -- A new vulnerability is added to the {% data variables.product.prodname_advisory_database %}. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)." -- New vulnerability data from [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database) is processed.{% else %} -- New advisory data is synchronized to {% data variables.product.prodname_ghe_server %} each hour from {% data variables.product.prodname_dotcom_the_website %}. For more information about advisory data, see "Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}."{% endif %} -- The dependency graph for a repository changes. For example, when a contributor pushes a commit to change the packages or versions it depends on{% if currentVersion == "free-pro-team@latest" %}, or when the code of one of the dependencies changes{% endif %}. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." +- Uma nova vulnerabilidade foi adicionada ao {% data variables.product.prodname_advisory_database %}. Para obter mais informações, consulte "[Pesquisar vulnerabilidades de segurança no {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)". +- São processados dados de nova vulnerabilidade retirados de [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database).{% else %} +- São sincronizados novos dados de consultoria com {% data variables.product.prodname_ghe_server %} a cada hora a partir de {% data variables.product.prodname_dotcom_the_website %}. Para obter mais informações sobre dados de consultoria, consulte "Procurar vulnerabilidades de segurança no {% data variables.product.prodname_advisory_database %}{% endif %} +- O gráfico de dependências para alterações de repositório. Por exemplo, quando um colaborador faz push de um commit para alterar os pacotes ou versões de que depende{% if currentVersion == "free-pro-team@latest" %} ou quando o código de uma das dependências muda{% endif %}. Para obter mais informações, consulte "[Sobre o gráfico de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)". -For a list of the ecosystems that {% data variables.product.product_name %} can detect vulnerabilities and dependencies for, see "[Supported package ecosystems](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)." +Para obter uma lista dos ecossistemas para os quais o {% data variables.product.product_name %} pode detectar vulnerabilidades e dependências, consulte "[Ecossistemas de pacotes compatíveis](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)". {% note %} -**Note:** It is important to keep your manifest and lock files up to date. If the dependency graph doesn't accurately reflect your current dependencies and versions, then you could miss alerts for vulnerable dependencies that you use. You may also get alerts for dependencies that you no longer use. +**Observação:** É importante manter seus manifestos atualizados e seu arquivos bloqueados. Se o gráfico de dependências não refletir corretamente suas dependências e versões atuais, você poderá perder alertas para dependências vulneráveis que você usar. Você também pode receber alertas de dependências que você já não usa. {% endnote %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" % %} -### {% data variables.product.prodname_dependabot %} alerts for vulnerable dependencies +### Alertas do {% data variables.product.prodname_dependabot %} para dependências vulneráveis {% else %} -### Security alerts for vulnerable dependencies +### Alertas de segurança para dependências vulneráveis {% endif %} {% data reusables.repositories.enable-security-alerts %} -{% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom %} detects and alerts users to vulnerable dependencies in _public_ repositories by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories. +{% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom %} detecta e alerta usuários para dependências vulneráveis em repositórios _públicos_ por padrão. Os proprietários de repositórios privados ou pessoas com acesso de administrador, podem habilitar o {% data variables.product.prodname_dependabot_alerts %} ativando o gráfico de dependências e {% data variables.product.prodname_dependabot_alerts %} para seus repositórios. -You can also enable or disable {% data variables.product.prodname_dependabot %} alerts for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +Você também pode habilitar ou desabilitar alertas do {% data variables.product.prodname_dependabot %} para todos os repositórios pertencentes à sua conta de usuário ou organização. Para mais informações consulte "[Gerenciar as configurações de segurança e análise da sua conta de usuário](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" ou "[Gerenciar as configurações de segurança e análise da sua organização](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)". -{% data variables.product.product_name %} starts generating the dependency graph immediately and sends alerts for any vulnerable dependencies as soon as they are identified. The graph is usually populated within minutes but this may take longer for repositories with many dependencies. For more information, see "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)." +{% data variables.product.product_name %} começa a gerar o gráfico de dependências imediatamente e envia alertas para quaisquer dependências vulneráveis assim que forem identificadas. O gráfico geralmente é preenchido em minutos, mas isso pode levar mais tempo para repositórios com muitas dependências. Para obter mais informações, consulte "[Gerenciando configurações do uso de dados de seu repositório privado](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)". {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert also contains a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."{% endif %} +Quando +{% data variables.product.product_name %} identifica uma dependência vulnerável, enviamos um alerta de {% data variables.product.prodname_dependabot_short %} aos mantenedores dos repositórios afetados com informações sobre a vulnerabilidade, um link para o arquivo afetado no projeto e informações sobre uma versão corrigida. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert will also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} -When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a security alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +Quando +{% data variables.product.product_name %} identifica uma dependência vulnerável, enviamos um alerta de segurança aos mantenedores dos repositórios afetados, com informações sobre a vulnerabilidade, um link para o arquivo afetado no projeto e informações sobre uma versão corrigida. {% endif %} {% warning %} -**Note**: {% data variables.product.product_name %}'s security features do not claim to catch all vulnerabilities. Though we are always trying to update our vulnerability database and alert you with our most up-to-date information, we will not be able to catch everything or alert you to known vulnerabilities within a guaranteed time frame. These features are not substitutes for human review of each dependency for potential vulnerabilities or any other issues, and we recommend consulting with a security service or conducting a thorough vulnerability review when necessary. +**Observação**: Os recursos de segurança de {% data variables.product.product_name %} não reivindicam garantem que todas as vulnerabilidades sejam detectadas. Embora estejamos sempre tentando atualizar nosso banco de dados de vulnerabilidades e alertar você com nossas informações mais atualizadas, não podemos capturar tudo nem alertar sobre vulnerabilidades conhecidas dentro de um prazo garantido. Esses recursos não substituem a revisão humana de cada dependência em busca de possíveis vulnerabilidades ou algum outro problema, e nossa sugestão é consultar um serviço de segurança ou realizar uma revisão completa de vulnerabilidade quando necessário. {% endwarning %} -### Access to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts +### Acesso a {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}alertas de segurança{% endif %} -You can see all of the alerts that affect a particular project{% if currentVersion == "free-pro-team@latest" %} on the repository's Security tab or{% endif %} in the repository's dependency graph.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %} +É possível ver todos os alertas que afetam um determinado projeto{% if currentVersion == "free-pro-team@latest" %} na aba Segurança do repositório ou{% endif %} no gráfico de dependências do repositório.{% if currentVersion == "free-pro-team@latest" %} Para obter mais informações, consulte "[Visualizar e atualizar dependências vulneráveis no seu repositório](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository){% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -We send {% data variables.product.prodname_dependabot_short %} alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository.{% if currentVersion == "free-pro-team@latest" %} You can also enable {% data variables.product.prodname_dependabot_short %} alerts for additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."{% endif %} +Nós enviamos +alertas de {% data variables.product.prodname_dependabot_short %} a pessoas com permissões de administrador nos repositórios afetados por padrão. {% data variables.product.product_name %} nunca divulga publicamente vulnerabilidades identificadas para qualquer repositório.{% if currentVersion == "free-pro-team@latest" %} Você também pode habilitar alertas de {% data variables.product.prodname_dependabot_short %} para repositórios de trabalho adicionais de equipes que você possui ou tem permissões de administrador. Para obter mais informações, consulte "[Gerenciar configurações de segurança e análise do repositório](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)".{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} -We send security alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +Enviamos alertas de segurança para as pessoas com permissões de administrador nos repositórios afetados por padrão. +O {% data variables.product.product_name %} nunca divulga publicamente vulnerabilidades identificadas para qualquer repositório. {% endif %} -### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %}{% if enterpriseServerVersions contém currentVersion e currentVersion ver_lt "enterprise-server@2. 1" %} Para mais informações, consulte "[Escolher o método de entrega para suas notificações](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 0" %} Para mais informações, consulte "[Configurar notificações para dependências vulneráveis](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."{% endif %} {% if currentVersion == "free-pro-team@latest" %} -By default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} +### Leia mais -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive {% data variables.product.prodname_dependabot_alerts %} by email. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#security-alert-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Choosing the delivery method for your notifications -](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.20" % %} - -{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} - -{% if currentVersion == "free-pro-team@latest" %} -### Further reading - -- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" -- "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)" -- "[Understanding how {% data variables.product.product_name %} uses and protects your data](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %} +- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" +- "[Exibir e atualizar dependências vulneráveis no repositório](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)" +- "[Entender como o {% data variables.product.product_name %} usa e protege seus dados](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %} diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md new file mode 100644 index 0000000000..b727305ceb --- /dev/null +++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md @@ -0,0 +1,33 @@ +--- +title: About GitHub Dependabot security updates +intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.' +shortTitle: About Dependabot security updates +versions: + free-pro-team: '*' +--- + +### Sobre o {% data variables.product.prodname_dependabot_security_updates %} + +{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot_short %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot_short %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + +{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot_short %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." + +{% note %} + +**Observação** + +The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. You will see a {% data variables.product.prodname_dependabot_short %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot_short %} is unable to update an indirect or transitive dependency that is not explicitly defined. Para obter mais informações, consulte "[Sobre o gráfico de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)". + +{% endnote %} + +### About pull requests for security updates + +Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. Isto inclui informações sobre a vulnerabilidade como, por exemplo, notas de lançamento, entradas de registros de mudanças e detalhes do commit. Detalhes de quais vulnerabilidades são resolvidas por um pull request de qualquer pessoa que não tem acesso aos alertas do {% data variables.product.prodname_dependabot_short %} para o repositório. + +When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot_short %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot_short %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)." + +{% data reusables.dependabot.automated-tests-note %} + +### Sobre pontuações de compatibilidade + +{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency. diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md index db51731db0..235627fcba 100644 --- a/translations/pt-BR/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md +++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md @@ -1,6 +1,7 @@ --- title: Pesquisar vulnerabilidades de segurança no banco de dados de consultoria do GitHub intro: 'O {% data variables.product.prodname_advisory_database %} permite que você pesquise vulnerabilidades que afetam projetos de código aberto no {% data variables.product.company_short %}.' +shortTitle: Browsing the Advisory Database versions: free-pro-team: '*' --- diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md index 32072a2aac..795dfe631d 100644 --- a/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md +++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md @@ -5,30 +5,16 @@ redirect_from: - /articles/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-updates +shortTitle: Configuring Dependabot security updates versions: free-pro-team: '*' --- -### Sobre o {% data variables.product.prodname_dependabot_security_updates %} +### About configuring {% data variables.product.prodname_dependabot_security_updates %} -O {% data variables.product.prodname_dependabot_short %} monitora as consultorias de segurança, como o {% data variables.product.prodname_advisory_database %} e o [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database) e aciona automaticamente um pull request quando detecta uma nova dependência vulnerável no gráfico de dependências dos repositórios. Para obter mais informações sobre o {% data variables.product.prodname_advisory_database %}, consulte "[Sobre o {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database#about-the-github-advisory-database)". +É possível habilitar o {% data variables.product.prodname_dependabot_security_updates %} para qualquer repositório que use alertas de {% data variables.product.prodname_dependabot_short %} e o gráfico de dependências. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)". -{% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} - -{% data variables.product.prodname_dependabot_short %} inclui um link para um pull request no alerta para a dependência vulnerável. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" e "[Sobre o gráfico de dependências](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)". - -Cada atualização de segurança contém tudo o que você precisa para revisar e mesclar, de forma rápida e segura, uma correção proposta no seu projeto. Isto inclui informações sobre a vulnerabilidade como, por exemplo, notas de lançamento, entradas de registros de mudanças e detalhes do commit. Detalhes de quais vulnerabilidades são resolvidas por um pull request de qualquer pessoa que não tem acesso aos alertas do {% data variables.product.prodname_dependabot_short %} para o repositório. - -Ao mesclar um pull request que contém uma atualização de segurança, o alerta correspondente será marcado como resolvido no seu repositório. - -{% note %} - -**Observação** -{% data variables.product.prodname_dependabot_security_updates %} resolve apenas vulnerabilidades de segurança nas dependências rastreadas pelo seu gráfico de dependências. As atualizações de segurança não são criadas para resolver vulnerabilidades em registros privados ou pacotes hospedados em repositórios privados. No entanto, as dependências indiretas ou transitórias são incluídas se forem definidas explicitamente em um arquivo bloqueado ou similar. Para obter mais informações, consulte "[Sobre o gráfico de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)". Além disso, é importante destacar que o {% data variables.product.prodname_dependabot_security_updates %} cria automaticamente pull requests com correções propostas para os arquivos bloqueados, para as dependências identificadas como vulneráveis. - -{% endnote %} - -É possível habilitar o {% data variables.product.prodname_dependabot_security_updates %} para qualquer repositório que use alertas de {% data variables.product.prodname_dependabot_short %} e o gráfico de dependências. Você pode desativar as {% data variables.product.prodname_dependabot_security_updates %} em um repositório individual ou para todos os repositórios que pertencem à sua conta de usuário ou organização. Para obter mais informações, consulte "[Gerenciar o {% data variables.product.prodname_dependabot_security_updates %} para seus repositórios](#managing-github-dependabot-security-updates-for-your-repositories) abaixo". +Você pode desativar as {% data variables.product.prodname_dependabot_security_updates %} em um repositório individual ou para todos os repositórios que pertencem à sua conta de usuário ou organização. Para obter mais informações, consulte "[Gerenciar o {% data variables.product.prodname_dependabot_security_updates %} para seus repositórios](#managing-github-dependabot-security-updates-for-your-repositories) abaixo". {% data reusables.dependabot.dependabot-tos %} @@ -53,10 +39,6 @@ O {% data variables.product.prodname_dotcom %} habilita automaticamente o {% dat Se as atualizações de segurança não estiverem habilitadas para o seu repositório e você não souber o motivo, primeiro tente habilitá-las utilizando as instruções fornecidas nas seções de procedimento abaixo. Se, ainda assim, as atualizações de segurança não funcionarem, você poderá [entrar em contato com o suporte](https://support.github.com/contact). -### Sobre pontuações de compatibilidade - -O {% data variables.product.prodname_dependabot_security_updates %} também inclui uma pontuação de compatibilidade para que você saiba se atualizar uma vulnerabilidade pode causar alterações significativas no seu projeto. Analisamos os testes de CI de execução anteriores a partir de repositórios públicos onde geramos uma determinada atualização de segurança para saber se a atualização faz com que ocorra uma falha nos testes. Uma pontuação de compatibilidade da atualização é a porcentagem de execuções de CI que foram aprovadas durante a atualização entre versões relevantes da dependência. - ### Gerenciar {% data variables.product.prodname_dependabot_security_updates %} para seus repositórios Você pode habilitar ou desabilitar {% data variables.product.prodname_dependabot_security_updates %} em um repositório individual. diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md new file mode 100644 index 0000000000..dbf47ece95 --- /dev/null +++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md @@ -0,0 +1,56 @@ +--- +title: Configuring notifications for vulnerable dependencies +shortTitle: Configuring notifications +intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts.' +versions: + free-pro-team: '*' + enterprise-server: '>=2.21' +--- + +### About notifications for vulnerable dependencies + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we send you {% data variables.product.prodname_dependabot_short %} alerts.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. +{% endif %} + +{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)." +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %} +Your site administrator needs to enable security alerts for vulnerable dependencies for {% data variables.product.product_location_enterprise %} before you can use the feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.20" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} by email.{% endif %} + +{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} + +You can configure notification settings for yourself or your organization from the Manage notifications drop-down {% octicon "bell" aria-label="The notifications bell" %} shown at the top of each page. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#choosing-your-notification-settings)." + +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} + ![{% data variables.product.prodname_dependabot_short %} alerts options](/assets/images/help/notifications-v2/dependabot-alerts-options.png) +{% else %} + ![Security alerts options](/assets/images/help/notifications-v2/security-alerts-options.png) +{% endif %} + +{% note %} + +**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)." + +{% endnote %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} + +### How to reduce the noise from notifications for vulnerable dependencies + +If you are concerned about receiving too many notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, we recommend you opt into the weekly email digest, or turn off notifications while keeping {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} enabled. You can still navigate to see your {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} in your repository's Security tab.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %} + +### Further reading + +- "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications)" +- "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-is-queries)" diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/index.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/index.md index 226c3a0d7f..efcc006abb 100644 --- a/translations/pt-BR/content/github/managing-security-vulnerabilities/index.md +++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/index.md @@ -28,8 +28,11 @@ versions: {% link_in_list /browsing-security-vulnerabilities-in-the-github-advisory-database %} {% link_in_list /about-alerts-for-vulnerable-dependencies %} + {% link_in_list /configuring-notifications-for-vulnerable-dependencies %} + {% link_in_list /about-github-dependabot-security-updates %} {% link_in_list /configuring-github-dependabot-security-updates %} {% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %} {% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %} + {% link_in_list /troubleshooting-github-dependabot-errors %} diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md new file mode 100644 index 0000000000..2d5a8e650f --- /dev/null +++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md @@ -0,0 +1,82 @@ +--- +title: Troubleshooting GitHub Dependabot errors +intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot_short %}.' +shortTitle: Solução de erros +versions: + free-pro-team: '*' +--- + +{% data reusables.dependabot.beta-note %} + +### About {% data variables.product.prodname_dependabot %} errors + +{% data reusables.dependabot.pull-request-introduction %} + +If anything prevents {% data variables.product.prodname_dependabot_short %} from raising a pull request, this is reported as an error. + +### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot_short %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_short %} alerts view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_short %} alerts** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request. + +![{% data variables.product.prodname_dependabot_short %} alerts view showing a pull request link](/assets/images/help/dependabot/dependabot-alert-pr-link.png) + +There are three reasons why an alert may have no pull request link: + +1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository. +1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file. +1. An error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request. + +If an error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request, you can display details of the error by clicking the alert. + +![{% data variables.product.prodname_dependabot_short %} alert showing the error that blocked the creation of a pull request](/assets/images/help/dependabot/dependabot-security-update-error.png) + +### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot_short %} are listed on the {% data variables.product.prodname_dependabot_short %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot_short %}** tab. + +![{% data variables.product.prodname_dependabot_short %} view showing an error](/assets/images/help/dependabot/dependabot-tab-view-error-beta.png) + +To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed. + +![{% data variables.product.prodname_dependabot_short %} version update error and log ](/assets/images/help/dependabot/dependabot-version-update-error-beta.png) + +### Understanding {% data variables.product.prodname_dependabot_short %} errors + +Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot_short %} configuration files. Consequently, some errors are specific to one type of update. + +#### {% data variables.product.prodname_dependabot_short %} cannot update DEPENDENCY to a non-vulnerable version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository. + +Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem. + +The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. Para obter detalhes, consulte "[Habilitando e desabilitando atualizações da versão](/github/administering-a-repository/enabling-and-disabling-version-updates)." + +#### {% data variables.product.prodname_dependabot_short %} cannot update to the required version as there is already an open pull request for the latest version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version. + +There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +#### {% data variables.product.prodname_dependabot_short %} timed out during its update + +{% data variables.product.prodname_dependabot_short %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out. + +This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot_short %} to review the version update and generate the pull request in the time available. + +If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. Para obter detalhes, consulte "[Habilitando e desabilitando atualizações da versão](/github/administering-a-repository/enabling-and-disabling-version-updates)." + +#### {% data variables.product.prodname_dependabot_short %} cannot open any more pull requests + +There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot_short %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests. + +There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. Para obter mais informações, consulte "[Opções de configuração para atualizações de dependências](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit)". + +The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +### Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually + +If you unblock {% data variables.product.prodname_dependabot_short %}, you can manually trigger a fresh attempt to create a pull request. + +- **Security updates**—display the {% data variables.product.prodname_dependabot_short %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot_short %} security update**. +- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**. diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md index f823bf4a77..1522435ed3 100644 --- a/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md +++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md @@ -1,6 +1,7 @@ --- title: Solução de problemas de detecção de dependências vulneráveis intro: 'Se as informações sobre dependências relatadas por {% data variables.product.product_name %} não são o que você esperava, há uma série de pontos a considerar, e várias coisas que você pode verificar.' +shortTitle: Troubleshooting detection versions: free-pro-team: '*' --- @@ -14,9 +15,9 @@ O {% data variables.product.prodname_dotcom %} gera e exibe dados de dependênci * {% data variables.product.prodname_advisory_database %} é uma das fontes de dados que {% data variables.product.prodname_dotcom %} usa para identificar dependências vulneráveis. É um banco de dados gratuito e curado com informações sobre vulnerabilidade para ecossistemas de pacote comum em {% data variables.product.prodname_dotcom %}. Inclui tanto dados relatados diretamente para {% data variables.product.prodname_dotcom %} de {% data variables.product.prodname_security_advisories %} quanto os feeds oficiais e as fontes comunitárias. Estes dados são revisados e curados por {% data variables.product.prodname_dotcom %} para garantir que informações falsas ou não acionáveis não sejam compartilhadas com a comunidade de desenvolvimento. Para obter mais informações, consulte "[Pesquisar vulnerabilidades de segurança no {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)" e "[Sobre {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)". * O gráfico de dependências analisa todos os arquivos conhecidos de manifesto de pacote no repositório de um usuário. Por exemplo, para o npm, ele irá analisar o arquivo _package-lock.json_. Ele constrói um gráfico de todas as dependências do repositório e dependências públicas. Isso acontece quando você habilita o gráfico de dependências e quando alguém faz push para o branch-padrão, e inclui commits que fazem alterações em um formato de manifesto compatível. Para obter mais informações, consulte "[Sobre o gráfico de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)". * {% data variables.product.prodname_dependabot_short %} verifica qualquer push, para o branch-padrão, que contém um arquivo de manifesto. Quando um novo registro de vulnerabilidade é adicionado, ele verifica todos os repositórios existentes e gera um alerta para cada repositório vulnerável. Os alertas do {% data variables.product.prodname_dependabot_short %} são agregados ao nível do repositório, em vez de criar um alerta por vulnerabilidade. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" -* {% data variables.product.prodname_dependabot_security_updates %} são acionados quando você recebe um alerta de segurança sobre uma dependência vulnerável em seu repositório. {% data variables.product.prodname_dotcom %} cria, automaticamente, uma pull request no seu repositório de modo a atualizar a dependência vulnerável para a mínima versão segura possível para evitar a vulnerabilidade. Para obter mais informações, consulte "[Configurando {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." - O {% data variables.product.prodname_dependabot_short %} não faz a varredura de repositórios de forma programada, mas sim, quando algo muda. Por exemplo, uma varredura é acionada quando uma nova dependência é adicionada ({% data variables.product.prodname_dotcom %} verifica isso em cada push), ou quando uma nova vulnerabilidade é descoberta e adicionada ao banco de dados consultivo. + {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. Por exemplo, uma varredura é acionada quando uma nova dependência é adicionada ({% data variables.product.prodname_dotcom %} verifica isso em cada push), ou quando uma nova vulnerabilidade é descoberta e adicionada ao banco de dados consultivo. ### Por que não recebo alertas de vulnerabilidade em alguns ecossistemas? @@ -97,3 +98,4 @@ Ao clicar para exibir os detalhes de alerta, você pode ver quantas vulnerabilid - "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" - "[Visualizar e atualizar dependências vulneráveis no seu repositório](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Gerenciar as configurações de segurança e análise para o seu repositório](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index 350a1d93e8..a42f22b489 100644 --- a/translations/pt-BR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -4,17 +4,18 @@ intro: 'Se o {% data variables.product.product_name %} descobrir dependências v redirect_from: - /articles/viewing-and-updating-vulnerable-dependencies-in-your-repository permissions: Os administradores e proprietários da organização podem visualizar e atualizar dependências. +shortTitle: Visualizar e atualizar dependências vulneráveis versions: free-pro-team: '*' --- A aba de alertas do {% data variables.product.prodname_dependabot %} do seu repositório lista todos {% data variables.product.prodname_dependabot_alerts %} e as {% data variables.product.prodname_dependabot_security_updates %} correspondente. Você pode classificar a lista de alertas usando o menu suspenso e clicar em determinados alertas para ver mais detalhes. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" -É possível habilitar atualizações de segurança automáticas para qualquer repositório que usa o {% data variables.product.prodname_dependabot_alerts %} e o gráfico de dependências. Para obter mais informações, consulte "[Configurando {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +É possível habilitar atualizações de segurança automáticas para qualquer repositório que usa o {% data variables.product.prodname_dependabot_alerts %} e o gráfico de dependências. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)". ### Sobre atualizações para dependências vulneráveis no seu repositório -O {% data variables.product.product_name %} envia {% data variables.product.prodname_dependabot_alerts %} quando detectamos vulnerabilidades que afetam o seu repositório. Para repositórios em que o {% data variables.product.prodname_dependabot_security_updates %} está ativado, quando {% data variables.product.product_name %} detecta uma dependência vulnerável, {% data variables.product.prodname_dependabot_short %} cria um pull request para corrigi-la. {% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} +O {% data variables.product.product_name %} envia {% data variables.product.prodname_dependabot_alerts %} quando detectamos vulnerabilidades que afetam o seu repositório. Para repositórios em que o {% data variables.product.prodname_dependabot_security_updates %} está ativado, quando {% data variables.product.product_name %} detecta uma dependência vulnerável, {% data variables.product.prodname_dependabot_short %} cria um pull request para corrigi-la. O pull request irá atualizar a dependência para a versão minimamente segura possível, o que é necessário para evitar a vulnerabilidade. ### Visualizar e atualizar dependências vulneráveis @@ -33,3 +34,4 @@ O {% data variables.product.product_name %} envia {% data variables.product.prod - "[Configurar {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" - "[Gerenciar as configurações de segurança e análise para o seu repositório](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" - "[Solução de problemas na detecção de dependências vulneráveis](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md index 82721ad95f..16873ff450 100644 --- a/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md +++ b/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md @@ -163,25 +163,10 @@ Se você for integrante de mais de uma organização, você poderá configurar c ### Opções de notificação de alerta de segurança {% endif %} -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}Escolha como deseja receber {% data variables.product.prodname_dependabot_alerts %} para os repositórios que você está inspecionando. Você pode receber {% if page.version == 'dotcom' %} {% data variables.product.prodname_dependabot_alerts %} {% else %} alertas de segurança {% endif %} na sua caixa de entrada, como um banner no {% data variables.product.product_name %}, na linha de comando, por email ou alguma combinação dessas opções. +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} -Se quiser receber {% data variables.product.prodname_dependabot_alerts %} por e-mail, escolha se você deseja receber um resumo semanal de vulnerabilidades para até 10 repositórios ou se deseja receber um novo email cada vez que uma vulnerabilidade for detectada. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)". {% endif %} - -{% if currentVersion == "enterprise-server@2.21" %}Escolha como deseja receber alertas de segurança para os repositórios que você está inspecionando. Você pode receber alertas de segurança na sua caixa de entrada, como um banner no {% data variables.product.product_name %}, na linha de comando, por e-mail ou alguma combinação dessas opções. - -Se você desejar receber alertas de segurança por e-mail, escolha se você deseja receber um resumo semanal de vulnerabilidades para até 10 repositórios ou se deseja receber um novo e-mail cada vez que uma vulnerabilidade for detectada. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)". {% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} - ![Opções de alertas {% data variables.product.prodname_dependabot_short %} ](/assets/images/help/notifications-v2/dependabot-alerts-options.png) -{% else %} - ![Opções de alerta de segurança](/assets/images/help/notifications-v2/security-alerts-options.png) -{% endif %} - -{% note %} - -**Observação:** Você pode filtrar as notificações da sua caixa de entrada de {% data variables.product.company_short %} por {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot_short %}{% else %} alertas de segurança{% endif %}. Para obter mais informações, consulte "[Gerenciando notificações de sua caixa de entrada](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)". - -{% endnote %} +Para mais informações sobre os métodos de entrega de notificação disponíveis para você e aconselhamento sobre como otimizar as notificações para {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}alertas de segurança{% endif %}, consulte "[Configurar notificações para dependências vulneráveis](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)". {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} diff --git a/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md index 74b9fb8fc5..2e6d8acf0f 100644 --- a/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md +++ b/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md @@ -124,6 +124,8 @@ Para filtrar notificações para uma atividade específica no {% data variables. - `is:repository-advisory` - `is:team-discussion` +Para informações sobre a redução de ruído de notificações para {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}alertas de segurança{% endif %}, consulte "[Configurar notificações para dependências vulneráveis](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)". + Você também pode usar a consulta `is:` para descrever como a notificação passou pela triagem. - `is:saved` diff --git a/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md b/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md index fde2dea8c2..8719b244d1 100644 --- a/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md +++ b/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md @@ -38,7 +38,7 @@ Ao cancelar a assinatura de notificações em sua caixa de entrada, elas desapar {% data reusables.notifications.access_notifications %} 1. Na caixa de entrada de notificações, selecione as notificações das quais você deseja cancelar sua assinatura. -2. Use o menu suspenso **selecionado** {% octicon "triangle-down" aria-label="The down triangle icon" %} para clicar em **Cancelar assinatura**. ![Opção de cancelamento de assinatura da caixa de entrada principal](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) +2. Use o menu suspenso **selecionado** {% octicon "triangle-down" aria-label="The down triangle icon" %} para clicar em **Cancelar inscrição.** ![Opção de cancelamento de assinatura da caixa de entrada principal](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) ### Cancelar assinatura de notificações na página de assinaturas diff --git a/translations/pt-BR/content/github/managing-your-work-on-github/about-automation-for-project-boards.md b/translations/pt-BR/content/github/managing-your-work-on-github/about-automation-for-project-boards.md index b2236a36c8..333c92f88e 100644 --- a/translations/pt-BR/content/github/managing-your-work-on-github/about-automation-for-project-boards.md +++ b/translations/pt-BR/content/github/managing-your-work-on-github/about-automation-for-project-boards.md @@ -29,7 +29,10 @@ A automação do quadro de projeto também pode ajudar as equipes a desenvolver | Concluído |
    • Mover todos os problemas fechados aqui
    • Mover todas as pull requests mescladas aqui
    • Mover todas as pull requests fechadas e não mescladas aqui
    | ### Acompanhamento do andamento do projeto -A automação do quadro de projeto permite o acompanhamento do andamento por padrão. Os cartões em colunas com as predefinições "Tarefas pendentes", "Em andamento" ou "Concluído" contam no andamento geral do projeto. {% data reusables.project-management.project-progress-locations %} + +Você pode acompanhar o progresso no seu quadro de projeto. Cartões nas colunas "Pendente", "Em progresso" ou "Concluído" contam para o progresso geral do projeto. {% data reusables.project-management.project-progress-locations %} + +Para obter mais informações, consulte "[Acompanhamento do progresso no quadro de projeto](/github/managing-your-work-on-github/tracking-progress-on-your-project-board)". ### Leia mais - "[Configurar automação para quadros de projeto](/articles/configuring-automation-for-project-boards)"{% if currentVersion == "free-pro-team@latest" %} diff --git a/translations/pt-BR/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md b/translations/pt-BR/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md index 53a67879b0..f6f3178e42 100644 --- a/translations/pt-BR/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md +++ b/translations/pt-BR/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md @@ -10,7 +10,7 @@ versions: --- {% warning %} -**Warning:** If you add an image to a pull request or issue comment, anyone can view the anonymized image URL without authentication, even if the pull request is in a private repository{% if currentVersion != "free-pro-team@latest" %}, or if private mode is enabled{% endif %}. To keep sensitive images private, serve them from a private network or server that requires authentication. {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} +**Warning:** If you add an image to a pull request or issue comment, anyone can view the anonymized image URL without authentication, even if the pull request is in a private repository{% if enterpriseServerVersions contains currentVersion %}, or if private mode is enabled{% endif %}. To keep sensitive images private, serve them from a private network or server that requires authentication. {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} {% endwarning %} @@ -20,7 +20,7 @@ To attach a file to an issue or pull request conversation, drag and drop it into {% tip %} -**Tip:** If you're using Chrome, you can also copy-and-paste images directly into the box. +**Tip:** In many browsers, you can copy-and-paste images directly into the box. {% endtip %} diff --git a/translations/pt-BR/content/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue.md b/translations/pt-BR/content/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue.md index 9c64551c3d..12af8adfe4 100644 --- a/translations/pt-BR/content/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue.md +++ b/translations/pt-BR/content/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue.md @@ -13,7 +13,7 @@ versions: {% note %} -**Note:** The special keywords in a pull request description are interpreted when the pull request targets the repository's *default* branch. However, if the PR's base is *any other branch*, then these keywords are ignored, no links are created and merging the PR has no effect on the issues. **If you want to link a pull request to an issue using a keyword, the PR must be on the default branch.** +**Observação:** As palavras-chave especiais na descrição de um pull request são interpretadas quando o pull request aponta para o branch-padrão do *repositório*. No entanto, se a base do PR's for *qualquer outro branch*, essas palavras-chave serão ignoradas, nenhum link será criado e o merge do PR não terá efeito sobre os problemas. **Se você deseja vincular um pull request a um problema usando uma palavra-chave, o PR deverá estar no branch-padrão.** {% endnote %} @@ -41,7 +41,7 @@ Você pode vincular manualmente até dez problemas para cada pull request. O pro ### Vinculando uma pull request a um problema usando uma palavra-chave -You can link a pull request to an issue by using a supported keyword in the pull request's description or in a commit message (please note that the pull request must be on the default branch). +Você pode vincular uma solicitação de pull a um problema usando uma palavra-chave compatível na descrição do pull request ou em uma mensagem de commit (observe que a solicitação do pull deve estar no branch-padrão). * close * closes diff --git a/translations/pt-BR/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md b/translations/pt-BR/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md index a18706490c..87f582f894 100644 --- a/translations/pt-BR/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md +++ b/translations/pt-BR/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md @@ -8,6 +8,12 @@ versions: enterprise-server: '*' --- +{% note %} + +**Observação:** Para vincular um repositório à sua organização ou quadro de projeto de propriedade de usuário, o repositório precisa ter problemas habilitados. Para obter informações sobre como ver se os problemas estão desabilitados em um repositório, consulte "[Desabilitar problemas](/github/managing-your-work-on-github/disabling-issues)". + +{% endnote %} + Qualquer pessoa com permissões de gravação em um quadro de projeto pode vincular repositórios pertencentes a essa organização ou conta de usuário ao quadro de projeto. Para obter mais informações, consulte "[Permissões de quadro de projeto da organização](/articles/project-board-permissions-for-an-organization/)" ou "[Níveis de permissão para quadros de projetos de propriedade de usuários](/articles/permission-levels-for-user-owned-project-boards/)". {% data reusables.project-management.link-repos-to-project-board %} Você pode adicionar problemas e pull requests de quaisquer repositórios desvinculados digitando a URL do problema ou pull request em um cartão. Para obter mais informações, consulte "[Adicionar problemas e pull requests a um quadro de projeto](/articles/adding-issues-and-pull-requests-to-a-project-board)". diff --git a/translations/pt-BR/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md b/translations/pt-BR/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md index 5174a629f2..6ac7e7f9c1 100644 --- a/translations/pt-BR/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md +++ b/translations/pt-BR/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md @@ -1,6 +1,6 @@ --- title: Acompanhar o andamento do quadro de projeto -intro: 'Por padrão, quando você habilita a automação em um quadro de projeto, pode acompanhar o andamento geral do projeto em uma barra de progresso.' +intro: 'Você pode ver o progresso geral do seu projeto na barra de progresso.' redirect_from: - /articles/tracking-progress-on-your-project-board versions: @@ -10,7 +10,7 @@ versions: {% data reusables.project-management.project-progress-locations %} -1. Navegue para o quadro de projeto no qual você deseja desabilitar o acompanhamento do andamento do projeto. +1. Acesse o quadro de projeto onde você deseja habilitar ou desabilitar o acompanhamento do progresso do projeto. {% data reusables.project-management.click-menu %} -{% data reusables.project-management.access-collaboration-settings %} -4. Desmarque **Track project progress** (Acompanhar andamento do projeto). +{% data reusables.project-management.click-edit-sidebar-menu-project-board %} +4. Selecione ou desmarque **Acompanhar o progresso do projeto**. diff --git a/translations/pt-BR/content/github/searching-for-information-on-github/finding-files-on-github.md b/translations/pt-BR/content/github/searching-for-information-on-github/finding-files-on-github.md index da9f4fb4ab..0b10b5d04d 100644 --- a/translations/pt-BR/content/github/searching-for-information-on-github/finding-files-on-github.md +++ b/translations/pt-BR/content/github/searching-for-information-on-github/finding-files-on-github.md @@ -18,7 +18,7 @@ versions: {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. No nome do repositório, clique em **Find file** (Localizar arquivo). ![Botão Find file (Localizar arquivo)](/assets/images/help/search/find-file-button.png) {% else %} 2. Acima da lista de arquivos, clique em **Ir para o arquivo**. ![Botão Find file (Localizar arquivo)](/assets/images/help/search/find-file-button.png) diff --git a/translations/pt-BR/content/github/searching-for-information-on-github/searching-for-packages.md b/translations/pt-BR/content/github/searching-for-information-on-github/searching-for-packages.md index f6d2f51993..22abbc6261 100644 --- a/translations/pt-BR/content/github/searching-for-information-on-github/searching-for-packages.md +++ b/translations/pt-BR/content/github/searching-for-information-on-github/searching-for-packages.md @@ -14,7 +14,7 @@ versions: É possível procurar pacotes globalmente em todos os {% data variables.product.product_name %} ou pesquisar pacotes dentro de uma determinada organização. Para obter mais informações, consulte "[Sobre a pesquisa no {% data variables.product.prodname_dotcom %}](/articles/about-searching-on-github)". -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Você só pode pesquisar pacotes em {% data variables.product.product_location_enterprise %}, não em {% data variables.product.prodname_dotcom_the_website %}, mesmo se {% data variables.product.prodname_github_connect %} estiver habilitado. {% endif %} diff --git a/translations/pt-BR/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md b/translations/pt-BR/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md index e10b204a26..123a673286 100644 --- a/translations/pt-BR/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md +++ b/translations/pt-BR/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md @@ -13,7 +13,7 @@ Você pode pesquisar problemas e pull requests globalmente no {% data variables. {% tip %} -**Dicas:**{% if currentVersion != "free-pro-team@latest" %} +**Tips:**{% if enterpriseServerVersions contains currentVersion %} - Este artigo tem exemplos de pesquisa no site {% data variables.product.prodname_dotcom %}.com, mas você pode usar os mesmos filtros de pesquisa na {% data variables.product.product_location_enterprise %}.{% endif %} - Para obter uma lista de sintaxes de pesquisa que podem ser adicionadas a qualquer qualificador de pesquisa para melhorar ainda mais os resultados, consulte "[Entender a sintaxe de pesquisa](/articles/understanding-the-search-syntax)". - Use aspas em termos de pesquisa com várias palavras. Por exemplo, se quiser pesquisar problemas com a etiqueta "In progress," pesquise `label:"in progress"`. A pesquisa não faz distinção entre maiúsculas e minúsculas. diff --git a/translations/pt-BR/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md b/translations/pt-BR/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md index 814c3ffc1e..58a10ab88f 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md @@ -51,7 +51,7 @@ O número de trabalhos que você pode executar simultaneamente em todos os repos No final do mês, {% data variables.product.prodname_dotcom %} calcula o custo de minutos e armazenamento usado sobre o valor incluído em sua conta. Por exemplo, se sua organização usa {% data variables.product.prodname_team %} e permite gastos ilimitados, usando 15.000 minutos, poderia ter um custo total de armazenamento e custo médio de minuto de $56, dependendo dos sistemas operacionais usados para executar trabalhos. - 5.000 (3.000 Linux e 2.000 Windows) minutos = $56 ($24 + $32). - - 3.000 minutos Linux a $0,008 por = $24. + - 3,000 Linux minutes at $0.008 per minute = $24. - 2.000 minutos do Windows a $0,016 por minuto = $32. No final do mês, {% data variables.product.prodname_dotcom %} arredonda sua transferência de dados para o GB mais próximo. diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md index a84b241442..bc41b1f22b 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md @@ -19,7 +19,7 @@ Para obter mais informações, consulte: ![Imagem de uma menção de equipe](/assets/images/help/teams/team-mention.png) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Você também pode usar a sincronização LDAP para sincronizar os integrantes e funções da equipe da {% data variables.product.product_location_enterprise %} com os grupos LDAP estabelecidos. Isso permite estabelecer o controle de acesso baseado em função para usuários do servidor LDAP em vez de manualmente na {% data variables.product.product_location_enterprise %}. Para obter mais informações, consulte "[Habilitar a Sincronização LDAP](/enterprise/{{ page.version }}/admin/guides/user-management/using-ldap#enabling-ldap-sync)". @@ -55,7 +55,7 @@ Para entender facilmente quem compartilha permissões da equipe principal e faz Você pode escolher uma principal quando criar a equipe ou pode mover uma equipe na hierarquia da organização posteriormente. Para obter mais informações, consulte "[Mover uma equipe na hierarquia da sua organização](/articles/moving-a-team-in-your-organization-s-hierarchy)". -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.enterprise_user_management.ldap-sync-nested-teams %} diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md index 40d77f2390..dbbc9bfe2c 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md @@ -28,7 +28,7 @@ Na barra lateral esquerda do painel, é possível acessar os principais reposit Na seção "All activity" (Todas as atividades) do seu feed de notícias, você pode ver atualizações de outras equipes e repositórios em sua organização. -A seção "All activity" (Todas as atividades) mostra todas as últimas atividades na organização, inclusive atividades em repositórios que você não assina e de pessoas que você não está seguindo. Para obter mais informações, consulte {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 0" %}"Sobre notificações](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Inspecionar e deixar de inspecionar repositórios](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" e "[Seguir pessoas](/articles/following-people)." +A seção "All activity" (Todas as atividades) mostra todas as últimas atividades na organização, inclusive atividades em repositórios que você não assina e de pessoas que você não está seguindo. For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." Por exemplo, o feed de notícias da organização mostra atualizações quando alguém na organização: - Cria um branch. diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md index 88ac265be8..ae045f3f1f 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md @@ -17,7 +17,7 @@ Você pode habilitar o {% data variables.product.prodname_actions %} para todos Como alternativa, você pode habilitar o {% data variables.product.prodname_actions %} para todos os repositórios na sua organização e limitar as ações que um fluxo de trabalho pode executar. {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### Gerenciar as permissões de {% data variables.product.prodname_actions %} para a sua organização diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md index f3231626ad..51ef231c91 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md @@ -12,7 +12,7 @@ versions: You can control whether members of your organization can publish websites from repositories in your organization using {% data variables.product.prodname_pages %}. For more information about {% data variables.product.prodname_pages %}, see "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages)." -{% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." +{% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. For more information, see{% if enterpriseServerVersions contains currentVersion %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." ### Disabling publication of {% data variables.product.prodname_pages %} sites diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/index.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/index.md index a999fc78c2..60222923b7 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/index.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/index.md @@ -127,7 +127,7 @@ versions: {% link_in_list /disabling-publication-of-github-pages-sites-for-your-organization %} {% link_in_list /deleting-an-organization-account %} {% link_in_list /converting-an-organization-into-a-user %} - + {% link_in_list /integrating-jira-with-your-organization-project-board %} diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md index c645cd71b8..acf51aae46 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md @@ -63,7 +63,7 @@ Os integrantes da organização podem ter funções de *proprietário*{% if curr | Comprar, instalar, gerenciar cobranças e cancelar aplicativos do {% data variables.product.prodname_marketplace %} | **X** | | | | Listar aplicativos no {% data variables.product.prodname_marketplace %} | **X** | | | | Recebe [{% data variables.product.prodname_dependabot_alerts %} sobre dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) para todos os repositórios de uma organização | **X** | | | -| Gerenciar {% data variables.product.prodname_dependabot_security_updates %} (consulte "[Configurar {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)") | **X** | | | +| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | | | [Gerenciar a política de bifurcação](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | | | [Limitar a atividade em repositórios públicos na organização](/articles/limiting-interactions-in-your-organization) | **X** | | | | Fazer pull (ler), fazer push (gravar) e clonar (copiar) *todos os repositórios* na organização | **X** | | | diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md index b0029b8eea..66375ea090 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md @@ -47,7 +47,7 @@ To search for specific events, use the `action` qualifier in your query. Actions | `repository_content_analysis` | Contains all activities related to [enabling or disabling data use for a private repository](/articles/about-github-s-use-of-your-data). | `repository_dependency_graph` | Contains all activities related to [enabling or disabling the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository).{% endif %} | `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} +| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion %} | `team` | Contains all activities related to teams in your organization.{% endif %} | `team_discussions` | Contains activities related to managing team discussions for an organization. @@ -85,7 +85,7 @@ This list describes the available categories and associated events: - [The `repository_content_analysis` category](#the-repository_content_analysis-category) - [The `repository_dependency_graph` category](#the-repository_dependency_graph-category){% endif %} - [The `repository_vulnerability_alert` category](#the-repository_vulnerability_alert-category){% if currentVersion == "free-pro-team@latest" %} -- [The `sponsors` category](#the-sponsors-category){% endif %}{% if currentVersion != "free-pro-team@latest" %} +- [The `sponsors` category](#the-sponsors-category){% endif %}{% if enterpriseServerVersions contains currentVersion %} - [The `team` category](#the-team-category){% endif %} - [The `team_discussions` category](#the-team_discussions-category) @@ -184,7 +184,8 @@ For more information, see "[Restricting publication of {% data variables.product |------------------|-------------------{% if currentVersion == "free-pro-team@latest"%} | `audit_log_export` | Triggered when an organization admin [creates an export of the organization audit log](#exporting-the-audit-log). If the export included a query, the log will list the query used and the number of audit log entries matching that query. | `block_user` | Triggered when an organization owner [blocks a user from accessing the organization's repositories](/articles/blocking-a-user-from-your-organization). -| `cancel_invitation` | Triggered when an organization invitation has been revoked. +| `cancel_invitation` | Triggered when an organization invitation has been revoked. {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization).{% endif %} {% if currentVersion == "free-pro-team@latest"%} | `disable_oauth_app_restrictions` | Triggered when an owner [disables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/disabling-oauth-app-access-restrictions-for-your-organization) for your organization. | `disable_saml` | Triggered when an organization admin disables SAML single sign-on for an organization.{% endif %} | `disable_member_team_creation_permission` | Triggered when an organization owner limits team creation to owners. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | @@ -196,13 +197,22 @@ For more information, see "[Restricting publication of {% data variables.product | `invite_member` | Triggered when [a new user was invited to join your organization](/articles/adding-organization-members-to-a-team).{% if currentVersion == "free-pro-team@latest" %} | `oauth_app_access_approved` | Triggered when an owner [grants organization access to an {% data variables.product.prodname_oauth_app %}](/articles/approving-oauth-apps-for-your-organization/). | `oauth_app_access_denied` | Triggered when an owner [disables a previously approved {% data variables.product.prodname_oauth_app %}'s access](/articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization) to your organization. -| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). +| `remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest"%} | `remove_billing_manager` | Triggered when an [owner removes a billing manager from an organization](/articles/removing-a-billing-manager-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and a billing manager doesn't use 2FA or disables 2FA. |{% endif %} | `remove_member` | Triggered when an [owner removes a member from an organization](/articles/removing-a-member-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an organization member doesn't use 2FA or disables 2FA. Also triggered when an [organization member removes themselves](/articles/removing-yourself-from-an-organization/) from an organization.| -| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" %} +| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). {% endif %}{% if currentVersion == "free-pro-team@latest" %} | `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." -| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." -| `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/articles/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). +| `runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. +| `runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. +| `runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). +| `runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. {% endif %}{% if currentVersion == "free-pro-team@latest"%} +| `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/articles/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} | `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} | `update_default_repository_permission` | Triggered when an owner changes the default repository permission level for organization members. | `update_member` | Triggered when an owner changes a person's role from owner to member or member to owner. @@ -300,21 +310,26 @@ For more information, see "[Restricting publication of {% data variables.product | `access` | Triggered when a repository owned by an organization is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). | `add_member` | Triggered when a user accepts an [invitation to have collaboration access to a repository](/articles/inviting-collaborators-to-a-personal-repository). | `add_topic` | Triggered when a repository admin [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. -| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} +| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if enterpriseServerVersions contains currentVersion %} | `config.disable_anonymous_git_access` | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | `config.enable_anonymous_git_access` | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | `config.lock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). | `config.unlock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is unlocked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access).{% endif %} -| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository). +| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository).{% endif %} | `destroy` | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} | `disable` | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %} -| `enable` | Triggered when a repository is reenabled. -| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository). +| `enable` | Triggered when a repository is reenabled.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret.{% endif %} +| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). +| `remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). {% endif %} | `remove_topic` | Triggered when a repository admin removes a topic from a repository. | `rename` | Triggered when [a repository is renamed](/articles/renaming-a-repository). | `transfer` | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). | `transfer_start` | Triggered when a repository transfer is about to occur. -| `unarchived` | Triggered when a repository admin unarchives a repository. +| `unarchived` | Triggered when a repository admin unarchives a repository.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret.{% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -351,7 +366,7 @@ For more information, see "[Restricting publication of {% data variables.product | repo_funding_links_file_action | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### The `team` category | Action | Description diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md index 85468de630..eb76b713f1 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md @@ -27,6 +27,8 @@ Para obter mais informações sobre acesso e gerenciamento de integrantes, consu Para obter mais informações sobre o gerenciamento de contas corporativas usando a API GraphQL, consulte "[Contas corporativas](/v4/guides/managing-enterprise-accounts)". +{% if currentVersion == "free-pro-team@latest" %} + ### Gerenciar organizações vinculadas à sua conta corporativa As organizações são contas compartilhadas, onde grupos de pessoas podem colaborar em vários projetos de uma vez. Os proprietários podem gerenciar o acesso dos integrantes aos dados e projetos da organização com recursos sofisticados de segurança e administrativos. Para obter mais informações, consulte "[Sobre organizações](/articles/about-organizations)". @@ -35,6 +37,8 @@ Os proprietários corporativos podem criar organizações e vinculá-las à empr Para obter mais informações, consulte "[Gerenciar organizações na sua conta corporativa](/articles/managing-organizations-in-your-enterprise-account)" e "[Configurar políticas para organizações em sua conta corporativa](/articles/setting-policies-for-organizations-in-your-enterprise-account)". +{% endif %} + ### Gerenciando as licenças {% data variables.product.prodname_ghe_server %} vinculadas à sua conta corporativa {% data reusables.enterprise-accounts.admin-managing-licenses %} diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md index 2dd90d2327..7a75d8c7a3 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md @@ -1,6 +1,6 @@ --- -title: Configurar o período de retenção para artefatos e registros do GitHub Actions na sua conta corporativa -intro: 'Os proprietários de empresas podem configurar o período de retenção para artefatos e registros de {% data variables.product.prodname_actions %} de uma conta corporativa.' +title: Configuring the retention period for GitHub Actions artifacts and logs in your enterprise account +intro: 'Enterprise owners can configure the retention period for {% data variables.product.prodname_actions %} artifacts and logs in an enterprise account.' product: '{% data reusables.gated-features.enterprise-accounts %}' miniTocMaxHeadingLevel: 4 versions: @@ -10,7 +10,7 @@ versions: {% data reusables.actions.about-artifact-log-retention %} -## Definir o período de retenção para uma empresa +## Setting the retention period for an enterprise {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/index.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/index.md index 9eaddb3935..629ce0b394 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/index.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/index.md @@ -6,6 +6,7 @@ redirect_from: - /categories/setting-up-and-managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md index a335ad13cf..4370448c9c 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/managing-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md index 8e5e58b2b0..17f0cecad4 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md @@ -6,5 +6,6 @@ redirect_from: - /articles/managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md index bb0d289531..53d0de627d 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/setting-policies-for-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md index 67d63d7c71..2f5f609b24 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md @@ -18,6 +18,9 @@ As contas corporativas atualmente estão disponíveis para clientes do {% data v {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} -4. Em "User licenses" (Licenças de usuário), exiba o total de licenças, o número de licenças consumidas e a data de expiração da sua assinatura. ![Informações de assinaturas e licenças nas configurações de cobrança da empresa](/assets/images/help/business-accounts/billing-license-info.png) -5. Para ver as informações das licenças de usuário em uso atualmente, clique em **Ver informações**. +{% data reusables.enterprise-accounts.license-tab %} +4. Under "User +{% if currentVersion == "free-pro-team@latest" %}Licenses{% else %}licenses{% endif %}", view your total licenses, number of consumed licenses, and your subscription expiration date. + {% if currentVersion == "free-pro-team@latest" %}![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png){% else %} + ![Informações de assinaturas e licenças nas configurações de cobrança da empresa](/assets/images/enterprise/enterprises/enterprise-server-billing-license-info.png){% endif %} +5. To view details of the user licenses currently in use, click **View {% if currentVersion == "free-pro-team@latest" %}details{% else %}users{% endif %}**. diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md b/translations/pt-BR/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md index 7235446fd1..20f7558cbe 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md @@ -25,7 +25,7 @@ Na sua página de perfil, determinadas ações contam como contribuições: - Fazer commit no branch `gh-pages` ou no branch padrão de um repositório - Abrir um problema - Propor uma pull request -- Enviar um pull request{% if currentVersion != "free-pro-team@latest" %} +- Enviar uma revisão de pull request{% if enterpriseServerVersions contains currentVersion %} - Fazer coautoria de commits no branch `gh-pages` ou no branch padrão do repositório{% endif %} {% data reusables.pull_requests.pull_request_merges_and_contributions %} diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md b/translations/pt-BR/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md index bd1d0e0c78..9aa583468c 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md @@ -29,10 +29,10 @@ Além disso, **pelo menos uma** das seguintes afirmativas devem ser verdadeiras: - Você bifurcou o repositório. - Você abriu uma pull request ou um problema no repositório. - Você marcou o repositório como favorito. -{% if currentVersion != "free-pro-team@latest" %} + ### Motivos comuns para as contribuições não serem contabilizadas -{% data reusables.pull_requests.pull_request_merges_and_contributions %}{% endif %} +{% data reusables.pull_requests.pull_request_merges_and_contributions %} #### O commit foi criado menos de 24 horas atrás @@ -67,7 +67,7 @@ Os commits só são contados se forem feitos no branch-padrão ou no branch `gh- Se os commits estiverem em um branch que não seja `gh-pages` ou o padrão e você quiser que eles sejam contabilizados para suas contribuições, precisará seguir um destes procedimentos: - [Abrir uma pull request](/articles/creating-a-pull-request) para que ocorra o merge das alterações no branch `gh-pages` ou padrão. -- [Alterar o branch padrão](/github/administering-a-repository/changing-the-default-branch) do repositório. +- [Change the default branch](/github/administering-a-repository/changing-the-default-branch) of the repository. {% warning %} diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/index.md b/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/index.md index 5e2f1795d6..515d533547 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/index.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/index.md @@ -24,7 +24,7 @@ versions: {% link_in_list /managing-the-default-branch-name-for-your-repositories %} {% link_in_list /managing-security-and-analysis-settings-for-your-user-account %} {% link_in_list /managing-access-to-your-user-accounts-project-boards %} - + {% link_in_list /integrating-jira-with-your-personal-projects %} diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md b/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md index b612becec8..57a370e676 100644 --- a/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md +++ b/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md @@ -1,6 +1,6 @@ --- title: Gerenciar o nome do branch-padrão para seus repositórios -intro: 'Você pode definir os novos repositórios com nome do branch-padrão que você cria em {% data variables.product.product_location %}.' +intro: 'You can set the default branch name new repositories that you create on {% data variables.product.product_location %}.' versions: free-pro-team: '*' enterprise-server: '>=2.23' @@ -8,7 +8,7 @@ versions: ### Sobre o gerenciamento do nome do brancc-padrão -Ao criar um novo repositório em {% data variables.product.product_location %}, o repositório conterá um branch, que será o branch-padrão. Você pode alterar o nome que {% data variables.product.product_name %} usa para o branch-padrão em novos repositórios que você criar. Para obter mais informações sobre o branch padrão, consulte "[Sobre branches](/github/collaborating-with-issues-and-pull-requests/about-branches#about-the-default-branch)". +When you create a new repository on {% data variables.product.product_location %}, the repository contains one branch, which is the default branch. You can change the name that {% data variables.product.product_name %} uses for the default branch in new repositories you create. Para obter mais informações sobre o branch padrão, consulte "[Sobre branches](/github/collaborating-with-issues-and-pull-requests/about-branches#about-the-default-branch)". {% data reusables.branches.change-default-branch %} @@ -22,4 +22,4 @@ Ao criar um novo repositório em {% data variables.product.product_location %}, ### Leia mais -- "[Gerenciar o nome do branch-padrão para repositórios na sua organização](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)" +- "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)" diff --git a/translations/pt-BR/content/github/site-policy/github-enterprise-subscription-agreement.md b/translations/pt-BR/content/github/site-policy/github-enterprise-subscription-agreement.md index 1f5917ae86..133d214dda 100644 --- a/translations/pt-BR/content/github/site-policy/github-enterprise-subscription-agreement.md +++ b/translations/pt-BR/content/github/site-policy/github-enterprise-subscription-agreement.md @@ -330,7 +330,7 @@ A aparência do Serviço é Copyright © GitHub, Inc. Todos os direitos reservad #### 3.5.2 Violação de direitos autorais e política DMCA. -Se o Cliente for proprietário de direitos autorais e acreditar que o Conteúdo no Serviço viola seus direitos autorais, ele poderá notificar o GitHub de acordo com a [Lei dos Direitos Autorais do Milênio Digital](https://github.com/contact/dmca) (DMCA – Digital Millenium Copyright Act Policy) usando o [Formulário DMCA](https://github.com/contact/dmca-notice) ou pelo e-mail copyright@github.com. +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 3.5.3 Logotipos e marcas registradas do GitHub. diff --git a/translations/pt-BR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/translations/pt-BR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md index c079aa0894..a8ca41da39 100644 --- a/translations/pt-BR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md +++ b/translations/pt-BR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md @@ -1,6 +1,6 @@ --- -title: GitHub Insights and data protection for your organization -intro: '{% data variables.product.prodname_insights %} analyzes your {% data variables.product.prodname_ghe_server %} data. This data could include personal data of individuals in your organization who may have the right to understand how such personal data is being used.' +title: O GitHub Insights e a proteção de dados para sua organização +intro: '{% data variables.product.prodname_insights %} analisa seus dados {% data variables.product.prodname_ghe_server %}. Esses dados podem incluir dados pessoais de indivíduos em sua organização que podem ter o direito de entender como esses dados pessoais estão sendo usados.' product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization @@ -9,38 +9,38 @@ versions: enterprise-server: '*' --- -For more information about the terms that govern {% data variables.product.prodname_insights %}, see your {% data variables.product.prodname_ghe_one %} subscription agreement. +Para obter mais informações sobre os termos que regem {% data variables.product.prodname_insights %}, consulte o seu contrato de assinatura do {% data variables.product.prodname_ghe_one %}. -For the avoidance of doubt, none of the foregoing information should be considered legal advice provided by {% data variables.product.prodname_dotcom %}. You are responsible for securing your own legal analysis of the information provided herein and for your compliance with privacy and data protection laws. It is up to you whether to use {% data variables.product.prodname_insights %} to process your employees’ and users’ data, and if you do so, you are solely responsible for conducting such processing in compliance with applicable law. +Para evitar dúvidas, nenhuma das informações acima devem ser consideradas aconselhamento legal fornecido por {% data variables.product.prodname_dotcom %}. Você é responsável por proteger sua própria análise legal das informações fornecidas neste documento e pelo seu cumprimento das leis de privacidade e proteção de dados. Fica a seu critério exclusivo usar {% data variables.product.prodname_insights %} para processar os dados dos seus funcionários e usuários e, se você fizer isso, você é o único responsável por realizar esse processamento em conformidade com a lei aplicável. -### The organization’s roles and responsibilities +### Funções e responsabilidades da organização -When using {% data variables.product.prodname_insights %}, your organization is the data controller because your organization determines whether, how, and why {% data variables.product.prodname_insights %} will process any individual’s personal data. Your organization is solely responsible for ensuring that you are complying with all applicable laws in processing data with {% data variables.product.prodname_insights %}. +Ao usar o {% data variables.product.prodname_insights %}, sua organização é o controlador de dados porque sua organização determina se, como e por que {% data variables.product.prodname_insights %} processará os dados pessoais de qualquer indivíduo. Sua organização é a única responsável por garantir que você esteja cumprindo com todas as leis aplicáveis no processamento de dados com {% data variables.product.prodname_insights %}. -### Data privacy recommendations +### Recomendação de privacidade de dados -You have full control over which metrics, reports, repositories, and contributors to include before beginning use of {% data variables.product.prodname_insights %}. The data you process with {% data variables.product.prodname_insights %} can only be pulled from your installation of {% data variables.product.prodname_ghe_server %}. Consider balancing the risks versus the benefits of analyzing personal data. +Você tem total controle sobre quais métricas, relatórios, repositórios e contribuidores incluir antes de iniciar o uso do {% data variables.product.prodname_insights %}. Os dados que você processa com {% data variables.product.prodname_insights %} só podem ser retirados da sua instalação do {% data variables.product.prodname_ghe_server %}. Considere equilibrar os riscos versus os benefícios da análise de dados pessoais. -- **Develop a clear analysis plan**: You must understand clearly what you want to analyze and why, and then consider how {% data variables.product.prodname_insights %} may help you find those answers. +- **Desenvolva um plano de análise claro**: você deve entender claramente o que você quer analisar e por quê, e, em seguida, considere como {% data variables.product.prodname_insights %} pode ajudá-lo a encontrar essas respostas. -- **Consider a data protection impact assessment**: If your proposed use of {% data variables.product.prodname_insights %} involves processing personal data, consider completing a data protection impact assessment or otherwise completing formal legal analysis of your planned use. +- **Considere uma avaliação de impacto de proteção de dados**: Se seu uso proposto de {% data variables.product.prodname_insights %} envolver processamento de dados pessoais, considere a conclusão de uma avaliação de impacto de proteção de dados ou a conclusão de uma análise jurídica formal do seu uso planejado. -### Decide what data to use +### Decida quais dados usar -- **Decide which repositories to include**: Before you start an analysis in {% data variables.product.prodname_insights %}, consider which repositories to include. Administrators can include repositories when adding organizations and can enable and disable repositories at any time. For more information on adding organizations to {% data variables.product.prodname_insights %}, see "[Managing organizations](/insights/installing-and-configuring-github-insights/managing-organizations)." For more information on enabling and disabling repositories, see "[Managing repositories](/insights/installing-and-configuring-github-insights/managing-repositories)." +- **Decida quais repositórios incluir**: Antes de iniciar uma análise em {% data variables.product.prodname_insights %}, considere quais repositórios incluir. Os administradores podem incluir repositórios quando estiverem adicionando organizações e podem habilitar e desabilitar repositórios a qualquer momento. Para obter mais informações sobre como adicionar organizações ao {% data variables.product.prodname_insights %}, consulte "[Gerenciar organizações](/insights/installing-and-configuring-github-insights/managing-organizations). Para obter mais informações sobre como ativar e desativar repositórios, consulte "[Gerenciar repositórios](/insights/installing-and-configuring-github-insights/managing-repositories)". -- **Decide which metrics and reports to include**: Administrators can enable and disable metrics and reports available for all users at any time. Administrators control the {% data variables.product.prodname_insights %} data that users have access to in your installation of {% data variables.product.prodname_ghe_server %}. For more information, see "[Managing available metrics and reports](/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports)." +- **Decida quais métricas e relatórios incluir**: Os administradores podem ativar e desativar as métricas e relatórios disponíveis para todos os usuários a qualquer momento. Os administradores controlam os dados do {% data variables.product.prodname_insights %} aos quais os usuários têm acesso na sua instalação do {% data variables.product.prodname_ghe_server %}. Para obter mais informações, consulte "[Gerenciar métricas e relatórios disponíveis](/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports)" -- **Decide which contributors to include**: Administrators can disable a specific contributor’s data from being processed in the metrics and reports. For more information on managing contributor data, see "[Managing contributors and teams](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)." +- **Decida quais contribuidores incluir**: Os administradores podem desativar os dados de um colaborador específico de serem processados nas métricas e relatórios. Para obter mais informações sobre o gerenciamento de dados do contribuidor, consulte "[Gerenciar contribuidores e equipes](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)". -### User rights +### Direitos do usuário -Under various data protection regulations, such as the General Data Protection Regulation (GDPR), users may have the right to request exclusion from processing, access, and correction, or to request deletion of their personal data. As the data controller, your organization should evaluate whether a particular user request is valid and, if appropriate, take action to fulfill the request. +Sob vários regulamentos de proteção de dados, como o Regulamento Geral de Proteção de Dados (RGPD), usuários podem ter o direito de solicitar a exclusão de processamento, acesso e correção ou solicitar a exclusão de seus dados pessoais. Como controlador de dados, sua organização deve avaliar se uma solicitação específica do usuário é válida e, se for o caso, tomar medidas para atender à solicitação. -- **Exclusion of processing**: Users may have the right to have their personal data excluded from being processed. Administrators have the ability to remove a contributor’s data from being processed in {% data variables.product.prodname_insights %}, and the resulting reports and metrics will exclude the contributor’s data accordingly. For more information, see "[Managing contributors and teams](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)." +- **Exclusão de processamento**: Os usuários podem ter o direito de ter seus dados pessoais excluídos do processamento. Os administradores têm a capacidade de remover do processamento os dados de um contribuinte em {% data variables.product.prodname_insights %} e os relatórios e métricas resultantes excluirão os dados do contribuidor apropriadamente. Para obter mais informações, consulte "[Gerenciar contribuidores e equipes](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)." -- **Access**: Users may have the right to demand to see what personal data is being processed. Each metric and report has a detailed description of what personal data is being processed. For more information, see "[Metrics available with {% data variables.product.prodname_insights %}](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)." Raw data is available through the {% data variables.product.prodname_enterprise %} API. Your organization is responsible for any decisions to process personal data and for fulfilling any such requests. +- **Acesso**: Os usuários podem ter o direito de exigir quais dados pessoais estão sendo processados. Cada métrica e cada relatório tem uma descrição detalhada dos dados pessoais que estão sendo processados. Para obter mais informações, consulte "[Mérticas disponíveis com o {% data variables.product.prodname_insights %}](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)". Os dados brutos estão disponíveis através da API do {% data variables.product.prodname_enterprise %}. Sua organização é responsável por quaisquer decisões de processamento de dados pessoais e pelo cumprimento de tais solicitações. -- **Correction and deletion**: Users may have the right to rectify or delete their personal data. The data used in {% data variables.product.prodname_insights %} is derived from the existing data you add to or generate from your {% data variables.product.prodname_ghe_server %} installation. Correction and deletion should follow your organization's existing process to correct and delete data from {% data variables.product.prodname_ghe_server %}. +- **Correção e exclusão**: Os usuários podem ter o direito de corrigir ou excluir seus dados pessoais. Os dados usados em {% data variables.product.prodname_insights %} são derivados de dados existentes que você adiciona ou gera a partir da instalação do seu {% data variables.product.prodname_ghe_server %}. A correção e a exclusão devem seguir o processo existente da sua organização para corrigir e excluir dados de {% data variables.product.prodname_ghe_server %}. -- **Transparency regarding processing**: Each metric and report has a detailed description of what personal data is being processed. For more information, see "[Metrics available with {% data variables.product.prodname_insights %}](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)." +- **Transparência em relação ao processamento**: Cada métrica e relatório tem uma descrição detalhada de quais dados pessoais estão sendo processados. Para obter mais informações, consulte "[Mérticas disponíveis com o {% data variables.product.prodname_insights %}](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)". diff --git a/translations/pt-BR/content/github/site-policy/github-sensitive-data-removal-policy.md b/translations/pt-BR/content/github/site-policy/github-sensitive-data-removal-policy.md index 8fe35d7226..0e0e6987c5 100644 --- a/translations/pt-BR/content/github/site-policy/github-sensitive-data-removal-policy.md +++ b/translations/pt-BR/content/github/site-policy/github-sensitive-data-removal-policy.md @@ -76,7 +76,7 @@ Essas diretrizes destinam-se a tornar o processamento de solicitação de remoç ### Como enviar sua solicitação -Você pode enviar sua solicitação para remover dados confidenciais através do nosso [formulário de contato](https://support.github.com/contact). Por favor, inclua uma versão simples de texto da sua solicitação no corpo da mensagem. Enviar sua solicitação em um anexo pode resultar em atrasos. +Você pode enviar sua solicitação para remover dados confidenciais através do nosso [formulário de contato](https://support.github.com/contact?tags=docs-sensitive-data). Por favor, inclua uma versão simples de texto da sua solicitação no corpo da mensagem. Enviar sua solicitação em um anexo pode resultar em atrasos. ### Disputas diff --git a/translations/pt-BR/content/github/site-policy/github-subprocessors-and-cookies.md b/translations/pt-BR/content/github/site-policy/github-subprocessors-and-cookies.md index 0d15a034ff..05b1c7f992 100644 --- a/translations/pt-BR/content/github/site-policy/github-subprocessors-and-cookies.md +++ b/translations/pt-BR/content/github/site-policy/github-subprocessors-and-cookies.md @@ -10,7 +10,7 @@ versions: free-pro-team: '*' --- -Data de vigência: **2 de outubro 2020** +Effective date: **October 2, 2020** O GitHub fornece um grande acordo de transparência em relação à forma como usamos seus dados, como os coletamos e com quem compartilhamos. Para tanto, nós fornecemos esta página, que detalha [nossos subprocessadores](#github-subprocessors), como usamos [cookies](#cookies-on-github), e onde e como executamos qualquer [rastreamento no GitHub](#tracking-on-github). @@ -28,7 +28,7 @@ Quando compartilhamos suas informações com terceiros subprocessadores, tais co | DiscoverOrg | Serviço de enriquecimento de dados de marketing | Estados Unidos | Estados Unidos | | Eloqua | Automatização da campanha marketing | Estados Unidos | Estados Unidos | | Google Apps | Infraestrutura interna da empresa | Estados Unidos | Estados Unidos | -| Google Analytics | Análise e desempenho | Estados Unidos | Estados Unidos | +| Google Analytics | Analytics and performance | Estados Unidos | Estados Unidos | | LinkedIn Navigator | Serviço de enriquecimento de dados de marketing | Estados Unidos | Estados Unidos | | Magic Robot | Relatórios de campanha (Complemento para Vendas) | Estados Unidos | Estados Unidos | | MailChimp | Fornecedor de serviços de correio para emissão de bilhetes a clientes | Estados Unidos | Estados Unidos | @@ -49,49 +49,49 @@ Quando trouxermos um novo subprocessador que lida com as Informações Pessoais ### Cookies no GitHub -O GitHub usa cookies e tecnologias semelhantes (coletivamente denominados “cookies”) para fornecer e proteger nossos sites, bem como analisar o uso dos nossos sites, para oferecer a você uma ótima experiência de usuário. Consulte nossa [Declaração de privacidade](/github/site-policy/github-privacy-statement#our-use-of-cookies-and-tracking) se você quiser saber mais informações sobre cookies e sobre como e por que os usamos. +GitHub uses cookies and similar technologies (collectively, “cookies”) to provide and secure our websites, as well as to analyze the usage of our websites, in order to offer you a great user experience. Please take a look at our [Privacy Statement](/github/site-policy/github-privacy-statement#our-use-of-cookies-and-tracking) if you’d like more information about cookies, and on how and why we use them. -Como o número e os nomes dos cookies podem mudar, a tabela abaixo pode ser atualizada de vez em quando. +Since the number and names of cookies may change,the table below may be updated from time to time. -| Provedor de serviço | Nome do cookie | Descrição | Vencimento* | -|:------------------- |:------------------------------------ |:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:---------------------------------------------------------------------------- | -| GitHub | `app_manifest_token` | Este cookie é usado durante o fluxo do manifesto do aplicativo para manter o estado do fluxo durante o redirecionamento para buscar uma sessão do usuário. | cinco minutos | -| GitHub | `cookie-preferences` | Este cookie é usado para rastrear preferências de cookie do usuário. | um ano | -| GitHub | `_device_id` | Este cookie é usado para rastrear dispositivos reconhecidos. | um ano | -| GitHub | `dotcom_user` | Este cookie é usado para sinalizar que o usuário já está logado. | um ano | -| GitHub | `_gh_ent` | Este cookie é usado para aplicação temporária e para o estado da estrutura entre páginas, como em que etapa o cliente se encontra em um processo de várias etapas. | duas semanas | -| GitHub | `_gh_sess` | Este cookie é usado para aplicação temporária e para o estado do framework entre páginas, como por exemplo, em qual etapa o usuário está em um formulário de várias etapas. | sessão | -| GitHub | `gist_oauth_csrf` | Este cookie é definido pelo Gist para garantir que o usuário que iniciou o fluxo de autenticação seja o mesmo usuário que o completa. | excluído quando o estado do oauth é validado | -| GitHub | `gist_user_session` | Este cookie é usado pelo Gist ao ser executado em um host separado. | duas semanas | -| GitHub | `has_recent_activity` | Este cookie é usado para impedir a exibição de intersticial de segurança para usuários que visitaram o aplicativo recentemente. | uma hora | -| GitHub | `__Host-gist_user_session_same_site` | Este cookie foi definido para garantir que os navegadores que suportam cookies do SameSite possam verificar se uma solicitação é originária do GitHub. | duas semanas | -| GitHub | `__Host-user_session_same_site` | Este cookie foi definido para garantir que os navegadores que suportam cookies do SameSite possam verificar se uma solicitação é originária do GitHub. | duas semanas | -| GitHub | `logged_in` | Este cookie é usado para sinalizar que o usuário já está logado. | um ano | -| GitHub | `marketplace_repository_ids` | Este cookie é usado para o fluxo de instalação do marketplace. | uma hora | -| GitHub | `marketplace_suggested_target_id` | Este cookie é usado para o fluxo de instalação do marketplace. | uma hora | -| GitHub | `_octo` | Este cookie é usado pelo nosso serviço interno de análise para distinguir usuários e clientes únicos. | um ano | -| GitHub | `org_transform_notice` | Este cookie é usado para fornecer aviso durante a transformação da organização. | uma hora | -| GitHub | `private_mode_user_session` | Este cookie é usado para solicitações de autenticação da empresa. | duas semanas | -| GitHub | `saml_csrf_token` | Este cookie é definido pelo método de caminho de autenticação SAML para associar um token ao cliente. | até que o usuário feche o navegador ou conclua a solicitação de autenticação | -| GitHub | `saml_csrf_token_legacy` | Este cookie é definido pelo método de caminho de autenticação SAML para associar um token ao cliente. | até que o usuário feche o navegador ou conclua a solicitação de autenticação | -| GitHub | `saml_return_to` | Este cookie é definido pelo método de caminho de autenticação SAML para manter o estado durante o loop de autenticação SAML. | até que o usuário feche o navegador ou conclua a solicitação de autenticação | -| GitHub | `saml_return_to_legacy` | Este cookie é definido pelo método de caminho de autenticação SAML para manter o estado durante o loop de autenticação SAML. | até que o usuário feche o navegador ou conclua a solicitação de autenticação | -| GitHub | `tz` | Este cookie permite que seu navegador nos diga em que fuso horário você está. | sessão | -| GitHub | `user_session` | Este cookie é usado para fazer seu login. | duas semanas | -| Google Analytics** | `_ga` | Este cookie é usado pelo Google Analytics. | dois anos | -| Google Analytics** | `_gat` | Este cookie é usado pelo Google Analytics. | um minuto | -| Google Analytics** | `_gid` | Este cookie é usado pelo Google Analytics. | um dia | +| Service Provider | Cookie Name | Descrição | Expiration* | +|:------------------ |:------------------------------------ |:------------------------------------------------------------------------------------------------------------------------------------------ |:------------------------------------------------------------- | +| GitHub | `app_manifest_token` | This cookie is used during the App Manifest flow to maintain the state of the flow during the redirect to fetch a user session. | five minutes | +| GitHub | `cookie-preferences` | This cookie is used to track user cookie preferences. | one year | +| GitHub | `_device_id` | This cookie is used to track recognized devices. | one year | +| GitHub | `dotcom_user` | This cookie is used to signal to us that the user is already logged in. | one year | +| GitHub | `_gh_ent` | This cookie is used for temporary application and framework state between pages like what step the customer is on in a multiple step form. | two weeks | +| GitHub | `_gh_sess` | This cookie is used for temporary application and framework state between pages like what step the user is on in a multiple step form. | sessão | +| GitHub | `gist_oauth_csrf` | This cookie is set by Gist to ensure the user that started the oauth flow is the same user that completes it. | deleted when oauth state is validated | +| GitHub | `gist_user_session` | This cookie is used by Gist when running on a separate host. | two weeks | +| GitHub | `has_recent_activity` | This cookie is used to prevent showing the security interstitial to users that have visited the app recently. | one hour | +| GitHub | `__Host-gist_user_session_same_site` | This cookie is set to ensure that browsers that support SameSite cookies can check to see if a request originates from GitHub. | two weeks | +| GitHub | `__Host-user_session_same_site` | This cookie is set to ensure that browsers that support SameSite cookies can check to see if a request originates from GitHub. | two weeks | +| GitHub | `logged_in` | This cookie is used to signal to us that the user is already logged in. | one year | +| GitHub | `marketplace_repository_ids` | This cookie is used for the marketplace installation flow. | one hour | +| GitHub | `marketplace_suggested_target_id` | This cookie is used for the marketplace installation flow. | one hour | +| GitHub | `_octo` | This cookie is used by our internal analytics service to distinguish unique users and clients. | one year | +| GitHub | `org_transform_notice` | This cookie is used to provide notice during organization transforms. | one hour | +| GitHub | `private_mode_user_session` | This cookie is used for Enterprise authentication requests. | two weeks | +| GitHub | `saml_csrf_token` | This cookie is set by SAML auth path method to associate a token with the client. | until user closes browser or completes authentication request | +| GitHub | `saml_csrf_token_legacy` | This cookie is set by SAML auth path method to associate a token with the client. | until user closes browser or completes authentication request | +| GitHub | `saml_return_to` | This cookie is set by the SAML auth path method to maintain state during the SAML authentication loop. | until user closes browser or completes authentication request | +| GitHub | `saml_return_to_legacy` | This cookie is set by the SAML auth path method to maintain state during the SAML authentication loop. | until user closes browser or completes authentication request | +| GitHub | `tz` | This cookie allows your browser to tell us what time zone you're in. | sessão | +| GitHub | `user_session` | This cookie is used to log you in. | two weeks | +| Google Analytics** | `_ga` | This cookie is used by Google Analytics. | two years | +| Google Analytics** | `_gat` | This cookie is used by Google Analytics. | one minute | +| Google Analytics** | `_gid` | This cookie is used by Google Analytics. | one day | -_*_ A data de **expiração** para os cookies listados abaixo geralmente se aplicam em uma base contínua. +_*_ The **expiration** dates for the cookies listed below generally apply on a rolling basis. -_**_ Utilizamos o **Google Analytics** como um serviço de análise de terceiros para coletar informações sobre o desempenho do nosso site e como nossos usuários navegam e usam o GitHub de modo geral. Isso nos ajuda a avaliar o uso do GitHub pelos nossos usuários, compilar relatórios estatísticos sobre atividades e melhorar nosso conteúdo e desempenho do site. +_**_ We use **Google Analytics** as a third party analytics service to collect information about how our website performs and how our users, in general, navigate through and use GitHub. This helps us evaluate our users' use of GitHub, compile statistical reports on activity, and improve our content and website performance. -Você pode controlar suas preferências de cookie do Google Analytics através do nosso link de preferência de cookie, localizado no rodapé do nosso site. Além disso, o Google fornece mais informações sobre suas próprias práticas de privacidade e [oferece um complemento do navegador para desativar o acompanhamento do Google Analytics](https://tools.google.com/dlpage/gaoptout). +You can control your Google Analytics cookie preferences through our cookie preference link located at the footer of our website. In addition, Google provides further information about its own privacy practices and [offers a browser add-on to opt out of Google Analytics tracking](https://tools.google.com/dlpage/gaoptout). -(!) Observe que certas páginas do nosso site podem definir outros cookies de terceiros. Por exemplo, podemos incorporar conteúdo, como vídeos, de outro site que define um cookie. Embora tentemos minimizar esses cookies de terceiros, nem sempre podemos controlar quais cookies esse conteúdo de terceiros define. +(!) Please note certain pages on our website may set other third party cookies. For example, we may embed content, such as videos, from another site that sets a cookie. While we try to minimize these third party cookies, we can’t always control what cookies this third party content sets. ### Rastreamento no GitHub -"[Não rastrear](https://www.eff.org/issues/do-not-track)" (DNT) é uma preferência de privacidade que você pode definir no seu navegador se não quiser que os serviços on-line coletem e compartilhem certos tipos de informações sobre asua atividade on-line de serviços de rastreamento de terceiros. O GitHub responde aos sinais de DNT dos navegadores e segue o [padrão do W3C de resposta aos sinais de DNT](https://www.w3.org/TR/tracking-dnt/). Se você deseja configurar seu navegador para sinalizar que não gostaria de ser rastreado, verifique a documentação do seu navegador para saber como ativar essa sinalização. Há também bons aplicativos que bloqueiam o rastreamento online, como [Badger de Privacidade](https://www.eff.org/privacybadger). +"[Do Not Track](https://www.eff.org/issues/do-not-track)" (DNT) is a privacy preference you can set in your browser if you do not want online services to collect and share certain kinds of information about your online activity from third party tracking services. O GitHub responde aos sinais de DNT dos navegadores e segue o [padrão do W3C de resposta aos sinais de DNT](https://www.w3.org/TR/tracking-dnt/). If you would like to set your browser to signal that you would not like to be tracked, please check your browser's documentation for how to enable that signal. There are also good applications that block online tracking, such as [Privacy Badger](https://www.eff.org/privacybadger). -Caso você não tenha habilitado o DNT em um navegador compatível com esse recurso, os cookies de algumas partes do nosso site rastrearão sua atividade de navegação online em outros serviços online ao longo do tempo, embora não permitamos que terceiros além de nossos provedores de análise e serviços monitorem a atividade dos usuários do GitHub ao longo do tempo no GitHub. Temos acordos com certos fornecedores, como fornecedores de análise, que nos ajudam a rastrear os movimentos dos visitantes em determinadas páginas no nosso site. Apenas nossos fornecedores, que estão coletando informações pessoais em nosso nome, podem coletar dados em nossas páginas, e assinamos contratos de proteção de dados com cada fornecedor que recolhe esses dados em nosso nome. Usamos os dados que recebemos desses fornecedores para entender melhor os interesses de nossos visitantes, entender o desempenho de nosso site e melhorar nosso conteúdo. Qualquer fornecedor de análise será listado na nossa [lista de subprocessadores](#github-subprocessors), e você pode ver uma lista de cada página em que coletamos esse tipo de dados abaixo. +If you have not enabled DNT on a browser that supports it, cookies on some parts of our website will track your online browsing activity on other online services over time, though we do not permit third parties other than our analytics and service providers to track GitHub users' activity over time on GitHub. We have agreements with certain vendors, such as analytics providers, who help us track visitors' movements on certain pages on our website. Only our vendors, who are collecting personal information on our behalf, may collect data on our pages, and we have signed data protection agreements with every vendor who collects this data on our behalf. We use the data we receive from these vendors to better understand our visitors' interests, to understand our website's performance, and to improve our content. Any analytics vendor will be listed in our [subprocessor list](#github-subprocessors), and you may see a list of every page where we collect this kind of data below. diff --git a/translations/pt-BR/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md b/translations/pt-BR/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md index c55011a2c8..6ee1de86eb 100644 --- a/translations/pt-BR/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md +++ b/translations/pt-BR/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md @@ -175,7 +175,7 @@ A aparência do Serviço é Copyright © GitHub, Inc. Todos os direitos reservad #### 2.5.2 Violação de direitos autorais e política DMCA. -Se o Cliente for proprietário de direitos autorais e acreditar que o Conteúdo no Serviço viola seus direitos autorais, ele poderá notificar o GitHub de acordo com a [Lei dos Direitos Autorais do Milênio Digital](https://github.com/contact/dmca) (DMCA – Digital Millenium Copyright Act Policy) usando o [Formulário DMCA](https://github.com/contact/dmca-notice) ou pelo e-mail copyright@github.com. +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 2.5.3 Logotipos e marcas registradas do GitHub. diff --git a/translations/pt-BR/content/github/site-policy/github-trademark-policy.md b/translations/pt-BR/content/github/site-policy/github-trademark-policy.md index 2432674881..68e7acb7b6 100644 --- a/translations/pt-BR/content/github/site-policy/github-trademark-policy.md +++ b/translations/pt-BR/content/github/site-policy/github-trademark-policy.md @@ -23,7 +23,7 @@ Quando recebemos relatórios de violações de políticas de marcas de propriet ### Como faço para denunciar uma violação da Política de Marca? -Os proprietários de marcas registradas podem relatar possíveis violações de política de marcas registradas ao GitHub, via [formulário de contato](https://support.github.com/contact). Por favor, envie solicitações relacionadas a marcas registradas a partir do seu endereço de e-mail comercial e inclua todas as informações solicitadas abaixo para ajudar a acelerar nossa resposta. Também certifique-se de nos descrever claramente por que razão a conta pode causar confusão com a sua marca ou como a conta pode mitigar ou manchar sua marca. +Os proprietários de marcas registradas podem relatar possíveis violações de política de marcas registradas ao GitHub, via [formulário de contato](https://support.github.com/contact?tags=docs-trademark). Por favor, envie solicitações relacionadas a marcas registradas a partir do seu endereço de e-mail comercial e inclua todas as informações solicitadas abaixo para ajudar a acelerar nossa resposta. Também certifique-se de nos descrever claramente por que razão a conta pode causar confusão com a sua marca ou como a conta pode mitigar ou manchar sua marca. ### Quais informações são necessárias para denunciar violação de Política de Marca? diff --git a/translations/pt-BR/content/github/using-git/changing-a-remotes-url.md b/translations/pt-BR/content/github/using-git/changing-a-remotes-url.md index 35f179f74d..2878fbac3f 100644 --- a/translations/pt-BR/content/github/using-git/changing-a-remotes-url.md +++ b/translations/pt-BR/content/github/using-git/changing-a-remotes-url.md @@ -50,7 +50,7 @@ git@{% data variables.command_line.codeblock %}:USERNAME/REPOSITORY > origin https://{% data variables.command_line.codeblock %}/USERNAME/REPOSITORY.git (push) ``` -Na próxima vez que você aplicar `git fetch`, `git pull` ou `git push` no repositório remote, precisará fornecer seu nome de usuário e a senha do GitHub. +Na próxima vez que você aplicar `git fetch`, `git pull` ou `git push` no repositório remote, precisará fornecer seu nome de usuário e a senha do GitHub. {% data reusables.user_settings.password-authentication-deprecation %} - Se você tiver habilitado a [autenticação de dois fatores](/articles/securing-your-account-with-two-factor-authentication-2fa), precisará [criar um token de acesso pessoal](/github/authenticating-to-github/creating-a-personal-access-token) para ser usado no lugar da senha do GitHub. - Você pode [usar um auxiliar de credenciais](/github/using-git/caching-your-github-credentials-in-git) para que o Git se lembre do seu nome de usuário e da sua senha do GitHub sempre que ele conversar com o GitHub. diff --git a/translations/pt-BR/content/github/using-git/managing-remote-repositories.md b/translations/pt-BR/content/github/using-git/managing-remote-repositories.md index d27857e6c3..2c4adbf965 100644 --- a/translations/pt-BR/content/github/using-git/managing-remote-repositories.md +++ b/translations/pt-BR/content/github/using-git/managing-remote-repositories.md @@ -1,5 +1,5 @@ --- -title: Gerenciar repositórios remote +title: Gerenciar repositórios remotos intro: 'Aprenda a trabalhar com seus repositórios locais no seu computador e repositórios remotos hospedados no {% data variables.product.product_name %}.' mapTopic: true redirect_from: diff --git a/translations/pt-BR/content/github/using-git/pushing-commits-to-a-remote-repository.md b/translations/pt-BR/content/github/using-git/pushing-commits-to-a-remote-repository.md index 8864fa8c24..f71231a0ec 100644 --- a/translations/pt-BR/content/github/using-git/pushing-commits-to-a-remote-repository.md +++ b/translations/pt-BR/content/github/using-git/pushing-commits-to-a-remote-repository.md @@ -97,3 +97,4 @@ Para obter mais informações sobre como trabalhar com bifurcações, consulte " - [Página do manual `git remote`](https://git-scm.com/docs/git-remote.html) - "[Folha de consultas Git](/articles/git-cheatsheet)" - "[Fluxos de trabalho Git](/articles/git-workflows)" +- "[Git Handbook](https://guides.github.com/introduction/git-handbook/)" diff --git a/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md index 069c3b38ed..e674add356 100644 --- a/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md +++ b/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md @@ -47,9 +47,9 @@ You can use the dependency graph to: {% if currentVersion == "free-pro-team@latest" %}To generate a dependency graph, {% data variables.product.product_name %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private repositories. For information about enabling or disabling it for private repositories, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md index e36be4de5d..5944335f47 100644 --- a/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md +++ b/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md @@ -35,7 +35,7 @@ Se foram detectadas vulnerabilidades no repositório, estas são exibidas na par {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} Todas as dependências diretas e indiretas especificadas no manifesto do repositório ou arquivos de bloqueio são listadas e agrupadas pelo ecossistema. Se foram detectadas vulnerabilidades no repositório, estas serão exibidas na parte superior da visualização para usuários com acesso ao Alertas de {% data variables.product.prodname_dependabot_short %}. @@ -55,7 +55,7 @@ Alertas de {% data variables.product.prodname_dependabot_short %}. {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} Todas as dependências diretas e indiretas especificadas no manifesto do repositório ou arquivos de bloqueio são listadas e agrupadas pelo ecossistema. Se foram detectadas vulnerabilidades no repositório, estas são exibidas na parte superior da visualização para usuários com acesso a alertas de segurança. {% note %} diff --git a/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md b/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md index 6fd41a7104..0ee7070c29 100644 --- a/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md +++ b/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md @@ -13,7 +13,7 @@ versions: ### Sobre contribuidores -Você pode visualizar os 100 principais contribuidores de um repositório{% if currentVersion != "free-pro-team@latest" %}, incluindo coautores,{% endif %} no gráfico de contribuidores. Commits de merge e commits vazios não são contabilizados como contribuições para este gráfico. +No gráfico de contribuidores, você pode visualizar os 100 principais contribuidores de um repositório{% if enterpriseServerVersions contains currentVersion %}, incluindo coautores de commits{% endif %}. Commits de merge e commits vazios não são contabilizados como contribuições para este gráfico. {% if currentVersion == "free-pro-team@latest" %} Você também pode ver uma lista de pessoas que contribuíram para as dependências Python do projeto. Para acessar essa lista de contribuidores da comunidade, visite `https://github.com/REPO-OWNER/REPO-NAME/community_contributors`. diff --git a/translations/pt-BR/content/github/working-with-github-pages/about-github-pages-and-jekyll.md b/translations/pt-BR/content/github/working-with-github-pages/about-github-pages-and-jekyll.md index 471a793cc7..87ba5d594f 100644 --- a/translations/pt-BR/content/github/working-with-github-pages/about-github-pages-and-jekyll.md +++ b/translations/pt-BR/content/github/working-with-github-pages/about-github-pages-and-jekyll.md @@ -27,7 +27,7 @@ versions: O Jekyll é um gerador de site estático com suporte integrado para {% data variables.product.prodname_pages %} e um processo de compilação simplificado. O Jekyll usa arquivos Markdown e HTML, além de criar um site estático completo com base na sua escolha de layouts. O Jekyll aceita Markdown e Liquid, uma linguagem de modelagem que carrega conteúdo dinâmico no site. Para obter mais informações, consulte [Jekyll](https://jekyllrb.com/). -O Jekyll não é oficialmente compatível com o Windows. Para obter mais informações, consulte "[Jekyll no Windows](http://jekyllrb.com/docs/windows/#installation)" na documentação do Jekyll. +O Jekyll não é oficialmente compatível com o Windows. For more information, see "[Jekyll on Windows](http://jekyllrb.com/docs/windows/#installation)" in the Jekyll documentation. É recomendável usar o Jekyll com o {% data variables.product.prodname_pages %}. Se preferir, você pode usar outros geradores de site estáticos ou personalizar seu próprio processo de compilação localmente ou em outro servidor. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_pages %}](/articles/about-github-pages#static-site-generators)". diff --git a/translations/pt-BR/content/github/working-with-github-pages/about-github-pages.md b/translations/pt-BR/content/github/working-with-github-pages/about-github-pages.md index fa9b721ea8..3595674fab 100644 --- a/translations/pt-BR/content/github/working-with-github-pages/about-github-pages.md +++ b/translations/pt-BR/content/github/working-with-github-pages/about-github-pages.md @@ -45,7 +45,7 @@ Para obter mais informações sobre como os domínios personalizados afetam o UR Você pode criar apenas um site de usuário ou organização para cada conta do {% data variables.product.product_name %}. Os sites de projeto, sejam eles de uma conta de organização ou de usuário, são ilimitados. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} A URL em que o site está disponível depende da habilitação do isolamento de subdomínio para {% data variables.product.product_location %}. diff --git a/translations/pt-BR/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md b/translations/pt-BR/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md index 86907ab801..c0ea333bf7 100644 --- a/translations/pt-BR/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md +++ b/translations/pt-BR/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md @@ -81,7 +81,7 @@ gem "github-pages", "~> VERSION", group: :jekyll_plugins ``` 10. Save and close the Gemfile. 11. Optionally, test your site locally. For more information, see "[Testing your {% data variables.product.prodname_pages %} site locally with Jekyll](/articles/testing-your-github-pages-site-locally-with-jekyll)." -12. Add your {% data variables.product.product_name %} repository as a remote, replacing {% if currentVersion != "free-pro-team@latest" %}_HOSTNAME_ with your appliance's hostname,{% endif %} _USER_ with the account that owns the repository{% if currentVersion != "free-pro-team@latest" %},{% endif %} and _REPOSITORY_ with the name of the repository. +12. Add your {% data variables.product.product_name %} repository as a remote, replacing {% if enterpriseServerVersions contains currentVersion %}_HOSTNAME_ with your appliance's hostname,{% endif %} _USER_ with the account that owns the repository{% if enterpriseServerVersions contains currentVersion %},{% endif %} and _REPOSITORY_ with the name of the repository. ```shell {% if currentVersion == "free-pro-team@latest" %} $ git remote add origin https://github.com/USER/REPOSITORY.git diff --git a/translations/pt-BR/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md b/translations/pt-BR/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md index e3f94e31c9..265c0668b9 100644 --- a/translations/pt-BR/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md +++ b/translations/pt-BR/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md @@ -13,7 +13,7 @@ versions: Pessoas com permissões de gravação para um repositório podem definir um processador markdown para um site do {% data variables.product.prodname_pages %}. -O {% data variables.product.prodname_pages %} é compatível com dois processadores markdown: [kramdown](http://kramdown.gettalong.org/) e o próprio processador [CommonMark](https://commonmark.org/) estendido do {% data variables.product.prodname_dotcom %}, que é usado para renderizar markdown em estilo {% data variables.product.prodname_dotcom %} em todo o {% data variables.product.product_name %}. Para obter mais informações, consulte "[Sobre gravação e formatação no {% data variables.product.prodname_dotcom %}](/articles/about-writing-and-formatting-on-github)". +{% data variables.product.prodname_pages %} supports two Markdown processors: [kramdown](http://kramdown.gettalong.org/) and {% data variables.product.prodname_dotcom %}'s own extended [CommonMark](https://commonmark.org/) processor, which is used to render {% data variables.product.prodname_dotcom %} Flavored Markdown throughout {% data variables.product.product_name %}. Para obter mais informações, consulte "[Sobre gravação e formatação no {% data variables.product.prodname_dotcom %}](/articles/about-writing-and-formatting-on-github)". Você pode usar o markdown em estilo {% data variables.product.prodname_dotcom %} com qualquer um dos processadores, mas apenas o processador CommonMark é que sempre corresponderá aos resultados que você vê no {% data variables.product.product_name %}. diff --git a/translations/pt-BR/content/github/writing-on-github/creating-gists.md b/translations/pt-BR/content/github/writing-on-github/creating-gists.md index 2277405631..cd43129854 100644 --- a/translations/pt-BR/content/github/writing-on-github/creating-gists.md +++ b/translations/pt-BR/content/github/writing-on-github/creating-gists.md @@ -17,9 +17,9 @@ Cada gist é um repositório Git, o que significa que ele pode ser bifurcado e c Os gists podem ser públicos ou secretos. Os gists públicos são mostrados no {% data variables.gists.discover_url %}, onde as pessoas podem navegar por novos gists à medida que eles são criados. Eles também são pesquisáveis, de modo que é possível usá-los se desejar que outras pessoas encontrem e vejam seu trabalho. {% data reusables.gist.cannot-convert-public-gists-to-secret %} -Os gists de segredos não aparecem em {% data variables.gists.discover_url %}{% if currentVersion != "free-pro-team@latest" %},{% endif %} e não são pesquisáveis. {% data reusables.gist.cannot-convert-public-gists-to-secret %} Os gists secretos não são privados. Se você enviar a URL de um gist secreto a uma amigo, ele poderá vê-la. No entanto, se alguém que você não conhece descobrir a URL, ele também poderá ver seu gist. Se precisar manter seu código longe de olhares curiosos, pode ser mais conveniente [criar um repositório privado](/articles/creating-a-new-repository). +Secret gists don't show up in {% data variables.gists.discover_url %} and are not searchable. {% data reusables.gist.cannot-convert-public-gists-to-secret %} Os gists secretos não são privados. Se você enviar a URL de um gist secreto a uma amigo, ele poderá vê-la. No entanto, se alguém que você não conhece descobrir a URL, ele também poderá ver seu gist. Se precisar manter seu código longe de olhares curiosos, pode ser mais conveniente [criar um repositório privado](/articles/creating-a-new-repository). -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Se o administrador do site tiver desabilitado o modo privado, você também poderá usar gists anônimos, que podem ser públicos ou secretos. diff --git a/translations/pt-BR/content/insights/installing-and-configuring-github-insights/updating-github-insights.md b/translations/pt-BR/content/insights/installing-and-configuring-github-insights/updating-github-insights.md index b6abe731a6..f0cf20248b 100644 --- a/translations/pt-BR/content/insights/installing-and-configuring-github-insights/updating-github-insights.md +++ b/translations/pt-BR/content/insights/installing-and-configuring-github-insights/updating-github-insights.md @@ -6,7 +6,6 @@ redirect_from: - /github/installing-and-configuring-github-insights/updating-github-insights permissions: 'As pessoas com permissões de leitura para o repositório `github/insights-releases` e acesso administrativo ao servidor do aplicativo podem atualizar {% data variables.product.prodname_insights %}.' versions: - free-pro-team: '*' enterprise-server: '*' --- diff --git a/translations/pt-BR/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md b/translations/pt-BR/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md index 9e1d50fdc5..bf45b9e0e2 100644 --- a/translations/pt-BR/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md +++ b/translations/pt-BR/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md @@ -78,7 +78,7 @@ Se tiver um fluxo de trabalho de {% data variables.product.prodname_actions %} q 2. No seu arquivo de fluxo de trabalho do {% data variables.product.prodname_actions %}, atualize a URL do pacote de `https://docker.pkg.github.com` para `ghcr.io`. -3. Adicione seu novo token de acesso pessoal (PAT) do {% data variables.product.prodname_container_registry %} como um segredo do GitHub ACtions. {% data variables.product.prodname_github_container_registry %} não é compatível com o uso do `GITHUB_TOKEN` para o seu PAT. Portanto, você deve usar uma variável personalizada diferente, como `CR_PAT`. Para obter mais informações, consulte "[Criar e armazenar segredos encriptados](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)". +3. Add your new {% data variables.product.prodname_container_registry %} authentication personal access token (PAT) as a GitHub Actions secret. {% data variables.product.prodname_github_container_registry %} não é compatível com o uso do `GITHUB_TOKEN` para o seu PAT. Portanto, você deve usar uma variável personalizada diferente, como `CR_PAT`. Para obter mais informações, consulte "[Criar e armazenar segredos encriptados](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)". 4. No seu arquivo de fluxo de trabalho de {% data variables.product.prodname_actions %} atualize a autenticação do PAT substituindo o seu PAT do registro do Docker ({% raw %}`${{ secrets.GITHUB_TOKEN }}`{% endraw %}) por uma nova variável para o seu PAT de {% data variables.product.prodname_container_registry %}, como, por exemplo, {% raw %}`${{ secrets.CR_PAT }}`{% endraw %}. diff --git a/translations/pt-BR/content/packages/publishing-and-managing-packages/about-github-packages.md b/translations/pt-BR/content/packages/publishing-and-managing-packages/about-github-packages.md index 58223a88b7..dfb10af446 100644 --- a/translations/pt-BR/content/packages/publishing-and-managing-packages/about-github-packages.md +++ b/translations/pt-BR/content/packages/publishing-and-managing-packages/about-github-packages.md @@ -100,7 +100,7 @@ Se o {% data variables.product.product_location_enterprise %} tiver o isolamento | Ruby | Gerenciador de pacotes de RubyGems | `Gemfile` | `gem` | `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` | | Java | Ferramenta de gerenciamento de projetos e compreensão do Apache Maven | `pom.xml` | `mvn` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` | | Java | Ferramenta de automação do build Gradle para Java | `build.gradle` ou `build.gradle.kts` | `gradle` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` | -| .NET | Gerenciamento de pacotes NuGet para .NET | `nupkg` | `dotnet` CLI | nuget.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` | +| .NET | Gerenciamento de pacotes NuGet para .NET | `nupkg` | `dotnet` CLI | `nuget.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` | {% else %} diff --git a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md index 13b5a865bc..9ac1b3572e 100644 --- a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md +++ b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md @@ -27,13 +27,13 @@ You can authenticate to {% data variables.product.prodname_registry %} with Apac In the `servers` tag, add a child `server` tag with an `id`, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, and *TOKEN* with your personal access token. -In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. {% data reusables.package_registry.lowercase-name-field %} +In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. {% data reusables.package_registry.lowercase-name-field %} If you want to interact with multiple repositories, you can add each repository to separate `repository` children in the `repositories` tag, mapping the `id` of each to the credentials in the `servers` tag. {% data reusables.package_registry.apache-maven-snapshot-versions-supported %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -76,7 +76,7 @@ If your instance has subdomain isolation enabled: ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ``` @@ -131,8 +131,8 @@ If you would like to publish multiple packages to the same repository, you can i For more information on creating a package, see the [maven.apache.org documentation](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html). -1. Edit the `distributionManagement` element of the *pom.xml* file located in your package directory, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. - {% if currentVersion != "free-pro-team@latest" %} +1. Edit the `distributionManagement` element of the *pom.xml* file located in your package directory, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} ``` @@ -144,7 +144,7 @@ For more information on creating a package, see the [maven.apache.org documentat     ``` - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ``` diff --git a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md index 59c0d2c8b8..09665952b5 100644 --- a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md +++ b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md @@ -21,7 +21,7 @@ versions: When installing or publishing a docker image, {% data variables.product.prodname_registry %} does not currently support foreign layers, such as Windows images. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Before you can use the Docker registry on {% data variables.product.prodname_registry %}, the site administrator for {% data variables.product.product_location_enterprise %} must enable Docker support and subdomain isolation for your instance. For more information, see "[Managing GitHub Packages for your enterprise](/enterprise/admin/packages)." @@ -49,7 +49,7 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% raw %} ```shell $ cat ~/TOKEN.txt | docker login docker.HOSTNAME -u USERNAME --password-stdin @@ -57,7 +57,7 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if currentVersion != "free-pro-team@latest" %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. +To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if enterpriseServerVersions contains currentVersion %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. For more information, see "[Docker login](https://docs.docker.com/engine/reference/commandline/login/#provide-a-password-using-stdin)." @@ -82,7 +82,7 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen > REPOSITORY TAG IMAGE ID CREATED SIZE > IMAGE_NAME VERSION IMAGE_ID 4 weeks ago 1.11MB ``` -2. Using the Docker image ID, tag the docker image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. +2. Using the Docker image ID, tag the docker image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker tag IMAGE_ID docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION @@ -92,7 +92,7 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen $ docker tag IMAGE_ID docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION ``` {% endif %} -3. If you haven't already built a docker image for the package, build the image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, *VERSION* with package version at build time,{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s +3. If you haven't already built a docker image for the package, build the image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, *VERSION* with package version at build time,{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker build -t docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH @@ -182,7 +182,7 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0 {% data reusables.package_registry.docker_registry_deprecation_status %} -You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} +You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} {% if currentVersion == "free-pro-team@latest" %} ```shell diff --git a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md index e12505cae4..ce6492639b 100644 --- a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md +++ b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md @@ -29,7 +29,7 @@ Para efetuar a autenticação em {% data variables.product.prodname_registry %} Você deve substituir: - `USUÁRIO` pelo o nome da sua conta de usuário em {% data variables.product.prodname_dotcom %}. - `TOKEN` pelo seu token de acesso pessoal. -- `PROPRIETÁRIO` com o nome do usuário ou conta da organização à qual pertence o repositório que contém o seu projeto.{% if currentVersion != "free-pro-team@latest" %} +- `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} - `HOSTNAME` com o nome de host para sua instância de {% data variables.product.prodname_ghe_server %}. Se sua instância tem o isolamento de subdomínio habilitado: @@ -51,7 +51,7 @@ Se sua instância tem o isolamento de subdomínio habilitado: ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Se sua instância tem o isolamento de subdomínio desabilitado: ```xml @@ -89,7 +89,7 @@ Você pode publicar um pacote no {% data variables.product.prodname_registry %}, 3. Adicione informações específicas do seu projeto ao arquivo do seu projeto, que termina em *.csproj*. Você deve substituir: - `PROPRIETÁRIO` com o nome do usuário ou conta da organização proprietária do repositório que contém o seu projeto. - `REPOSITÓRIO` pelo nome do repositório que contém o pacote que você deseja publicar. - - `1.0.0` com o número de versão do pacote.{% if currentVersion != "free-pro-team@latest" %} + - `1.0.0` with the version number of the package.{% if enterpriseServerVersions contains currentVersion %} - `HOSTNAME` com o nome de host para sua instância de {% data variables.product.prodname_ghe_server %} .{% endif %} ``` xml diff --git a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md index ae19d06c8e..935d45194d 100644 --- a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md +++ b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md @@ -25,7 +25,7 @@ versions: Você pode efetuar a autenticação no {% data variables.product.prodname_registry %} com Gradle usando Gradle Groovy ou Kotlin DSL e editando o seu arquivo *build.gradle* (Gradle Groovy) ou o arquivo *build.gradle.kts* (Kotlin DSL) para incluir seu token de acesso pessoal. Também é possível configurar o Gradle Groovy e o Kotlin DSL para reconhecer um único pacote ou vários pacotes em um repositório. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Substitua *REGISTRY-URL* pela URL do registro do Maven para a sua instância. Se sua instância tiver o isolamento de subdomínio habilitado, use `maven.HOSTNAME`. Se sua instância estiver com o isolamento de subdomínio desabilitado, use `HOSTNAME/registry/maven`. Em ambos os casos, substitua *HOSTNAME* pelo nome do host da sua instância de {% data variables.product.prodname_ghe_server %}. {% endif %} diff --git a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md index efc0e2d450..77b4552fe5 100644 --- a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md +++ b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md @@ -25,9 +25,9 @@ versions: You can authenticate to {% data variables.product.prodname_registry %} with npm by either editing your per-user *~/.npmrc* file to include your personal access token or by logging in to npm on the command line using your username and personal access token. -To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. Create a new *~/.npmrc* file if one doesn't exist. +To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. Create a new *~/.npmrc* file if one doesn't exist. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -35,7 +35,7 @@ If your instance has subdomain isolation enabled: //{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}/:_authToken=TOKEN ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell @@ -45,7 +45,7 @@ If your instance has subdomain isolation disabled: To authenticate by logging in to npm, use the `npm login` command, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *PUBLIC-EMAIL-ADDRESS* with your email address. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -56,7 +56,7 @@ $ npm login --registry=https://{% if currentVersion == "free-pro-team@latest" %} > Email: PUBLIC-EMAIL-ADDRESS ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell @@ -97,7 +97,7 @@ You can use an *.npmrc* file to configure the scope mapping for your project. In You can use `publishConfig` element in the *package.json* file to specify the registry where you want the package published. For more information, see "[publishConfig](https://docs.npmjs.com/files/package.json#publishconfig)" in the npm documentation. 1. Edit the *package.json* file for your package and include a `publishConfig` entry. - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} ```shell @@ -105,7 +105,7 @@ You can use `publishConfig` element in the *package.json* file to specify the re "registry":"https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}" }, ``` - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell "publishConfig": { @@ -166,9 +166,9 @@ You also need to add the *.npmrc* file to your project so all requests to instal #### Installing packages from other organizations -By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} +By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -178,7 +178,7 @@ registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github @OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %} ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell diff --git a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md index 35f32a1ae3..da25231521 100644 --- a/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md +++ b/translations/pt-BR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md @@ -56,7 +56,7 @@ For example, you would create or edit a *~/.gem/credentials* to include the foll To install gems, you need to authenticate to {% data variables.product.prodname_registry %} by editing the *~/.gemrc* file for your project to include `https://USERNAME:TOKEN@{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER/`. You must replace: - `USERNAME` with your {% data variables.product.prodname_dotcom %} username. - `TOKEN` with your personal access token. - - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} + - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} - `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance. {% endif %} @@ -74,7 +74,7 @@ If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this exa ``` -To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} {% data reusables.package_registry.lowercase-name-field %} @@ -97,7 +97,7 @@ $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygem ```shell gem build OCTO-GEM.gemspec ``` -3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ```shell $ gem push --key github \ @@ -107,7 +107,7 @@ $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygem ### Publishing multiple packages to the same repository -To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if currentVersion != "free-pro-team@latest" %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if enterpriseServerVersions contains currentVersion %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` gem.metadata = { "github_repo" => "ssh://{% if currentVersion == "free-pro-team@latest" %}github.com{% else %}HOSTNAME{% endif %}/OWNER/REPOSITORY" } @@ -118,7 +118,7 @@ gem.metadata = { "github_repo" => "ssh://{% if currentVersion == "free-pro-team@ You can use gems from {% data variables.product.prodname_registry %} much like you use gems from *rubygems.org*. You need to authenticate to {% data variables.product.prodname_registry %} by adding your {% data variables.product.prodname_dotcom %} user or organization as a source in the *~/.gemrc* file or by using Bundler and editing you *Gemfile*. {% data reusables.package_registry.authenticate-step %} -2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` source "https://rubygems.org" diff --git a/translations/pt-BR/content/rest/guides/basics-of-authentication.md b/translations/pt-BR/content/rest/guides/basics-of-authentication.md index c98da6906c..636114bcb7 100644 --- a/translations/pt-BR/content/rest/guides/basics-of-authentication.md +++ b/translations/pt-BR/content/rest/guides/basics-of-authentication.md @@ -21,7 +21,7 @@ Você pode fazer o download do código-fonte completo para este projeto[no repos ### Registrar seu aplicativo -Primeiro, você precisará [registrar o seu aplicativo][new oauth app]. A cada aplicativo OAuth registrado recebe um ID de Cliente único e um Segredo de Cliente. O Segredo do Cliente não deve ser compartilhado! Isso inclui verificar o string de caracteres no seu repositório. +First, you'll need to [register your application][new oauth app]. A cada aplicativo OAuth registrado recebe um ID de Cliente único e um Segredo de Cliente. O Segredo do Cliente não deve ser compartilhado! Isso inclui verificar o string de caracteres no seu repositório. Você pode preencher cada informação da forma que preferir, exceto a **URL de chamada de retorno de autorização**. Esta é facilmente a parte mais importante para configurar o seu aplicativo. É a URL de chamada de retorno que o {% data variables.product.product_name %} retorna ao usuário após a autenticação bem-sucedida. @@ -46,7 +46,7 @@ get '/' do end ``` -O seu ID de cliente e as chaves secretas de cliente vêm da [página de configuração do seu aplicativo][app settings]. Você **nunca __** armazene esses valores em +Your client ID and client secret keys come from [your application's configuration page][app settings]. Você **nunca __** armazene esses valores em {% data variables.product.product_name %} ou qualquer outro lugar público para essa questão. Recomendamos armazená-los como [Variáveis de ambiente][about env vars]--que é exatamente o que fizemos aqui. diff --git a/translations/pt-BR/content/rest/guides/getting-started-with-the-rest-api.md b/translations/pt-BR/content/rest/guides/getting-started-with-the-rest-api.md index 730c36fc93..44fdfa348e 100644 --- a/translations/pt-BR/content/rest/guides/getting-started-with-the-rest-api.md +++ b/translations/pt-BR/content/rest/guides/getting-started-with-the-rest-api.md @@ -54,7 +54,6 @@ $ curl -i {% data variables.product.api_url_pre %}/users/defunkt > Server: GitHub.com > Date: Sun, 11 Nov 2012 18:43:28 GMT > Content-Type: application/json; charset=utf-8 -> Connection: keep-alive > Status: 200 OK > ETag: "bfd85cbf23ac0b0c8a29bee02e7117c6" > X-RateLimit-Limit: 60 diff --git a/translations/pt-BR/content/rest/overview/api-previews.md b/translations/pt-BR/content/rest/overview/api-previews.md index 02037b51e7..bbd8987849 100644 --- a/translations/pt-BR/content/rest/overview/api-previews.md +++ b/translations/pt-BR/content/rest/overview/api-previews.md @@ -45,7 +45,7 @@ Obter uma [lista de eventos](/v3/issues/timeline/) para um problema ou pull requ **Tipo de mídia personalizada:** `mockingbird-preview` **Anunciado em:** [2016-05-23](https://developer.github.com/changes/2016-05-23-timeline-preview-api/) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Ambientes pre-receive @@ -56,7 +56,7 @@ Cria, lista, atualiza e exclui ambientes para hooks pre-receive. {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### Integrações @@ -121,7 +121,7 @@ Veja todos os [códigos de conduta](/v3/codes_of_conduct) ou obtenha qual códig **Tipo de mídia personalizado:** `scarlet-witch-preview` -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### Equipes aninhadas @@ -132,7 +132,7 @@ Inclua o conteúdo aninhado das cargas da [equipe](/v3/teams/). {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} @@ -144,7 +144,7 @@ Habilita [webhooks globais](/rest/reference/enterprise-admin#global-webhooks/) p {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### Transferência de repositório @@ -155,7 +155,7 @@ Transfira um [repositório](/v3/repos/) para uma organização ou usuário. {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### Adicionar motivo do bloqueio @@ -182,7 +182,7 @@ Agora você pode [exigir múltiplas revisões de aprovação](/v3/repos/branches **Tipo de mídia personalizada:** `luke-cage-preview` **Anunciado em:** [2018-03-16](https://developer.github.com/changes/2018-03-16-protected-branches-required-approving-reviews) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.19" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.19" %} ### Recuperar informações do hovercard @@ -204,7 +204,7 @@ Permite que um aplicativo GitHub execute verificações externas no código de u {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} @@ -272,7 +272,7 @@ Permite que você restrinja temporariamente interações, como comentários, pro {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### Pull requests de rascunho @@ -299,7 +299,7 @@ Você pode usar dois novos pontos de extremidade na [API de commits](/v3/repos/c **Tipos de mídia personalizada:** `groot-preview` **Anunciado:** [2019-04-11](https://developer.github.com/changes/2019-04-11-pulls-branches-for-commit/) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### Desinstalar um aplicativo do GitHub diff --git a/translations/pt-BR/content/rest/overview/resources-in-the-rest-api.md b/translations/pt-BR/content/rest/overview/resources-in-the-rest-api.md index fe23827fea..b48bee74a2 100644 --- a/translations/pt-BR/content/rest/overview/resources-in-the-rest-api.md +++ b/translations/pt-BR/content/rest/overview/resources-in-the-rest-api.md @@ -40,7 +40,7 @@ $ curl -i {% data variables.product.api_url_pre %}/users/octocat/orgs > X-GitHub-Media-Type: github.v3 > X-RateLimit-Limit: 5000 > X-RateLimit-Remaining: 4987 -> X-RateLimit-Reset: 1350085394{% if currentVersion != "free-pro-team@latest" %} +> X-RateLimit-Reset: 1350085394{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: {{ currentVersion }}.0{% endif %} > Content-Length: 5 > Cache-Control: max-age=0, private, must-revalidate @@ -107,7 +107,7 @@ curl -u my_client_id:my_client_secret '{% data variables.product.api_url_pre %}/ Usar o seu `client_id` e `client_secret` _ não_ autenticam você como usuário. Isso apenas irá identificar o seu aplicativo OAuth para aumentar o seu limite de taxa. As permissões só são concedidas a usuários, não aplicativos, e você só obterá dados que um usuário não autenticado visualizaria. Por este motivo, você só deve usar a chave/segredo OAuth2 em cenários de servidor para servidor. Não compartilhe o segredo do cliente do aplicativo OAuth com os seus usuários. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Você não conseguirá efetuar a autenticação usando sua chave e segredo do OAuth2 enquanto estiver no modo privado e essa tentativa de autenticação irá retornar `401 Unauthorized`. Para obter mais informações, consulte "[Habilitar o modo privado](/enterprise/admin/installation/enabling-private-mode)". {% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -163,10 +163,10 @@ $ curl -i -u username -d '{"scopes":["public_repo"]}' {% data variables.product. Você pode emitir uma solicitação `GET` para o ponto de extremidade de raiz para obter todas as categorias do ponto de extremidade com a qual a API REST é compatível: ```shell -$ curl {% if currentVersion != "free-pro-team@latest" %}-u username:password {% endif %}{% data variables.product.api_url_pre %} +$ curl {% if enterpriseServerVersions contains currentVersion %}-u username:password {% endif %}{% data variables.product.api_url_pre %} ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/pt-BR/content/rest/reference/apps.md b/translations/pt-BR/content/rest/reference/apps.md index 2bb2743b7b..b83fe6ae79 100644 --- a/translations/pt-BR/content/rest/reference/apps.md +++ b/translations/pt-BR/content/rest/reference/apps.md @@ -61,3 +61,12 @@ Certifique-se de substituir pontos de extremidades de amostra pelos pontos de ex {% endfor %} {% endif %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +## Webhooks + +{% for operation in currentRestOperations %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} +{% endfor %} + +{% endif %} \ No newline at end of file diff --git a/translations/pt-BR/content/rest/reference/enterprise-admin.md b/translations/pt-BR/content/rest/reference/enterprise-admin.md index 00531e06b7..f7be62b6a5 100644 --- a/translations/pt-BR/content/rest/reference/enterprise-admin.md +++ b/translations/pt-BR/content/rest/reference/enterprise-admin.md @@ -21,7 +21,7 @@ You can use these {{ site.data.variables.product.prodname_ghe_cloud }} endpoints {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### URLs do ponto de extremidade @@ -39,7 +39,7 @@ http(s)://hostname/ ### Autenticação -Os endpoints de API da sua instalação do {% data variables.product.product_name %} aceitam [os mesmos métodos de autenticação](/rest/overview/resources-in-the-rest-api#authentication) da API do GitHub.com. Você pode se autenticar com **[tokens OAuth](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** (que podem ser criados usando a [API de Autorizações](/rest/reference/oauth-authorizations#create-a-new-authorization)) ou **[autenticação básica](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if currentVersion != "free-pro-team@latest" %} Os tokens OAuth devem ter o escopo do OAuth `site_admin` [](/developers/apps/scopes-for-oauth-apps#available-scopes) quando usados com pontos de extremidades específicos da empresa.{% endif %} +Os endpoints de API da sua instalação do {% data variables.product.product_name %} aceitam [os mesmos métodos de autenticação](/rest/overview/resources-in-the-rest-api#authentication) da API do GitHub.com. Você pode se autenticar com **[tokens OAuth](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** (que podem ser criados usando a [API de Autorizações](/rest/reference/oauth-authorizations#create-a-new-authorization)) ou **[autenticação básica](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if enterpriseServerVersions contains currentVersion %} Os tokens OAuth devem ter o `site_admin` [escopo OAuth](/developers/apps/scopes-for-oauth-apps#available-scopes) quando usados com endpoints específicos da Enterprise.{% endif %} Os endpoints da API de administração da empresa somente são acessíveis para administradores do site autenticados pelo {% data variables.product.product_name %}, exceto a API [Console de gerenciamento](#management-console), que requer a [senha do Console de Gerenciamento](/enterprise/admin/articles/accessing-the-management-console/). @@ -135,7 +135,7 @@ GET /scim/v2/enterprises/{enterprise}/Users/{scim_user_id} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ## Estatísticas de admin diff --git a/translations/pt-BR/content/rest/reference/gists.md b/translations/pt-BR/content/rest/reference/gists.md index 8781404350..bce3141c2a 100644 --- a/translations/pt-BR/content/rest/reference/gists.md +++ b/translations/pt-BR/content/rest/reference/gists.md @@ -9,7 +9,7 @@ versions: ### Autenticação -Você pode ler gists públicos {% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "2.9" %}e criá-los para usuários anônimos sem um token.{% else %} anonimamente,. No entanto, você deve entrar no GitHub para criar gists.{% endif %} Para ler ou escrever gists em nome do usuário, você precisa do escopo do OAuth e um token. Para obter mais informações, consulte "[Escopos para aplicativos OAuth](/developers/apps/scopes-for-oauth-apps)." +Você pode ler listas públicas {% if enterpriseServerVersions contains currentVersion %}e criá-las para usuários anônimos sem um token.{% else %} anonimamente, mas você precisa conectar-se ao GitHub para criar gist.{% endif %} Para ler ou escrever gists em nome de um usuário, você precisa do escopo do OAuth e de um token. Para obter mais informações, consulte "[Escopos para aplicativos OAuth](/developers/apps/scopes-for-oauth-apps)." diff --git a/translations/pt-BR/content/rest/reference/orgs.md b/translations/pt-BR/content/rest/reference/orgs.md index 93df7c6209..bb52dc253d 100644 --- a/translations/pt-BR/content/rest/reference/orgs.md +++ b/translations/pt-BR/content/rest/reference/orgs.md @@ -56,5 +56,5 @@ Para obter mais práticas recomendadas, [consulte nosso guia](/guides/best-pract {% data variables.product.product_name %} enviará ao longo de vários cabeçalhos de HTTP para diferenciar entre tipos de evento e identificadores de carga. Consulte [cabeçalhos de webhook](/webhooks/event-payloads/#delivery-headers) para obter informações. {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} diff --git a/translations/pt-BR/content/rest/reference/permissions-required-for-github-apps.md b/translations/pt-BR/content/rest/reference/permissions-required-for-github-apps.md index 616103e4c8..9785f382ce 100644 --- a/translations/pt-BR/content/rest/reference/permissions-required-for-github-apps.md +++ b/translations/pt-BR/content/rest/reference/permissions-required-for-github-apps.md @@ -577,7 +577,7 @@ _Equipes_ - [`GET /orgs/:org/teams`](/v3/teams/#list-teams) (:read) - [`POST /orgs/:org/teams`](/v3/teams/#create-a-team) (:write) - [`GET /orgs/:org/teams/:team_slug`](/v3/teams/#get-a-team-by-name) (:read) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} - [`GET /teams/:team_id`](/v3/teams/#get-a-team) (:read) {% endif %} - [`PATCH /teams/:team_id`](/v3/teams/#update-a-team) (:write) @@ -619,7 +619,7 @@ _Equipes_ _Equipes_ - [`DELETE /teams/:team_id/projects/:project_id`](/v3/teams/#remove-a-project-from-a-team) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Permissão em "hooks pre-receive da organização" - [`GET /orgs/:org/pre-receive-hooks`](/v3/enterprise-admin/org_pre_receive_hooks/#list-pre-receive-hooks-for-an-organization) (:read) @@ -766,7 +766,7 @@ _Revisões_ - [`POST /repos/:owner/:repo/hooks/:hook_id/pings`](/v3/repos/hooks/#ping-a-repository-webhook) (:read) - [`POST /repos/:owner/:repo/hooks/:hook_id/tests`](/v3/repos/hooks/#test-the-push-repository-webhook) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Permission on "repository pre receive hooks" - [`GET /repos/:owner/:repo/pre-receive-hooks`](/v3/enterprise-admin/repo_pre_receive_hooks/#list-pre-receive-hooks-for-a-repository) (:read) diff --git a/translations/pt-BR/content/rest/reference/repos.md b/translations/pt-BR/content/rest/reference/repos.md index 194f718504..62baecae3d 100644 --- a/translations/pt-BR/content/rest/reference/repos.md +++ b/translations/pt-BR/content/rest/reference/repos.md @@ -263,7 +263,7 @@ A API de Webhooks do Repositório permite que os administradores do repositório Se você deseja configurar um único webhook para receber eventos de todos os repositórios da organização, consulte nossa documentação de API para [Webhooks de organização](/rest/reference/orgs#webhooks). {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} ### Receber Webhooks @@ -292,14 +292,14 @@ O formato padrão é o que [os hooks post-receive existentes devem esperar](/pos #### URLs de chamada de retorno As URLs de chamada de retorno podem usar o protocolo `http://`. -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %}Você também pode `github://` fazer chamada de retorno para especificar um serviço do GitHub. +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %}You can also `github://` callbacks to specify a GitHub service. {% data reusables.apps.deprecating_github_services_ghe %} {% endif %} # Send updates to postbin.org http://postbin.org/123 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} # Send updates to Campfire github://campfire?subdomain=github&room=Commits&token=abc123 {% endif %} diff --git a/translations/pt-BR/data/reusables/actions/actions-not-verified.md b/translations/pt-BR/data/reusables/actions/actions-not-verified.md index 7e12068cc3..61c3a7cdfa 100644 --- a/translations/pt-BR/data/reusables/actions/actions-not-verified.md +++ b/translations/pt-BR/data/reusables/actions/actions-not-verified.md @@ -1 +1 @@ -Qualquer pessoa pode publicar uma ação em {% data variables.product.prodname_marketplace %} desde que cumpram os termos de serviço. Ao contrário dos aplicativos, {% data variables.product.prodname_actions %} listados em {% data variables.product.prodname_marketplace %} não são verificados por {% data variables.product.prodname_dotcom %}. +Qualquer pessoa pode publicar uma ação em {% data variables.product.prodname_marketplace %}. {% data variables.product.prodname_dotcom %} verifica algumas organizações parceiras, mas, diferentemente dos aplicativos verificados, {% data variables.product.prodname_dotcom %} não revisa ou verifica ações individuais listadas em {% data variables.product.prodname_marketplace %}. diff --git a/translations/pt-BR/data/reusables/actions/enterprise-beta.md b/translations/pt-BR/data/reusables/actions/enterprise-beta.md index 34984da350..d86df3736c 100644 --- a/translations/pt-BR/data/reusables/actions/enterprise-beta.md +++ b/translations/pt-BR/data/reusables/actions/enterprise-beta.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.22" %} {% note %} **Observação:** O suporte de {% data variables.product.prodname_actions %} em {% data variables.product.prodname_ghe_server %} 2.22 é beta pública limitada. Para revisar os requisitos de armazenamento externo e solicitar acesso ao beta, consulte "[Habilitar {% data variables.product.prodname_actions %} e configurar o armazenamento](/enterprise/admin/github-actions/enabling-github-actions-and-configuring-storage)". diff --git a/translations/pt-BR/data/reusables/actions/enterprise-github-hosted-runners.md b/translations/pt-BR/data/reusables/actions/enterprise-github-hosted-runners.md index 798a8e1d86..5a97a48e49 100644 --- a/translations/pt-BR/data/reusables/actions/enterprise-github-hosted-runners.md +++ b/translations/pt-BR/data/reusables/actions/enterprise-github-hosted-runners.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} {% note %} **Observação:** Executores hospedados em {% data variables.product.prodname_dotcom %} não são atualmente compatíveis com {% data variables.product.prodname_ghe_server %}. Você pode ver mais informações sobre suporte futuro planejado no [{% data variables.product.prodname_roadmap %}](https://github.com/github/roadmap/issues/72). diff --git a/translations/pt-BR/data/reusables/actions/enterprise-marketplace-actions.md b/translations/pt-BR/data/reusables/actions/enterprise-marketplace-actions.md index 5ef7d584b7..e73516061c 100644 --- a/translations/pt-BR/data/reusables/actions/enterprise-marketplace-actions.md +++ b/translations/pt-BR/data/reusables/actions/enterprise-marketplace-actions.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/pt-BR/data/reusables/actions/enterprise-setup-prereq.md b/translations/pt-BR/data/reusables/actions/enterprise-setup-prereq.md index d17d43a29f..336e348390 100644 --- a/translations/pt-BR/data/reusables/actions/enterprise-setup-prereq.md +++ b/translations/pt-BR/data/reusables/actions/enterprise-setup-prereq.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} #### Usar executores auto-hospedados no {% data variables.product.prodname_ghe_server %} diff --git a/translations/pt-BR/data/reusables/apps/deprecating_auth_with_query_parameters.md b/translations/pt-BR/data/reusables/apps/deprecating_auth_with_query_parameters.md index 06df84b48c..777215eb07 100644 --- a/translations/pt-BR/data/reusables/apps/deprecating_auth_with_query_parameters.md +++ b/translations/pt-BR/data/reusables/apps/deprecating_auth_with_query_parameters.md @@ -3,7 +3,7 @@ **Aviso de método obsoleto:** {% data variables.product.prodname_dotcom %} irá descontinuar a autenticação para a API usando parâmetros de consulta. A autenticação para a API deve ser feita com a [autenticação básica HTTP](/v3/auth/#via-oauth-and-personal-access-tokens).{% if currentVersion == "free-pro-team@latest" %} Usar parâmetros de consulta para efetuar a autenticação na API não funcionará mais a partir de 5 de maio de 2021. {% endif %} Para mais informações, incluindo brownouts agendadas, veja [blog post](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/). -{% if currentVersion != "free-pro-team@latest" %} Embora disponível, a autenticação da API usando parâmetros de consulta não é mais compatível devido a questões de segurança. Em vez disso, recomendamos que integradores movam seu token de acesso, `client_id`, or `client_secret` no cabeçalho. {% data variables.product.prodname_dotcom %} anunciará a remoção da autenticação por parâmetros de consulta com aviso prévio. {% endif %} +{% if enterpriseServerVersions contains currentVersion %} Autenticação à API usando parâmetros de consulta, enquanto disponível não é mais suportada devido a questões de segurança. Em vez disso, recomendamos que integradores movam seu token de acesso, `client_id`, or `client_secret` no cabeçalho. {% data variables.product.prodname_dotcom %} anunciará a remoção da autenticação por parâmetros de consulta com aviso prévio. {% endif %} {% endwarning %} {% endif %} diff --git a/translations/pt-BR/data/reusables/apps/deprecating_github_services_ghe.md b/translations/pt-BR/data/reusables/apps/deprecating_github_services_ghe.md index e1475ae8ff..6ac8784e41 100644 --- a/translations/pt-BR/data/reusables/apps/deprecating_github_services_ghe.md +++ b/translations/pt-BR/data/reusables/apps/deprecating_github_services_ghe.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% note %} **Nota:** GitHub Enterprise versão 2. 7 e superiores não permitem mais que os administradores instalem novos Serviços GitHub e os serviços existentes deixarão de funcionar no GitHub Enterprise versão 2.20 ou superior. Você pode usar o [Replacing GitHub Services guide](/v3/guides/replacing-github-services) para ajudá-lo a atualizar seus serviços para webhooks. diff --git a/translations/pt-BR/data/reusables/apps/deprecating_password_auth.md b/translations/pt-BR/data/reusables/apps/deprecating_password_auth.md index 9c1c13c503..2f2a40a098 100644 --- a/translations/pt-BR/data/reusables/apps/deprecating_password_auth.md +++ b/translations/pt-BR/data/reusables/apps/deprecating_password_auth.md @@ -3,7 +3,7 @@ **Aviso de Depreciação:** {% data variables.product.prodname_dotcom %} irá descontinuar a autenticação de senha com a API. Agora, você deve efetuar a autenticação na API de {% data variables.product.prodname_dotcom %} com um token da API, como, por exemplo, um token de acesso do OAuth, token de acesso de instalação do aplicativo GitHub ou token de acesso pessoal, dependendo do que você precisa fazer com o token.{% if currentVersion == "free-pro-team@latest" %} A autenticação de senha na API será removida em 13 de Novembro de 2020.{% endif %} Para mais informações{% if currentVersion == "free-pro-team@latest" %} incluindo períodos de inatividade agendados,{% endif %} veja o [post no blogue](https://developer.github.com/changes/2020-02-14-deprecating-password-auth/). -{% if currentVersion != "free-pro-team@latest" %} A autenticação na API que usa uma senha está atualmente disponível e ainda não está obsoleta em {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %} anunciará a depreciação e fornecerá um aviso antecipadamente antes de remover o suporte para este recurso.{% endif %} +{% if enterpriseServerVersions contains currentVersion %} A autenticação na API usando uma senha está disponível e ainda não está obsoleta em {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %} anunciará a depreciação e fornecerá um aviso antecipadamente antes de remover o suporte para este recurso.{% endif %} {% endwarning %} {% endif %} diff --git a/translations/pt-BR/data/reusables/apps/deprecating_token_oauth_authorizations.md b/translations/pt-BR/data/reusables/apps/deprecating_token_oauth_authorizations.md index d26d7a658a..73904fa8d5 100644 --- a/translations/pt-BR/data/reusables/apps/deprecating_token_oauth_authorizations.md +++ b/translations/pt-BR/data/reusables/apps/deprecating_token_oauth_authorizations.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% warning %} **Aviso de Depreciação:** O atributo `token` está obsoleto em algumas respostas da API de Autorizações OAuth: diff --git a/translations/pt-BR/data/reusables/code-scanning/choose-alert-dismissal-reason.md b/translations/pt-BR/data/reusables/code-scanning/choose-alert-dismissal-reason.md new file mode 100644 index 0000000000..0d91433f48 --- /dev/null +++ b/translations/pt-BR/data/reusables/code-scanning/choose-alert-dismissal-reason.md @@ -0,0 +1 @@ +É importante escolher o motivo apropriado no menu suspenso, pois isso pode afetar se uma consulta continua sendo incluída em análise futura. \ No newline at end of file diff --git a/translations/pt-BR/data/reusables/code-scanning/false-positive-fix-codeql.md b/translations/pt-BR/data/reusables/code-scanning/false-positive-fix-codeql.md index 59bdff96b8..9204038e05 100644 --- a/translations/pt-BR/data/reusables/code-scanning/false-positive-fix-codeql.md +++ b/translations/pt-BR/data/reusables/code-scanning/false-positive-fix-codeql.md @@ -1 +1 @@ -Se você fechar um alerta de {% data variables.product.prodname_codeql %} como um falso resultado positivo, por exemplo, porque o código usa uma biblioteca de sanitização incompatível, considere contribuir ao repositório de {% data variables.product.prodname_codeql %} e melhorar a análise. Para obter mais informações sobre {% data variables.product.prodname_codeql %}, consulte "[Contribuir para {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)". +If you {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. Para obter mais informações sobre {% data variables.product.prodname_codeql %}, consulte "[Contribuir para {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)". diff --git a/translations/pt-BR/data/reusables/dependabot/automated-tests-note.md b/translations/pt-BR/data/reusables/dependabot/automated-tests-note.md new file mode 100644 index 0000000000..03e6861ba9 --- /dev/null +++ b/translations/pt-BR/data/reusables/dependabot/automated-tests-note.md @@ -0,0 +1,5 @@ +{% note %} + +**Observação:** É uma prática recomendada ter testes automatizados e processos de aceitação em vigor para que as verificações sejam realizadas antes do merge do pull request. Isso é especialmente importante se a versão sugerida a ser atualizada contiver funcionalidades adicionais ou se uma mudança que quebrar o código do seu projeto. Para obter mais informações sobre a integração contínua, consulte "[Sobre integração contínua](/actions/building-and-testing-code-with-continuous-integration/about-continuous-integration)". + +{% endnote %} diff --git a/translations/pt-BR/data/reusables/dependabot/pull-request-introduction.md b/translations/pt-BR/data/reusables/dependabot/pull-request-introduction.md new file mode 100644 index 0000000000..e90899b87f --- /dev/null +++ b/translations/pt-BR/data/reusables/dependabot/pull-request-introduction.md @@ -0,0 +1 @@ +O {% data variables.product.prodname_dependabot %} gera pull requests para atualizar dependências. Dependendo de como seu repositório está configurado, o {% data variables.product.prodname_dependabot_short %} pode gerar pull requests para atualizações de versão e/ou para atualizações de segurança. Você gerencia essas pull requests da mesma forma que qualquer outra pull request, mas também existem alguns comandos extras disponíveis. Para obter mais informações sobre habilitar atualizações de dependência {% data variables.product.prodname_dependabot %}, consulte "[Configurando {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" e "[Habilitando e desabilitando atualizações de versão](/github/administering-a-repository/enabling-and-disabling-version-updates)." \ No newline at end of file diff --git a/translations/pt-BR/data/reusables/dependabot/supported-package-managers.md b/translations/pt-BR/data/reusables/dependabot/supported-package-managers.md index d3641aac46..3bfa04903d 100644 --- a/translations/pt-BR/data/reusables/dependabot/supported-package-managers.md +++ b/translations/pt-BR/data/reusables/dependabot/supported-package-managers.md @@ -7,7 +7,7 @@ | Elm: `elm` | | | git submodule: `gitsubmodule` | | | GitHub Actions: `github-actions` | | -| Go modules: `gomod` | | +| Go modules: `gomod` | **X** | | Gradle: `gradle` | | | Maven: `maven` | | | Mix: `mix` | | diff --git a/translations/pt-BR/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md b/translations/pt-BR/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md new file mode 100644 index 0000000000..e08c095288 --- /dev/null +++ b/translations/pt-BR/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md @@ -0,0 +1,5 @@ +1. Navegue até o {% data variables.product.prodname_dotcom_the_website %}. + +1. No canto superior direito de {% data variables.product.prodname_dotcom_the_website %}, clique na sua foto de perfil e, em seguida, clique em **Suas empresas**. !["Suas empresas" no menu suspenso para a foto do perfil em {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) + +1. Na lista de empresas, clique na empresa que você deseja visualizar. ![Nome de uma empresa na lista das suas empresas](/assets/images/help/enterprises/your-enterprises-list.png) diff --git a/translations/pt-BR/data/reusables/enterprise-accounts/access-enterprise.md b/translations/pt-BR/data/reusables/enterprise-accounts/access-enterprise.md index 4bd1144960..dbbbd4a831 100644 --- a/translations/pt-BR/data/reusables/enterprise-accounts/access-enterprise.md +++ b/translations/pt-BR/data/reusables/enterprise-accounts/access-enterprise.md @@ -1,3 +1,17 @@ -1. No canto superior direito de {% data variables.product.product_name %}, clique na sua foto de perfil e, em seguida, clique em **Suas empresas**. !["Suas empresas" no menu suspenso para a foto do perfil no GitHub](/assets/images/help/enterprises/your-enterprises.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. No canto superior direito de {% data variables.product.product_name %}, clique na sua foto de perfil e, em seguida, clique em **Suas empresas**. !["Suas empresas" no menu suspenso para a foto do perfil em {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) 1. Na lista de empresas, clique na empresa que você deseja visualizar. ![Nome de uma empresa na lista das suas empresas](/assets/images/help/enterprises/your-enterprises-list.png) + +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %} + +1. Acesse a conta corporativa visitando {% raw %}https://HOSTNAME/enterprises/ENTERPRISE-NAME{% endraw %}, substituindo `HOSTNAME` pelo nome de host da sua instância e `ENTERPRISE-NAME` pelo nome da conta da sua empresa. + +{% elsif enterpriseServerVersions contains currentVersion %} + +1. No canto superior direito de {% data variables.product.product_name %}, clique na sua foto de perfil e, em seguida, clique em **Configurações da empresa**. !["Configurações da empresa" no menu suspenso para foto do perfil em {% data variables.product.product_name %}](/assets/images/enterprise/settings/enterprise-settings.png) + +{% endif %} diff --git a/translations/pt-BR/data/reusables/enterprise-accounts/license-tab.md b/translations/pt-BR/data/reusables/enterprise-accounts/license-tab.md index afa5562dc6..d6f060404e 100644 --- a/translations/pt-BR/data/reusables/enterprise-accounts/license-tab.md +++ b/translations/pt-BR/data/reusables/enterprise-accounts/license-tab.md @@ -1 +1,9 @@ -1. Na barra lateral esquerda, clique em **License**. ![Aba de licença na barra lateral de configurações do servidor empresarial](/assets/images/enterprise/business-accounts/license-tab.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. Na barra lateral esquerda, clique em **Enterprise licensing** (Licenciamento Empresarial). ![Aba "Licenciamento empresarial" na barra lateral de configurações da conta corporativa](/assets/images/help/enterprises/enterprise-licensing-tab.png) + +{% else %} + +1. Na barra lateral esquerda, clique em **License**. ![Aba "Licença" na barra lateral de configurações da conta corporativa](/assets/images/enterprise/enterprises/license.png) + +{% endif %} diff --git a/translations/pt-BR/data/reusables/enterprise/rate_limit.md b/translations/pt-BR/data/reusables/enterprise/rate_limit.md index 3e86f46d9c..6829a81fd1 100644 --- a/translations/pt-BR/data/reusables/enterprise/rate_limit.md +++ b/translations/pt-BR/data/reusables/enterprise/rate_limit.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Observe que os limites mencionados acima são os limites de taxa padrão para um instância de {% data variables.product.prodname_ghe_server %}. Entre em contato com o administrador do site para confirmar se os limites de taxa estão habilitados e como eles estão configurados. {% endif %} diff --git a/translations/pt-BR/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md b/translations/pt-BR/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md index 4ef8e862bd..2af04f118d 100644 --- a/translations/pt-BR/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md +++ b/translations/pt-BR/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md @@ -9,7 +9,7 @@ - Escolha **{% data variables.product.support_ticket_priority_urgent %}** para relatar {% if currentVersion == "free-pro-team@latest" %}uma falha crítica do sistema{% else %}falhas fatais do sistema, interrupções que afetam as operações críticas do sistema, incidentes de segurança e licenças expiradas{% endif %}. - Escolha **{% data variables.product.support_ticket_priority_high %}** para relatar problemas que afetam as operações de negócio, incluindo {% if currentVersion == "free-pro-team@latest" %}a remoção de dados confidenciais (commits, problemas, pull requests, anexos enviados) das suas próprias contas e restaurações de organização{% else %}problemas de desempenho do sistema{% endif %}ou para relatar erros críticos. - Escolha **{% data variables.product.support_ticket_priority_normal %}** para {% if currentVersion == "free-pro-team@latest" %}solicitar recuperação de conta ou remoção de sinalizador de spam, relatar problemas de login do usuário{% else %}fazer solicitações técnicas, como alterações de configuração e integrações de terceiros{% endif %}e para relatar erros não críticos. - - Escolha **{% data variables.product.support_ticket_priority_low %}** para fazer perguntas gerais e enviar solicitações para novos recursos, compras, treinamentos ou verificações de integridade.{% if currentVersion != "free-pro-team@latest" %} + - Escolha **{% data variables.product.support_ticket_priority_low %}** para fazer perguntas gerais e enviar solicitações para novos recursos, compras, treinamentos ou check-ups do ambiente de segurança de Ti.{% if enterpriseServerVersions contains currentVersion %} 1. No " menu suspenso séries de {% data variables.product.prodname_enterprise %}", selecione a versão de {% data variables.product.prodname_ghe_server %} que você está usando. ![{% data variables.product.prodname_enterprise %} Series drop-down menu](/assets/images/enterprise/support/support-ticket-ghes-series.png) diff --git a/translations/pt-BR/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md b/translations/pt-BR/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md index ba34269b0d..dc84946317 100644 --- a/translations/pt-BR/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md +++ b/translations/pt-BR/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md @@ -1,5 +1,5 @@ 1. Clique em **Enviar**. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Se você escolheu não incluir diagnósticos no seu tíquete de suporte, você pode compartilhar informações de diagnóstico com suporte de {% data variables.product.prodname_enterprise %} após enviar a sua solicitação de suporte. Para obter mais informações, consulte "[Providing data to {% data variables.product.prodname_dotcom %} Support](/enterprise/admin/guides/enterprise-support/providing-data-to-github-support)."{% endif %} diff --git a/translations/pt-BR/data/reusables/enterprise_installation/aws-recommended-instance-types.md b/translations/pt-BR/data/reusables/enterprise_installation/aws-recommended-instance-types.md index a74f2a9550..3d34978276 100644 --- a/translations/pt-BR/data/reusables/enterprise_installation/aws-recommended-instance-types.md +++ b/translations/pt-BR/data/reusables/enterprise_installation/aws-recommended-instance-types.md @@ -1,5 +1,5 @@ Com base na contagem de licenças de usuário, recomendamos os seguintes tipos de instâncias. | -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} | Licenças de usuário | Tipo recomendado | |:---------------------------------------- | ----------------:| | Teste, demonstração ou 10 usuários leves | r4.large | diff --git a/translations/pt-BR/data/reusables/enterprise_installation/aws-supported-instance-types.md b/translations/pt-BR/data/reusables/enterprise_installation/aws-supported-instance-types.md index 5e30521f31..2c5a7a83dd 100644 --- a/translations/pt-BR/data/reusables/enterprise_installation/aws-supported-instance-types.md +++ b/translations/pt-BR/data/reusables/enterprise_installation/aws-supported-instance-types.md @@ -1,37 +1,37 @@ -{% data variables.product.prodname_ghe_server %} é suportado nos seguintes tipos de instância do EC2. Para obter mais informações, consulte [the AWS EC2 instance type overview page](http://aws.amazon.com/ec2/instance-types/). +{% data variables.product.prodname_ghe_server %} is supported on the following EC2 instance types. For more information, see [the AWS EC2 instance type overview page](http://aws.amazon.com/ec2/instance-types/). -| Tipo de instância EC2 | Modelo | -| --------------------- | ---------------------------------- | -| C3 | c3.2xlarge, c3.4xlarge, c3.8xlarge | +| EC2 instance type | Model | +| ----------------- | ----- | +| C3 | c3.2xlarge, c3.4xlarge, c3.8xlarge | -| Tipo de instância EC2 | Modelo | -| --------------------- | ---------------------------------- | -| C4 | c4.2xlarge, c4.4xlarge, c4.8xlarge | +| EC2 instance type | Model | +| ----------------- | ----- | +| C4 | c4.2xlarge, c4.4xlarge, c4.8xlarge | -| Tipo de instância EC2 | Modelo | -| --------------------- | -------------------------------------------------------------------- | -| C5 | c5.large, c5.xlarge, c5.2xlarge, c5.4xlarge, c5.9xlarge, c5.18xlarge | +| EC2 instance type | Model | +| ----------------- | ----- | +| C5 | c5.large, c5.xlarge, c5.2xlarge, c5.4xlarge, c5.9xlarge, c5.18xlarge | -| Tipo de instância EC2 | Modelo | -| --------------------- | --------------------- | -| M3 | m3.xlarge, m3.2xlarge | +| EC2 instance type | Model | +| ----------------- | ----- | +| M3 | m3.xlarge, m3.2xlarge | -| Tipo de instância EC2 | Modelo | -| --------------------- | ----------------------------------------------------------- | -| M4 | m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge | +| EC2 instance type | Model | +| ----------------- | ----- | +| M4 | m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge | -| Tipo de instância EC2 | Modelo | -| --------------------- | --------------------------------------------------------------------- | -| M5 | m5.large, m5.xlarge, m5.2xlarge, m5.4xlarge, m5.12xlarge, m5.24xlarge | +| EC2 instance type | Model | +| ----------------- | ----- | +| M5 | m5.large, m5.xlarge, m5.2xlarge, m5.4xlarge, m5.12xlarge, m5.24xlarge | -| Tipo de instância EC2 | Modelo | -| --------------------- | -------------------------------------------------------------------- | -| R4 | r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge | +| EC2 instance type | Model | +| ----------------- | ----- | +| R4 | r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge | -| Tipo de instância EC2 | Modelo | -| --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} +| EC2 instance type | Model | +| ----------------- | ----- | +| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} | -| Tipo de instância EC2 | Modelo | -| --------------------- | ------------------------ | -| X1 | x1.16xlarge, x1.32xlarge | +| EC2 instance type | Model | +| ----------------- | ----- | +| X1 | x1.16xlarge, x1.32xlarge | diff --git a/translations/pt-BR/data/reusables/files/add-file.md b/translations/pt-BR/data/reusables/files/add-file.md index 6a1c0af0eb..d347f1765c 100644 --- a/translations/pt-BR/data/reusables/files/add-file.md +++ b/translations/pt-BR/data/reusables/files/add-file.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Acima da lista de arquivos, clique em **Create new file** (Criar novo arquivo). !["Criar novo arquivo" botão](/assets/images/help/repository/create_new_file.png) {% else %} 1. Acima da lista de arquivos, utilizando o menu suspenso **Add file** (Adicionar arquivo), clique em **Create new file** (Criar novo arquivo). !["Criar novo arquivo" no menu suspenso "Adicionar arquivo"](/assets/images/help/repository/create_new_file.png) diff --git a/translations/pt-BR/data/reusables/gated-features/code-scanning.md b/translations/pt-BR/data/reusables/gated-features/code-scanning.md index fc21cc6223..2bcd80c1d4 100644 --- a/translations/pt-BR/data/reusables/gated-features/code-scanning.md +++ b/translations/pt-BR/data/reusables/gated-features/code-scanning.md @@ -1 +1 @@ -{% data variables.product.prodname_code_scanning_capc %} está disponível em repositórios públicos e em repositórios públicos e privados pertencentes a organizações com uma licença para {% data variables.product.prodname_advanced_security %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +{% data variables.product.prodname_code_scanning_capc %} is available {% if currentVersion == "free-pro-team@latest" %}in public repositories, and in private repositories owned by organizations with {% else %}if you have {% endif %}an {% data variables.product.prodname_advanced_security %} license. {% data reusables.gated-features.more-info %} diff --git a/translations/pt-BR/data/reusables/gated-features/draft-prs.md b/translations/pt-BR/data/reusables/gated-features/draft-prs.md index 0379025602..52b7344ec8 100644 --- a/translations/pt-BR/data/reusables/gated-features/draft-prs.md +++ b/translations/pt-BR/data/reusables/gated-features/draft-prs.md @@ -1 +1 @@ -Draft pull requests are 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 %}{% if currentVersion != "free-pro-team@latest" %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +Draft pull requests are 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 %}{% if enterpriseServerVersions contains currentVersion %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} diff --git a/translations/pt-BR/data/reusables/gist/anonymous-gists-cannot-be-deleted.md b/translations/pt-BR/data/reusables/gist/anonymous-gists-cannot-be-deleted.md index 915bdb8e15..91b8365429 100644 --- a/translations/pt-BR/data/reusables/gist/anonymous-gists-cannot-be-deleted.md +++ b/translations/pt-BR/data/reusables/gist/anonymous-gists-cannot-be-deleted.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% warning %} **Aviso:** Os gists anônimos não podem ser excluídos do navegador da Web. Para ter um gist anônimo excluído, entre em contato com {% data variables.contact.contact_support %}. Por favor, forneça a URL do gist que você deseja excluir. diff --git a/translations/pt-BR/data/reusables/github-actions/macos-runner-preview.md b/translations/pt-BR/data/reusables/github-actions/macos-runner-preview.md new file mode 100644 index 0000000000..88a2d482c4 --- /dev/null +++ b/translations/pt-BR/data/reusables/github-actions/macos-runner-preview.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** The MacOS 11.0 virtual environment is currently provided as a preview only. The `macos-latest` YAML workflow label still uses the MacOS 10.15 virtual environment. + +{% endnote %} diff --git a/translations/pt-BR/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md b/translations/pt-BR/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md index ba64ff0879..79243cb611 100644 --- a/translations/pt-BR/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md +++ b/translations/pt-BR/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md @@ -1,9 +1,9 @@ -Um executor auto-hospedado pode estar localizado no seu repositório, organização ou {% if currentVersion == "free-pro-team@latest" %}configurações da conta corporativa em {% data variables.product.prodname_dotcom %}{% else se currentVersion ! "free-pro-team@latest" e currentVersion ver_gt "enterprise-server@2. 1" %} configurações empresariais em {% data variables.product.product_location %}{% endif %}. Para gerenciar um executor auto-hospedado, você deve ter as seguintes permissões, dependendo de onde o executor auto-hospedado foi adicionado: +A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. Para gerenciar um executor auto-hospedado, você deve ter as seguintes permissões, dependendo de onde o executor auto-hospedado foi adicionado: - **Repositório de Usuário**: Você deve ser o proprietário do repositório. - **Organização**: Você deve ser um proprietário da organização. - **Repositório da organização**: Você deve ser o proprietário da organização ou ter acesso de administrador ao repositório. {% if currentVersion == "free-pro-team@latest" %} - **Conta corporativa**: Você deve ser proprietário de uma empresa. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} - **Empresa**: Você deve ser um administrador do site de {% data variables.product.prodname_enterprise %} {% endif %} diff --git a/translations/pt-BR/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md b/translations/pt-BR/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md index 6a14a881ff..e76339afec 100644 --- a/translations/pt-BR/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md +++ b/translations/pt-BR/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md @@ -1,6 +1,6 @@ 1. Navegue por onde seu runner auto-hospedado está registrado: * **Em uma organização ou repositório**: navegue até a página principal e clique em {% octicon "gear" aria-label="The Settings gear" %} **Configurações**. - * {% if currentVersion == "free-pro-team@latest" %}**Se você estiver usando uma conta corporativa**: navegue até a conta corporativa acessando`https://github. om/enterprises/ENTERPRISE-NAME`, substituindo `ENTERPRISE-NAME` pelo nome da conta corporativa.{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**Se estiver usando um executor de nível empresarial**: + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: 1. No canto superior direito de qualquer página, clique em {% octicon "rocket" aria-label="The rocket ship" %}. 1. Na barra lateral esquerda, clique em **Visão geral da empresa**. @@ -9,4 +9,4 @@ * **Em uma organização ou um repositório**: clique em **Ações** na barra lateral esquerda. ![Configuração de ações](/assets/images/help/settings/settings-sidebar-actions.png) - * {% if currentVersion == "free-pro-team@latest" %}**Se estiver usando uma conta corporativa**{% else if currentVersion != "free-pro-team@latest" e currentVersion ver_gt "enterprise-server@2. 1" %}**Se usar um executor de nível empresarial**{% endif %}: clique **Ações** em "Políticas de {% octicon "law" aria-label="The law icon" %}". + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". diff --git a/translations/pt-BR/data/reusables/github-actions/supported-github-runners.md b/translations/pt-BR/data/reusables/github-actions/supported-github-runners.md index 08a1ef8423..eb59a94fbb 100644 --- a/translations/pt-BR/data/reusables/github-actions/supported-github-runners.md +++ b/translations/pt-BR/data/reusables/github-actions/supported-github-runners.md @@ -4,4 +4,5 @@ | Ubuntu 20.04 | `ubuntu-20.04` | | Ubuntu 18.04 | `ubuntu-latest` ou `ubuntu-18.04` | | Ubuntu 16.04 | `ubuntu-16.04` | +| macOS Big Sur 11.0 | `macos-11.0` | | macOS Catalina 10.15 | `macos-latest` or `macos-10.15` | diff --git a/translations/pt-BR/data/reusables/github-actions/usage-matrix-limits.md b/translations/pt-BR/data/reusables/github-actions/usage-matrix-limits.md index b83297c5cc..33318a57d8 100644 --- a/translations/pt-BR/data/reusables/github-actions/usage-matrix-limits.md +++ b/translations/pt-BR/data/reusables/github-actions/usage-matrix-limits.md @@ -1 +1 @@ -- **Matriz de trabalho** - A matriz de trabalho pode gerar no máximo 256 trabalhos por execução de fluxo de trabalho. Este limite também se aplica a executores auto-hospedados. +Uma matriz de tarefas pode gerar 256 tarefas no máximo por execução do fluxo de trabalho. Este limite também se aplica a executores auto-hospedados. diff --git a/translations/pt-BR/data/reusables/notifications/outbound_email_tip.md b/translations/pt-BR/data/reusables/notifications/outbound_email_tip.md index 9dd957ca5e..ba84e8a1e3 100644 --- a/translations/pt-BR/data/reusables/notifications/outbound_email_tip.md +++ b/translations/pt-BR/data/reusables/notifications/outbound_email_tip.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} Você só receberá notificações por e-mail se o suporte a e-mails de saída estiver ativado no {% data variables.product.product_location_enterprise %}. Para mais informações, entre em contato com o administrador do site. diff --git a/translations/pt-BR/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md b/translations/pt-BR/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md new file mode 100644 index 0000000000..6b3de47d4c --- /dev/null +++ b/translations/pt-BR/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md @@ -0,0 +1,3 @@ +You can choose the delivery method for notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} on repositories that you are watching, as well as the frequency at which the notifications are sent to you. + + diff --git a/translations/pt-BR/data/reusables/notifications/vulnerable-dependency-notification-options.md b/translations/pt-BR/data/reusables/notifications/vulnerable-dependency-notification-options.md new file mode 100644 index 0000000000..58d9eab582 --- /dev/null +++ b/translations/pt-BR/data/reusables/notifications/vulnerable-dependency-notification-options.md @@ -0,0 +1,33 @@ +{% if currentVersion == "free-pro-team@latest" %} +Por padrão, você receberá +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} +Por padrão, se o administrador do site tiver configurado e-mail para notificações na sua instância, você receberá +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) + +You can customize the way you are notified about security alerts. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} diff --git a/translations/pt-BR/data/reusables/package_registry/admins-can-configure-package-types.md b/translations/pt-BR/data/reusables/package_registry/admins-can-configure-package-types.md index c73d529f01..f7d1e469d1 100644 --- a/translations/pt-BR/data/reusables/package_registry/admins-can-configure-package-types.md +++ b/translations/pt-BR/data/reusables/package_registry/admins-can-configure-package-types.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **Nota:** Este tipo de pacote pode não estar disponível para sua instância, porque os administradores do site podem habilitar ou desabilitar cada tipo de pacote compatível. Para obter mais informações, consulte "[Configurar pacotes de suporte para a sua empresa](/enterprise/admin/packages/configuring-packages-support-for-your-enterprise)". diff --git a/translations/pt-BR/data/reusables/package_registry/docker_registry_deprecation_status.md b/translations/pt-BR/data/reusables/package_registry/docker_registry_deprecation_status.md index 79e9650f34..2df9364c31 100644 --- a/translations/pt-BR/data/reusables/package_registry/docker_registry_deprecation_status.md +++ b/translations/pt-BR/data/reusables/package_registry/docker_registry_deprecation_status.md @@ -1,5 +1,5 @@ {% warning %} -**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if currentVersion != "free-pro-team@latest" %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} +**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if enterpriseServerVersions contains currentVersion %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} {% endwarning %} diff --git a/translations/pt-BR/data/reusables/package_registry/packages-ghes-release-stage.md b/translations/pt-BR/data/reusables/package_registry/packages-ghes-release-stage.md index 08d901be5f..445ac117f3 100644 --- a/translations/pt-BR/data/reusables/package_registry/packages-ghes-release-stage.md +++ b/translations/pt-BR/data/reusables/package_registry/packages-ghes-release-stage.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **Observação:** {% data variables.product.prodname_registry %} está atualmente em beta para {% data variables.product.prodname_ghe_server %} 2.22. Para participar da versão beta da sua instância, use o [formulário de inscrição](https://resources.github.com/beta-signup/). diff --git a/translations/pt-BR/data/reusables/pages/build-failure-email-server.md b/translations/pt-BR/data/reusables/pages/build-failure-email-server.md index 036e9d0775..aa8f6b9562 100644 --- a/translations/pt-BR/data/reusables/pages/build-failure-email-server.md +++ b/translations/pt-BR/data/reusables/pages/build-failure-email-server.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} Você só receberá um e-mail se o suporte a e-mails de saída estiver habilitado no {% data variables.product.product_location_enterprise %}. Para mais informações, entre em contato com o administrador do site. diff --git a/translations/pt-BR/data/reusables/pages/private_pages_are_public_warning.md b/translations/pt-BR/data/reusables/pages/private_pages_are_public_warning.md index 2579c5d10f..eb8dfe837d 100644 --- a/translations/pt-BR/data/reusables/pages/private_pages_are_public_warning.md +++ b/translations/pt-BR/data/reusables/pages/private_pages_are_public_warning.md @@ -1,5 +1,5 @@ {% warning %} - **Warning**: {% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. If you have sensitive data in your site's repository, you may want to remove it before publishing. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." + **Warning**: {% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. If you have sensitive data in your site's repository, you may want to remove it before publishing. For more information, see{% if enterpriseServerVersions contains currentVersion %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." {% endwarning %} diff --git a/translations/pt-BR/data/reusables/pre-release-program/fury-pre-release.md b/translations/pt-BR/data/reusables/pre-release-program/fury-pre-release.md index ff784fff6d..f105880c14 100644 --- a/translations/pt-BR/data/reusables/pre-release-program/fury-pre-release.md +++ b/translations/pt-BR/data/reusables/pre-release-program/fury-pre-release.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% note %} **Observação:** Os manifestos de {% data variables.product.prodname_github_app %} estão atualmente disponíveis para pré-visualização dos desenvolvedores. Para acessar essa API durante o período de pré-visualização, você deve fornecer um [tipo de mídia](/v3/media) personalizado no cabeçalho `Aceitar`: diff --git a/translations/pt-BR/data/reusables/pre-release-program/machine-man-preview.md b/translations/pt-BR/data/reusables/pre-release-program/machine-man-preview.md index d4c31918ea..0134c2291c 100644 --- a/translations/pt-BR/data/reusables/pre-release-program/machine-man-preview.md +++ b/translations/pt-BR/data/reusables/pre-release-program/machine-man-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **Observação:** Para acessar a API com o seu aplicativo GitHub, você deve fornecer um [tipo de mídia](/v3/media) personalizado no cabeçalho `Aceitar` para as suas solicitações. diff --git a/translations/pt-BR/data/reusables/pre-release-program/sailor-v-preview.md b/translations/pt-BR/data/reusables/pre-release-program/sailor-v-preview.md index 80d4cf79b0..676c8c9745 100644 --- a/translations/pt-BR/data/reusables/pre-release-program/sailor-v-preview.md +++ b/translations/pt-BR/data/reusables/pre-release-program/sailor-v-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **Observação:** Agora você pode usar a API REST para adicionar um motivo ao bloquear um problema e você verá as razões de bloqueio nas respostas que incluem problemas ou pull requests. Você também verá razões de bloqueio em eventos `bloqueados`. Esse recurso está atualmente disponível para pré-visualização dos desenvolvedores. Consulte o [post do blogue](https://developer.github.com/changes/2018-01-10-lock-reason-api-preview) para obter informações completas. Para acessar este recurso, você deve fornecer um [tipo de mídia](/v3/media) personalizado no cabeçalho `Aceitar`: diff --git a/translations/pt-BR/data/reusables/profile/user_profile_page_block_or_report.md b/translations/pt-BR/data/reusables/profile/user_profile_page_block_or_report.md index d14480f75a..4dd58d8151 100644 --- a/translations/pt-BR/data/reusables/profile/user_profile_page_block_or_report.md +++ b/translations/pt-BR/data/reusables/profile/user_profile_page_block_or_report.md @@ -1 +1 @@ -1. Na barra lateral esquerda, abaixo da imagem de perfil do usuário, clique em **Bloquear ou relatar usuário**. ![Link para bloquear ou relatar usuário](/assets/images/help/profile/profile-block-or-report-button.png) +1. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Block or report user**. ![Link para bloquear ou relatar usuário](/assets/images/help/profile/profile-block-or-report-button.png) diff --git a/translations/pt-BR/data/reusables/project-management/project-progress-locations.md b/translations/pt-BR/data/reusables/project-management/project-progress-locations.md index b6d063e885..9ac6c41be9 100644 --- a/translations/pt-BR/data/reusables/project-management/project-progress-locations.md +++ b/translations/pt-BR/data/reusables/project-management/project-progress-locations.md @@ -1 +1 @@ -Quando a automação do quadro de projeto está habilitada, uma barra de progresso aparece acima do quadro de projeto, na página de listagem de projetos, na barra lateral do problema e nas referências ao projeto em outros quadros de projeto. +If progress tracking is enabled, a progress bar appears above the project board, on the project listing page, in the issue sidebar, and in references to the project on other project boards. diff --git a/translations/pt-BR/data/reusables/pull_requests/pull_request_merges_and_contributions.md b/translations/pt-BR/data/reusables/pull_requests/pull_request_merges_and_contributions.md index bf75017c4f..a0348ed0f5 100644 --- a/translations/pt-BR/data/reusables/pull_requests/pull_request_merges_and_contributions.md +++ b/translations/pt-BR/data/reusables/pull_requests/pull_request_merges_and_contributions.md @@ -1,6 +1,6 @@ {% note %} -**Observações:**{% if currentVersion != "free-pro-team@latest" %} +**Observações:**{% if enterpriseServerVersions contains currentVersion %} - Para aparecer no gráfico de contribuições do seu perfil, os commits de criação conjunta devem atender aos mesmos critérios que os commits com um autor.{% endif %} - Ao fazer rebase dos commits, os autores originais do commit e a pessoa que fez o rebase dos commits, seja na linha de comando ou em {% data variables.product.product_location %}, receberá o crédito de contribuição. diff --git a/translations/pt-BR/data/reusables/repositories/about-internal-repos.md b/translations/pt-BR/data/reusables/repositories/about-internal-repos.md index d921cfd133..cfa9b36198 100644 --- a/translations/pt-BR/data/reusables/repositories/about-internal-repos.md +++ b/translations/pt-BR/data/reusables/repositories/about-internal-repos.md @@ -1 +1 @@ -You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if currentVersion != "free-pro-team@latest" %}, even with private mode disabled{% endif %}. +You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if enterpriseServerVersions contains currentVersion %}, even with private mode disabled{% endif %}. diff --git a/translations/pt-BR/data/reusables/repositories/copy-clone-url.md b/translations/pt-BR/data/reusables/repositories/copy-clone-url.md index 34848bc345..fdfc92c5a1 100644 --- a/translations/pt-BR/data/reusables/repositories/copy-clone-url.md +++ b/translations/pt-BR/data/reusables/repositories/copy-clone-url.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. No nome do repositório, clique em **Clonar ou fazer download**. ![Botão Clone or download (Clonar ou baixar)](/assets/images/help/repository/clone-repo-clone-url-button.png) 2. Para clonar o repositório usando HTTPS, em "Clonar com HTTPS", clique em {% octicon "clippy" aria-label="The clipboard icon" %}. diff --git a/translations/pt-BR/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md b/translations/pt-BR/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md index 2c2457772d..3f57f32090 100644 --- a/translations/pt-BR/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md +++ b/translations/pt-BR/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md @@ -2,7 +2,7 @@ **Aviso:** -- Se você remover o acesso de uma pessoa a um repositório privado, todas as suas bifurcações desse repositório privado serão excluídas. Os clones locais do repositório privado são mantidos. Se o acesso de uma equipe a um repositório privado for revogado ou uma equipe com acesso a um repositório privado for excluída, e os integrantes da equipe não tiverem acesso ao repositório por meio de outra equipe, as bifurcações privadas do repositório serão excluídos.{% if currentVersion != "free-pro-team@latest" %} +- Se você remover o acesso de uma pessoa a um repositório privado, todas as suas bifurcações desse repositório privado serão excluídas. Os clones locais do repositório privado são mantidos. Se o acesso de uma equipe a um repositório privado for revogado ou uma equipe com acesso a um repositório privado for excluída, e os integrantes da equipe não tiverem acesso ao repositório por meio de outra equipe, as bifurcações privadas do repositório serão excluídas.{% if enterpriseServerVersions contains currentVersion %} - When [LDAP Sync is enabled](/enterprise/{{ page.version }}/admin/guides/user-management/using-ldap/#enabling-ldap-sync), if you remove a person from a repository, they will lose access but their forks will not be deleted. Se a pessoa for adicionada a uma equipe com acesso ao repositório original da organização dentro de três meses, seu acesso às bifurcações será automaticamente restaurado na próxima sincronização.{% endif %} - Você é responsável por garantir que as pessoas que perderam o acesso a um repositório excluam qualquer informação confidencial ou de propriedade intelectual. diff --git a/translations/pt-BR/data/reusables/repositories/enable-security-alerts.md b/translations/pt-BR/data/reusables/repositories/enable-security-alerts.md index 987463ed21..9d2f072beb 100644 --- a/translations/pt-BR/data/reusables/repositories/enable-security-alerts.md +++ b/translations/pt-BR/data/reusables/repositories/enable-security-alerts.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} O seu administrador do site deve habilitar {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}alertas de segurança{% endif %} para dependências vulneráveis para {% data variables.product.product_location_enterprise %} antes de você poder usar este recurso. Para obter mais informações, consulte "[Habilitar alertas para dependências vulneráveis em {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)". {% endif %} diff --git a/translations/pt-BR/data/reusables/repositories/new-pull-request.md b/translations/pt-BR/data/reusables/repositories/new-pull-request.md index 217a407ff1..7aff906c0a 100644 --- a/translations/pt-BR/data/reusables/repositories/new-pull-request.md +++ b/translations/pt-BR/data/reusables/repositories/new-pull-request.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. À direita do menu do Branch, clique em **Novo pull request**. ![link de "pul request" acima da lista de arquivos](/assets/images/help/pull_requests/pull-request-start-review-button.png) {% else %} 1. Acima da lista de arquivos, clique em diff --git a/translations/pt-BR/data/reusables/repositories/open-with-github-desktop.md b/translations/pt-BR/data/reusables/repositories/open-with-github-desktop.md index 46b6018ae3..eb0cbbccb1 100644 --- a/translations/pt-BR/data/reusables/repositories/open-with-github-desktop.md +++ b/translations/pt-BR/data/reusables/repositories/open-with-github-desktop.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. No nome do seu repositório, clique em **Clone or download** (Clonar ou baixar). ![Botão Clone or download (Clonar ou baixar)](/assets/images/help/repository/clone-repo-clone-url-button.png) 1. Clique em **Abrir no Desktop** para clonar o repositório e abra-o no {% data variables.product.prodname_desktop %}. diff --git a/translations/pt-BR/data/reusables/repositories/releases.md b/translations/pt-BR/data/reusables/repositories/releases.md index 51d50e4113..161af43961 100644 --- a/translations/pt-BR/data/reusables/repositories/releases.md +++ b/translations/pt-BR/data/reusables/repositories/releases.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. No nome do repositório, clique em **Versões**. ![Aba de versões](/assets/images/help/releases/release-link.png) diff --git a/translations/pt-BR/data/reusables/repositories/tracks-vulnerabilities.md b/translations/pt-BR/data/reusables/repositories/tracks-vulnerabilities.md index 2e668126c8..82e127b005 100644 --- a/translations/pt-BR/data/reusables/repositories/tracks-vulnerabilities.md +++ b/translations/pt-BR/data/reusables/repositories/tracks-vulnerabilities.md @@ -2,7 +2,4 @@ Adicionamos vulnerabilidades a {% data variables.product.prodname_advisory_datab - A [Base de Dados de Vulnerabilidade Nacional](https://nvd.nist.gov/) - Uma combinação de aprendizado de máquina e revisão humana para detectar vulnerabilidades em commits públicos em {% data variables.product.prodname_dotcom %} - Consultorias de segurança relatadas em {% data variables.product.prodname_dotcom %} -- O banco de dados de Consultorias de segurança de npm - - - - [FriendsOfPHP](https://github.com/FriendsOfPHP/security-advisories) +- O banco de dados de Consultorias de segurança de npm diff --git a/translations/pt-BR/data/reusables/search/syntax_tips.md b/translations/pt-BR/data/reusables/search/syntax_tips.md index bab8a7e3d9..a99e6f8ce4 100644 --- a/translations/pt-BR/data/reusables/search/syntax_tips.md +++ b/translations/pt-BR/data/reusables/search/syntax_tips.md @@ -1,6 +1,6 @@ {% tip %} -**Dicas:**{% if currentVersion != "free-pro-team@latest" %} +**Tips:**{% if enterpriseServerVersions contains currentVersion %} - Este artigo tem exemplos de pesquisa no site {% data variables.product.prodname_dotcom %}.com, mas você pode usar os mesmos filtros de pesquisa na {% data variables.product.product_location_enterprise %}.{% endif %} - Para obter uma lista de sintaxes de pesquisa que podem ser adicionadas a qualquer qualificador de pesquisa para melhorar ainda mais os resultados, consulte "[Entender a sintaxe de pesquisa](/articles/understanding-the-search-syntax)". - Use aspas em termos de pesquisa com várias palavras. Por exemplo, se quiser pesquisar problemas com a etiqueta "In progress," pesquise `label:"in progress"`. A pesquisa não faz distinção entre maiúsculas e minúsculas. diff --git a/translations/pt-BR/data/reusables/support/receiving-credits.md b/translations/pt-BR/data/reusables/support/receiving-credits.md index 01c593337e..40c0b9bb9e 100644 --- a/translations/pt-BR/data/reusables/support/receiving-credits.md +++ b/translations/pt-BR/data/reusables/support/receiving-credits.md @@ -1,19 +1,19 @@ -### Receiving credits for missed responses to support tickets +### Receber créditos para respostas perdidas para tíquetes de suporte -If you don't receive an initial response within the guaranteed response time to more than four tickets in a given quarter based on {% data variables.product.company_short %}'s fiscal year, you're eligible for a credit. To honor the SLA, {% data variables.product.company_short %} will refund 20% of the quarterly {% data variables.contact.premium_support %} fee in cash. To receive the refund, you must submit a credit request. +Se você não receber uma resposta inicial dentro do tempo de resposta garantido para mais de quatro tíquetes em um determinado trimestre com base no ano fiscal de {% data variables.product.company_short %}, você será elegível a um crédito. Para honrar o SLA, {% data variables.product.company_short %} reembolsará 20% da taxa trimestral de {% data variables.contact.premium_support %} em dinheiro. Para receber o reembolso, você deve enviar uma solicitação de crédito. -The credit request must be made within 30 days of the end of the quarter during which {% data variables.contact.premium_support %} did not respond to your tickets within the designated response time. Credit requests will not be honored if the respective deadline has passed. Once the respective deadline passes, you have waived the ability to claim a refund for the qualified credit. +A solicitação de crédito deve ser feita dentro de 30 dias do final do trimestre durante o qual {% data variables.contact.premium_support %} não respondeu aos seus tíquetes dentro do tempo de resposta indicado. As solicitações de crédito não serão cumpridas se o respectivo prazo tiver passado. Uma vez esgotado o respectivo prazo, você renunciou à capacidade de reivindicar um reembolso pelo crédito qualificado. -To receive a refund, you must submit a completed credit request to . To be eligible, the credit request must: -- Be sent from an email address associated with your {% data variables.product.product_name %} account -- Be received by {% data variables.product.company_short %} by the end of the 30th day after the quarter in which the four qualifying credits occurred -- Include "Credit Request" in the subject line +Para receber um reembolso, você deve enviar uma solicitação de crédito completa para . Para ser elegível, a solicitação de crédito deve: +- Ser enviada de um endereço de e-mail associado à sua conta de {% data variables.product.product_name %} +- Ser recebida por {% data variables.product.company_short %} até o final do 30 dia após o trimestre em que ocorreram os quatro créditos qualificados +- Incluir "Solicitação de Crédito" na linha de assunto -The following information **must be included** in your credit request: -- **Date** (The date must be within 30 days after the quarter based on {% data variables.product.company_short %}’s fiscal year end in which the claims occurred [January 31, April 30, July 31, or October 31].) -- **Customer contact** (You must specify both name and email address.) -- **Customer address** -- **Qualifying credits** (You must provide the date of each qualifying credit and the associated ticket number.){% if currentVersion == "free-pro-team@latest" %} -- **Name of {% data variables.product.prodname_ghe_cloud %} organization**{% endif %} -- **Ticket numbers** +As seguintes informações **devem ser incluídas** na sua solicitação de crédito: +- **Data** (A data deve ser dentro de 30 dias após o trimestre baseado no final do ano fiscal de {% data variables.product.company_short %} em que as reivindicações ocorreram [31 de janeiro, 30 de abril, 31 de julho ou 31 de outubro.) +- **Contato do cliente** (Você deve especificar nome e endereço de e-mail) +- **Endereço do cliente** +- **Créditos qualificados** (Deve indicar a data de cada crédito qualificado e o número do tíquete associado.){% if currentVersion == "free-pro-team@latest" %} +- **Nome da organização de {% data variables.product.prodname_ghe_cloud %} **{% endif %} +- **Números do tíquete** diff --git a/translations/pt-BR/data/reusables/two_fa/auth_methods_2fa.md b/translations/pt-BR/data/reusables/two_fa/auth_methods_2fa.md index a7bb7fb624..e2ffd3565a 100644 --- a/translations/pt-BR/data/reusables/two_fa/auth_methods_2fa.md +++ b/translations/pt-BR/data/reusables/two_fa/auth_methods_2fa.md @@ -1,10 +1,10 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Métodos de autenticação compatíveis com a 2FA -| Método de autenticação | Descrição | Suporte para autenticação de dois fatores | -| ---------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Integrado | A autenticação é feita para as contas de usuário armazenadas no dispositivo de {% data variables.product.prodname_ghe_server %}. | Recebe suporte e gerenciamento no dispositivo de {% data variables.product.prodname_ghe_server %}. Os administradores da organização podem exigir que a 2FA seja habilitada para integrantes da organização. |{% if currentVersion != "free-pro-team@latest" %} +| Método de autenticação | Descrição | Suporte para autenticação de dois fatores | +| ---------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Integrado | A autenticação é feita para as contas de usuário armazenadas no dispositivo de {% data variables.product.prodname_ghe_server %}. | Recebe suporte e gerenciamento no dispositivo de {% data variables.product.prodname_ghe_server %}. Os administradores da organização podem exigir que a 2FA seja habilitada para integrantes da organização. |{% if enterpriseServerVersions contains currentVersion %} | Autenticação integrada com um provedor de identidade | A autenticação é realizada para as contas de usuário armazenadas no provedor de identidade. | Depende do provedor de identidade.{% endif %} -| LDAP | Permite integração com seus diretórios da empresa para autenticação. | Recebe suporte e gerenciamento no dispositivo de {% data variables.product.prodname_ghe_server %}. Os administradores da organização podem exigir que a 2FA seja habilitada para integrantes da organização. | +| LDAP | Permite integração com seus diretórios da empresa para autenticação. | Recebe suporte e gerenciamento no dispositivo de {% data variables.product.prodname_ghe_server %}. Os administradores da organização podem exigir que a 2FA seja habilitada para integrantes da organização. | | SAML | A autenticação é realizada em um provedor de identidade externo. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %} | CAS | Serviço de logon único é fornecido por um servidor externo. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %}{% endif %} diff --git a/translations/pt-BR/data/reusables/webhooks/check_run_properties.md b/translations/pt-BR/data/reusables/webhooks/check_run_properties.md index 327331acb0..4379e26d0f 100644 --- a/translations/pt-BR/data/reusables/webhooks/check_run_properties.md +++ b/translations/pt-BR/data/reusables/webhooks/check_run_properties.md @@ -1,10 +1,10 @@ -| Tecla | Tipo | Descrição | -| ------------------------------ | --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `Ação` | `string` | A ação realizada. Pode ser uma das ações a seguir:
    • `created` - A new check run was created.
    • `completed` - The `status` of the check run is `completed`.
    • `rerequested` - Someone requested to re-run your check run from the pull request UI. See "[About status checks](/articles/about-status-checks#checks)" for more details about the GitHub UI. When you receive a `rerequested` action, you'll need to [create a new check run](/v3/checks/runs/#create-a-check-run). Only the {% data variables.product.prodname_github_app %} that someone requests to re-run the check will receive the `rerequested` payload.
    • `requested_action` - Someone requested an action your app provides to be taken. Only the {% data variables.product.prodname_github_app %} someone requests to perform an action will receive the `requested_action` payload. To learn more about check runs and requested actions, see "[Check runs and requested actions](/v3/checks/runs/#check-runs-and-requested-actions)."
    | -| `check_run` | `objeto` | The [check_run](/v3/checks/runs/#get-a-check-run). | -| `check_run[status]` | `string` | The current status of the check run. Can be `queued`, `in_progress`, or `completed`. | -| `check_run[conclusion]` | `string` | The result of the completed check run. Can be one of `success`, `failure`, `neutral`, `cancelled`, `timed_out`, {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}`action_required` or `stale`{% else %}or `action_required`{% endif %}. This value will be `null` until the check run has `completed`. | -| `check_run[name]` | `string` | The name of the check run. | -| `check_run[check_suite][id]` | `inteiro` | The id of the check suite that this check run is part of. | -| `requested_action` | `objeto` | The action requested by the user. | -| `requested_action[identifier]` | `string` | The integrator reference of the action requested by the user. | +| Tecla | Tipo | Descrição | +| ------------------------------ | --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `Ação` | `string` | A ação realizada. Pode ser uma das ações a seguir:
    • `created` - Uma nova execução de verificação foi criada.
    • `completed` - O `status` da execução da verificação está `completed`.
    • `rerequested` - Alguém pediu para executar novamente sua verificação a partir da interface de usuário do pull request. Veja "[Sobre verificações de status](/articles/about-status-checks#checks)" para mais informações sobre a interface do usuário do GitHub. Ao receber uma ação `rerequested`, você deverá [criar uma nova execução de verificação](/v3/checks/runs/#create-a-check-run). Apenas o {% data variables.product.prodname_github_app %} que alguém solicitar para repetir a verificação receberá a carga `rerequested`.
    • `requested_action` - Alguém solicitou novamente que se tome uma ação fornecida pelo seu aplicativo. Apenas o {% data variables.product.prodname_github_app %} para o qual alguém solicitou uma ação receberá a carga `requested_action`. Para saber mais sobre verificações executadas e ações solicitadas, consulte "[Verificar executa e ações solicitadas](/v3/checks/runs/#check-runs-and-requested-actions)".
    | +| `check_run` | `objeto` | O [check_run](/v3/checks/runs/#get-a-check-run). | +| `check_run[status]` | `string` | O status atual da execução da verificação. Pode ser `queued`, `in_progress` ou `completed`. | +| `check_run[conclusion]` | `string` | O resultado da execução de verificação concluída. Pode ser `success`, `failure`, `neutral`, `cancelled`, `timed_out`, {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}`action_required` ou `stale`{% else %}ou `action_required`{% endif %}. Este valor será `null` até que a execução da verificação seja `completed`. | +| `check_run[name]` | `string` | O nome da execução da verificação. | +| `check_run[check_suite][id]` | `inteiro` | A identificação do conjunto de verificações do qual a execução de verificação faz parte. | +| `requested_action` | `objeto` | A ação solicitada pelo usuário. | +| `requested_action[identifier]` | `string` | A referência de integrador da ação solicitada pelo usuário. | diff --git a/translations/pt-BR/data/reusables/webhooks/check_suite_properties.md b/translations/pt-BR/data/reusables/webhooks/check_suite_properties.md index e365b9d239..226a4d7f12 100644 --- a/translations/pt-BR/data/reusables/webhooks/check_suite_properties.md +++ b/translations/pt-BR/data/reusables/webhooks/check_suite_properties.md @@ -1,10 +1,10 @@ -| Tecla | Tipo | Descrição | -| ---------------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `Ação` | `string` | A ação realizada. Can be:
    • `completed` - All check runs in a check suite have completed.
    • `requested` - Occurs when new code is pushed to the app's repository. When you receive the `requested` action events, you'll need to [create a new check run](/v3/checks/runs/#create-a-check-run).
    • `rerequested` - Occurs when someone requests to re-run the entire check suite from the pull request UI. When you receive the `rerequested` action events, you'll need to [create a new check run](/v3/checks/runs/#create-a-check-run). See "[About status checks](/articles/about-status-checks#checks)" for more details about the GitHub UI.
    | -| `check_suite` | `objeto` | The [check_suite](/v3/checks/suites/). | -| `check_suite[head_branch]` | `string` | The head branch name the changes are on. | -| `check_suite[head_sha]` | `string` | The SHA of the most recent commit for this check suite. | -| `check_suite[status]` | `string` | The summary status for all check runs that are part of the check suite. Can be `requested`, `in_progress`, or `completed`. | -| `check_suite[conclusion]` | `string` | The summary conclusion for all check runs that are part of the check suite. Can be one of `success`, `failure`, `neutral`, `cancelled`, `timed_out`, {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}`action_required` or `stale`{% else %}or `action_required`{% endif %}. This value will be `null` until the check run has `completed`. | -| `check_suite[url]` | `string` | URL that points to the check suite API resource. | -| `check_suite[pull_requests]` | `array` | An array of pull requests that match this check suite. A pull request matches a check suite if they have the same `head_sha` and `head_branch`. When the check suite's `head_branch` is in a forked repository it will be `null` and the `pull_requests` array will be empty. | +| Tecla | Tipo | Descrição | +| ---------------------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `Ação` | `string` | A ação realizada. Pode ser:
    • `completed` - Todas as verificações executadas em um conjunto de verificações foram concluídas.
    • `requested` - Ocorre quando o novo código é carregado para o repositório do aplicativo. Quando você receber os eventos de ação `requested`, você deverá [criar uma nova execução de verificação](/v3/checks/runs/#create-a-check-run).
    • `rerequested` - Ocorre quando alguém solicita uma nova execução de todo o conjunto de verificação da interface de usuário do pull request. Ao receber os eventos da ação `rerequested`, você deverá [criar uma nova execução de verificação](/v3/checks/runs/#create-a-check-run). Veja "[Sobre verificações de status](/articles/about-status-checks#checks)" para mais informações sobre a interface do usuário do GitHub.
    | +| `check_suite` | `objeto` | O [check_suite](/v3/checks/suites/). | +| `check_suite[head_branch]` | `string` | O nome do branch principal em que as alterações se encontram. | +| `check_suite[head_sha]` | `string` | A SHA do commit mais recente para este conjunto de verificações. | +| `check_suite[status]` | `string` | O status de resumo para todas as verificações que fazem parte do conjunto de verificações. Pode ser `requested`, `in_progress` ou `completed`. | +| `check_suite[conclusion]` | `string` | O resumo da conclusão para todas as verificações que fazem parte do conjunto de verificações. Pode ser `success`, `failure`, `neutral`, `cancelled`, `timed_out`, {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}`action_required` ou `stale`{% else %}ou `action_required`{% endif %}. Este valor será `null` até que a execução da verificação seja `completed`. | +| `check_suite[url]` | `string` | A URL que aponta para o recurso da API do conjunto de verificações. | +| `check_suite[pull_requests]` | `array` | Um array de pull requests que correspondem a este conjunto de verificações. Um pull request corresponde a um conjunto de verificações se tiverem os mesmos `head_sha` e `head_branch`. Quando o `head_branch` do conjunto de verificações estiver em um repositório bifurcado, ele será `null` e o array `pull_requests` ficará vazio. | diff --git a/translations/pt-BR/data/reusables/webhooks/issue_properties.md b/translations/pt-BR/data/reusables/webhooks/issue_properties.md index c146faa968..cda10c54b9 100644 --- a/translations/pt-BR/data/reusables/webhooks/issue_properties.md +++ b/translations/pt-BR/data/reusables/webhooks/issue_properties.md @@ -1 +1 @@ -`issue`|`object` | The [issue](/v3/issues) itself. `changes`|`object`| The changes to the issue if the action was `edited`. `changes[title][from]`|`string` | The previous version of the title if the action was `edited`. `changes[body][from]`|`string` | The previous version of the body if the action was `edited`. `assignee`|`object` | The optional user who was assigned or unassigned from the issue. `label`|`object` | The optional label that was added or removed from the issue. +`problema`|`objeto` | O próprio [problema](/v3/issues). `alterações`|`objeto`| As alterações feitas no problemas se a ação foi `editada`. `alterações[title][from]`|`string` | A versão anterior do título se a ação foi `editada`. `alterações[body][from]`|`string` | A versão anterior do texto se a ação foi `editada`. `responsável`|`objeto` | O usuário opcional ao qual foi atribuído ou não foi atribuído o problema. `etiqueta`|`objeto` | A etiqueta opcional adicionada ou removida do problema. diff --git a/translations/pt-BR/data/reusables/webhooks/pull_request_properties.md b/translations/pt-BR/data/reusables/webhooks/pull_request_properties.md index fdc0563b1e..943737d6f1 100644 --- a/translations/pt-BR/data/reusables/webhooks/pull_request_properties.md +++ b/translations/pt-BR/data/reusables/webhooks/pull_request_properties.md @@ -1 +1 @@ -`número`|`inteiro` | O número do pull request. `alterações`|`objeto`| As alterações no comentário se a ação foi `editada`. `changes[title][from]`|`string` | The previous version of the title if the action was `edited`. `changes[body][from]`|`string` | The previous version of the body if the action was `edited`. `pull_request`|`objeto` | O próprio [pull request](/v3/pulls). +`número`|`inteiro` | O número do pull request. `alterações`|`objeto`| As alterações no comentário se a ação foi `editada`. `alterações[title][from]`|`string` | A versão anterior do título se a ação foi `editada`. `alterações[body][from]`|`string` | A versão anterior do texto se a ação foi `editada`. `pull_request`|`objeto` | O próprio [pull request](/v3/pulls). diff --git a/translations/pt-BR/data/reusables/webhooks/pull_request_review_comment_properties.md b/translations/pt-BR/data/reusables/webhooks/pull_request_review_comment_properties.md index 631fd5ae3e..a756fd6bfe 100644 --- a/translations/pt-BR/data/reusables/webhooks/pull_request_review_comment_properties.md +++ b/translations/pt-BR/data/reusables/webhooks/pull_request_review_comment_properties.md @@ -1 +1 @@ -`alterações`|`objeto`| As alterações no comentário se a ação foi `editada`. `changes[body][from]`|`string` | The previous version of the body if the action was `edited`. `pull_request`|`objeto` | O [pull request](/v3/pulls/) ao qual o comentário pertence. `comentário`|`objeto` | O próprio [comentário](/v3/pulls/comments). +`alterações`|`objeto`| As alterações no comentário se a ação foi `editada`. `alterações[body][from]`|`string` | A versão anterior do texto se a ação foi `editada`. `pull_request`|`objeto` | O [pull request](/v3/pulls/) ao qual o comentário pertence. `comentário`|`objeto` | O próprio [comentário](/v3/pulls/comments). diff --git a/translations/pt-BR/data/reusables/webhooks/sponsorship_properties.md b/translations/pt-BR/data/reusables/webhooks/sponsorship_properties.md index 939d7fd0ea..1004fb000e 100644 --- a/translations/pt-BR/data/reusables/webhooks/sponsorship_properties.md +++ b/translations/pt-BR/data/reusables/webhooks/sponsorship_properties.md @@ -1 +1 @@ -`effective_date` | `string` | The `pending_cancellation` and `pending_tier_change` event types will include the date the cancellation or tier change will take effect. `changes[tier][from]` | `object` | The `tier_changed` and `pending_tier_change` will include the original tier before the change or pending change. For more information, see the [pending tier change payload](/webhooks/event-payloads#webhook-payload-example-when-someone-downgrades-a-sponsorship). `changes[privacy_level][from]` | `string` | The `edited` event types include the details about the change when someone edits a sponsorship to change the privacy. +`effective_date` | `string` | Os tipos de evento `pending_cancellation` and `pending_tier_change` incluirão a data de cancelamento ou a alteração da camada entrará em vigor. `alterações[tier][from]` | `objeto` | `tier_changed` e `pending_tier_change` incluirão a camada antes da alteração ou da alteração penente. Para obter mais informações, consulte a [carga de alteração da camada pendente](/webhooks/event-payloads#webhook-payload-example-when-someone-downgrades-a-sponsorship). `alterações[privacy_level][from]` | `string` | Os tipos de eventos `editados` incluem as informações sobre a alteração quando alguém edita um patrocínio para alterar a privacidade. diff --git a/translations/pt-BR/data/reusables/webhooks/webhooks-rest-api-links.md b/translations/pt-BR/data/reusables/webhooks/webhooks-rest-api-links.md new file mode 100644 index 0000000000..3882222b05 --- /dev/null +++ b/translations/pt-BR/data/reusables/webhooks/webhooks-rest-api-links.md @@ -0,0 +1,4 @@ +You can use the repository, organization, and app webhook REST APIs to create, update, delete, and ping webhooks. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}You can also use the REST API to change the configuration of the webhook. For example, you can modify the payload URL, content type, SSL verification, and secret. {% endif %}For more information, see: +- [Repository Webhooks REST API](/rest/reference/repos#webhooks) +- [Organization Webhooks REST API](/rest/reference/orgs#webhooks){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +- [GitHub App Webhooks REST API](/rest/reference/apps#webhooks){% endif %} diff --git a/translations/pt-BR/data/reusables/webhooks/webhooks_intro.md b/translations/pt-BR/data/reusables/webhooks/webhooks_intro.md index eb7b435376..fe42d88031 100644 --- a/translations/pt-BR/data/reusables/webhooks/webhooks_intro.md +++ b/translations/pt-BR/data/reusables/webhooks/webhooks_intro.md @@ -1 +1 @@ -When configuring a webhook, you can use the UI or API to choose which events will send you payloads. Only subscribing to the specific events you plan on handling limits the number of HTTP requests to your server. You can also subscribe to all current and future events. By default, webhooks are only subscribed to the push event. You can change the list of subscribed events anytime. +Ao configurar um webhook, você pode usar a interface do usuário ou API para escolher quais eventos enviarão cargas. Assinar apenas os eventos específicos que pretende gerenciar limita o número de solicitações HTTP para o seu servidor. Você também pode assinar todos os eventos atuais e futuros. Por padrão, os webhooks são apenas inscritos no evento de push. Você pode alterar a lista de eventos assinados a qualquer momento. diff --git a/translations/pt-BR/data/reusables/webhooks/webhooks_ssl.md b/translations/pt-BR/data/reusables/webhooks/webhooks_ssl.md index 66d348aa5e..d7a76d1b58 100644 --- a/translations/pt-BR/data/reusables/webhooks/webhooks_ssl.md +++ b/translations/pt-BR/data/reusables/webhooks/webhooks_ssl.md @@ -1 +1 @@ -Se sua "URL da carga" for uma site seguro (HTTPS), você terá a opção de definir as configurações de verificação SSL. Se a sua "URL de carga " não for segura (HTTP), o GitHub não exibirá esta opção. Por padrão, o GitHub verifica o certificado SSL do seu site ao entregar as cargas de webhook. SSL verification helps ensure that hook payloads are delivered to your URL endpoint securely. You have the option to disable SSL, but we recommend keeping **Enable SSL verification** selected. +Se sua "URL da carga" for uma site seguro (HTTPS), você terá a opção de definir as configurações de verificação SSL. Se a sua "URL de carga " não for segura (HTTP), o GitHub não exibirá esta opção. Por padrão, o GitHub verifica o certificado SSL do seu site ao entregar as cargas de webhook. A verificação SSL ajuda a garantir que as cargas de hook sejam entregues no seu ponto de extremidade da URL de forma segura. Você tem a opção de desabilitar SSL, mas recomendamos manter a opção **Habilitar a verificação de SSL** selecionada. diff --git a/translations/pt-BR/data/reusables/webhooks/workflow_run_desc.md b/translations/pt-BR/data/reusables/webhooks/workflow_run_desc.md index 8866577116..fc40653cf6 100644 --- a/translations/pt-BR/data/reusables/webhooks/workflow_run_desc.md +++ b/translations/pt-BR/data/reusables/webhooks/workflow_run_desc.md @@ -1,4 +1,4 @@ -This event occurs when a workflow run is requested or completed, and allows you to execute a workflow based on the finished result of another workflow. For example, if your `pull_request` workflow generates build artifacts, you can create a new workflow that uses `workflow_run` to analyze the results and add a comment to the original pull request. +Este evento ocorre quando uma execução do fluxo de trabalho é solicitada ou concluída, e permite que você execute um fluxo de trabalho com base no resultado concluído de outro fluxo de trabalho. Por exemplo, se o fluxo de trabalho `pull_request` gera artefatos de criação, você pode criar um novo fluxo de trabalho que usa `workflow_run` para analisar os resultados e adicionar um comentário ao pull request original. -The workflow started by the `workflow_run` event is able to access the secrets and write tokens used by the original workflow. +O fluxo de trabalho iniciado pelo evento `workflow_run` pode acessar os segredos e escrever tokens usados pelo fluxo de trabalho original. diff --git a/translations/pt-BR/data/ui.yml b/translations/pt-BR/data/ui.yml index 2f3b728b44..c8d37d2a3a 100644 --- a/translations/pt-BR/data/ui.yml +++ b/translations/pt-BR/data/ui.yml @@ -3,7 +3,7 @@ header: github_docs: GitHub Docs contact: Contato notices: - ghe_release_candidate: GitHub Enterprise Server 2.22 is currently under limited release as a release candidate. + ghe_release_candidate: O GitHub Enterprise Server 2.22 encontra-se atualmente em versão limitada como candidato ao versão. localization_complete: Publicamos atualizações frequentes em nossa documentação, e a tradução desta página ainda pode estar em andamento. Para obter as informações mais recentes, acesse a documentação em inglês. Se houver problemas com a tradução desta página, entre em contato conosco. localization_in_progress: Olá! No momento, esta página ainda está sendo desenvolvida ou traduzida. Para obter as informações mais recentes, acesse a documentação em inglês. product_in_progress: '👋 Olá, explorador! Esta página está em desenvolvimento ativo. Para obter as informações mais atualizadas e precisas, visite nossa documentação do desenvolvedor.' @@ -26,34 +26,34 @@ errors: we_track_errors: Monitoramos esses erros automaticamente, mas não deixe entrar em contato conosco se o problema persistir. page_doesnt_exist: Parece que a página não existe. support: - still_need_help: Still need help? + still_need_help: Ainda precisa de ajuda? contact_support: Entrar em contato com o suporte - ask_community: Ask the GitHub community + ask_community: Pergunte à comunidade do GitHub helpfulness: - able_to_find: Did this doc help you? + able_to_find: Esse documento ajudou você? yes: true no: false - yes_feedback: Want to learn about new docs features and updates? Sign up for updates! + yes_feedback: Quer saber mais sobre novos recursos e atualizações da documentação? Inscreva-se para receber atualizações! email_placeholder: email@example.com - no_feedback: We're continually improving our docs. We'd love to hear how we can do better. - category_label: What problem did you have? - category_default: Choose an option - category_unclear: Information was unclear - category_confusing: The content was confusing - category_unhelpful: The article didn't answer my question - category_other: Other - comment_label: Let us know what we can do better + no_feedback: Estamos constantemente melhorando nossos documentos. Adoraríamos ouvir como podemos melhorar. + category_label: Qual era o seu problema? + category_default: Selecione uma opção + category_unclear: As informações não eram claras + category_confusing: O conteúdo era confuso + category_unhelpful: O artigo não respondeu à minha pergunta + category_other: Outro + comment_label: Conte-nos como podemos melhorar optional: Opcional required: Obrigatório - email_label: Can we contact you if we have more questions? + email_label: Podemos entrar em contato com você em caso de dúvidas? send: Enviar feedback: Obrigado. Seu feedback foi recebido. contribution_cta: - title: Help us make these docs great! - body: All GitHub docs are open source. See something that's wrong or unclear? Submit a pull request. - button: Make a contribution + title: Ajude-nos a tornar esses documentos ótimos! + body: Todos os documentos do GitHub são de código aberto. Você percebeu que algo que está errado ou não está claro? Envie um pull request. + button: Faça uma contribuição or: Ou, - to_guidelines: learn how to contribute. + to_guidelines: aprenda como contribuir. products: graphql: reference: diff --git a/translations/pt-BR/data/variables/contact.yml b/translations/pt-BR/data/variables/contact.yml index 52f4c514ee..538243e577 100644 --- a/translations/pt-BR/data/variables/contact.yml +++ b/translations/pt-BR/data/variables/contact.yml @@ -1,15 +1,15 @@ --- contact_ent_support: '[Suporte do GitHub Enterprise](https://enterprise.githubsupport.com/hc/en-us) ou [Suporte do GitHub Premium](https://premium.githubsupport.com)' contact_support: >- - {% if currentVersion == "free-pro-team@latest" %}[GitHub Support](https://support.github.com/contact) or [GitHub Premium Support](https://premium.githubsupport.com){% else %}your GitHub Enterprise site administrator{% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Suporte no GitHub](https://support.github.com/contact) ou [Suporte do GitHub Premium](https://premium.githubsupport.com){% else %}o seu administrador no site GitHub Enterprise{% endif %} report_abuse: >- - {% if currentVersion == "free-pro-team@latest" %}[Report abuse](https://github.com/contact/report-abuse){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[RElatar abuso](https://github.com/contact/report-abuse){% endif %} report_content: >- - {% if currentVersion == "free-pro-team@latest" %}[Report content](https://github.com/contact/report-content){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Relatar conteúdo](https://github.com/contact/report-content){% endif %} contact_dmca: >- - {% if currentVersion == "free-pro-team@latest" %}[Copyright claims form](https://github.com/contact/dmca){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Formulário de reivindicação de direitos autorais](https://github.com/contact/dmca){% endif %} contact_privacy: >- - {% if currentVersion == "free-pro-team@latest" %}[Privacy contact form](https://github.com/contact/privacy){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Formulário de contato com a equipe de privacidade](https://github.com/contact/privacy){% endif %} contact_enterprise_sales: '[Equipe de Vendas do GitHub](https://enterprise.github.com/contact)' contact_feedback_actions: '[Formulário de feedback do GitHub Actions](https://support.github.com/contact/feedback?contact[category]=actions)' #The team that provides Standard Support diff --git a/translations/pt-BR/data/variables/desktop.yml b/translations/pt-BR/data/variables/desktop.yml index a9f6650333..45f3f75650 100644 --- a/translations/pt-BR/data/variables/desktop.yml +++ b/translations/pt-BR/data/variables/desktop.yml @@ -1,4 +1,4 @@ --- #Supported platforms mac-osx-versions: macOS 10.10 ou mais recente -windows-versions: Windows 7 64-bit or later +windows-versions: Windows 7 64-bit ou versão posterior diff --git a/translations/pt-BR/data/variables/explore.yml b/translations/pt-BR/data/variables/explore.yml index e9d43c4230..e9c034053d 100644 --- a/translations/pt-BR/data/variables/explore.yml +++ b/translations/pt-BR/data/variables/explore.yml @@ -1,7 +1,7 @@ --- explore_github: >- - {% if currentVersion == "free-pro-team@latest" %}[Explore GitHub](https://github.com/explore){% else %}Explore GitHub (`https://[hostname]/explore`){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Explore o GitHub](https://github.com/explore){% else %}Explore o GitHub (`https://[hostname]/explore`){% endif %} your_stars_page: >- - {% if currentVersion == "free-pro-team@latest" %}[stars page](https://github.com/stars){% else %}stars page (`https://[hostname]/stars`){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[página de estrelas](https://github.com/stars){% else %}página de estrelas (`https://[hostname]/stars`){% endif %} trending_page: >- - {% if currentVersion == "free-pro-team@latest" %}[Trending page](https://github.com/trending){% else %}Trending page (`https://[hostname]/trending`){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Página de tendências](https://github.com/trending){% else %}Página de tendências (`https://[hostname]/trending`){% endif %} diff --git a/translations/pt-BR/data/variables/gists.yml b/translations/pt-BR/data/variables/gists.yml index 9d1fea10ac..d263d6bccf 100644 --- a/translations/pt-BR/data/variables/gists.yml +++ b/translations/pt-BR/data/variables/gists.yml @@ -1,7 +1,7 @@ --- gist_homepage: >- - {% if currentVersion == "free-pro-team@latest" %}[gist home page](https://gist.github.com/){% else %}gist home page, `http(s)://[hostname]/gist` or `http(s)://gist.[hostname]` if subdomains are enabled {% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Página inicial do gist](https://gist.github.com/){% else %}página inicial do gist, `http(s)://[hostname]/gist` ou `http(s)://gist.[hostname]` se os subdomínios estiverem habilitados {% endif %} gist_search_url: >- - {% if currentVersion == "free-pro-team@latest" %}[Gist Search](https://gist.github.com/search){% else %}Gist Search, `http(s)://[hostname]/gist/search` or `http(s)://gist.[hostname]/search` if subdomains are enabled{% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Pesquisa do Gist](https://gist.github.com/search){% else %}Pesquisa do Gist, `http(s)://[hostname]/gist/search` or `http(s)://gist.[hostname]/search` se os subdomínios estiverem habilitados{% endif %} discover_url: >- - {% if currentVersion == "free-pro-team@latest" %}[Discover](https://gist.github.com/discover){% else %}Discover, `http(s)://[hostname]/gist/discover` or `http(s)://gist.[hostname]/discover` if subdomains are enabled{% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Discover](https://gist.github.com/discover){% else %}Descubra, `http(s)://[hostname]/gist/discover` ou `http(s)://gist.[hostname]/discover` se os subdomínios estiverem habilitados{% endif %} diff --git a/translations/pt-BR/data/variables/migrations.yml b/translations/pt-BR/data/variables/migrations.yml index 15201e4a03..13ee04f095 100644 --- a/translations/pt-BR/data/variables/migrations.yml +++ b/translations/pt-BR/data/variables/migrations.yml @@ -1,7 +1,7 @@ --- user_migrations_intro: >- - You can use this API to review, backup, or migrate your user data stored on {% data variables.product.product_name %}.com. + Você pode usar esta API para revisar, fazer backup ou migrar os seus dados de usuário armazenados em {% data variables.product.product_name %}.com. organization_migrations_intro: >- - The organization migrations API lets you move a repository from GitHub to {% data variables.product.prodname_ghe_server %}. + A API de migrações da organização permite que você transfira um repositório do GitHub para {% data variables.product.prodname_ghe_server %}. source_imports_intro: >- - The Source Import API lets you start an import from a Git, Subversion, Mercurial, or Team Foundation Server source repository. This is the same functionality as the {% data variables.product.prodname_dotcom %} Importer. For more information, see "[Importing a repository with {% data variables.product.prodname_dotcom %} Importer](/github/importing-your-projects-to-github/importing-a-repository-with-github-importer)." + A API de Importação de Código-Fonte permite que você inicie uma importação a partir de um repositório de origem no Git, Subversion, Mercurial ou Team Foundation Server. Esta é a mesma funcionalidade do Importador de {% data variables.product.prodname_dotcom %}. Para obter mais informações, consulte "[Importar um repositório com o importador de {% data variables.product.prodname_dotcom %}](/github/importing-your-projects-to-github/importing-a-repository-with-github-importer)." diff --git a/translations/pt-BR/data/variables/notifications.yml b/translations/pt-BR/data/variables/notifications.yml index 441bdba328..c7db64ab37 100644 --- a/translations/pt-BR/data/variables/notifications.yml +++ b/translations/pt-BR/data/variables/notifications.yml @@ -1,5 +1,5 @@ --- no_reply_address: >- - {% if currentVersion == "free-pro-team@latest" %}`noreply@github.com`{% else %}the no-reply email address configured by your site administrator{% endif %} + {% if currentVersion == "free-pro-team@latest" %}`noreply@github.com`{% else %}o endereço de e-mail do tipo no-reply configurado pelo seu administrador do site{% endif %} cc_address: >- - {% if currentVersion == "free-pro-team@latest" %}`@noreply.github.com`{% else %}based on the no-reply email address configured by your site administrator{% endif %} + {% if currentVersion == "free-pro-team@latest" %}`@noreply.github.com`{% else %}com base no endereço de e-mail do tipo no-reply configurado pelo seu administrador do site{% endif %} diff --git a/translations/pt-BR/data/variables/product.yml b/translations/pt-BR/data/variables/product.yml index bafdbef8f9..8156cd5b69 100644 --- a/translations/pt-BR/data/variables/product.yml +++ b/translations/pt-BR/data/variables/product.yml @@ -19,7 +19,7 @@ prodname_ghe_cloud: 'GitHub Enterprise Cloud' prodname_ghe_one: 'GitHub One' ## Use these variables when referring specifically to a location within a product product_location: >- - {% if currentVersion == "free-pro-team@latest" %}GitHub{% else %}your GitHub Enterprise Server instance{% endif %} + {% if currentVersion == "free-pro-team@latest" %}GitHub{% else %}a sua instância do servidor do GitHub Enterprise{% endif %} product_location_enterprise: 'sua instância do GitHub Enterprise Server' prodname_free_user: 'GitHub Free' prodname_pro: 'GitHub Pro' @@ -66,8 +66,8 @@ prodname_actions: 'GitHub Actions' prodname_debug: 'GitHub Debug' #GitHub Packages prodname_registry: 'GitHub Package Registry' -prodname_github_container_registry: 'GitHub Container Registry' -prodname_container_registry: 'container registry' +prodname_github_container_registry: 'Registro de contêiner do GitHub' +prodname_container_registry: 'registro de contêiner' #GitHub Insights prodname_insights: 'GitHub Insights' #GitHub Sponsors @@ -85,7 +85,7 @@ prodname_blog: 'GitHub Blog' prodname_jobs: 'GitHub Jobs' prodname_learning: 'GitHub Learning Lab' prodname_learning_link: 'https://lab.github.com/' -prodname_roadmap: 'GitHub public roadmap' +prodname_roadmap: 'Itinerário público do GitHub' prodname_roadmap_link: 'https://github.com/github/roadmap#github-public-roadmap' #GitHub support premium_support_plan: 'Plano Premium' @@ -104,14 +104,14 @@ prodname_secret_scanning: 'varredura secreta' prodname_secret_scanning_caps: 'Varredura secreta' prodname_code_scanning: 'Varredura de código' prodname_code_scanning_capc: 'Varredura de código' -prodname_codeql_runner: 'CodeQL runner' +prodname_codeql_runner: 'Executor do CodeQL' prodname_advisory_database: 'Banco de Dados Consultivo GitHub' -prodname_codeql_workflow: 'CodeQL analysis workflow' +prodname_codeql_workflow: 'Fluxo de trabalho de análise do CodeQL' #Visual Studio prodname_vs: 'Visual Studio' prodname_vscode: 'Visual Studio Code' -prodname_vss_ghe: 'Visual Studio subscription with GitHub Enterprise' -prodname_vss_admin_portal_with_url: 'the [administrator portal for Visual Studio subscriptions](https://visualstudio.microsoft.com/subscriptions-administration/)' +prodname_vss_ghe: 'Assinatura do Visual Studio com GitHub Enterprise' +prodname_vss_admin_portal_with_url: '[portal de administrador para assinaturas do Visual Studio](https://visualstudio.microsoft.com/subscriptions-administration/)' #GitHub Dependabot prodname_dependabot: 'GitHub Dependabot' prodname_dependabot_short: 'Dependabot' @@ -120,15 +120,15 @@ prodname_dependabot_security_updates: 'Atualizações de segurança do GitHub De prodname_dependabot_version_updates: 'Atualizações de versão do GitHub Dependabot' #GitHub Archive Program prodname_archive: 'Programa Arquivo do GitHub' -prodname_arctic_vault: 'Arctic Code Vault' +prodname_arctic_vault: 'Cofre de Código do Ártico' #Links product_url: >- {% if currentVersion == "free-pro-team@latest" %}github.com{% else %}[hostname]{% endif %} pricing_url: 'https://github.com/pricing' signin_link: >- - {% if currentVersion == "free-pro-team@latest" %}[Sign in](https://github.com/login){% else %}Sign in (`https://[hostname]/login`){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Sign in](https://github.com/login){% else %}Iniciar sessão (`https://[hostname]/login`){% endif %} signout_link: >- - {% if currentVersion == "free-pro-team@latest" %}[Sign out](https://github.com/logout){% else %}Sign out (`https://[hostname]/logout`){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Sign out](https://github.com/logout){% else %}Encerrar sessão (`https://[hostname]/logout`){% endif %} raw_github_com: >- {% if currentVersion == "free-pro-team@latest" %}raw.githubusercontent.com{% else %}[hostname]/user/repo/raw{% endif %} #GitHub Enterprise Server past versions diff --git a/translations/pt-BR/data/variables/search.yml b/translations/pt-BR/data/variables/search.yml index f22c85c916..f06cfe37ba 100644 --- a/translations/pt-BR/data/variables/search.yml +++ b/translations/pt-BR/data/variables/search.yml @@ -1,5 +1,5 @@ --- advanced_url: >- - {% if currentVersion == "free-pro-team@latest" %}[advanced search](https://github.com/search/advanced) page{% else %}advanced search page (`https://[hostname]/search/advanced`){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[pesquisa avançada](https://github.com/search/advanced) página{% else %}página de pesquisa avançada (`https://[hostname]/search/advanced`){% endif %} search_page_url: >- - {% if currentVersion == "free-pro-team@latest" %}[search](https://github.com/search) page{% else %}search page (`https://[hostname]/search`){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[search](https://github.com/search) page{% else %}página de pesquisa (`https://[hostname]/search`){% endif %} diff --git a/translations/ru-RU/content/actions/creating-actions/creating-a-javascript-action.md b/translations/ru-RU/content/actions/creating-actions/creating-a-javascript-action.md index 7c0b43a5e7..06ffca01fb 100644 --- a/translations/ru-RU/content/actions/creating-actions/creating-a-javascript-action.md +++ b/translations/ru-RU/content/actions/creating-actions/creating-a-javascript-action.md @@ -262,4 +262,4 @@ From your repository, click the **Actions** tab, and select the latest workflow ![A screenshot of using your action in a workflow](/assets/images/help/repository/javascript-action-workflow-run-updated.png) {% else %} ![A screenshot of using your action in a workflow](/assets/images/help/repository/javascript-action-workflow-run.png) -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/ru-RU/content/actions/guides/building-and-testing-nodejs.md b/translations/ru-RU/content/actions/guides/building-and-testing-nodejs.md index d57c344490..abca907346 100644 --- a/translations/ru-RU/content/actions/guides/building-and-testing-nodejs.md +++ b/translations/ru-RU/content/actions/guides/building-and-testing-nodejs.md @@ -33,7 +33,7 @@ We recommend that you have a basic understanding of Node.js, YAML, workflow conf To get started quickly, add the template to the `.github/workflows` directory of your repository. {% raw %} -```yaml +```yaml{:copy} name: Node.js CI on: [push] diff --git a/translations/ru-RU/content/actions/guides/publishing-docker-images.md b/translations/ru-RU/content/actions/guides/publishing-docker-images.md index 7447263c5c..62536e0727 100644 --- a/translations/ru-RU/content/actions/guides/publishing-docker-images.md +++ b/translations/ru-RU/content/actions/guides/publishing-docker-images.md @@ -50,7 +50,7 @@ To push to Docker Hub, you will need to have a Docker Hub account, and have a Do The `build-push-action` options required for Docker Hub are: -* `username` and `password`: This is your Docker Hub username and password. We recommend storing your Docker Hub username and password as encrypted secrets in the your {% data variables.product.prodname_dotcom %} repository so they aren't exposed in your workflow file. For more information, see "[Creating and using encrypted secrets](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)." +* `username` and `password`: This is your Docker Hub username and password. We recommend storing your Docker Hub username and password as encrypted secrets in your {% data variables.product.prodname_dotcom %} repository so they aren't exposed in your workflow file. For more information, see "[Creating and using encrypted secrets](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)." * `repository`: Your Docker Hub repository in the format `DOCKER-HUB-NAMESPACE/DOCKER-HUB-REPOSITORY`. {% raw %} diff --git a/translations/ru-RU/content/actions/guides/storing-workflow-data-as-artifacts.md b/translations/ru-RU/content/actions/guides/storing-workflow-data-as-artifacts.md index e90cba6cb8..a67cb57594 100644 --- a/translations/ru-RU/content/actions/guides/storing-workflow-data-as-artifacts.md +++ b/translations/ru-RU/content/actions/guides/storing-workflow-data-as-artifacts.md @@ -74,7 +74,7 @@ For example, your repository or a web application might contain SASS and TypeScr | ``` -This example shows you how to create a workflow for a Node.js project that `builds` the code in the `src` directory and runs the tests in the `tests` directory. You can assume that running `npm test` produces a code coverage report named `code-coverage.html` stored in the `output/test/` directory. +This example shows you how to create a workflow for a Node.js project that builds the code in the `src` directory and runs the tests in the `tests` directory. You can assume that running `npm test` produces a code coverage report named `code-coverage.html` stored in the `output/test/` directory. The workflow uploads the production artifacts in the `dist` directory, but excludes any markdown files. It also and uploads the `code-coverage.html` report as another artifact. diff --git a/translations/ru-RU/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/ru-RU/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index 48ba5968ca..49fe56fbdc 100644 --- a/translations/ru-RU/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/translations/ru-RU/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -91,7 +91,7 @@ The following operating systems are supported for the self-hosted runner applica - macOS 10.13 (High Sierra) or later -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Supported actions on self-hosted runners diff --git a/translations/ru-RU/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md b/translations/ru-RU/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md index 6f0d8a18b8..ad4b2a21e9 100644 --- a/translations/ru-RU/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md +++ b/translations/ru-RU/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md @@ -50,14 +50,14 @@ You can add self-hosted runners to an enterprise, where they can be assigned to {% if currentVersion == "free-pro-team@latest" %} To add a self-hosted runner to an enterprise account, you must be an enterprise owner. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} To add a self-hosted runner at the enterprise level of {% data variables.product.product_location %}, you must be a site administrator. {% endif %} {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/ru-RU/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/translations/ru-RU/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index 00b4c59f46..7c3e4a45e9 100644 --- a/translations/ru-RU/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/translations/ru-RU/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -56,7 +56,7 @@ When creating a group, you must choose a policy that grants access to all organi {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/ru-RU/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md b/translations/ru-RU/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md index 58f8548dc7..02e76d0794 100644 --- a/translations/ru-RU/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md +++ b/translations/ru-RU/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md @@ -62,7 +62,7 @@ To remove a self-hosted runner from an organization, you must be an organization {% if currentVersion == "free-pro-team@latest" %} To remove a self-hosted runner from an enterprise account, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} To remove a self-hosted runner at the enterprise level of {% data variables.product.product_location %}, you must be a site administrator. We recommend that you also have access to the self-hosted runner machine. {% endif %} @@ -71,7 +71,7 @@ To remove a self-hosted runner at the enterprise level of {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/ru-RU/content/actions/index.md b/translations/ru-RU/content/actions/index.md index d4c9c05869..804cd3e8ea 100644 --- a/translations/ru-RU/content/actions/index.md +++ b/translations/ru-RU/content/actions/index.md @@ -37,7 +37,7 @@ versions:
    -

    {% data ui.toc.getting_started %}

    +

    {% data ui.toc.guides %}

      {% for link in featuredLinks.gettingStarted %} @@ -68,34 +68,10 @@ versions:
    - -
    -
    - -
    {% octicon "bookmark" width="24" %}
    -

    Create actions

    -

    A complete guide to creating and sharing actions with the community.

    -     -
    -
    - -
    {% octicon "rocket" width="24" %}
    -

    Starter workflows

    -

    A collection of workflow files to help you get started with GitHub Actions.

    -     -
    -
    - -
    {% octicon "light-bulb" width="24" %}
    -

    GitHub Actions Marketplace

    -

    Explore community actions and supercharge your workflow.

    -     -
    -
    -

    Руководства

    +

    More guides

    @@ -184,7 +160,7 @@ versions:

    Publishing Node.js packages

    Use GitHub Actions to push your Node.js package to GitHub Packages or npm.

    - Java + JavaScript/TypeScript CI
    @@ -196,5 +172,5 @@ versions:
    - More guides {% octicon "arrow-right" %} + Show all guides {% octicon "arrow-right" %} diff --git a/translations/ru-RU/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/translations/ru-RU/content/actions/learn-github-actions/security-hardening-for-github-actions.md index 6c3ad525b8..8c60f3d148 100644 --- a/translations/ru-RU/content/actions/learn-github-actions/security-hardening-for-github-actions.md +++ b/translations/ru-RU/content/actions/learn-github-actions/security-hardening-for-github-actions.md @@ -95,3 +95,40 @@ As a result, self-hosted runners should almost [never be used for public reposit You should also consider the environment of the self-hosted runner machines: - What sensitive information resides on the machine configured as a self-hosted runner? For example, private SSH keys, API access tokens, among others. - Does the machine have network access to sensitive services? For example, Azure or AWS metadata services. The amount of sensitive information in this environment should be kept to a minimum, and you should always be mindful that any user capable of invoking workflows has access to this environment. + +### Auditing {% data variables.product.prodname_actions %} events + +You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account perfomed the action. + +For example, you can use the audit log to track the `action:org.update_actions_secret` event, which tracks changes to organization secrets: ![Audit log entries](/assets/images/help/repository/audit-log-entries.png) + +The following tables describe the {% data variables.product.prodname_actions %} events that you can find in the audit log. For more information on using the audit log, see "[Reviewing the audit log for your organization](/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization#searching-the-audit-log)." + +#### Events for secret management +| Действие | Description | +| ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `action:org.create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization). | +| `action:org.remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret. | +| `action:org.update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret. | +| `action:repo.create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository). | +| `action:repo.remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret. | +| `action:repo.update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret. | + +#### Events for self-hosted runners +| Действие | Description | +| ----------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). | +| `action:org.remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). | +| `action:repo.register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). | +| `action:repo.remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). | + +#### Events for self-hosted runner groups +| Действие | Description | +| ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). | +| `action:org.runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. | +| `action:org.runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. | +| `action:org.runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). | +| `action:org.runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. | + + diff --git a/translations/ru-RU/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md b/translations/ru-RU/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md index a95381aadd..0b46fd51a5 100644 --- a/translations/ru-RU/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md +++ b/translations/ru-RU/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md @@ -1,6 +1,6 @@ --- title: Disabling and enabling a workflow -intro: You can disable and re-enable a workflow using {% data variables.product.prodname_dotcom %} or the REST API. +intro: 'You can disable and re-enable a workflow using {% data variables.product.prodname_dotcom %} or the REST API.' product: '{% data reusables.gated-features.actions %}' versions: free-pro-team: '*' diff --git a/translations/ru-RU/content/actions/managing-workflow-runs/removing-workflow-artifacts.md b/translations/ru-RU/content/actions/managing-workflow-runs/removing-workflow-artifacts.md index df297ba2b6..a7eb83e1c6 100644 --- a/translations/ru-RU/content/actions/managing-workflow-runs/removing-workflow-artifacts.md +++ b/translations/ru-RU/content/actions/managing-workflow-runs/removing-workflow-artifacts.md @@ -38,4 +38,4 @@ You can also define a custom retention period for individual artifacts using the ### Finding the expiration date of an artifact You can use the API to confirm the date that an artifact is scheduled to be deleted. For more information, see the `expires_at` value returned by "[List artifacts for a repository](/rest/reference/actions#artifacts)." -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/ru-RU/content/actions/quickstart.md b/translations/ru-RU/content/actions/quickstart.md index 385de75577..6a56530081 100644 --- a/translations/ru-RU/content/actions/quickstart.md +++ b/translations/ru-RU/content/actions/quickstart.md @@ -21,7 +21,7 @@ You only need an existing {% data variables.product.prodname_dotcom %} repositor 1. From your repository on {% data variables.product.prodname_dotcom %}, create a new file in the `.github/workflows` directory named `superlinter.yml`. For more information, see "[Creating new files](/github/managing-files-in-a-repository/creating-new-files)." 2. Copy the following YAML contents into the `superlinter.yml` file. **Note:** If your default branch is not `main`, update the value of `DEFAULT_BRANCH` to match your repository's default branch name. {% raw %} - ```yaml + ```yaml{:copy} name: Super-Linter # Run this workflow every time a new commit pushed to your repository diff --git a/translations/ru-RU/content/actions/reference/context-and-expression-syntax-for-github-actions.md b/translations/ru-RU/content/actions/reference/context-and-expression-syntax-for-github-actions.md index 3b2cb54758..4c9f3de9f1 100644 --- a/translations/ru-RU/content/actions/reference/context-and-expression-syntax-for-github-actions.md +++ b/translations/ru-RU/content/actions/reference/context-and-expression-syntax-for-github-actions.md @@ -93,7 +93,7 @@ The `github` context contains information about the workflow run and the event t | `github.event_path` | `строка` | The path to the full event webhook payload on the runner. | | `github.head_ref` | `строка` | The `head_ref` or source branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is a `pull_request`. | | `github.job` | `строка` | The [`job_id`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_id) of the current job. | -| `github.ref` | `строка` | The branch or tag ref that triggered the workflow run. | +| `github.ref` | `строка` | The branch or tag ref that triggered the workflow run. For branches this in the format `refs/heads/`, and for tags it is `refs/tags/`. | | `github.repository` | `строка` | The owner and repository name. For example, `Codertocat/Hello-World`. | | `github.repository_owner` | `строка` | The repository owner's name. For example, `Codertocat`. | | `github.run_id` | `строка` | {% data reusables.github-actions.run_id_description %} diff --git a/translations/ru-RU/content/actions/reference/specifications-for-github-hosted-runners.md b/translations/ru-RU/content/actions/reference/specifications-for-github-hosted-runners.md index 8f71a14af2..38ae3ee790 100644 --- a/translations/ru-RU/content/actions/reference/specifications-for-github-hosted-runners.md +++ b/translations/ru-RU/content/actions/reference/specifications-for-github-hosted-runners.md @@ -50,6 +50,7 @@ Each virtual machine has the same hardware resources available. {% data reusables.github-actions.supported-github-runners %} {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} Workflow logs list the runner used to run a job. For more information, see "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history)." @@ -63,8 +64,10 @@ The software tools included in {% data variables.product.prodname_dotcom %}-host * [Windows Server 2019](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md) * [Windows Server 2016](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md) * [MacOS 10.15](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md) +* [MacOS 11.0](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md) {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} {% data variables.product.prodname_dotcom %}-hosted runners include the operating system's default built-in tools, in addition to the packages listed in the above references. For example, Ubuntu and macOS runners include `grep`, `find`, and `which`, among other default tools. diff --git a/translations/ru-RU/content/actions/reference/workflow-commands-for-github-actions.md b/translations/ru-RU/content/actions/reference/workflow-commands-for-github-actions.md index cf219da975..f917d69f72 100644 --- a/translations/ru-RU/content/actions/reference/workflow-commands-for-github-actions.md +++ b/translations/ru-RU/content/actions/reference/workflow-commands-for-github-actions.md @@ -53,13 +53,15 @@ core.setOutput('SELECTED_COLOR', 'green'); You can use the `set-output` command in your workflow to set the same value: +{% raw %} ``` yaml - name: Set selected color run: echo '::set-output name=SELECTED_COLOR::green' id: random-color-generator - name: Get color - run: echo 'The selected color is' ${steps.random-color-generator.outputs.SELECTED_COLOR} + run: echo "The selected color is ${{ steps.random-color-generator.outputs.SELECTED_COLOR }}" ``` +{% endraw %} The following table shows which toolkit functions are available within a workflow: diff --git a/translations/ru-RU/content/actions/reference/workflow-syntax-for-github-actions.md b/translations/ru-RU/content/actions/reference/workflow-syntax-for-github-actions.md index 12c4e78c4a..8cdef8a5bc 100644 --- a/translations/ru-RU/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/translations/ru-RU/content/actions/reference/workflow-syntax-for-github-actions.md @@ -946,7 +946,7 @@ jobs: #### **`jobs..container.image`** -The Docker image to use as the container to run the action. The value can be the Docker Hub image name or a {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. +The Docker image to use as the container to run the action. The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..container.credentials`** @@ -1029,7 +1029,7 @@ services: #### **`jobs..services..image`** -The Docker image to use as the service container to run the action. The value can be the Docker Hub image name or a {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. +The Docker image to use as the service container to run the action. The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..services..credentials`** diff --git a/translations/ru-RU/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/translations/ru-RU/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md index f6a08240e3..90a226a78b 100644 --- a/translations/ru-RU/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md +++ b/translations/ru-RU/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md @@ -18,10 +18,13 @@ You can connect {% data variables.product.product_location_enterprise %} to {% d After connecting {% data variables.product.product_location_enterprise %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. You can also choose to manually sync vulnerability data at any time. No code or information about code from {% data variables.product.product_location_enterprise %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}. -{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send {% data variables.product.prodname_dependabot_short %} alerts to owners and people with admin access in those repositories. They can customize how they receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)." +{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send {% data variables.product.prodname_dependabot_short %} alerts. You can customize how you receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)." {% endif %} -{% if currentVersion ver_lt "enterprise-server@2.21" or currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts to owners and people with admin access in those repositories. They can customize how they receive security alerts. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)." +{% if currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts. You can customize how you receive security alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)." +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts. You can customize how you receive security alerts. For more information, see "[Choosing the delivery method for your notifications](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications#choosing-the-delivery-method-for-security-alerts-for-vulnerable-dependencies)." {% endif %} {% if currentVersion ver_gt "enterprise-server@2.21" %} @@ -45,7 +48,14 @@ Before enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data v ``` shell $ ghe-dep-graph-enable ``` + {% note %} + + **Note**: For more information about enabling access to the administrative shell via SSH, see "[Accessing the administrative shell (SSH)](/enterprise/{{ currentVersion }}/admin/configuration/accessing-the-administrative-shell-ssh)." + + {% endnote %} + 3. Return to + {% data variables.product.prodname_ghe_server %}. {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} diff --git a/translations/ru-RU/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md b/translations/ru-RU/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md index 5967df1b8b..abb0d22717 100644 --- a/translations/ru-RU/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md +++ b/translations/ru-RU/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md @@ -30,6 +30,15 @@ The time required to failover depends on how long it takes to manually promote t 5. Update the DNS record to point to the IP address of the replica. Traffic is directed to the replica after the TTL period elapses. If you are using a load balancer, ensure it is configured to send traffic to the replica. 6. Notify users that they can resume normal operations. 7. If desired, set up replication from the new primary to existing appliances and the previous primary. For more information, see "[About high availability configuration](/enterprise/{{ currentVersion }}/admin/guides/installation/about-high-availability-configuration/#utilities-for-replication-management)." +8. Appliances you do not intend to setup replication to that were part of the high availability configuration prior the failover, need to be removed from the high availability configuration by UUID. + - On the former appliances, get their UUID via `cat /data/user/common/uuid`. + ```shell + $ cat /data/user/common/uuid + ``` + - On the new primary, remove the UUIDs using `ghe-repl-teardown`. Please replace *`UUID`* with a UUID you retrieved in the previous step. + ```shell + $ ghe-repl-teardown -u UUNID + ``` ### Дополнительная литература diff --git a/translations/ru-RU/content/admin/enterprise-management/upgrade-requirements.md b/translations/ru-RU/content/admin/enterprise-management/upgrade-requirements.md index 9e84d36fbe..d327553e6d 100644 --- a/translations/ru-RU/content/admin/enterprise-management/upgrade-requirements.md +++ b/translations/ru-RU/content/admin/enterprise-management/upgrade-requirements.md @@ -21,7 +21,7 @@ versions: ### Recommendations -- Include as few upgrades as possible in your upgrade process. For example, instead of upgrading from {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} to {{ enterpriseVersions.supported[1] }} to {{ enterpriseVersions.latest }}, you could upgrade from {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} to {{ enterpriseVersions.latest }}. +- Include as few upgrades as possible in your upgrade process. For example, instead of upgrading from {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} to {{ enterpriseServerReleases.supported[1] }} to {{ enterpriseServerReleases.latest }}, you could upgrade from {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} to {{ enterpriseServerReleases.latest }}. - If you’re several versions behind, upgrade {% data variables.product.product_location_enterprise %} as far forward as possible with each step of your upgrade process. Using the latest version possible on each upgrade allows you to take advantage of performance improvements and bug fixes. For example, you could upgrade from {% data variables.product.prodname_enterprise %} 2.7 to 2.8 to 2.10, but upgrading from {% data variables.product.prodname_enterprise %} 2.7 to 2.9 to 2.10 uses a later version in the second step. - Use the latest patch release when upgrading. {% data reusables.enterprise_installation.enterprise-download-upgrade-pkg %} - Use a staging instance to test the upgrade steps. For more information, see "[Setting up a staging instance](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-staging-instance/)." @@ -29,7 +29,7 @@ versions: ### Требования -- You must upgrade from a feature release that's **at most** two releases behind. For example, to upgrade to {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.latest }}, you must be on {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[1] }} or {{ enterpriseVersions.supported[2] }}. +- You must upgrade from a feature release that's **at most** two releases behind. For example, to upgrade to {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.latest }}, you must be on {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[1] }} or {{ enterpriseServerReleases.supported[2] }}. - {% data reusables.enterprise_installation.hotpatching-explanation %} - A hotpatch may require downtime if the affected services (like kernel, MySQL, or Elasticsearch) require a VM reboot or a service restart. You'll be notified when a reboot or restart is required. You can complete the reboot or restart at a later time. - Additional root storage must be available when upgrading through hotpatching, as it installs multiple versions of certain services until the upgrade is complete. Pre-flight checks will notify you if you don't have enough root disk storage. diff --git a/translations/ru-RU/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/ru-RU/content/admin/enterprise-support/about-github-enterprise-support.md index 5876e057a5..df1114d9ca 100644 --- a/translations/ru-RU/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/ru-RU/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,7 +59,7 @@ For urgent issues, we can help you in English 24 hours per day, 7 days per week, {% data variables.contact.enterprise_support %} observes these U.S. holidays, although our global support team is available to answer urgent tickets. -| U.S. holiday | Date observed | +| U.S. holiday | Date observed | | --------------------------- | --------------------------- | | New Year's Day | January 1 | | Martin Luther King, Jr. Day | Third Monday in January | diff --git a/translations/ru-RU/content/admin/enterprise-support/providing-data-to-github-support.md b/translations/ru-RU/content/admin/enterprise-support/providing-data-to-github-support.md index 0f859c304c..323d710a4d 100644 --- a/translations/ru-RU/content/admin/enterprise-support/providing-data-to-github-support.md +++ b/translations/ru-RU/content/admin/enterprise-support/providing-data-to-github-support.md @@ -99,9 +99,9 @@ You can use these steps to create and share a support bundle if you have SSH acc #### Uploading a support bundle using your enterprise account -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Under "{% data variables.product.prodname_enterprise %} Help", click **Upload a support bundle**. ![Upload a support bundle link](/assets/images/enterprise/support/upload-support-bundle.png) 5. Under "Select an enterprise account", select the support bundle's associated account from the drop-down menu. ![Choose the support bundle's enterprise account](/assets/images/enterprise/support/support-bundle-account.png) 6. Under "Upload a support bundle for {% data variables.contact.enterprise_support %}", to select your support bundle, click **Choose file**, or drag your support bundle file onto **Choose file**. ![Upload support bundle file](/assets/images/enterprise/support/choose-support-bundle-file.png) diff --git a/translations/ru-RU/content/admin/enterprise-support/submitting-a-ticket.md b/translations/ru-RU/content/admin/enterprise-support/submitting-a-ticket.md index 951e7dad22..fd4cf969be 100644 --- a/translations/ru-RU/content/admin/enterprise-support/submitting-a-ticket.md +++ b/translations/ru-RU/content/admin/enterprise-support/submitting-a-ticket.md @@ -22,9 +22,9 @@ After submitting your support request and optional diagnostic information, {% da ### Submitting a ticket using your enterprise account -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Under "{% data variables.product.prodname_enterprise %} Help", click **{% data variables.contact.enterprise_support %} Portal**. ![Link to navigate to Enterprise support site](/assets/images/enterprise/support/enterprise-support-link.png) 5. Click **Submit a Ticket** ![Submit a ticket to Enterprise Support team](/assets/images/enterprise/support/submit-ticket-button.png) {% data reusables.enterprise_enterprise_support.submit-support-ticket-first-section %} diff --git a/translations/ru-RU/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md b/translations/ru-RU/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md index 6c34701515..83a7d50425 100644 --- a/translations/ru-RU/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md +++ b/translations/ru-RU/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md @@ -34,7 +34,7 @@ You can populate the runner tool cache by running a {% data variables.product.pr ### Populating the tool cache for a self-hosted runner -1. On {% data variables.product.prodname_dotcom_the_website %}, navigate to a repostory that you can use to run a {% data variables.product.prodname_actions %} workflow. +1. On {% data variables.product.prodname_dotcom_the_website %}, navigate to a repository that you can use to run a {% data variables.product.prodname_actions %} workflow. 1. Create a new workflow file in the repository's `.github/workflows` folder that uploads an artifact containing the {% data variables.product.prodname_dotcom %}-hosted runner's tool cache. The following example demonstrates a workflow that uploads the tool cache for an Ubuntu 18.04 environment, using the `setup-node` action with Node.js versions 10 and 12. diff --git a/translations/ru-RU/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md b/translations/ru-RU/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md index 2a23da1a69..efdf433f20 100644 --- a/translations/ru-RU/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md +++ b/translations/ru-RU/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md @@ -25,8 +25,7 @@ Before launching {% data variables.product.product_location_enterprise %} on Goo #### Supported machine types {% data variables.product.prodname_ghe_server %} is supported on the following Google Compute Engine (GCE) machine types. For more information, see [the Google Cloud Platform machine types article](https://cloud.google.com/compute/docs/machine-types). -| -{% if currentVersion != "free-pro-team@latest" %} + | | High-memory | | | ------------- | | | n1-highmem-4 | @@ -35,7 +34,6 @@ Before launching {% data variables.product.product_location_enterprise %} on Goo | | n1-highmem-32 | | | n1-highmem-64 | | | n1-highmem-96 | -{% endif %} #### Recommended machine types diff --git a/translations/ru-RU/content/admin/overview/managing-your-github-enterprise-license.md b/translations/ru-RU/content/admin/overview/managing-your-github-enterprise-license.md index a35377b399..207a78cfa5 100644 --- a/translations/ru-RU/content/admin/overview/managing-your-github-enterprise-license.md +++ b/translations/ru-RU/content/admin/overview/managing-your-github-enterprise-license.md @@ -30,9 +30,9 @@ After you purchase a new license or upgrade an existing license from {% data var If you'd like to renew or add user licenses to {% data variables.product.prodname_enterprise %}, contact {% data variables.contact.contact_enterprise_sales %}. Your new license file will be available for download immediately after you complete your order. -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Under "Enterprise Server Instances", click {% octicon "download" aria-label="The download icon" %} to download your license file. ![Download GitHub Enterprise Server license](/assets/images/help/business-accounts/download-ghes-license.png) 5. Log into your {% data variables.product.prodname_ghe_server %} instance as a site administrator. @@ -46,9 +46,9 @@ If you'd like to renew or add user licenses to {% data variables.product.prodnam ### Viewing license usage -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses. ### Automatically syncing user license usage with {% data variables.product.prodname_ghe_cloud %} @@ -63,11 +63,12 @@ You can download a JSON file from {% data variables.product.prodname_ghe_server {% data reusables.enterprise_site_admin_settings.business %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.license-tab %} -5. Under "Quick links", to download a file containing your current license usage on {% data variables.product.prodname_ghe_server %}, click **Export license usage**. ![Export license usage link](/assets/images/enterprise/business-accounts/export-license-usage-link.png) -6. Navigate to -{% data variables.product.prodname_ghe_cloud %}. -{% data reusables.enterprise-accounts.access-enterprise %} +5. Under "Quick links", to download a file containing your current license usage on +{% data variables.product.prodname_ghe_server %}, click **Export license usage**. + ![Export license usage link](/assets/images/enterprise/business-accounts/export-license-usage-link.png) +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +8. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) +{% data reusables.enterprise-accounts.license-tab %} 10. Under "Enterprise Server Instances", click **Add server usage**. ![Upload GitHub Enterprise Servers usage link](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png) 11. Upload the JSON file you downloaded from {% data variables.product.prodname_ghe_server %}. ![Drag and drop or select a file to upload](/assets/images/help/business-accounts/upload-ghe-server-usage-file.png) diff --git a/translations/ru-RU/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md b/translations/ru-RU/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md index 80be8702b8..d2535bf887 100644 --- a/translations/ru-RU/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md +++ b/translations/ru-RU/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md @@ -11,7 +11,7 @@ When using LDAP or built-in authentication, two-factor authentication is support {% data reusables.enterprise_user_management.external_auth_disables_2fa %} -For more information, see [this chart on authentication methods that support 2FA](/enterprise/{{ currentVersion }}/user/articles/about-two-factor-authentication/#authentication-methods-that-support-2fa). +For more information, see "[About two-factor authentication](/github/authenticating-to-github/about-two-factor-authentication)." ### Requirements for enforcing two-factor authentication diff --git a/translations/ru-RU/content/developers/apps/authenticating-with-github-apps.md b/translations/ru-RU/content/developers/apps/authenticating-with-github-apps.md index 79dd1fc619..db6f497430 100644 --- a/translations/ru-RU/content/developers/apps/authenticating-with-github-apps.md +++ b/translations/ru-RU/content/developers/apps/authenticating-with-github-apps.md @@ -10,7 +10,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -92,7 +92,7 @@ Use your {% data variables.product.prodname_github_app %}'s identifier (`YOUR_AP After creating the JWT, set it in the `Header` of the API request: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -H "Authorization: Bearer YOUR_JWT" -H "Accept: application/vnd.github.machine-man-preview+json" {% data variables.product.api_url_pre %}/app ``` @@ -127,7 +127,7 @@ By default, installation access tokens are scoped to all the repositories that a To create an installation access token, include the JWT [generated above](#jwt-payload) in the Authorization header in the API request: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -X POST \ -H "Authorization: Bearer YOUR_JWT" \ @@ -147,7 +147,7 @@ The response will include your installation access token, the expiration date, t To authenticate with an installation access token, include it in the Authorization header in the API request: -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i \ -H "Authorization: token YOUR_INSTALLATION_ACCESS_TOKEN" \ diff --git a/translations/ru-RU/content/developers/apps/creating-a-github-app-from-a-manifest.md b/translations/ru-RU/content/developers/apps/creating-a-github-app-from-a-manifest.md index ccd3772120..caa854f146 100644 --- a/translations/ru-RU/content/developers/apps/creating-a-github-app-from-a-manifest.md +++ b/translations/ru-RU/content/developers/apps/creating-a-github-app-from-a-manifest.md @@ -162,7 +162,7 @@ You must complete this step of the GitHub App Manifest flow within one hour. {% endnote %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% data reusables.pre-release-program.fury-pre-release %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/ru-RU/content/developers/apps/creating-ci-tests-with-the-checks-api.md b/translations/ru-RU/content/developers/apps/creating-ci-tests-with-the-checks-api.md index 252f841f72..126674ed0f 100644 --- a/translations/ru-RU/content/developers/apps/creating-ci-tests-with-the-checks-api.md +++ b/translations/ru-RU/content/developers/apps/creating-ci-tests-with-the-checks-api.md @@ -143,8 +143,7 @@ def create_check_run check_run = @installation_client.post( "repos/#{@payload['repository']['full_name']}/check-runs", { - # This header allows for beta access to Checks API - accept: 'application/vnd.github.antiope-preview+json', + accept: 'application/vnd.github.v3+json', # The name of your check run. name: 'Octo RuboCop', # The payload structure differs depending on whether a check run or a check suite event occurred. diff --git a/translations/ru-RU/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/translations/ru-RU/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md index c7e2917bdd..48de4edac1 100644 --- a/translations/ru-RU/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md +++ b/translations/ru-RU/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md @@ -136,7 +136,7 @@ For more information about authorizing users using the device flow, see "[Author ### Check which installation's resources a user can access -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -422,7 +422,7 @@ While most of your API interaction should occur using your server-to-server inst * [Convert an organization member to outside collaborator](/v3/orgs/outside_collaborators/#convert-an-organization-member-to-outside-collaborator) * [Remove outside collaborator from an organization](/v3/orgs/outside_collaborators/#remove-outside-collaborator-from-an-organization) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Organization Pre Receive Hooks * [List pre-receive hooks for an organization](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-an-organization) @@ -460,7 +460,7 @@ While most of your API interaction should occur using your server-to-server inst * [List teams](/v3/teams/#list-teams) * [Create a team](/v3/teams/#create-a-team) * [Get a team by name](/v3/teams/#get-a-team-by-name) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} * [Get a team](/v3/teams/#get-a-team) {% endif %} * [Update a team](/v3/teams/#update-a-team) @@ -762,7 +762,7 @@ While most of your API interaction should occur using your server-to-server inst * [Get GitHub Pages build](/rest/reference/repos#get-github-pages-build) * [Get latest pages build](/rest/reference/repos#get-latest-pages-build) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Repository Pre Receive Hooks * [List pre-receive hooks for a repository](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-a-repository) diff --git a/translations/ru-RU/content/developers/apps/installing-github-apps.md b/translations/ru-RU/content/developers/apps/installing-github-apps.md index 85a635fff5..ff6dd370a9 100644 --- a/translations/ru-RU/content/developers/apps/installing-github-apps.md +++ b/translations/ru-RU/content/developers/apps/installing-github-apps.md @@ -52,7 +52,7 @@ These steps assume you have [built a {% data variables.product.prodname_github_a You can simplify the authorization process by completing it during app installation. To do this, select **Request user authorization (OAuth) during installation** when creating or modifying your app in GitHub. See "[Creating a GitHub App](/apps/building-github-apps/creating-a-github-app/)" to learn more. -Once someone has installed your app, you will need to get an access token for the user. See steps 2 and 3 in "[Identifying a users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. +Once someone has installed your app, you will need to get an access token for the user. See steps 2 and 3 in "[Identifying users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. ### Preserving an application state during installation You can provide a `state` parameter in an app's installation URL to preserve the state of the application page and return people back to that state after they install, authenticate, or accept updates to your GitHub App. For example, you could use the `state` to correlate an installation to a user or account. diff --git a/translations/ru-RU/content/developers/apps/scopes-for-oauth-apps.md b/translations/ru-RU/content/developers/apps/scopes-for-oauth-apps.md index 447de3165e..0fb4ff55cc 100644 --- a/translations/ru-RU/content/developers/apps/scopes-for-oauth-apps.md +++ b/translations/ru-RU/content/developers/apps/scopes-for-oauth-apps.md @@ -37,42 +37,42 @@ X-Accepted-OAuth-Scopes: user ### Available scopes -| Name | Description | -| ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| **`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if currentVersion != "free-pro-team@latest" %} +| Name | Description | +| ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if enterpriseServerVersions contains currentVersion %} | **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/v3/enterprise-admin).{% endif %} -| **`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects. | -|  `repo:status` | Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. | -|  `repo_deployment` | Grants access to [deployment statuses](/v3/repos/deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code. | -|  `public_repo` | Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories. | +| **`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects. | +|  `repo:status` | Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. | +|  `repo_deployment` | Grants access to [deployment statuses](/v3/repos/deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code. | +|  `public_repo` | Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories. | |  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21"%} |  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/v3/code-scanning).{% endif %} -| **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. | -|  `write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories. | -|  `read:repo_hook` | Grants read and ping access to hooks in public or private repositories. | -| **`admin:org`** | Fully manage the organization and its teams, projects, and memberships. | -|  `write:org` | Read and write access to organization membership, organization projects, and team membership. | -|  `read:org` | Read-only access to organization membership, organization projects, and team membership. | -| **`admin:public_key`** | Fully manage public keys. | -|  `write:public_key` | Create, list, and view details for public keys. | -|  `read:public_key` | List and view details for public keys. | -| **`admin:org_hook`** | Grants read, write, ping, and delete access to organization hooks. **Note:** OAuth tokens will only be able to perform these actions on organization hooks which were created by the OAuth App. Personal access tokens will only be able to perform these actions on organization hooks created by a user. | -| **`gist`** | Grants write access to gists. | -| **`notification (Оповещения)`** | Grants:
    * read access to a user's notifications
    * mark as read access to threads
    * watch and unwatch access to a repository, and
    * read, write, and delete access to thread subscriptions. | -| **`пользователь`** | Grants read/write access to profile info only. Note that this scope includes `user:email` and `user:follow`. | -|  `read:user` | Grants access to read a user's profile data. | -|  `user:email` | Grants read access to a user's email addresses. | -|  `user:follow` | Grants access to follow or unfollow other users. | -| **`delete_repo`** | Grants access to delete adminable repositories. | -| **`write:discussion`** | Allows read and write access for team discussions. | +| **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. | +|  `write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories. | +|  `read:repo_hook` | Grants read and ping access to hooks in public or private repositories. | +| **`admin:org`** | Fully manage the organization and its teams, projects, and memberships. | +|  `write:org` | Read and write access to organization membership, organization projects, and team membership. | +|  `read:org` | Read-only access to organization membership, organization projects, and team membership. | +| **`admin:public_key`** | Fully manage public keys. | +|  `write:public_key` | Create, list, and view details for public keys. | +|  `read:public_key` | List and view details for public keys. | +| **`admin:org_hook`** | Grants read, write, ping, and delete access to organization hooks. **Note:** OAuth tokens will only be able to perform these actions on organization hooks which were created by the OAuth App. Personal access tokens will only be able to perform these actions on organization hooks created by a user. | +| **`gist`** | Grants write access to gists. | +| **`notification (Оповещения)`** | Grants:
    * read access to a user's notifications
    * mark as read access to threads
    * watch and unwatch access to a repository, and
    * read, write, and delete access to thread subscriptions. | +| **`пользователь`** | Grants read/write access to profile info only. Note that this scope includes `user:email` and `user:follow`. | +|  `read:user` | Grants access to read a user's profile data. | +|  `user:email` | Grants read access to a user's email addresses. | +|  `user:follow` | Grants access to follow or unfollow other users. | +| **`delete_repo`** | Grants access to delete adminable repositories. | +| **`write:discussion`** | Allows read and write access for team discussions. | |  `read:discussion` | Allows read access for team discussions.{% if currentVersion == "free-pro-team@latest" %} -| **`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[Publishing a package](/github/managing-packages-with-github-packages/publishing-a-package)". | -| **`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[Installing a package](/github/managing-packages-with-github-packages/installing-a-package)". | +| **`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[Publishing a package](/github/managing-packages-with-github-packages/publishing-a-package)". | +| **`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[Installing a package](/github/managing-packages-with-github-packages/installing-a-package)". | | **`delete:packages`** | Grants access to delete packages from {% data variables.product.prodname_registry %}. For more information, see "[Deleting packages](/github/managing-packages-with-github-packages/deleting-a-package)".{% endif %} -| **`admin:gpg_key`** | Fully manage GPG keys. | -|  `write:gpg_key` | Create, list, and view details for GPG keys. | +| **`admin:gpg_key`** | Fully manage GPG keys. | +|  `write:gpg_key` | Create, list, and view details for GPG keys. | |  `read:gpg_key` | List and view details for GPG keys.{% if currentVersion == "free-pro-team@latest" %} -| **`рабочий процесс`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository.{% endif %} +| **`рабочий процесс`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes, see https://docs.github.com/en/free-pro-team@latest/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token for details.{% endif %} {% note %} diff --git a/translations/ru-RU/content/developers/github-marketplace/about-github-marketplace.md b/translations/ru-RU/content/developers/github-marketplace/about-github-marketplace.md index 083f066f55..fd42d3a91c 100644 --- a/translations/ru-RU/content/developers/github-marketplace/about-github-marketplace.md +++ b/translations/ru-RU/content/developers/github-marketplace/about-github-marketplace.md @@ -14,7 +14,7 @@ versions: {% data reusables.actions.actions-not-verified %} -To learn about publishing {% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}, see "[{% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}](/marketplace/actions/)." +To learn about publishing {% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}, see "[Publishing actions in GitHub Marketplace](/actions/creating-actions/publishing-actions-in-github-marketplace)." ### Приложения diff --git a/translations/ru-RU/content/developers/overview/replacing-github-services.md b/translations/ru-RU/content/developers/overview/replacing-github-services.md index eb1925fc9e..7cc93257bf 100644 --- a/translations/ru-RU/content/developers/overview/replacing-github-services.md +++ b/translations/ru-RU/content/developers/overview/replacing-github-services.md @@ -29,7 +29,7 @@ As an alternative to the email service, you can now start using email notificati GitHub Services (sometimes referred to as Service Hooks) is the legacy method of integrating where GitHub hosted a portion of our integrator’s services via [the `github-services` repository](https://github.com/github/github-services). Actions performed on GitHub trigger these services, and you can use these services to trigger actions outside of GitHub. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Finding repositories that use GitHub Services We provide a command-line script that helps you identify which repositories on your appliance use GitHub Services. For more information, see [ghe-legacy-github-services-report](/enterprise/{{currentVersion}}/admin/articles/command-line-utilities/#ghe-legacy-github-services-report).{% endif %} diff --git a/translations/ru-RU/content/developers/webhooks-and-events/about-webhooks.md b/translations/ru-RU/content/developers/webhooks-and-events/about-webhooks.md index 10abb1ffae..4cbf97da30 100644 --- a/translations/ru-RU/content/developers/webhooks-and-events/about-webhooks.md +++ b/translations/ru-RU/content/developers/webhooks-and-events/about-webhooks.md @@ -11,9 +11,9 @@ versions: Webhooks allow you to build or set up integrations, such as [{% data variables.product.prodname_github_app %}s](/apps/building-github-apps/) or [{% data variables.product.prodname_oauth_app %}s](/apps/building-oauth-apps/), which subscribe to certain events on GitHub.com. When one of those events is triggered, we'll send a HTTP POST payload to the webhook's configured URL. Webhooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server. You're only limited by your imagination. -Webhooks can be installed on{% if currentVersion != "free-pro-team@latest" %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. +Webhooks can be installed on{% if enterpriseServerVersions contains currentVersion %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. -You can create up to {% if currentVersion != "free-pro-team@latest" %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if currentVersion != "free-pro-team@latest" %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} +You can create up to {% if enterpriseServerVersions contains currentVersion %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if enterpriseServerVersions contains currentVersion %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} ### События diff --git a/translations/ru-RU/content/developers/webhooks-and-events/creating-webhooks.md b/translations/ru-RU/content/developers/webhooks-and-events/creating-webhooks.md index dbf8e204c9..dbb818f26f 100644 --- a/translations/ru-RU/content/developers/webhooks-and-events/creating-webhooks.md +++ b/translations/ru-RU/content/developers/webhooks-and-events/creating-webhooks.md @@ -14,6 +14,9 @@ Now that we understand [the basics of webhooks][webhooks-overview], let's go thr Creating a webhook is a two-step process. You'll first need to set up how you want your webhook to behave through {% data variables.product.product_name %}--what events should it listen to. After that, you'll set up your server to receive and manage the payload. + +{% data reusables.webhooks.webhooks-rest-api-links %} + ### Setting up a Webhook You can install webhooks on an organization or on a specific repository. diff --git a/translations/ru-RU/content/developers/webhooks-and-events/github-event-types.md b/translations/ru-RU/content/developers/webhooks-and-events/github-event-types.md index 9793b91b72..e45f8d5160 100644 --- a/translations/ru-RU/content/developers/webhooks-and-events/github-event-types.md +++ b/translations/ru-RU/content/developers/webhooks-and-events/github-event-types.md @@ -28,13 +28,13 @@ The event objects returned from the Events API endpoints have the same structure | `actor.id` | The unique identifier for the actor. | | `actor.login` | The username of the actor. | | `actor.display_login` | The specific display format of the username. | -| `actor.gravatar_id` | The unique indentifier of the Gravatar profile for the actor. | +| `actor.gravatar_id` | The unique identifier of the Gravatar profile for the actor. | | `actor.url` | The REST API URL used to retrieve the user object, which includes additional user information. | | `actor.avatar_url` | The URL of the actor's profile image. | | `repo` | The repository object where the event occurred. | | `repo.id` | The unique identifier of the repository. | | `repo.name` | The name of the repository, which includes the owner and repository name. For example, `octocat/hello-world` is the name of the `hello-world` repository owned by the `octocat` user account. | -| `repo.url` | The REST API URL used to retrive the repository object, which includes additional repository information. | +| `repo.url` | The REST API URL used to retrieve the repository object, which includes additional repository information. | | `payload` | The event payload object is unique to the event type. See the event type below for the event API `payload` object. | #### Example WatchEvent event object diff --git a/translations/ru-RU/content/developers/webhooks-and-events/issue-event-types.md b/translations/ru-RU/content/developers/webhooks-and-events/issue-event-types.md index 1881dc8a93..a42e5f9b15 100644 --- a/translations/ru-RU/content/developers/webhooks-and-events/issue-event-types.md +++ b/translations/ru-RU/content/developers/webhooks-and-events/issue-event-types.md @@ -229,7 +229,7 @@ The issue or pull request was referenced from another issue or pull request. | --------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `actor` | `объект` | The person who generated the event. | | `created_at` | `строка` | The timestamp indicating when the cross-reference was added. | -| `updated_at` | `строка` | The timestamp indicating when the cross-refererence was updated or created, if the cross-reference is never updated. | +| `updated_at` | `строка` | The timestamp indicating when the cross-reference was updated or created, if the cross-reference is never updated. | | `source` | `объект` | The issue or pull request that added a cross-reference. | | `source[type]` | `строка` | This value will always be `"issue"` because pull requests are of type issue. Only cross-reference events triggered by issues or pull requests are returned in the Timeline Events API. To determine if the issue that triggered the event is a pull request, you can check if the `source[issue][pull_request` object exists. | | `source[issue]` | `объект` | The `issue` object that added the cross-reference. | @@ -347,7 +347,7 @@ The issue or pull request was locked. #### Event object properties -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -664,7 +664,7 @@ The issue was unlocked. #### Event object properties -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/ru-RU/content/developers/webhooks-and-events/securing-your-webhooks.md b/translations/ru-RU/content/developers/webhooks-and-events/securing-your-webhooks.md index 0a5ed84359..09dd7373c1 100644 --- a/translations/ru-RU/content/developers/webhooks-and-events/securing-your-webhooks.md +++ b/translations/ru-RU/content/developers/webhooks-and-events/securing-your-webhooks.md @@ -12,6 +12,7 @@ versions: Once your server is configured to receive payloads, it'll listen for any payload sent to the endpoint you configured. For security reasons, you probably want to limit requests to those coming from GitHub. There are a few ways to go about this--for example, you could opt to allow requests from GitHub's IP address--but a far easier method is to set up a secret token and validate the information. +{% data reusables.webhooks.webhooks-rest-api-links %} ### Setting your secret token diff --git a/translations/ru-RU/content/developers/webhooks-and-events/testing-webhooks.md b/translations/ru-RU/content/developers/webhooks-and-events/testing-webhooks.md index 459c8bc69b..3e1f058296 100644 --- a/translations/ru-RU/content/developers/webhooks-and-events/testing-webhooks.md +++ b/translations/ru-RU/content/developers/webhooks-and-events/testing-webhooks.md @@ -13,7 +13,7 @@ Now that you've [configured your local server](/webhooks/configuring/), you migh ### Listing recent deliveries -Every webhook has its own "Recent Deliveries" section, which lists, at a glance whether a deployment was successful (green check) or failed (red x). You can also identify when each delivery was attempted. +Every webhook has its own "Recent Deliveries" section, which lists, at a glance whether a delivery was successful (green check) or failed (red x). You can also identify when each delivery was attempted. {% data variables.product.product_name %} keeps a log of each webhook delivery for {% if currentVersion == "free-pro-team@latest" %} 30 {% else %} 8 {% endif %} days. diff --git a/translations/ru-RU/content/developers/webhooks-and-events/webhook-events-and-payloads.md b/translations/ru-RU/content/developers/webhooks-and-events/webhook-events-and-payloads.md index c565738cd4..526261c4d6 100644 --- a/translations/ru-RU/content/developers/webhooks-and-events/webhook-events-and-payloads.md +++ b/translations/ru-RU/content/developers/webhooks-and-events/webhook-events-and-payloads.md @@ -47,7 +47,7 @@ HTTP POST payloads that are delivered to your webhook's configured URL endpoint | Header | Description | | ----------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `X-GitHub-Event` | Name of the event that triggered the delivery. | -| `X-GitHub-Delivery` | A [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) to identify the delivery.{% if currentVersion != "free-pro-team@latest" %} +| `X-GitHub-Delivery` | A [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) to identify the delivery.{% if enterpriseServerVersions contains currentVersion %} | `X-GitHub-Enterprise-Version` | The version of the {% data variables.product.prodname_ghe_server %} instance that sent the HTTP POST payload. | | `X-GitHub-Enterprise-Host` | The hostname of the {% data variables.product.prodname_ghe_server %} instance that sent the HTTP POST payload.{% endif %}{% if currentVersion != "private-instances@latest" %} | `X-Hub-Signature` | This header is sent if the webhook is configured with a [`secret`](/v3/repos/hooks/#create-hook-config-params). This is the HMAC hex digest of the request body, and is generated using the SHA-1 hash function and the `secret` as the HMAC `key`.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} `X-Hub-Signature` is provided for compatibility with existing integrations, and we recommend that you use the more secure `X-Hub-Signature-256` instead.{% endif %}{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -61,7 +61,7 @@ Also, the `User-Agent` for the requests will have the prefix `GitHub-Hookshot/`. > POST /payload HTTP/1.1 > Host: localhost:4567 -> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if currentVersion != "free-pro-team@latest" %} +> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: 2.15.0 > X-GitHub-Enterprise-Host: example.com{% endif %}{% if currentVersion != "private-instances@latest" %} > X-Hub-Signature: sha1=7d38cdd689735b008b3c702edd92eea23791c5f6{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -332,7 +332,7 @@ Only {% data variables.product.prodname_github_app %}s can receive this event. { {{ webhookPayloadsForCurrentVersion.deployment_status }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### корпоративный @@ -617,7 +617,7 @@ For a detailed description of this payload and the payload for each type of `act ### meta -The webhook this event is configured on was deleted. This event will only listen for changes to the particular hook the event is installed on. Therefore, it must be selected for each hook that you'd like to recieve meta events for. +The webhook this event is configured on was deleted. This event will only listen for changes to the particular hook the event is installed on. Therefore, it must be selected for each hook that you'd like to receive meta events for. #### Availability @@ -667,18 +667,18 @@ The webhook this event is configured on was deleted. This event will only listen #### Availability -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} - GitHub Enterprise webhooks only receive `created` and `deleted` events. For more information, "[Global webhooks](/v3/enterprise-admin/global_webhooks/).{% endif %} - Organization webhooks only receive the `deleted`, `added`, `removed`, `renamed`, and `invited` events - {% data variables.product.prodname_github_app %}s with the `members` permission #### Webhook payload object -| Клавиша | Тип | Description | -| ------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `действие` | `строка` | The action that was performed. Can be one of:{% if currentVersion != "free-pro-team@latest" %} `created`,{% endif %} `deleted`, `renamed`, `member_added`, `member_removed`, or `member_invited`. | -| `приглашение` | `объект` | The invitation for the user or email if the action is `member_invited`. | -| `membership` | `объект` | The membership between the user and the organization. Not present when the action is `member_invited`. | +| Клавиша | Тип | Description | +| ------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `действие` | `строка` | The action that was performed. Can be one of:{% if enterpriseServerVersions contains currentVersion %} `created`,{% endif %} `deleted`, `renamed`, `member_added`, `member_removed`, or `member_invited`. | +| `приглашение` | `объект` | The invitation for the user or email if the action is `member_invited`. | +| `membership` | `объект` | The membership between the user and the organization. Not present when the action is `member_invited`. | {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} {% data reusables.webhooks.sender_desc %} @@ -974,13 +974,17 @@ Deliveries for `review_requested` and `review_request_removed` events will have | `before` | `строка` | The SHA of the most recent commit on `ref` before the push. | | `after` | `строка` | The SHA of the most recent commit on `ref` after the push. | | `commits` | `array` | An array of commit objects describing the pushed commits. (The array includes a maximum of 20 commits. If necessary, you can use the [Commits API](/v3/repos/commits/) to fetch additional commits. This limit is applied to timeline events only and isn't applied to webhook deliveries.) | -| `commits[][sha]` | `строка` | The SHA of the commit. | +| `commits[][id]` | `строка` | The SHA of the commit. | +| `commits[][timestamp]` | `строка` | The ISO 8601 timestamp of the commit. | | `commits[][message]` | `строка` | The commit message. | | `commits[][author]` | `объект` | The git author of the commit. | | `commits[][author][name]` | `строка` | The git author's name. | | `commits[][author][email]` | `строка` | The git author's email address. | | `commits[][url]` | `url` | URL that points to the commit API resource. | | `commits[][distinct]` | `boolean` | Whether this commit is distinct from any that have been pushed before. | +| `commits[][added]` | `array` | An array of files added in the commit. | +| `commits[][modified]` | `array` | An array of files modified by the commit. | +| `commits[][removed]` | `array` | An array of files removed in the commit. | | `pusher` | `объект` | The user who pushed the commits. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} @@ -1042,7 +1046,7 @@ This event occurs when a {% data variables.product.prodname_github_app %} sends | Клавиша | Тип | Description | | ---------- | -------- | --------------------------------------------------------------------------- | -| `действие` | `строка` | The action that was performed. This can be one of:
    • `created` - A repository is created.
    • `deleted` - A repository is deleted. This event type is only available to [organization hooks](/v3/orgs/hooks/)
    • `archived` - A repository is archived.
    • `unarchived` - A repository is unarchived.
      • {% if currentVersion != "free-pro-team@latest" %}
    • `anonymous_access_enabled` - A repository is [enabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories), `anonymous_access_disabled` - A repository is [disabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories)
      • {% endif %}
    • `edited` - A repository's information is edited.
    • `renamed` - A repository is renamed.
    • `transferred` - A repository is transferred.
    • `publicized` - A repository is made public.
    • `privatized` - A repository is made private.
    | +| `действие` | `строка` | The action that was performed. This can be one of:
    • `created` - A repository is created.
    • `deleted` - A repository is deleted. This event type is only available to [organization hooks](/v3/orgs/hooks/)
    • `archived` - A repository is archived.
    • `unarchived` - A repository is unarchived.
      • {% if enterpriseServerVersions contains currentVersion %}
    • `anonymous_access_enabled` - A repository is [enabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories), `anonymous_access_disabled` - A repository is [disabled for anonymous Git access](/v3/previews/#anonymous-git-access-to-repositories)
      • {% endif %}
    • `edited` - A repository's information is edited.
    • `renamed` - A repository is renamed.
    • `transferred` - A repository is transferred.
    • `publicized` - A repository is made public.
    • `privatized` - A repository is made private.
    | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -1244,7 +1248,7 @@ You can only create a sponsorship webhook on {% data variables.product.prodname_ {{ webhookPayloadsForCurrentVersion.team_add }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### пользователь diff --git a/translations/ru-RU/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md b/translations/ru-RU/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md index 0ec56a12dd..137d91e9d4 100644 --- a/translations/ru-RU/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md +++ b/translations/ru-RU/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md @@ -12,7 +12,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" %}{% data reusables.notifications.outbound_email_tip %}{% endif %} +{% if enterpriseServerVersions contains currentVersion %}{% data reusables.notifications.outbound_email_tip %}{% endif %} Each email notification for a push to a repository lists the new commits and links to a diff containing just those commits. In the email notification you'll see: diff --git a/translations/ru-RU/content/github/administering-a-repository/about-github-dependabot-version-updates.md b/translations/ru-RU/content/github/administering-a-repository/about-github-dependabot-version-updates.md index 617d1c7778..8978a11290 100644 --- a/translations/ru-RU/content/github/administering-a-repository/about-github-dependabot-version-updates.md +++ b/translations/ru-RU/content/github/administering-a-repository/about-github-dependabot-version-updates.md @@ -17,7 +17,7 @@ You enable {% data variables.product.prodname_dependabot_version_updates %} by c When {% data variables.product.prodname_dependabot_short %} identifies an outdated dependency, it raises a pull request to update the manifest to the latest version of the dependency. For vendored dependencies, {% data variables.product.prodname_dependabot_short %} raises a pull request to directly replace the outdated dependency with the new version. You check that your tests pass, review the changelog and release notes included in the pull request summary, and then merge it. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." -If you enable security updates, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +If you enable security updates, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." {% data reusables.dependabot.dependabot-tos %} diff --git a/translations/ru-RU/content/github/administering-a-repository/about-required-commit-signing.md b/translations/ru-RU/content/github/administering-a-repository/about-required-commit-signing.md index 36922f79a3..e612095027 100644 --- a/translations/ru-RU/content/github/administering-a-repository/about-required-commit-signing.md +++ b/translations/ru-RU/content/github/administering-a-repository/about-required-commit-signing.md @@ -11,7 +11,7 @@ versions: If you've enforced branch protections in your repository, you can set up required commit signing. For more information, see "[Configuring protected branches](/articles/configuring-protected-branches/)." -When you enable required commit signing on a branch, contibutors {% if currentVersion == "free-pro-team@latest" %}and bots{% endif %} can only push commits that have been signed and verified to the branch. For more information, see "[About commit signature verification](/articles/about-commit-signature-verification)." +When you enable required commit signing on a branch, contributors {% if currentVersion == "free-pro-team@latest" %}and bots{% endif %} can only push commits that have been signed and verified to the branch. For more information, see "[About commit signature verification](/articles/about-commit-signature-verification)." You can always push local commits to the branch if the commits are signed and verified. {% if currentVersion == "free-pro-team@latest" %}You can also merge signed and verified commits into the branch using a pull request on {% data variables.product.product_name %}. However, you cannot squash and merge a pull request into the branch on {% data variables.product.product_name %} unless you are the author of the pull request.{% else %} However, you cannot merge pull requests into the branch on {% data variables.product.product_name %}.{% endif %} You can {% if currentVersion == "free-pro-team@latest" %}squash and {% endif %}merge pull requests locally. For more information, see "[Checking out pull requests locally](/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally)."{% if currentVersion == "free-pro-team@latest" %} For more information about merge methods, see "[About merge methods on {% data variables.product.prodname_dotcom %}](/github/administering-a-repository/about-merge-methods-on-github)."{% endif %} diff --git a/translations/ru-RU/content/github/administering-a-repository/about-securing-your-repository.md b/translations/ru-RU/content/github/administering-a-repository/about-securing-your-repository.md index 2b7c963ec1..9b1b79977a 100644 --- a/translations/ru-RU/content/github/administering-a-repository/about-securing-your-repository.md +++ b/translations/ru-RU/content/github/administering-a-repository/about-securing-your-repository.md @@ -21,9 +21,13 @@ The first step to securing a repository is to set up who can see and modify your Privately discuss and fix security vulnerabilities in your repository's code. You can then publish a security advisory to alert your community to the vulnerability and encourage them to upgrade. For more information, see "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." -- **{% data variables.product.prodname_dependabot_short %} alerts** +- **{% data variables.product.prodname_dependabot_short %} alerts and security updates** - View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." + +- **{% data variables.product.prodname_dependabot_short %} version updates** + + Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot-version-updates)." - **{% data variables.product.prodname_code_scanning_capc %} alerts** diff --git a/translations/ru-RU/content/github/administering-a-repository/classifying-your-repository-with-topics.md b/translations/ru-RU/content/github/administering-a-repository/classifying-your-repository-with-topics.md index bb919c1771..db10d95a24 100644 --- a/translations/ru-RU/content/github/administering-a-repository/classifying-your-repository-with-topics.md +++ b/translations/ru-RU/content/github/administering-a-repository/classifying-your-repository-with-topics.md @@ -27,7 +27,7 @@ You can search for repositories that are associated with a particular topic. For ### Adding topics to your repository -{% data reusables.repositories.navigate-to-repo %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% data reusables.repositories.navigate-to-repo %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. Under your repository description, click **Add topics**. ![Add topics link on a repository's main page](/assets/images/help/repository/add-topics-link.png) 3. Type the topic you want to add to your repository, then type a space. ![Form to enter topics](/assets/images/help/repository/add-topic-form.png) 4. After you've finished adding topics, click **Done**. ![Form with a list of topics and Done button](/assets/images/help/repository/add-topics-done-button.png) diff --git a/translations/ru-RU/content/github/administering-a-repository/configuration-options-for-dependency-updates.md b/translations/ru-RU/content/github/administering-a-repository/configuration-options-for-dependency-updates.md index 7429759707..fced9d76ce 100644 --- a/translations/ru-RU/content/github/administering-a-repository/configuration-options-for-dependency-updates.md +++ b/translations/ru-RU/content/github/administering-a-repository/configuration-options-for-dependency-updates.md @@ -545,12 +545,6 @@ updates: Use the `vendor` option to tell {% data variables.product.prodname_dependabot_short %} to vendor dependencies when updating them. -{% note %} - -Currently, {% data variables.product.prodname_dependabot_short %} only supports vendoring dependencies for Bundler. - -{% endnote %} - ```yaml # Configure version updates for both dependencies defined in manifests and vendored dependencies @@ -564,7 +558,13 @@ updates: interval: "weekly" ``` -{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. For Bundler, the dependencies must be in the _vendor/cache_ directory. Other file paths are not supported. For more information, see the [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html). +{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. + +| Package manager | Required file path for vendored dependencies | More information | +| --------------- | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------- | +| `bundler` | The dependencies must be in the _vendor/cache_ directory.
    Other file paths are not supported. | [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html) | +| `gomod` | No path requirement (dependencies are usually located in the _vendor_ directory) | [`go mod vendor` documentation](https://golang.org/ref/mod#go-mod-vendor) | + ### `versioning-strategy` diff --git a/translations/ru-RU/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/translations/ru-RU/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md index dc98637951..cde1f08871 100644 --- a/translations/ru-RU/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md +++ b/translations/ru-RU/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md @@ -17,7 +17,7 @@ You can enable {% data variables.product.prodname_actions %} for your repository Alternatively, you can enable {% data variables.product.prodname_actions %} in your repository but limit the actions a workflow can run. {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### Managing {% data variables.product.prodname_actions %} permissions for your repository diff --git a/translations/ru-RU/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md b/translations/ru-RU/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md index 8e8fa47277..c2f06eb458 100644 --- a/translations/ru-RU/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md +++ b/translations/ru-RU/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md @@ -15,7 +15,7 @@ By default, force pushes are blocked on all protected branches. When you enable Enabling force pushes will not override any other branch protection rules. For example, if a branch requires a linear commit history, you cannot force push merge commits to that branch. -{% if currentVersion != "free-pro-team@latest" %}You cannot enable force pushes for a protected branch if a site administrator has blocked force pushes to all branches in your repository. For more information, see "[Blocking force pushes to repositories owned by a user account or organization](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)." +{% if enterpriseServerVersions contains currentVersion %}You cannot enable force pushes for a protected branch if a site administrator has blocked force pushes to all branches in your repository. For more information, see "[Blocking force pushes to repositories owned by a user account or organization](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)." If a site administrator has blocked force pushes to the default branch only, you can still enable force pushes for any other protected branch.{% endif %} diff --git a/translations/ru-RU/content/github/administering-a-repository/index.md b/translations/ru-RU/content/github/administering-a-repository/index.md index b84dfb362a..181c1e1dbd 100644 --- a/translations/ru-RU/content/github/administering-a-repository/index.md +++ b/translations/ru-RU/content/github/administering-a-repository/index.md @@ -26,7 +26,7 @@ versions: {% link_in_list /viewing-deployment-activity-for-your-repository %} {% link_in_list /managing-the-forking-policy-for-your-repository %} - + {% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-repository %} {% link_in_list /disabling-or-limiting-github-actions-for-a-repository %} {% link_in_list /managing-git-lfs-objects-in-archives-of-your-repository %} diff --git a/translations/ru-RU/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/translations/ru-RU/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md index d59bf97cc3..6f93905e1f 100644 --- a/translations/ru-RU/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md +++ b/translations/ru-RU/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md @@ -9,9 +9,9 @@ versions: ### About {% data variables.product.prodname_dependabot %} pull requests -{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot_short %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." +{% data reusables.dependabot.pull-request-introduction %} -When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package management system. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package manager. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." If you have many dependencies to manage, you may want to customize the configuration for each package manager so that pull requests have specific reviewers, assignees, and labels. For more information, see "[Customizing dependency updates](/github/administering-a-repository/customizing-dependency-updates)." diff --git a/translations/ru-RU/content/github/administering-a-repository/setting-repository-visibility.md b/translations/ru-RU/content/github/administering-a-repository/setting-repository-visibility.md index eed101908b..87d4c3f760 100644 --- a/translations/ru-RU/content/github/administering-a-repository/setting-repository-visibility.md +++ b/translations/ru-RU/content/github/administering-a-repository/setting-repository-visibility.md @@ -23,7 +23,7 @@ We recommend reviewing the following caveats before you change the visibility of {% if currentVersion == "free-pro-team@latest" %}* If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. {% data reusables.gated-features.more-info %} * Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)." * {% data variables.product.prodname_dotcom %} will no longer included the repository in the {% data variables.product.prodname_archive %}. For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)."{% endif %} - {% if currentVersion != "free-pro-team@latest" %}* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} + {% if enterpriseServerVersions contains currentVersion %}* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} #### Making a repository public diff --git a/translations/ru-RU/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md b/translations/ru-RU/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md index 98711af810..3bf76274b9 100644 --- a/translations/ru-RU/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md +++ b/translations/ru-RU/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md @@ -14,7 +14,7 @@ versions: {% endnote %} -People with read access to a repository can see an overview of all current deployments and a log of past deployment activity, if the repository's deployment workflow is integrated with {% data variables.product.product_name %} through the Deployments API or an app from [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment). For more information, see "[Deployments](/v3/repos/deployments/)." +People with read access to a repository can see an overview of all current deployments and a log of past deployment activity, if the repository's deployment workflow is integrated with {% data variables.product.product_name %} through the Deployments API or an app from [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment). For more information, see "[Deployments](/rest/reference/repos#deployments)." You can also see deployment information on the "Conversation" tab of a pull request. diff --git a/translations/ru-RU/content/github/authenticating-to-github/error-bad-file-number.md b/translations/ru-RU/content/github/authenticating-to-github/error-bad-file-number.md index 77507d3adb..74166cb93c 100644 --- a/translations/ru-RU/content/github/authenticating-to-github/error-bad-file-number.md +++ b/translations/ru-RU/content/github/authenticating-to-github/error-bad-file-number.md @@ -12,7 +12,7 @@ When running remote Git commands or SSH, your connection might time out: ```shell $ ssh -vT git@{% data variables.command_line.codeblock %} -> OpenSSH_5.8p1, OpenSSL 1.0.0d 8 Feb 2011 +> OpenSSH_8.1p1, LibreSSL 2.7.3 > debug1: Connecting to {% data variables.command_line.codeblock %} [207.97.227.239] port 22. > debug1: connect to address 207.97.227.239 port 22: Connection timed out > ssh: connect to host {% data variables.command_line.codeblock %} port 22: Connection timed out diff --git a/translations/ru-RU/content/github/authenticating-to-github/generating-a-new-gpg-key.md b/translations/ru-RU/content/github/authenticating-to-github/generating-a-new-gpg-key.md index fcb6c3eb44..5b363cfd5d 100644 --- a/translations/ru-RU/content/github/authenticating-to-github/generating-a-new-gpg-key.md +++ b/translations/ru-RU/content/github/authenticating-to-github/generating-a-new-gpg-key.md @@ -29,7 +29,7 @@ versions: ```shell $ gpg --default-new-key-algo rsa4096 --gen-key ``` -4. At the prompt, specify the kind of key you want, or press `Enter` to accept the default `RSA and DSA`. +4. At the prompt, specify the kind of key you want, or press `Enter` to accept the default `RSA and RSA`. 5. Enter the desired key size. Your key must be at least `4096` bits. 6. Enter the length of time the key should be valid. Press `Enter` to specify the default selection, indicating that the key doesn't expire. 7. Verify that your selections are correct. diff --git a/translations/ru-RU/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md b/translations/ru-RU/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md index dce42bcc6b..df4b35b5d7 100644 --- a/translations/ru-RU/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md +++ b/translations/ru-RU/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md @@ -134,7 +134,7 @@ To illustrate how `git filter-branch` works, we'll show you how to remove your f {% endnote %} -## Avoiding accidental commits in the future +### Avoiding accidental commits in the future There are a few simple tricks to avoid committing things you don't want committed: @@ -145,5 +145,5 @@ There are a few simple tricks to avoid committing things you don't want committe ### Дополнительная литература -- [`git filter-branch` main page](https://git-scm.com/docs/git-filter-branch) +- [`git filter-branch` man page](https://git-scm.com/docs/git-filter-branch) - [Pro Git: Git Tools - Rewriting History](https://git-scm.com/book/en/Git-Tools-Rewriting-History) diff --git a/translations/ru-RU/content/github/authenticating-to-github/reviewing-your-security-log.md b/translations/ru-RU/content/github/authenticating-to-github/reviewing-your-security-log.md index c75274f6d4..4ee72cc5ce 100644 --- a/translations/ru-RU/content/github/authenticating-to-github/reviewing-your-security-log.md +++ b/translations/ru-RU/content/github/authenticating-to-github/reviewing-your-security-log.md @@ -31,22 +31,22 @@ The security log lists all actions performed within the last 90 days{% if curren ### Understanding events in your security log Actions listed in your security log are grouped within the following categories: |{% endif %} -| Category Name | Description | -| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |{% if currentVersion == "free-pro-team@latest" %} -| `account_recovery_token` | Contains all activities related to [adding a recovery token](/articles/configuring-two-factor-authentication-recovery-methods). | -| `выставление счетов` | Contains all activities related to your billing information. | -| `marketplace_agreement_signature` | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | +| Category Name | Description | +| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest" %} +| `account_recovery_token` | Contains all activities related to [adding a recovery token](/articles/configuring-two-factor-authentication-recovery-methods). | +| `выставление счетов` | Contains all activities related to your billing information. | +| `marketplace_agreement_signature` | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | | `marketplace_listing` | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %} | `oauth_access` | Contains all activities related to [{% data variables.product.prodname_oauth_app %}s](/articles/authorizing-oauth-apps) you've connected with.{% if currentVersion == "free-pro-team@latest" %} | `payment_method` | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %} -| `profile_picture` | Contains all activities related to your profile picture. | -| `проект` | Contains all activities related to project boards. | -| `public_key` | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). | +| `profile_picture` | Contains all activities related to your profile picture. | +| `проект` | Contains all activities related to project boards. | +| `public_key` | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). | | `repo` | Contains all activities related to the repositories you own.{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to {% data variables.product.prodname_sponsors %} and sponsor buttons (see "[About {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)" and "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} +| `sponsors` | Contains all events related to {% data variables.product.prodname_sponsors %} and sponsor buttons (see "[About {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)" and "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion %} | `команда` | Contains all activities related to teams you are a part of.{% endif %} -| `two_factor_authentication` | Contains all activities related to [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa). | -| `пользователь` | Contains all activities related to your account. | +| `two_factor_authentication` | Contains all activities related to [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa). | +| `пользователь` | Contains all activities related to your account. | A description of the events within these categories is listed below. @@ -137,7 +137,7 @@ A description of the events within these categories is listed below. | access | Triggered when you a repository you own is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). | | add_member | Triggered when a {% data variables.product.product_name %} user is {% if currentVersion == "free-pro-team@latest" %}[invited to have collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% else %}[given collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% endif %} to a repository. | | add_topic | Triggered when a repository owner [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. | -| archived | Triggered when a repository owner [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} +| archived | Triggered when a repository owner [archives a repository](/articles/about-archiving-repositories).{% if enterpriseServerVersions contains currentVersion %} | config.disable_anonymous_git_access | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | | config.enable_anonymous_git_access | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | | config.lock_anonymous_git_access | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). | @@ -186,7 +186,7 @@ A description of the events within these categories is listed below. | revoke | Triggered when you revoke a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") | {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} #### The `team` category diff --git a/translations/ru-RU/content/github/building-a-strong-community/adding-a-license-to-a-repository.md b/translations/ru-RU/content/github/building-a-strong-community/adding-a-license-to-a-repository.md index e26225b293..ca6cdbb8c8 100644 --- a/translations/ru-RU/content/github/building-a-strong-community/adding-a-license-to-a-repository.md +++ b/translations/ru-RU/content/github/building-a-strong-community/adding-a-license-to-a-repository.md @@ -32,7 +32,7 @@ Open source licenses enable others to freely use, change, and distribute the pro {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.files.add-file %} diff --git a/translations/ru-RU/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md b/translations/ru-RU/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md index 4796ffbb22..7c0c84aece 100644 --- a/translations/ru-RU/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md +++ b/translations/ru-RU/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md @@ -28,7 +28,7 @@ assignees: octocat ``` {% note %} -**Note:** You must put YAML-reserved characters such as `:` in quotes. For example, `":bug: Bug"`. +**Note:** If a front matter value includes a YAML-reserved character such as `:` , you must put the whole value in quotes. For example, `":bug: Bug"` or `":new: triage needed, :bug: bug"`. {% endnote %} diff --git a/translations/ru-RU/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md b/translations/ru-RU/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md index 1f2ff61f15..47fe96ea7c 100644 --- a/translations/ru-RU/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md +++ b/translations/ru-RU/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md @@ -22,7 +22,7 @@ You can unblock a user in your account settings or from the user's profile page. ### Unblocking a user from their profile page {% data reusables.profile.user_profile_page_navigation %} -2. In the left sidebar, under the user's profile picture, click **Unblock or report user**. ![Unblock or report user link](/assets/images/help/profile/profile-unblock-or-report-user.png) +2. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Unblock or report user**. ![Unblock or report user link](/assets/images/help/profile/profile-unblock-or-report-user.png) 3. Click **Unblock user**. ![Modal box with option to unblock user or report abuse](/assets/images/help/profile/profile-unblockuser.png) {% tip %} diff --git a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md index f987ad56e8..e33dc90b58 100644 --- a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md +++ b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md @@ -53,6 +53,13 @@ When you create a pull request, you can choose to create a pull request that is {% data reusables.pull_requests.mark-ready-review %} You can convert a pull request to a draft at any time. For more information, see "[Changing the stage of a pull request](/articles/changing-the-stage-of-a-pull-request)." +### Differences between commits on compare and pull request pages + +The compare and pull request pages use different methods to calculate the diff for changed files: + +- Compare pages show the diff between the tip of the head ref and the current common ancestor (that is, the merge base) of the head and base ref. +- Pull request pages show the diff between the tip of the head ref and the common ancestor of the head and base ref at the time when the pull request was created. Consequently, the merge base used for the comparison might be different. + ### Дополнительная литература - "[Pull request](/articles/github-glossary/#pull-request)" in the {% data variables.product.prodname_dotcom %} glossary diff --git a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md index bbdd9d35e6..3957d7d182 100644 --- a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md +++ b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md @@ -20,6 +20,12 @@ versions: 4. In the base branch drop-down menu, select the base branch you'd like to [compare changes against](/github/committing-changes-to-your-project/comparing-commits#comparing-branches). ![Base branch drop-down menu ](/assets/images/help/pull_requests/pull-request-edit-base-branch.png) 5. Read the information about changing the base branch and click **Change base**. ![Base branch change confirmation button ](/assets/images/help/pull_requests/pull-request-base-branch-confirm.png) +{% tip %} + +**Tip:** When you open a pull request, {% data variables.product.product_name %} will set the base to the commit that branch references. If the branch is updated in the future, {% data variables.product.product_name %} will not update the base branch's commit. + +{% endtip %} + ### Дополнительная литература - "[Creating a pull request](/articles/creating-a-pull-request)" diff --git a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md index 95ca378e1e..0d6e6b63f5 100644 --- a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md +++ b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md @@ -1,6 +1,6 @@ --- title: Collaborating on repositories with code quality features -intro: 'Workflow quality features like statuses, {% if currentVersion != "free-pro-team@latest" %}pre-receive hooks, {% endif %}protected branches, and required status checks help collaborators make contributions that meet conditions set by organization and repository administrators.' +intro: 'Workflow quality features like statuses, {% if enterpriseServerVersions contains currentVersion %}pre-receive hooks, {% endif %}protected branches, and required status checks help collaborators make contributions that meet conditions set by organization and repository administrators.' mapTopic: true redirect_from: - /articles/collaborating-on-repositories-with-code-quality-features-enabled/ diff --git a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/index.md b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/index.md index 96b1e50d22..63d76c463f 100644 --- a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/index.md +++ b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/index.md @@ -28,7 +28,7 @@ versions: {% link_in_list /what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility %} {% topic_link_in_list /collaborating-on-repositories-with-code-quality-features %} {% link_in_list /about-status-checks %} - + {% link_in_list /working-with-pre-receive-hooks %} {% topic_link_in_list /proposing-changes-to-your-work-with-pull-requests %} diff --git a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md index d1c78924c3..0cb4a7a104 100644 --- a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md +++ b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md @@ -10,7 +10,7 @@ versions: You can only resolve merge conflicts on {% data variables.product.product_name %} that are caused by competing line changes, such as when people make different changes to the same line of the same file on different branches in your Git repository. For all other types of merge conflicts, you must resolve the conflict locally on the command line. For more information, see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line/)." -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If a site administrator disables the merge conflict editor for pull requests between repositories, you cannot use the conflict editor on {% data variables.product.product_name %} and must resolve merge conflicts on the command line. For example, if the merge conflict editor is disabled, you cannot use it on a pull request between a fork and upstream repository. {% endif %} @@ -33,7 +33,7 @@ If a site administrator disables the merge conflict editor for pull requests bet {% tip %} - **Tip:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line)." + **Tip:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% if enterpriseServerVersions contains currentVersion %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line)." {% endtip %} {% data reusables.pull_requests.decide-how-to-resolve-competing-line-change-merge-conflict %} diff --git a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md index 458bfa66d6..a3d3ac7f76 100644 --- a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md +++ b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md @@ -20,16 +20,16 @@ Before you can sync your fork with an upstream repository, you must [configure a > remote: Total 62 (delta 27), reused 44 (delta 9) > Unpacking objects: 100% (62/62), done. > From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY - > * [new branch] master -> upstream/master + > * [new branch] main -> upstream/main ``` -4. Check out your fork's local `master` branch. +4. Check out your fork's local `main` branch. ```shell - $ git checkout master - > Switched to branch 'master' + $ git checkout main + > Switched to branch 'main' ``` -5. Merge the changes from `upstream/master` into your local `master` branch. This brings your fork's `master` branch into sync with the upstream repository, without losing your local changes. +5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes. ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating a422352..5fdff0f > Fast-forward > README | 9 ------- @@ -39,7 +39,7 @@ Before you can sync your fork with an upstream repository, you must [configure a > create mode 100644 README.md ``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward": ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating 34e91da..16c56ad > Fast-forward > README.md | 5 +++-- diff --git a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index ed37da84f4..2a218f1320 100644 --- a/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/translations/ru-RU/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -29,7 +29,7 @@ If a public repository is made private, its public forks are split off into a ne In other words, a public repository's forks will remain public in their own separate repository network even after the parent repository is made private. This allows the fork owners to continue to work and collaborate without interruption. If public forks were not moved into a separate network in this way, the owners of those forks would need to get the appropriate [access permissions](/articles/access-permissions-on-github) to pull changes from and submit pull requests to the (now private) parent repository—even though they didn't need those permissions before. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If a public repository has anonymous Git read access enabled and the repository is made private, all of the repository's forks will lose anonymous Git read access and return to the default disabled setting. If a forked repository is made public, repository administrators can re-enable anonymous Git read access. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)." {% endif %} diff --git a/translations/ru-RU/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md b/translations/ru-RU/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md index 17cf2730e1..87eb7aab0c 100644 --- a/translations/ru-RU/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md +++ b/translations/ru-RU/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md @@ -1,6 +1,6 @@ --- title: Creating a commit with multiple authors -intro: 'You can attribute a commit to more than one author by adding one or more `Co-authored-by` trailers to the commit''s message. Co-authored commits are visible on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} and can be included in the profile contributions graph and the repository''s statistics{% endif %}.' +intro: 'You can attribute a commit to more than one author by adding one or more `Co-authored-by` trailers to the commit''s message. Co-authored commits are visible on {% data variables.product.product_name %}{% if enterpriseServerVersions contains currentVersion %} and can be included in the profile contributions graph and the repository''s statistics{% endif %}.' redirect_from: - /articles/creating-a-commit-with-multiple-authors versions: @@ -67,7 +67,7 @@ After you've made changes in a file using the web editor on {% data variables.pr The new commit and message will appear on {% data variables.product.product_location %}. ### Дополнительная литература -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} - "[Viewing contributions on your profile](/articles/viewing-contributions-on-your-profile)" - "[Why are my contributions not showing up on my profile?](/articles/why-are-my-contributions-not-showing-up-on-my-profile)"{% endif %} - "[Viewing a summary of repository activity](/articles/viewing-a-summary-of-repository-activity)" diff --git a/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md b/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md index b27145281c..0c73f568d7 100644 --- a/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md +++ b/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md @@ -10,7 +10,7 @@ versions: When you create a repository, you can choose to make the repository public or private. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you're creating the repository in an organization{% if currentVersion == "free-pro-team@latest" %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %} -{% if currentVersion != "free-pro-team@latest" %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if currentVersion != "free-pro-team@latest" %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to {% if currentVersion == "free-pro-team@latest" %}members of your enterprise account{% else %}members of any organization on your instance{% endif %}. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} +{% if enterpriseServerVersions contains currentVersion %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if enterpriseServerVersions contains currentVersion %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to members of your enterprise. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} Organization owners always have access to every repository created in an organization. For more information, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." diff --git a/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md b/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md index f32ddf4207..e8f9a6b9ae 100644 --- a/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md +++ b/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md @@ -1,6 +1,6 @@ --- title: Backing up a repository -intro: 'You can use{% if currentVersion != "free-pro-team@latest" %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' +intro: 'You can use{% if enterpriseServerVersions contains currentVersion %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' redirect_from: - /articles/backing-up-a-repository versions: @@ -31,7 +31,7 @@ When you clone a repository or wiki, only Git data, such as project files and co - [Projects](/v3/projects/#list-repository-projects) {% endif %} -Once you have {% if currentVersion != "free-pro-team@latest" %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). +Once you have {% if enterpriseServerVersions contains currentVersion %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). {% if currentVersion == "free-pro-team@latest" %} ### Third-party backup tools diff --git a/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md b/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md index fdf9378035..50231fa578 100644 --- a/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md +++ b/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md @@ -1,6 +1,7 @@ --- title: Creating a template repository intro: 'You can make an existing repository a template, so you and others can generate new repositories with the same directory structure{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}, branches,{% endif %} and files.' +permissions: 'Anyone with admin permissions to a repository can make the repository a template.' redirect_from: - /articles/creating-a-template-repository versions: @@ -8,7 +9,11 @@ versions: enterprise-server: '*' --- -Anyone with admin permissions to a repository can make the repository a template. +{% note %} + +**Note**: Your template repository cannot include files stored using {% data variables.large_files.product_name_short %}. + +{% endnote %} To create a template repository, you must create a repository, then make the repository a template. For more information about creating a repository, see "[Creating a new repository](/articles/creating-a-new-repository)." @@ -16,4 +21,4 @@ After you make your repository a template, anyone with access to the repository {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -3. Select **Template repository**. ![Checkbox to make a repository a template](/assets/images/help/repository/template-repository-checkbox.png) +1. Select **Template repository**. ![Checkbox to make a repository a template](/assets/images/help/repository/template-repository-checkbox.png) diff --git a/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md b/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md index 134004c045..e8ca80005d 100644 --- a/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md +++ b/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md @@ -42,7 +42,7 @@ If the repository belongs to an organization and you're using an SSH key generat For more information, see [Adding a new SSH key to your GitHub account](/articles/adding-a-new-ssh-key-to-your-github-account). -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Check if your instance is in private mode diff --git a/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md b/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md index 4e50f0caec..8a24bb5005 100644 --- a/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md +++ b/translations/ru-RU/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md @@ -70,7 +70,7 @@ When prompted for a username and password, make sure you use an account that has {% tip %} -**Tip**: If you don't want to enter your credentials every time you interact with the remote repository, you can turn on [credential caching](/github/using-git/caching-your-github-credentials-in-git). +**Tip**: If you don't want to enter your credentials every time you interact with the remote repository, you can turn on [credential caching](/github/using-git/caching-your-github-credentials-in-git). If you are already using credential caching, please make sure that your computer has the correct credentials cached. Incorrect or out of date credentials will cause authentication to fail. {% endtip %} diff --git a/translations/ru-RU/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md b/translations/ru-RU/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md index e10171796c..9d49e1b75b 100644 --- a/translations/ru-RU/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md +++ b/translations/ru-RU/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md @@ -10,7 +10,7 @@ versions: ### Editor tools -To streamline your workflow, you can connect to {% data variables.product.product_name %} repositories within third-party editor tools, such as Atom, Unity, and Visual Studio. +You can connect to {% data variables.product.product_name %} repositories within third-party editor tools, such as Atom, Unity, and Visual Studio. #### {% data variables.product.product_name %} for Atom @@ -30,8 +30,12 @@ With the {% data variables.product.prodname_dotcom %} for Visual Studio Code ext ### Project management tools -To streamline your workflow, you can integrate your {% data variables.product.product_name %} personal account or organization with third-party project management tools, such as Jira. +You can integrate your {% data variables.product.product_name %} personal account or organization with third-party project management tools, such as Jira or Slack. #### Jira Cloud and {% data variables.product.product_name %}.com integration -You can integrate Jira Cloud with your personal or organization account to scan commits and pull requests, creating relevant metadata and hyperlinks in any mentioned Jira issues. +You can integrate Jira Cloud with your personal or organization account to scan commits and pull requests, creating relevant metadata and hyperlinks in any mentioned Jira issues. For more information, visit the [Jira integration app](https://github.com/marketplace/jira-software-github) in the marketplace. + +#### Slack and {% data variables.product.product_name %} integration + +You can integrate Slack with your personal or organization account to subscribe for notifications, close or open issues, and provide rich references to issues and pull requests without leaving Slack. For more information, visit the [Slack integration app](https://github.com/marketplace/slack-github) in the marketplace. diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md index d182e1408d..e6a8592a00 100644 --- a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md @@ -22,5 +22,5 @@ You can use {% data variables.product.prodname_code_scanning %} webhooks to buil ### Дополнительная литература * "[About code scanning](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" -* "[Configuring code scanning in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning-in-your-ci-system)" +* "[Using {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} with your existing CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/using-codeql-code-scanning-with-your-existing-ci-system)" * "[SARIF support for code scanning](/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning)" diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md index bdc1ef11eb..fc315b34d3 100644 --- a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md @@ -46,7 +46,7 @@ By default, the {% data variables.product.prodname_codeql_workflow %} uses the ` #### Scanning pull requests -The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on the `HEAD` commit of a pull request against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} +The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on pull requests targeted against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} For more information about the `pull_request` event, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags)." @@ -140,10 +140,34 @@ For GitHub-hosted runners that use Linux only, the {% data variables.product.pro Alternatively, you can install Python dependencies manually on any operating system. You will need to add `setup-python-dependencies` and set it to `false`, as well as set `CODEQL_PYTHON` to the Python executable that includes the dependencies, as shown in this workflow extract: ```yaml -- uses: github/codeql-action/init@v1 - with: - - config-file: ./.github/codeql/codeql-config.yml - - queries: +security-and-quality,octo-org/python-qlpack/show_ifs.ql@main +jobs: + CodeQL-Build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.x' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + if [ -f requirements.txt ]; + then pip install -r requirements.txt; + fi + # Set the `CODEQL-PYTHON` environment variable to the Python executable + # that includes the dependencies + echo "::set-env name=CODEQL_PYTHON::$(which python)" + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: python + # Override the default behavior so that the action doesn't attempt + # to auto-install Python dependencies + setup-python-dependencies: false ``` {% endif %} diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md index 1f822c1857..d32b75e54d 100644 --- a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md @@ -38,7 +38,7 @@ You decide how you generate {% data variables.product.prodname_code_scanning %} 7. Choose whether you'd like to commit directly to the default branch, or create a new branch and start a pull request. ![Choose where to commit](/assets/images/help/repository/start-commit-choose-where-to-commit.png) 8. Click **Commit new file** or **Propose new file**. -Optionally, to customize how {% data variables.product.prodname_code_scanning %} scans your code, edit the workflow. For more information, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)." +In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch. For more information, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)." ### Дальнейшие шаги @@ -86,7 +86,7 @@ After {% data variables.product.prodname_code_scanning %} has analyzed the code There are other situations where there may be no analysis for the latest commit to the base branch for a pull request. These include: -* The pull request has been raised against a branch other than the default branch or a protected branch, and this branch hasn't been analyzed. +* The pull request has been raised against a branch other than the default branch, and this branch hasn't been analyzed. To the right of "Code scanning", click **Set up code scanning**. diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md index 1107de21b2..f5742510b7 100644 --- a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md @@ -1,5 +1,6 @@ --- title: Finding security vulnerabilities and errors in your code +shortTitle: Finding vulnerabilities and coding errors product: '{% data reusables.gated-features.code-scanning %}' redirect_from: - /github/managing-security-vulnerabilities/finding-security-vulnerabilities-in-your-projects-code @@ -18,6 +19,7 @@ versions: {% link_in_list /configuring-code-scanning %} {% link_in_list /configuring-the-codeql-workflow-for-compiled-languages %} {% link_in_list /troubleshooting-the-codeql-workflow %} + {% link_in_list /running-codeql-code-scanning-in-a-container %} {% topic_link_in_list /integrating-with-code-scanning %} {% link_in_list /about-integration-with-code-scanning %} {% link_in_list /uploading-a-sarif-file-to-github %} diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md index 46678ed9fa..b99e37c1fc 100644 --- a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md @@ -1,7 +1,7 @@ --- title: Managing code scanning alerts for your repository shortTitle: Managing alerts -intro: 'You can view, fix, and close alerts for potential vulnerabilities or errors in your project''s code.' +intro: 'You can view, fix, {% if currentVersion == "enterprise-server@2.22" %}or close{% else %}dismiss, or delete{% endif %} alerts for potential vulnerabilities or errors in your project''s code.' product: '{% data reusables.gated-features.code-scanning %}' permissions: 'People with write permission to a repository can manage {% data variables.product.prodname_code_scanning %} alerts for the repository.' versions: @@ -37,25 +37,89 @@ Anyone with read permission for a repository can see {% data variables.product.p {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} -{% data reusables.code-scanning.click-alert-in-list %} -5. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. ![Example data-flow alert](/assets/images/help/repository/code-scanning-show-paths.png) +1. Under "{% data variables.product.prodname_code_scanning_capc %}," click the alert you'd like to explore. ![Summary of alerts](/assets/images/help/repository/code-scanning-click-alert.png) +1. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. ![The "Show paths" link on an alert](/assets/images/help/repository/code-scanning-show-paths.png) +1. Alerts from {% data variables.product.prodname_codeql %} analysis include a description of the problem. Click **Show more** for guidance on how to fix your code. ![Details for an alert](/assets/images/help/repository/code-scanning-alert-details.png) ### Fixing an alert Anyone with write permission for a repository can fix an alert by committing a correction to the code. If the repository has {% data variables.product.prodname_code_scanning %} scheduled to run on pull requests, it's best to raise a pull request with your correction. This will trigger {% data variables.product.prodname_code_scanning %} analysis of the changes and test that your fix doesn't introduce any new problems. For more information, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)" and "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)." +If you have write permission for a repository, you can view fixed alerts by viewing the summary of alerts and clicking **Closed**. For more information, see "[Viewing an alert](#viewing-an-alert)." The "Closed" list shows fixed alerts and alerts that users have {% if currentVersion == "enterprise-server@2.22" %}closed{% else %}dismissed{% endif %}. + +Alerts may be fixed in one branch but not in another. You can use the "Branch" drop-down menu, on the summary of alerts, to check whether an alert is fixed in a particular branch. + +![Filtering alerts by branch](/assets/images/help/repository/code-scanning-branch-filter.png) + +{% if currentVersion == "enterprise-server@2.22" %} + ### Closing an alert Closing an alert is a way to resolve an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} +{% else %} + +### Dismissing or deleting alerts + +There are two ways of closing an alert. You can fix the problem in the code, or you can dismiss the alert. Alternatively, if you have admin permissions for the repository, you can delete alerts. Deleting alerts is useful in situations where you have enabled a {% data variables.product.prodname_code_scanning %} tool and then decided to remove it, or where you have enabled {% data variables.product.prodname_codeql %} analysis with a larger set of queries than you want to continue using, and you've then removed some queries from the tool. In both cases, deleting alerts allows you to clean up your {% data variables.product.prodname_code_scanning %} results. You can delete alerts from the summary list within the **Security** tab. + +Dismissing an alert is a way of closing an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} You can dismiss alerts from {% data variables.product.prodname_code_scanning %} annotations in code, or from the summary list within the **Security** tab. + +When you dismiss an alert: + +- It's dismissed in all branches. +- The alert is removed from the number of current alerts for your project. +- The alert is moved to the "Closed" list in the summary of alerts, from where you can reopen it, if required. +- The reason why you closed the alert is recorded. +- Next time {% data variables.product.prodname_code_scanning %} runs, the same code won't generate an alert. + +When you delete an alert: + +- It's deleted in all branches. +- The alert is removed from the number of current alerts for your project. +- It is _not_ added to the "Closed" list in the summary of alerts. +- If the code that generated the alert stays the same, and the same {% data variables.product.prodname_code_scanning %} tool runs again without any configuration changes, the alert will be shown again in your analysis results. + +To dismiss or delete alerts: + +{% endif %} + {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} +{% if currentVersion == "enterprise-server@2.22" %} {% data reusables.code-scanning.click-alert-in-list %} -5. Select the Close drop-down menu and click a reason for closing the alert. ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) +1. Select the **Close** drop-down menu and click a reason for closing the alert. + ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) {% data reusables.code-scanning.false-positive-fix-codeql %} +{% else %} + +1. If you have admin permissions for the repository, and you want to delete alerts for this {% data variables.product.prodname_code_scanning %} tool, select some or all of the check boxes and click **Delete**. + + ![Deleting alerts](/assets/images/help/repository/code-scanning-delete-alerts.png) + + Optionally, you can use the filters to display a subset of alerts and then delete all matching alerts at once. For example, if you have removed a query from {% data variables.product.prodname_codeql %} analysis, you can use the "Rule" filter to list just the alerts for that query and then select and delete all of those alerts. + + ![Filter alerts by rule](/assets/images/help/repository/code-scanning-filter-by-rule.png) + +1. If you want to dismiss an alert, it's important to explore the alert first, so that you can choose the correct dismissal reason. Click the alert you'd like to explore. + + ![Open an alert from the summary list](/assets/images/help/repository/code-scanning-click-alert.png) + +1. Review the alert, then click **Dismiss** and choose a reason for closing the alert. ![Choosing a reason for dismissing an alert](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + + {% data reusables.code-scanning.choose-alert-dismissal-reason %} + + {% data reusables.code-scanning.false-positive-fix-codeql %} + +#### Dismissing multiple alerts at once + +If a project has multiple alerts that you want to dismiss for the same reason, you can bulk dismiss them from the summary of alerts. Typically, you'll want to filter the list and then dismiss all of the matching alerts. For example, you might want to dismiss all of the current alerts in the project that have been tagged for a particular Common Weakness Enumeration (CWE) vulnerability. + +{% endif %} + ### Дополнительная литература - "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)" diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md new file mode 100644 index 0000000000..d32e59c2c2 --- /dev/null +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md @@ -0,0 +1,69 @@ +--- +title: Running CodeQL code scanning in a container +shortTitle: '{% data variables.product.prodname_code_scanning_capc %} in a container' +intro: 'You can run {% data variables.product.prodname_code_scanning %} in a container by ensuring that all processes run in the same container.' +product: '{% data reusables.gated-features.code-scanning %}' +versions: + free-pro-team: '*' + enterprise-server: '>=2.22' +--- + +{% data reusables.code-scanning.beta %} + +### About {% data variables.product.prodname_code_scanning %} with a containerized build + +If you're setting up {% data variables.product.prodname_code_scanning %} for a compiled language, and you're building the code in a containerized environment, the analysis may fail with the error message "No source code was seen during the build." This indicates that {% data variables.product.prodname_codeql %} was unable to monitor your code as it was compiled. + +You must run {% data variables.product.prodname_codeql %} in the same container in which you build your code. This applies whether you are using the {% data variables.product.prodname_codeql_runner %}, or {% data variables.product.prodname_actions %}. If you're using the {% data variables.product.prodname_codeql_runner %}, run it in the container where your code builds. For more information about the {% data variables.product.prodname_codeql_runner %}, see "[Running {% data variables.product.prodname_codeql %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-code-scanning-in-your-ci-system)." If you're using {% data variables.product.prodname_actions %}, configure your workflow to run all the actions in the same container. For more information, see "[Example workflow](#example-workflow)." + +### Dependencies + +You may have difficulty running {% data variables.product.prodname_code_scanning %} if the container you're using is missing certain dependencies (for example, Git must be installed and added to the PATH variable). If you encounter dependency issues, review the list of software typically included on {% data variables.product.prodname_dotcom %}'s virtual environments. For more information, see the version-specific `readme` files in these locations: + +* Linux: https://github.com/actions/virtual-environments/tree/main/images/linux +* MacOS: https://github.com/actions/virtual-environments/tree/main/images/macos +* Windows: https://github.com/actions/virtual-environments/tree/main/images/win + +### Example workflow + +This sample workflow uses {% data variables.product.prodname_actions %} to run {% data variables.product.prodname_codeql %} analysis in a containerized environment. The value of `container.image` identifies the container to use. In this example the image is named `codeql-container`, with a tag of `f0f91db`. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)." + +``` yaml +name: "{% data variables.product.prodname_codeql %}" + +on: + push: + branches: [main] + pull_request: + branches: [main] + schedule: + - cron: '0 0 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: [java] + + # Specify the container in which actions will run + container: + image: codeql-container:f0f91db + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Initialize {% data variables.product.prodname_codeql %} + uses: github/codeql-action/init@v1 + with: + languages: {% raw %}${{ matrix.language }}{% endraw %} + - name: Build + run: | + ./configure + make + - name: Perform {% data variables.product.prodname_codeql %} Analysis + uses: github/codeql-action/analyze@v1 +``` diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md index 62109f2c50..5fdb172f9d 100644 --- a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md @@ -10,6 +10,8 @@ versions: enterprise-server: '>=2.22' --- + + {% data reusables.code-scanning.beta-codeql-runner %} {% data reusables.code-scanning.beta %} {% data reusables.code-scanning.enterprise-enable-code-scanning %} @@ -66,7 +68,7 @@ The options for providing access to the {% data variables.product.prodname_codeq 1. Allow the CI servers access to {% data variables.product.prodname_dotcom_the_website %} so that the {% data variables.product.prodname_codeql_runner %} can download the bundle automatically. 1. Manually download/extract the bundle, store it with other central resources, and use the `--codeql-path` flag to specify the location of the bundle in calls to initialize the {% data variables.product.prodname_codeql_runner %}. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} 1. You can mirror the `github/codeql-action` repository on {% data variables.product.product_location %}. Unless you specify the `--codeql-path` flag, the runner automatically checks for the bundle in this location and on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} ### Calling the {% data variables.product.prodname_codeql_runner %} @@ -76,7 +78,7 @@ You should call the {% data variables.product.prodname_codeql_runner %} from the 1. `init` required to initialize the runner and create a {% data variables.product.prodname_codeql %} database for each language to be analyzed. These databases are populated and analyzed by subsequent commands. 1. `analyze` required to populate the {% data variables.product.prodname_codeql %} databases, analyze them, and upload results to {% data variables.product.product_location %}. -For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}. +For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if enterpriseServerVersions contains currentVersion %} or mirrored on {% data variables.product.product_location %}{% endif %}. You can configure where the {% data variables.product.prodname_codeql_runner %} stores the CodeQL bundle for future analysis on a server using the `--tools-dir` flag and where it stores temporary files during analysis using `--temp-dir`. @@ -110,7 +112,7 @@ This example runs {% data variables.product.prodname_codeql %} analysis on a Lin > Successfully uploaded results ``` -The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if enterpriseServerVersions contains currentVersion %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." #### Compiled language example diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md index 633c5cc926..747a4dfb9d 100644 --- a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md @@ -36,6 +36,8 @@ If you upload a SARIF file without fingerprint data using the `/code-scanning/sa ### Validating your SARIF file + + If you're using {% data variables.product.prodname_actions %} with the {% data variables.product.prodname_codeql_workflow %} or using the {% data variables.product.prodname_codeql_runner %}, then the {% data variables.product.prodname_code_scanning %} results will automatically use the supported subset of SARIF 2.1.0. For more information, visit the [Microsoft SARIF validator](https://sarifweb.azurewebsites.net/). ### Supported SARIF output file properties diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md index 931419d501..ea1297c8d9 100644 --- a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md @@ -13,11 +13,11 @@ versions: ### About {% data variables.product.prodname_code_scanning %} results on pull requests -In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch or protected branches, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." -If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch, and the repository owner has configured required status checks, then you must either fix or close any error alerts before the pull request can be merged. For more information, see "[About required status checks](/github/administering-a-repository/about-required-status-checks)." +If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch that has been enabled for {% data variables.product.prodname_code_scanning %}, and the repository owner has configured required status checks, then you must either fix or {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} all error alerts before the pull request can be merged. For more information, see "[About required status checks](/github/administering-a-repository/about-required-status-checks)." -![Example pull request check status with {% data variables.product.prodname_code_scanning %} alert](/assets/images/help/repository/code-scanning-check-failure.png) +![Failed {% data variables.product.prodname_code_scanning %} check on a pull request](/assets/images/help/repository/code-scanning-check-failure.png) ### About {% data variables.product.prodname_code_scanning %} as a pull request check @@ -29,20 +29,38 @@ If the repository uses the {% data variables.product.prodname_codeql_workflow %} When you look at the **Files changed** tab for a pull request, you see annotations for any lines of code that triggered the alert. -![Example {% data variables.product.prodname_code_scanning %} alert shown as an annotation in the "Files changed" view of a pull request](/assets/images/help/repository/code-scanning-pr-annotation.png) +![Alert annotation within a pull request diff](/assets/images/help/repository/code-scanning-pr-annotation.png) Some annotations contain links with extra context for the alert. In the example above, from {% data variables.product.prodname_codeql %} analysis, you can click **user-provided value** to see where the untrusted data enters the data flow (this is referred to as the source). In this case you can view the full path from the source to the code that uses the data (the sink) by clicking **Show paths**. This makes it easy to check whether the data is untrusted or if the analysis failed to recognize a data sanitization step between the source and the sink. For information about analyzing data flow using {% data variables.product.prodname_codeql %}, see "[About data flow analysis](https://help.semmle.com/QL/learn-ql/intro-to-data-flow.html)." For more information about an alert, click **Show more details** on the annotation. This allows you to see all of the context and metadata provided by the tool in an alert view. In the example below, you can see tags showing the severity, type, and relevant common weakness enumerations (CWEs) for the problem. The view also shows which commit introduced the problem. -Alerts from some tools, like {% data variables.product.prodname_codeql %}, also include a description and a **Show more** link for guidance on how to fix the problem in the code. +In the detailed view for an alert, some {% data variables.product.prodname_code_scanning %} tools, like {% data variables.product.prodname_codeql %} analysis, also include a description of the problem and a **Show more** link for guidance on how to fix your code. -![Example of "Show more details" for a {% data variables.product.prodname_code_scanning %} alert in a pull request](/assets/images/help/repository/code-scanning-pr-alert.png) +![Alert description and link to show more information](/assets/images/help/repository/code-scanning-pr-alert.png) -### Resolving an alert on your pull request +### {% if currentVersion == "enterprise-server@2.22" %}Resolving{% else %}Fixing{% endif %} an alert on your pull request -Anyone with write permission for a repository can resolve alerts on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is resolved and the annotation removed. +Anyone with write permission for a repository can fix a {% data variables.product.prodname_code_scanning %} alert that's identified on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is closed and the annotation removed. + +{% if currentVersion == "enterprise-server@2.22" %} If you don't think that an alert needs to be fixed, you can close the alert manually. {% data reusables.code-scanning.close-alert-examples %} The **Close** button is available in annotations and in the alerts view if you have write permission for the repository. {% data reusables.code-scanning.false-positive-fix-codeql %} + +{% else %} + +### Dismissing an alert on your pull request + +An alternative way of closing an alert is to dismiss it. You can dismiss an alert if you don't think it needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} If you have write permission for the repository, the **Dismiss** button is available in code annotations and in the alerts summary. When you click **Dismiss** you will be prompted to choose a reason for closing the alert. + +![Choosing a reason for dismissing an alert](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + +{% data reusables.code-scanning.choose-alert-dismissal-reason %} + +{% data reusables.code-scanning.false-positive-fix-codeql %} + +For more information about dismissing alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#dismissing-or-deleting-alerts)." + +{% endif %} \ No newline at end of file diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md index 317698c3e0..05cc0e7610 100644 --- a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md @@ -49,4 +49,4 @@ If the `analyze` command for the {% data variables.product.prodname_codeql_runne {% endnote %} -1. The code is built in a container or on a separate machine. If you use a containerized build or if you outsource the build to another machine, make sure to run the {% data variables.product.prodname_codeql_runner %} in the container or on the machine where your build task takes place. +1. The code is built in a container or on a separate machine. If you use a containerized build or if you outsource the build to another machine, make sure to run the {% data variables.product.prodname_codeql_runner %} in the container or on the machine where your build task takes place. For more information, see "[Running CodeQL code scanning in a container](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)." diff --git a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md index a34e7f6ac2..120f8640c1 100644 --- a/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md +++ b/translations/ru-RU/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md @@ -60,7 +60,11 @@ For more information, see the workflow extract in "[Automatic build for a compil 1. Your {% data variables.product.prodname_code_scanning %} workflow is analyzing a compiled language (C, C++, C#, or Java), but the code was not compiled. By default, the {% data variables.product.prodname_codeql %} analysis workflow contains an `autobuild` step, however, this step represents a best effort process, and may not succeed in building your code, depending on your specific build environment. Compilation may also fail if you have removed the `autobuild` step and did not include build steps manually. For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." 1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but portions of your build are cached to improve performance (most likely to occur with build systems like Gradle or Bazel). Since {% data variables.product.prodname_codeql %} observes the activity of the compiler to understand the data flows in a repository, {% data variables.product.prodname_codeql %} requires a complete build to take place in order to perform analysis. 1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but compilation does not occur between the `init` and `analyze` steps in the workflow. {% data variables.product.prodname_codeql %} requires that your build happens in between these two steps in order to observe the activity of the compiler and perform analysis. -1. Your compiled code (in C, C++, C#, or Java) was compiled successfully, but {% data variables.product.prodname_codeql %} was unable to detect the compiler invocations. The most common causes are certain configuration options like running your build process in a container, if you're building using a distributed build system external to {% data variables.product.prodname_actions %} using a daemon process, or if {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. +1. Your compiled code (in C, C++, C#, or Java) was compiled successfully, but {% data variables.product.prodname_codeql %} was unable to detect the compiler invocations. The most common causes are: + + * Running your build process in a separate container to {% data variables.product.prodname_codeql %}. For more information, see "[Running CodeQL code scanning in a container](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)." + * Building using a distributed build system external to GitHub Actions, using a daemon process. + * {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. For C# projects using either `dotnet build` or `msbuild` which target .NET Core 2, you should specify `/p:UseSharedCompilation=false` in your workflow's `run` step, when you build your code. The `UseSharedCompilation` flag isn't necessary for .NET Core 3.0 and later. @@ -123,4 +127,4 @@ If you are analyzing code written in Python, you may see different results depen On GitHub-hosted runners that use Linux, the {% data variables.product.prodname_codeql_workflow %} tries to install and analyze Python dependencies, which could lead to more results. To disable the auto-install, add `setup-python-dependencies: false` to the "Initialize CodeQL" step of the workflow. For more information about configuring the analysis of Python dependencies, see "[Analyzing Python dependencies](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#analyzing-python-dependencies)." -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/ru-RU/content/github/getting-started-with-github/githubs-products.md b/translations/ru-RU/content/github/getting-started-with-github/githubs-products.md index 441315fb55..5b29e81ef4 100644 --- a/translations/ru-RU/content/github/getting-started-with-github/githubs-products.md +++ b/translations/ru-RU/content/github/getting-started-with-github/githubs-products.md @@ -96,7 +96,7 @@ For more information about hosting your own instance of [{% data variables.produ - {% data variables.contact.github_support %} {% data variables.product.premium_plus_support_plan %} - {% data variables.product.prodname_insights %} -- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} +- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} - [{% data variables.product.prodname_learning %} for organizations](https://lab.github.com/organizations) For more information about signing up for {% data variables.product.prodname_ghe_one %}, contact [{% data variables.product.product_name %}'s Sales team](https://enterprise.github.com/contact). diff --git a/translations/ru-RU/content/github/getting-started-with-github/supported-browsers.md b/translations/ru-RU/content/github/getting-started-with-github/supported-browsers.md index 57d8e0ab96..4432a1f0f3 100644 --- a/translations/ru-RU/content/github/getting-started-with-github/supported-browsers.md +++ b/translations/ru-RU/content/github/getting-started-with-github/supported-browsers.md @@ -4,7 +4,7 @@ redirect_from: - /articles/why-doesn-t-graphs-work-with-ie-8/ - /articles/why-don-t-graphs-work-with-ie8/ - /articles/supported-browsers -intro: 'We design {% data variables.product.product_name %} to support the latest web browsers. We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.16" %}Internet Explorer 11, {% endif %}and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' +intro: 'We design {% data variables.product.product_name %} to support the latest web browsers. We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' versions: free-pro-team: '*' enterprise-server: '*' diff --git a/translations/ru-RU/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md b/translations/ru-RU/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md index cb6f6ab132..92e772332b 100644 --- a/translations/ru-RU/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md +++ b/translations/ru-RU/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md @@ -29,7 +29,7 @@ versions: 3. Change the current working directory to your local project. 4. Initialize the local directory as a Git repository. ```shell - $ git init + $ git init -b main ``` 5. Add the files in your new local repository. This stages them for the first commit. ```shell @@ -67,7 +67,7 @@ versions: 3. Change the current working directory to your local project. 4. Initialize the local directory as a Git repository. ```shell - $ git init + $ git init -b main ``` 5. Add the files in your new local repository. This stages them for the first commit. ```shell @@ -105,7 +105,7 @@ versions: 3. Change the current working directory to your local project. 4. Initialize the local directory as a Git repository. ```shell - $ git init + $ git init -b main ``` 5. Add the files in your new local repository. This stages them for the first commit. ```shell diff --git a/translations/ru-RU/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md b/translations/ru-RU/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md index fa5eec4376..215edb868c 100644 --- a/translations/ru-RU/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md +++ b/translations/ru-RU/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md @@ -19,7 +19,7 @@ Files that you add to a repository via a browser are limited to {% data variable {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. Under your repository name, click **Upload files**. ![Upload files button](/assets/images/help/repository/upload-files-button.png) {% else %} 2. Above the list of files, using the **Add file** drop-down, click **Upload files**. !["Upload files" in the "Add file" dropdown](/assets/images/help/repository/upload-files-button.png) diff --git a/translations/ru-RU/content/github/managing-files-in-a-repository/navigating-code-on-github.md b/translations/ru-RU/content/github/managing-files-in-a-repository/navigating-code-on-github.md index 9d33dc83cb..518caf7a83 100644 --- a/translations/ru-RU/content/github/managing-files-in-a-repository/navigating-code-on-github.md +++ b/translations/ru-RU/content/github/managing-files-in-a-repository/navigating-code-on-github.md @@ -10,6 +10,7 @@ versions: ### About navigating code on {% data variables.product.prodname_dotcom %} Navigating code functions use the open source library [`semantic`](https://github.com/github/semantic). The following languages are supported: +- C# - CodeQL - Go - Java diff --git a/translations/ru-RU/content/github/managing-large-files/about-git-large-file-storage.md b/translations/ru-RU/content/github/managing-large-files/about-git-large-file-storage.md index 5c6faf3409..b6a79eb837 100644 --- a/translations/ru-RU/content/github/managing-large-files/about-git-large-file-storage.md +++ b/translations/ru-RU/content/github/managing-large-files/about-git-large-file-storage.md @@ -41,11 +41,13 @@ size 84977953 It tracks the `version` of {% data variables.large_files.product_name_short %} you're using, followed by a unique identifier for the file (`oid`). It also stores the `size` of the final file. -{% tip %} +{% note %} -**Tip**: {% data variables.large_files.product_name_short %} cannot be used with {% data variables.product.prodname_pages %} sites. +**Notes**: +- {% data variables.large_files.product_name_short %} cannot be used with {% data variables.product.prodname_pages %} sites. +- {% data variables.large_files.product_name_short %} cannot be used with template repositories. -{% endtip %} +{% endnote %} ### Дополнительная литература diff --git a/translations/ru-RU/content/github/managing-large-files/conditions-for-large-files.md b/translations/ru-RU/content/github/managing-large-files/conditions-for-large-files.md index 3daf4fef53..262eaddd69 100644 --- a/translations/ru-RU/content/github/managing-large-files/conditions-for-large-files.md +++ b/translations/ru-RU/content/github/managing-large-files/conditions-for-large-files.md @@ -16,4 +16,4 @@ If you attempt to add or update a file that is larger than {% data variables.lar ### Blocked pushes for large files -{% if currentVersion != "free-pro-team@latest" %}By default, {% endif %}{% data variables.product.product_name %} blocks pushes that exceed {% data variables.large_files.max_github_size %}. {% if currentVersion != "free-pro-team@latest" %}However, a site administrator can configure a different limit for your {% data variables.product.prodname_ghe_server %} instance. For more information, see "[Setting Git push limits](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits)".{% endif %} +{% if enterpriseServerVersions contains currentVersion %}By default, {% endif %}{% data variables.product.product_name %} blocks pushes that exceed {% data variables.large_files.max_github_size %}. {% if enterpriseServerVersions contains currentVersion %}However, a site administrator can configure a different limit for your {% data variables.product.prodname_ghe_server %} instance. For more information, see "[Setting Git push limits](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits)".{% endif %} diff --git a/translations/ru-RU/content/github/managing-large-files/configuring-git-large-file-storage.md b/translations/ru-RU/content/github/managing-large-files/configuring-git-large-file-storage.md index 98a2e5aa94..189293fadc 100644 --- a/translations/ru-RU/content/github/managing-large-files/configuring-git-large-file-storage.md +++ b/translations/ru-RU/content/github/managing-large-files/configuring-git-large-file-storage.md @@ -13,7 +13,7 @@ If there are existing files in your repository that you'd like to use {% data va {% data reusables.large_files.resolving-upload-failures %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} diff --git a/translations/ru-RU/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/translations/ru-RU/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index ef000d815b..40258e1aba 100644 --- a/translations/ru-RU/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/translations/ru-RU/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -50,10 +50,10 @@ You can also enable or disable {% data variables.product.prodname_dependabot %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} When -{% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert also contains a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."{% endif %} +{% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert will also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a security alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% endif %} @@ -73,46 +73,16 @@ We send {% data variables.product.prodname_dependabot_short %} alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository.{% if currentVersion == "free-pro-team@latest" %} You can also enable {% data variables.product.prodname_dependabot_short %} alerts for additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} We send security alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. {% endif %} -### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} - -{% if currentVersion == "free-pro-team@latest" %} -By default, you will receive -{% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive -{% data variables.product.prodname_dependabot_alerts %} by email. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the -{% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#security-alert-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the -{% data variables.product.product_name %} user interface. For more information, see "[Choosing the delivery method for your notifications ](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.20" % %} - -{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} For more information, see "[Choosing the delivery method for your notifications](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)."{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."{% endif %} {% if currentVersion == "free-pro-team@latest" %} ### Дополнительная литература -- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" +- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" - "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Understanding how {% data variables.product.product_name %} uses and protects your data](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %} diff --git a/translations/ru-RU/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md b/translations/ru-RU/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md new file mode 100644 index 0000000000..3d1f19a010 --- /dev/null +++ b/translations/ru-RU/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md @@ -0,0 +1,33 @@ +--- +title: About GitHub Dependabot security updates +intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.' +shortTitle: About Dependabot security updates +versions: + free-pro-team: '*' +--- + +### About {% data variables.product.prodname_dependabot_security_updates %} + +{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot_short %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot_short %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + +{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot_short %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." + +{% note %} + +**Примечание** + +The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. You will see a {% data variables.product.prodname_dependabot_short %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot_short %} is unable to update an indirect or transitive dependency that is not explicitly defined. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)." + +{% endnote %} + +### About pull requests for security updates + +Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. This includes information about the vulnerability like release notes, changelog entries, and commit details. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_short %} alerts for the repository. + +When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot_short %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot_short %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)." + +{% data reusables.dependabot.automated-tests-note %} + +### About compatibility scores + +{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency. diff --git a/translations/ru-RU/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md b/translations/ru-RU/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md index e022af6b04..f43190ddc3 100644 --- a/translations/ru-RU/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md +++ b/translations/ru-RU/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md @@ -1,6 +1,7 @@ --- title: Browsing security vulnerabilities in the GitHub Advisory Database intro: 'The {% data variables.product.prodname_advisory_database %} allows you to browse or search for vulnerabilities that affect open source projects on {% data variables.product.company_short %}.' +shortTitle: Browsing the Advisory Database versions: free-pro-team: '*' --- diff --git a/translations/ru-RU/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md b/translations/ru-RU/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md index 38e4b01eae..337fcc5ef2 100644 --- a/translations/ru-RU/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md +++ b/translations/ru-RU/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md @@ -5,30 +5,16 @@ redirect_from: - /articles/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-updates +shortTitle: Configuring Dependabot security updates versions: free-pro-team: '*' --- -### About {% data variables.product.prodname_dependabot_security_updates %} +### About configuring {% data variables.product.prodname_dependabot_security_updates %} -{% data variables.product.prodname_dependabot_short %} monitors security advisories such as the {% data variables.product.prodname_advisory_database %} and [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database) and automatically triggers a pull request when it detects a new vulnerable dependency in the dependency graph of repositories. For more information about the {% data variables.product.prodname_advisory_database %}, see "[About the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database#about-the-github-advisory-database)." +You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_short %} alerts and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." -{% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} - -{% data variables.product.prodname_dependabot_short %} includes a link to the pull request in the alert for the vulnerable dependency. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." - -Each security update contains everything you need to quickly and safely review and merge a proposed fix into your project. This includes information about the vulnerability like release notes, changelog entries, and commit details. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_short %} alerts for the repository. - -When you merge a pull request that contains a security update, the corresponding alert is marked as resolved for your repository. - -{% note %} - -**Примечание** -{% data variables.product.prodname_dependabot_security_updates %} only resolve security vulnerabilities in the dependencies tracked by your dependency graph. Security updates are not created to resolve vulnerabilities in private registries or packages hosted in private repositories. However, indirect or transitive dependencies are included if they are explicitly defined in a lock file, or similar. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." Additionally, it's important to highlight that {% data variables.product.prodname_dependabot_security_updates %} automatically create pulls requests with proposed fixes to the lock files, for the dependencies detected as vulnerable. - -{% endnote %} - -You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_short %} alerts and the dependency graph. You can disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository or for all repositories owned by your user account or organization. For more information, see "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-github-dependabot-security-updates-for-your-repositories)" below. +You can disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository or for all repositories owned by your user account or organization. For more information, see "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-github-dependabot-security-updates-for-your-repositories)" below. {% data reusables.dependabot.dependabot-tos %} @@ -53,10 +39,6 @@ You can enable {% data variables.product.prodname_dependabot_security_updates %} If security updates are not enabled for your repository and you don't know why, first try enabling them using the instructions given in the procedural sections below. If security updates are still not working, you can [contact support](https://support.github.com/contact). -### About compatibility scores - -{% data variables.product.prodname_dependabot_security_updates %} also include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. We look at previously-passing CI tests from public repositories where we've generated a given security update to learn whether the update causes tests to fail. An update's compatibility score is the percentage of CI runs that passed when updating between relevant versions of the dependency. - ### Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories You can enable or disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository. diff --git a/translations/ru-RU/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/translations/ru-RU/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md new file mode 100644 index 0000000000..3b78d1bb81 --- /dev/null +++ b/translations/ru-RU/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md @@ -0,0 +1,58 @@ +--- +title: Configuring notifications for vulnerable dependencies +shortTitle: Configuring notifications +intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts.' +versions: + free-pro-team: '*' + enterprise-server: '>=2.21' +--- + +### About notifications for vulnerable dependencies + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we send you {% data variables.product.prodname_dependabot_short %} alerts.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. +{% endif %} + +{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)." +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %} +Your site administrator needs to enable security alerts for vulnerable dependencies for +{% data variables.product.product_location_enterprise %} before you can use the feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.20" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive +{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} by email.{% endif %} + +{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} + +You can configure notification settings for yourself or your organization from the Manage notifications drop-down {% octicon "bell" aria-label="The notifications bell" %} shown at the top of each page. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#choosing-your-notification-settings)." + +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} + ![{% data variables.product.prodname_dependabot_short %} alerts options](/assets/images/help/notifications-v2/dependabot-alerts-options.png) +{% else %} + ![Security alerts options](/assets/images/help/notifications-v2/security-alerts-options.png) +{% endif %} + +{% note %} + +**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)." + +{% endnote %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} + +### How to reduce the noise from notifications for vulnerable dependencies + +If you are concerned about receiving too many notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, we recommend you opt into the weekly email digest, or turn off notifications while keeping {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} enabled. You can still navigate to see your {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} in your repository's Security tab.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %} + +### Дополнительная литература + +- "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications)" +- "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-is-queries)" diff --git a/translations/ru-RU/content/github/managing-security-vulnerabilities/index.md b/translations/ru-RU/content/github/managing-security-vulnerabilities/index.md index a4285a6d86..61c09009e1 100644 --- a/translations/ru-RU/content/github/managing-security-vulnerabilities/index.md +++ b/translations/ru-RU/content/github/managing-security-vulnerabilities/index.md @@ -28,8 +28,11 @@ versions: {% link_in_list /browsing-security-vulnerabilities-in-the-github-advisory-database %} {% link_in_list /about-alerts-for-vulnerable-dependencies %} + {% link_in_list /configuring-notifications-for-vulnerable-dependencies %} + {% link_in_list /about-github-dependabot-security-updates %} {% link_in_list /configuring-github-dependabot-security-updates %} {% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %} {% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %} + {% link_in_list /troubleshooting-github-dependabot-errors %} diff --git a/translations/ru-RU/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md b/translations/ru-RU/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md new file mode 100644 index 0000000000..a376ff1995 --- /dev/null +++ b/translations/ru-RU/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md @@ -0,0 +1,82 @@ +--- +title: Troubleshooting GitHub Dependabot errors +intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot_short %}.' +shortTitle: Troubleshooting errors +versions: + free-pro-team: '*' +--- + +{% data reusables.dependabot.beta-note %} + +### About {% data variables.product.prodname_dependabot %} errors + +{% data reusables.dependabot.pull-request-introduction %} + +If anything prevents {% data variables.product.prodname_dependabot_short %} from raising a pull request, this is reported as an error. + +### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot_short %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_short %} alerts view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_short %} alerts** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request. + +![{% data variables.product.prodname_dependabot_short %} alerts view showing a pull request link](/assets/images/help/dependabot/dependabot-alert-pr-link.png) + +There are three reasons why an alert may have no pull request link: + +1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository. +1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file. +1. An error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request. + +If an error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request, you can display details of the error by clicking the alert. + +![{% data variables.product.prodname_dependabot_short %} alert showing the error that blocked the creation of a pull request](/assets/images/help/dependabot/dependabot-security-update-error.png) + +### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot_short %} are listed on the {% data variables.product.prodname_dependabot_short %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot_short %}** tab. + +![{% data variables.product.prodname_dependabot_short %} view showing an error](/assets/images/help/dependabot/dependabot-tab-view-error-beta.png) + +To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed. + +![{% data variables.product.prodname_dependabot_short %} version update error and log ](/assets/images/help/dependabot/dependabot-version-update-error-beta.png) + +### Understanding {% data variables.product.prodname_dependabot_short %} errors + +Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot_short %} configuration files. Consequently, some errors are specific to one type of update. + +#### {% data variables.product.prodname_dependabot_short %} cannot update DEPENDENCY to a non-vulnerable version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository. + +Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem. + +The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." + +#### {% data variables.product.prodname_dependabot_short %} cannot update to the required version as there is already an open pull request for the latest version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version. + +There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +#### {% data variables.product.prodname_dependabot_short %} timed out during its update + +{% data variables.product.prodname_dependabot_short %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out. + +This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot_short %} to review the version update and generate the pull request in the time available. + +If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." + +#### {% data variables.product.prodname_dependabot_short %} cannot open any more pull requests + +There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot_short %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests. + +There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit)." + +The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +### Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually + +If you unblock {% data variables.product.prodname_dependabot_short %}, you can manually trigger a fresh attempt to create a pull request. + +- **Security updates**—display the {% data variables.product.prodname_dependabot_short %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot_short %} security update**. +- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**. diff --git a/translations/ru-RU/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/translations/ru-RU/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md index 867a97a1ed..e0570a6140 100644 --- a/translations/ru-RU/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md +++ b/translations/ru-RU/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md @@ -1,6 +1,7 @@ --- title: Troubleshooting the detection of vulnerable dependencies intro: 'If the dependency information reported by {% data variables.product.product_name %} is not what you expected, there are a number of points to consider, and various things you can check.' +shortTitle: Troubleshooting detection versions: free-pro-team: '*' --- @@ -14,9 +15,9 @@ The results of dependency detection reported by {% data variables.product.produc * {% data variables.product.prodname_advisory_database %} is one of the data sources that {% data variables.product.prodname_dotcom %} uses to identify vulnerable dependencies. It's a free, curated database of vulnerability information for common package ecosystems on {% data variables.product.prodname_dotcom %}. It includes both data reported directly to {% data variables.product.prodname_dotcom %} from {% data variables.product.prodname_security_advisories %}, as well as official feeds and community sources. This data is reviewed and curated by {% data variables.product.prodname_dotcom %} to ensure that false or unactionable information is not shared with the development community. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)" and "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." * The dependency graph parses all known package manifest files in a user’s repository. For example, for npm it will parse the _package-lock.json_ file. It constructs a graph of all of the repository’s dependencies and public dependents. This happens when you enable the dependency graph and when anyone pushes to the default branch, and it includes commits that makes changes to a supported manifest format. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." * {% data variables.product.prodname_dependabot_short %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_short %} alerts are aggregated at the repository level, rather than creating one alert per vulnerability. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." -* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive a security alert about a vulnerable dependency in your repository. {% data variables.product.prodname_dotcom %} automatically creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." - {% data variables.product.prodname_dependabot_short %} doesn't scan repositories on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database. + {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database. ### Why don't I get vulnerability alerts for some ecosystems? @@ -97,3 +98,4 @@ When you click to display the alert details, you can see how many vulnerabilitie - "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/ru-RU/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/ru-RU/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index 55ced87f8b..f8b0466c20 100644 --- a/translations/ru-RU/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/translations/ru-RU/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -4,17 +4,18 @@ intro: 'If {% data variables.product.product_name %} discovers vulnerable depend redirect_from: - /articles/viewing-and-updating-vulnerable-dependencies-in-your-repository permissions: Repository administrators and organization owners can view and update dependencies. +shortTitle: Viewing and updating vulnerable dependencies versions: free-pro-team: '*' --- Your repository's {% data variables.product.prodname_dependabot %} alerts tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}. You can sort the list of alerts using the drop-down menu, and you can click into specific alerts for more details. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." -You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." +You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." ### About updates for vulnerable dependencies in your repository -{% data variables.product.product_name %} sends {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} creates a pull request to fix it. {% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} +{% data variables.product.product_name %} sends {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} 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. ### Viewing and updating vulnerable dependencies @@ -33,3 +34,4 @@ You can enable automatic security updates for any repository that uses {% data v - "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" - "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" - "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md index 1e1e1ce0b2..8a40ef5797 100644 --- a/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md +++ b/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md @@ -163,25 +163,10 @@ If you are a member of more than one organization, you can configure each one to ### Security alert notification options {% endif %} -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}Choose how you want to receive {% data variables.product.prodname_dependabot_alerts %} for repositories that you are watching. You can receive {% data variables.product.prodname_dependabot_alerts %} in your inbox, as a banner on {% data variables.product.product_name %}, on the command line, through email, or some combination of these options. +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} -If you want to receive {% data variables.product.prodname_dependabot_alerts %} by email, choose whether you want a weekly email summary of vulnerabilities for up 10 repositories or a new email each time a vulnerability is detected. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."{% endif %} - -{% if currentVersion == "enterprise-server@2.21" %}Choose how you want to receive security alerts for repositories that you are watching. You can receive security alerts in your inbox, as a banner on {% data variables.product.product_name %}, on the command line, through email, or some combination of these options. - -If you want to receive security alerts by email, choose whether you want a weekly email summary of vulnerabilities for up 10 repositories or a new email each time a vulnerability is detected. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."{% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} - ![{% data variables.product.prodname_dependabot_short %} alerts options](/assets/images/help/notifications-v2/dependabot-alerts-options.png) -{% else %} - ![Security alerts options](/assets/images/help/notifications-v2/security-alerts-options.png) -{% endif %} - -{% note %} - -**Note:** You can filter your {% data variables.product.company_short %} inbox notifications by {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)." - -{% endnote %} +For more information about the notification delivery methods available to you, and advice on optimizing your notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} diff --git a/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md index ae12036c07..fd467e64be 100644 --- a/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md +++ b/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md @@ -124,6 +124,8 @@ To filter notifications for specific activity on {% data variables.product.produ - `is:repository-advisory` - `is:team-discussion` +For information about reducing noise from notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." + You can also use the `is:` query to describe how the notification was triaged. - `is:saved` diff --git a/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md b/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md index 15708a2bf8..c230f8978a 100644 --- a/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md +++ b/translations/ru-RU/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md @@ -38,7 +38,7 @@ When you unsubscribe from notifications in your inbox, they will automatically d {% data reusables.notifications.access_notifications %} 1. From the notifications inbox, select the notifications you want to unsubscribe to. -2. Use the the **selected** {% octicon "triangle-down" aria-label="The down triangle icon" %} drop-down to click **Unsubscribe.** ![Unsubcribe option from main inbox](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) +2. Use the **selected** {% octicon "triangle-down" aria-label="The down triangle icon" %} drop-down to click **Unsubscribe.** ![Unsubcribe option from main inbox](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) ### Unsubscribing from notifications on the subscriptions page diff --git a/translations/ru-RU/content/github/managing-your-work-on-github/about-automation-for-project-boards.md b/translations/ru-RU/content/github/managing-your-work-on-github/about-automation-for-project-boards.md index bf3e6f55f9..d33cb4b5cc 100644 --- a/translations/ru-RU/content/github/managing-your-work-on-github/about-automation-for-project-boards.md +++ b/translations/ru-RU/content/github/managing-your-work-on-github/about-automation-for-project-boards.md @@ -29,7 +29,10 @@ Project board automation can also help teams develop a shared understanding of a | Done |
    • Move all closed issues here
    • Move all merged pull requests here
    • Move all closed, unmerged pull requests here
    | ### Project progress tracking -Project board automation enables progress tracking by default. Cards in columns with the "To do", "In progress", or "Done" presets count toward the overall project progress. {% data reusables.project-management.project-progress-locations %} + +You can track the progress on your project board. Cards in the "To do", "In progress", or "Done" columns count toward the overall project progress. {% data reusables.project-management.project-progress-locations %} + +For more information, see "[Tracking progress on your project board](/github/managing-your-work-on-github/tracking-progress-on-your-project-board)." ### Дополнительная литература - "[Configuring automation for project boards](/articles/configuring-automation-for-project-boards)"{% if currentVersion == "free-pro-team@latest" %} diff --git a/translations/ru-RU/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md b/translations/ru-RU/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md index a1db5e6177..46c6b67fc0 100644 --- a/translations/ru-RU/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md +++ b/translations/ru-RU/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md @@ -11,7 +11,7 @@ versions: {% warning %} -**Warning:** If you add an image to a pull request or issue comment, anyone can view the anonymized image URL without authentication, even if the pull request is in a private repository{% if currentVersion != "free-pro-team@latest" %}, or if private mode is enabled{% endif %}. To keep sensitive images private, serve them from a private network or server that requires authentication. {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} +**Warning:** If you add an image to a pull request or issue comment, anyone can view the anonymized image URL without authentication, even if the pull request is in a private repository{% if enterpriseServerVersions contains currentVersion %}, or if private mode is enabled{% endif %}. To keep sensitive images private, serve them from a private network or server that requires authentication. {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} {% endwarning %} @@ -21,7 +21,7 @@ To attach a file to an issue or pull request conversation, drag and drop it into {% tip %} -**Tip:** If you're using Chrome, you can also copy-and-paste images directly into the box. +**Tip:** In many browsers, you can copy-and-paste images directly into the box. {% endtip %} diff --git a/translations/ru-RU/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md b/translations/ru-RU/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md index 49afa80f99..0280ed5c34 100644 --- a/translations/ru-RU/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md +++ b/translations/ru-RU/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md @@ -8,6 +8,12 @@ versions: enterprise-server: '*' --- +{% note %} + +**Note:** In order to link a repository to your organization or user owned project board the repository needs to have issues enabled. For information on how to see if issues are disabled for a repository, see "[Disabling issues](/github/managing-your-work-on-github/disabling-issues) ." + +{% endnote %} + Anyone with write permissions to a project board can link repositories owned by that organization or user account to the project board. For more information, see "[Project board permissions for an organization](/articles/project-board-permissions-for-an-organization/)" or "[Permission levels for user-owned project boards](/articles/permission-levels-for-user-owned-project-boards/)." {% data reusables.project-management.link-repos-to-project-board %} You can add issues and pull requests from any unlinked repositories by typing the issue or pull request URL in a card. For more information, see "[Adding issues and pull requests to a project board](/articles/adding-issues-and-pull-requests-to-a-project-board)." diff --git a/translations/ru-RU/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md b/translations/ru-RU/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md index 67d7e71547..de986e8ae3 100644 --- a/translations/ru-RU/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md +++ b/translations/ru-RU/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md @@ -1,6 +1,6 @@ --- title: Tracking progress on your project board -intro: 'By default, when you enable automation on a project board, the overall progress of the project is tracked in a progress bar.' +intro: 'You can see the overall progress of your project in a progress bar.' redirect_from: - /articles/tracking-progress-on-your-project-board versions: @@ -10,7 +10,7 @@ versions: {% data reusables.project-management.project-progress-locations %} -1. Navigate to the project board where you want to disable project progress tracking. +1. Navigate to the project board where you want to enable or disable project progress tracking. {% data reusables.project-management.click-menu %} -{% data reusables.project-management.access-collaboration-settings %} -4. Unselect **Track project progress**. +{% data reusables.project-management.click-edit-sidebar-menu-project-board %} +4. Select or deselect **Track project progress**. diff --git a/translations/ru-RU/content/github/searching-for-information-on-github/finding-files-on-github.md b/translations/ru-RU/content/github/searching-for-information-on-github/finding-files-on-github.md index 11faf4712f..9e691179e6 100644 --- a/translations/ru-RU/content/github/searching-for-information-on-github/finding-files-on-github.md +++ b/translations/ru-RU/content/github/searching-for-information-on-github/finding-files-on-github.md @@ -18,7 +18,7 @@ versions: {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. Under your repository name, click **Find file**. ![Find file button](/assets/images/help/search/find-file-button.png) {% else %} 2. Above the list of files, click **Go to file**. ![Find file button](/assets/images/help/search/find-file-button.png) diff --git a/translations/ru-RU/content/github/searching-for-information-on-github/searching-for-packages.md b/translations/ru-RU/content/github/searching-for-information-on-github/searching-for-packages.md index 22fcaed03b..97c31f24ac 100644 --- a/translations/ru-RU/content/github/searching-for-information-on-github/searching-for-packages.md +++ b/translations/ru-RU/content/github/searching-for-information-on-github/searching-for-packages.md @@ -14,7 +14,7 @@ versions: You can search for packages globally across all of {% data variables.product.product_name %}, or search for packages within a particular organization. For more information, see "[About searching on {% data variables.product.prodname_dotcom %}](/articles/about-searching-on-github)." -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} You can only search for packages on {% data variables.product.product_location_enterprise %}, not {% data variables.product.prodname_dotcom_the_website %}, even if {% data variables.product.prodname_github_connect %} is enabled. {% endif %} diff --git a/translations/ru-RU/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md b/translations/ru-RU/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md index ac2d748ad4..4cf4504a9b 100644 --- a/translations/ru-RU/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md +++ b/translations/ru-RU/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md @@ -13,7 +13,7 @@ You can search for issues and pull requests globally across all of {% data varia {% tip %} -**Tips:**{% if currentVersion != "free-pro-team@latest" %} +**Tips:**{% if enterpriseServerVersions contains currentVersion %} - This article contains example searches on the {% data variables.product.prodname_dotcom %}.com website, but you can use the same search filters on {% data variables.product.product_location_enterprise %}.{% endif %} - For a list of search syntaxes that you can add to any search qualifier to further improve your results, see "[Understanding the search syntax](/articles/understanding-the-search-syntax)". - Use quotations around multi-word search terms. For example, if you want to search for issues with the label "In progress," you'd search for `label:"in progress"`. Search is not case sensitive. diff --git a/translations/ru-RU/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md b/translations/ru-RU/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md index b8d65743c0..daf74f355e 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md @@ -51,7 +51,7 @@ The number of jobs you can run concurrently across all repositories in your user At the end of the month, {% data variables.product.prodname_dotcom %} calculates the cost of minutes and storage used over the amount included in your account. For example, if your organization uses {% data variables.product.prodname_team %} and allows unlimited spending, using 15,000 minutes could have a total storage and minute overage cost of $56, depending on the operating systems used to run jobs. - 5,000 (3,000 Linux and 2,000 Windows) minutes = $56 ($24 + $32). - - 3,000 Linux minutes at $0.008 per = $24. + - 3,000 Linux minutes at $0.008 per minute = $24. - 2,000 Windows minutes at $0.016 per minute = $32. At the end of the month, {% data variables.product.prodname_dotcom %} rounds your data transfer to the nearest GB. diff --git a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md index a5e7c7f590..bda5ede759 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md @@ -19,7 +19,7 @@ Organization owners and team maintainers can give teams admin, read, or write ac ![Image of a team mention](/assets/images/help/teams/team-mention.png) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} You can also use LDAP Sync to synchronize {% data variables.product.product_location_enterprise %} team members and team roles against your established LDAP groups. This lets you establish role-based access control for users from your LDAP server instead of manually within {% data variables.product.product_location_enterprise %}. For more information, see "[Enabling LDAP Sync](/enterprise/admin/authentication/using-ldap#enabling-ldap-sync)." @@ -55,7 +55,7 @@ To easily understand who shares a parent team's permissions and mentions, you ca You can choose a parent when you create the team, or you can move a team in your organization's hierarchy later. For more information see, "[Moving a team in your organization’s hierarchy](/articles/moving-a-team-in-your-organization-s-hierarchy)." -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.enterprise_user_management.ldap-sync-nested-teams %} diff --git a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md index 5893835485..70fd57ed1e 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md @@ -28,7 +28,7 @@ In the left sidebar of your dashboard, you can access your organization's top re In the "All activity" section of your news feed, you can view updates from other teams and repositories in your organization. -The "All activity" section shows all recent activity in the organization, including activity in repositories you're not subscribed to and of people you're not following. For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." +The "All activity" section shows all recent activity in the organization, including activity in repositories you're not subscribed to and of people you're not following. For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." For instance, the organization news feed shows updates when someone in the organization: - Creates a new branch. diff --git a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md index 2a6807c27c..1c3b0ddfa8 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md @@ -17,7 +17,7 @@ You can enable {% data variables.product.prodname_actions %} for all repositorie Alternatively, you can enable {% data variables.product.prodname_actions %} for all repositories in your organization but limit the actions a workflow can run. {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### Managing {% data variables.product.prodname_actions %} permissions for your organization diff --git a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md index 4af92ee86b..874d4ba6ce 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md @@ -12,7 +12,7 @@ versions: You can control whether members of your organization can publish websites from repositories in your organization using {% data variables.product.prodname_pages %}. For more information about {% data variables.product.prodname_pages %}, see "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages)." -{% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." +{% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. For more information, see{% if enterpriseServerVersions contains currentVersion %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." ### Disabling publication of {% data variables.product.prodname_pages %} sites diff --git a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/index.md b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/index.md index 771bfe8a8d..b4da2b12e3 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/index.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/index.md @@ -127,7 +127,7 @@ versions: {% link_in_list /disabling-publication-of-github-pages-sites-for-your-organization %} {% link_in_list /deleting-an-organization-account %} {% link_in_list /converting-an-organization-into-a-user %} - + {% link_in_list /integrating-jira-with-your-organization-project-board %} diff --git a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md index 3a47970e69..1a505bfccb 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md @@ -63,7 +63,7 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | Purchase, install, manage billing for, and cancel {% data variables.product.prodname_marketplace %} apps | **X** | | | | List apps in {% data variables.product.prodname_marketplace %} | **X** | | | | Receive [{% data variables.product.prodname_dependabot_alerts %} about vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) for all of an organization's repositories | **X** | | | -| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)") | **X** | | | +| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | | | [Manage the forking policy](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | | | [Limit activity in public repositories in an organization](/articles/limiting-interactions-in-your-organization) | **X** | | | | Pull (read), push (write), and clone (copy) *all repositories* in the organization | **X** | | | diff --git a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md index dddddc5062..488b69a87c 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md @@ -47,7 +47,7 @@ To search for specific events, use the `action` qualifier in your query. Actions | `repository_content_analysis` | Contains all activities related to [enabling or disabling data use for a private repository](/articles/about-github-s-use-of-your-data). | | `repository_dependency_graph` | Contains all activities related to [enabling or disabling the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository).{% endif %} | `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} +| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion %} | `команда` | Contains all activities related to teams in your organization.{% endif %} | `team_discussions` | Contains activities related to managing team discussions for an organization. | @@ -85,7 +85,7 @@ This list describes the available categories and associated events: - [The `repository_content_analysis` category](#the-repository_content_analysis-category) - [The `repository_dependency_graph` category](#the-repository_dependency_graph-category){% endif %} - [The `repository_vulnerability_alert` category](#the-repository_vulnerability_alert-category){% if currentVersion == "free-pro-team@latest" %} -- [The `sponsors` category](#the-sponsors-category){% endif %}{% if currentVersion != "free-pro-team@latest" %} +- [The `sponsors` category](#the-sponsors-category){% endif %}{% if enterpriseServerVersions contains currentVersion %} - [The `team` category](#the-team-category){% endif %} - [The `team_discussions` category](#the-team_discussions-category) @@ -180,35 +180,45 @@ For more information, see "[Restricting publication of {% data variables.product ##### The `org` category -| Действие | Description | -| ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest"%} -| `audit_log_export` | Triggered when an organization admin [creates an export of the organization audit log](#exporting-the-audit-log). If the export included a query, the log will list the query used and the number of audit log entries matching that query. | -| `block_user` | Triggered when an organization owner [blocks a user from accessing the organization's repositories](/articles/blocking-a-user-from-your-organization). | -| `cancel_invitation` | Triggered when an organization invitation has been revoked. | -| `disable_oauth_app_restrictions` | Triggered when an owner [disables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/disabling-oauth-app-access-restrictions-for-your-organization) for your organization. | -| `disable_saml` | Triggered when an organization admin disables SAML single sign-on for an organization.{% endif %} -| `disable_member_team_creation_permission` | Triggered when an organization owner limits team creation to owners. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | -| `disable_two_factor_requirement` | Triggered when an owner disables a two-factor authentication requirement for all members{% if currentVersion == "free-pro-team@latest" %}, billing managers,{% endif %} and outside collaborators in an organization.{% if currentVersion == "free-pro-team@latest" %} -| `enable_oauth_app_restrictions` | Triggered when an owner [enables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/enabling-oauth-app-access-restrictions-for-your-organization) for your organization. | -| `enable_saml` | Triggered when an organization admin [enables SAML single sign-on](/articles/enabling-and-testing-saml-single-sign-on-for-your-organization) for an organization.{% endif %} -| `enable_member_team_creation_permission` | Triggered when an organization owner allows members to create teams. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | -| `enable_two_factor_requirement` | Triggered when an owner requires two-factor authentication for all members{% if currentVersion == "free-pro-team@latest" %}, billing managers,{% endif %} and outside collaborators in an organization. | -| `invite_member` | Triggered when [a new user was invited to join your organization](/articles/adding-organization-members-to-a-team).{% if currentVersion == "free-pro-team@latest" %} -| `oauth_app_access_approved` | Triggered when an owner [grants organization access to an {% data variables.product.prodname_oauth_app %}](/articles/approving-oauth-apps-for-your-organization/). | -| `oauth_app_access_denied` | Triggered when an owner [disables a previously approved {% data variables.product.prodname_oauth_app %}'s access](/articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization) to your organization. | -| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" %} -| `remove_billing_manager` | Triggered when an [owner removes a billing manager from an organization](/articles/removing-a-billing-manager-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and a billing manager doesn't use 2FA or disables 2FA. |{% endif %} -| `remove_member` | Triggered when an [owner removes a member from an organization](/articles/removing-a-member-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an organization member doesn't use 2FA or disables 2FA. Also triggered when an [organization member removes themselves](/articles/removing-yourself-from-an-organization/) from an organization. | -| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" %} -| `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." | -| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." | -| `unblock_user` | {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.17" %} -| `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} -| `update_default_repository_permission` | Triggered when an owner changes the default repository permission level for organization members. | -| `update_member` | Triggered when an owner changes a person's role from owner to member or member to owner. | -| `update_member_repository_creation_permission` | Triggered when an owner changes the create repository permission for organization members.{% if currentVersion == "free-pro-team@latest" %} -| `update_saml_provider_settings` | Triggered when an organization's SAML provider settings are updated. | -| `update_terms_of_service` | Triggered when an organization changes between the Standard Terms of Service and the Corporate Terms of Service. For more information, see "[Upgrading to the Corporate Terms of Service](/articles/upgrading-to-the-corporate-terms-of-service)."{% endif %} +| Действие | Description | +| -------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest"%} +| `audit_log_export` | Triggered when an organization admin [creates an export of the organization audit log](#exporting-the-audit-log). If the export included a query, the log will list the query used and the number of audit log entries matching that query. | +| `block_user` | Triggered when an organization owner [blocks a user from accessing the organization's repositories](/articles/blocking-a-user-from-your-organization). | +| `cancel_invitation` | Triggered when an organization invitation has been revoked. |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization).{% endif %} |{% if currentVersion == "free-pro-team@latest"%} +| `disable_oauth_app_restrictions` | Triggered when an owner [disables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/disabling-oauth-app-access-restrictions-for-your-organization) for your organization. | +| `disable_saml` | Triggered when an organization admin disables SAML single sign-on for an organization.{% endif %} +| `disable_member_team_creation_permission` | Triggered when an organization owner limits team creation to owners. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | +| `disable_two_factor_requirement` | Triggered when an owner disables a two-factor authentication requirement for all members{% if currentVersion == "free-pro-team@latest" %}, billing managers,{% endif %} and outside collaborators in an organization.{% if currentVersion == "free-pro-team@latest" %} +| `enable_oauth_app_restrictions` | Triggered when an owner [enables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/enabling-oauth-app-access-restrictions-for-your-organization) for your organization. | +| `enable_saml` | Triggered when an organization admin [enables SAML single sign-on](/articles/enabling-and-testing-saml-single-sign-on-for-your-organization) for an organization.{% endif %} +| `enable_member_team_creation_permission` | Triggered when an organization owner allows members to create teams. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | +| `enable_two_factor_requirement` | Triggered when an owner requires two-factor authentication for all members{% if currentVersion == "free-pro-team@latest" %}, billing managers,{% endif %} and outside collaborators in an organization. | +| `invite_member` | Triggered when [a new user was invited to join your organization](/articles/adding-organization-members-to-a-team).{% if currentVersion == "free-pro-team@latest" %} +| `oauth_app_access_approved` | Triggered when an owner [grants organization access to an {% data variables.product.prodname_oauth_app %}](/articles/approving-oauth-apps-for-your-organization/). | +| `oauth_app_access_denied` | Triggered when an owner [disables a previously approved {% data variables.product.prodname_oauth_app %}'s access](/articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization) to your organization. | +| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). | +| `remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest"%} +| `remove_billing_manager` | Triggered when an [owner removes a billing manager from an organization](/articles/removing-a-billing-manager-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and a billing manager doesn't use 2FA or disables 2FA. |{% endif %} +| `remove_member` | Triggered when an [owner removes a member from an organization](/articles/removing-a-member-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an organization member doesn't use 2FA or disables 2FA. Also triggered when an [organization member removes themselves](/articles/removing-yourself-from-an-organization/) from an organization. | +| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). |{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." | +| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). | +| `runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. | +| `runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. | +| `runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). | +| `runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. |{% endif %}{% if currentVersion == "free-pro-team@latest"%} +| `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/articles/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +| `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} +| `update_default_repository_permission` | Triggered when an owner changes the default repository permission level for organization members. | +| `update_member` | Triggered when an owner changes a person's role from owner to member or member to owner. | +| `update_member_repository_creation_permission` | Triggered when an owner changes the create repository permission for organization members.{% if currentVersion == "free-pro-team@latest" %} +| `update_saml_provider_settings` | Triggered when an organization's SAML provider settings are updated. | +| `update_terms_of_service` | Triggered when an organization changes between the Standard Terms of Service and the Corporate Terms of Service. For more information, see "[Upgrading to the Corporate Terms of Service](/articles/upgrading-to-the-corporate-terms-of-service)."{% endif %} {% if currentVersion == "free-pro-team@latest" %} ##### The `org_credential_authorization` category @@ -295,26 +305,31 @@ For more information, see "[Restricting publication of {% data variables.product ##### The `repo` category -| Действие | Description | -| ------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `access` | Triggered when a repository owned by an organization is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). | -| `add_member` | Triggered when a user accepts an [invitation to have collaboration access to a repository](/articles/inviting-collaborators-to-a-personal-repository). | -| `add_topic` | Triggered when a repository admin [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. | -| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} -| `config.disable_anonymous_git_access` | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | -| `config.enable_anonymous_git_access` | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | -| `config.lock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). | +| Действие | Description | +| ------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `access` | Triggered when a repository owned by an organization is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). | +| `add_member` | Triggered when a user accepts an [invitation to have collaboration access to a repository](/articles/inviting-collaborators-to-a-personal-repository). | +| `add_topic` | Triggered when a repository admin [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. | +| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if enterpriseServerVersions contains currentVersion %} +| `config.disable_anonymous_git_access` | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | +| `config.enable_anonymous_git_access` | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | +| `config.lock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). | | `config.unlock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is unlocked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access).{% endif %} -| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository). | +| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository).{% endif %} | `destroy` | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} | `отключить` | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %} -| `включить` | Triggered when a repository is reenabled. | -| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository). | -| `remove_topic` | Triggered when a repository admin removes a topic from a repository. | -| `rename` | Triggered when [a repository is renamed](/articles/renaming-a-repository). | -| `передача` | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). | -| `transfer_start` | Triggered when a repository transfer is about to occur. | -| `unarchived` | Triggered when a repository admin unarchives a repository. | +| `включить` | Triggered when a repository is reenabled.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret.{% endif %} +| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). | +| `remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). |{% endif %} +| `remove_topic` | Triggered when a repository admin removes a topic from a repository. | +| `rename` | Triggered when [a repository is renamed](/articles/renaming-a-repository). | +| `передача` | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). | +| `transfer_start` | Triggered when a repository transfer is about to occur. | +| `unarchived` | Triggered when a repository admin unarchives a repository.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret.{% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -352,7 +367,7 @@ For more information, see "[Restricting publication of {% data variables.product | repo_funding_links_file_action | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") | {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### The `team` category | Действие | Description | diff --git a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md index 794f20cd77..0486b796b5 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md @@ -27,6 +27,8 @@ For more information about member access and management, see "[Managing users in For more information about managing enterprise accounts using the GraphQL API, see "[Enterprise accounts](/v4/guides/managing-enterprise-accounts)." +{% if currentVersion == "free-pro-team@latest" %} + ### Managing organizations linked to your enterprise account Organizations are shared accounts where groups of people can collaborate across many projects at once. Owners can manage member access to the organization's data and projects with sophisticated security and administrative features. For more information, see "[About organizations](/articles/about-organizations)." @@ -35,6 +37,8 @@ Enterprise owners can create organizations and link them to the enterprise. Afte For more information, see "[Managing organizations in your enterprise account](/articles/managing-organizations-in-your-enterprise-account)" and "[Setting policies for organizations in your enterprise account](/articles/setting-policies-for-organizations-in-your-enterprise-account)." +{% endif %} + ### Managing {% data variables.product.prodname_ghe_server %} licenses linked to your enterprise account {% data reusables.enterprise-accounts.admin-managing-licenses %} diff --git a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/index.md b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/index.md index 2eac95839d..647d15530f 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/index.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/index.md @@ -6,6 +6,7 @@ redirect_from: - /categories/setting-up-and-managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md index 614a01214c..9bce247ef1 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/managing-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md index a85f74127e..348926c13c 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md @@ -6,5 +6,6 @@ redirect_from: - /articles/managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md index 05032da4ee..4d664620ad 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/setting-policies-for-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md index 11c6b3b94e..da7c1cbeb3 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md @@ -18,6 +18,9 @@ Enterprise accounts are currently available to {% data variables.product.prodnam {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} -4. Under "User licenses", view your total licenses, number of consumed licenses, and your subscription expiration date. ![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png) -5. To view details of the user licenses currently in use, click **View details**. +{% data reusables.enterprise-accounts.license-tab %} +4. Under "User +{% if currentVersion == "free-pro-team@latest" %}Licenses{% else %}licenses{% endif %}", view your total licenses, number of consumed licenses, and your subscription expiration date. + {% if currentVersion == "free-pro-team@latest" %}![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png){% else %} + ![License and subscription information in enterprise billing settings](/assets/images/enterprise/enterprises/enterprise-server-billing-license-info.png){% endif %} +5. To view details of the user licenses currently in use, click **View {% if currentVersion == "free-pro-team@latest" %}details{% else %}users{% endif %}**. diff --git a/translations/ru-RU/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md b/translations/ru-RU/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md index f210bd1dc8..4abd33741e 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md @@ -25,7 +25,7 @@ On your profile page, certain actions count as contributions: - Committing to a repository's default branch or `gh-pages` branch - Opening an issue - Proposing a pull request -- Submitting a pull request review{% if currentVersion != "free-pro-team@latest" %} +- Submitting a pull request review{% if enterpriseServerVersions contains currentVersion %} - Co-authoring commits in a repository's default branch or `gh-pages` branch{% endif %} {% data reusables.pull_requests.pull_request_merges_and_contributions %} diff --git a/translations/ru-RU/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md b/translations/ru-RU/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md index 3ee3b26f89..03e5d55400 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md @@ -29,10 +29,10 @@ In addition, **at least one** of the following must be true: - You have forked the repository. - You have opened a pull request or issue in the repository. - You have starred the repository. -{% if currentVersion != "free-pro-team@latest" %} + ### Common reasons that contributions are not counted -{% data reusables.pull_requests.pull_request_merges_and_contributions %}{% endif %} +{% data reusables.pull_requests.pull_request_merges_and_contributions %} #### Commit was made less than 24 hours ago diff --git a/translations/ru-RU/content/github/setting-up-and-managing-your-github-user-account/index.md b/translations/ru-RU/content/github/setting-up-and-managing-your-github-user-account/index.md index aaf38e6431..5ea0fb1d8b 100644 --- a/translations/ru-RU/content/github/setting-up-and-managing-your-github-user-account/index.md +++ b/translations/ru-RU/content/github/setting-up-and-managing-your-github-user-account/index.md @@ -24,7 +24,7 @@ versions: {% link_in_list /managing-the-default-branch-name-for-your-repositories %} {% link_in_list /managing-security-and-analysis-settings-for-your-user-account %} {% link_in_list /managing-access-to-your-user-accounts-project-boards %} - + {% link_in_list /integrating-jira-with-your-personal-projects %} diff --git a/translations/ru-RU/content/github/site-policy/github-enterprise-subscription-agreement.md b/translations/ru-RU/content/github/site-policy/github-enterprise-subscription-agreement.md index b6bcac169a..50ad30b4a7 100644 --- a/translations/ru-RU/content/github/site-policy/github-enterprise-subscription-agreement.md +++ b/translations/ru-RU/content/github/site-policy/github-enterprise-subscription-agreement.md @@ -330,7 +330,7 @@ The look and feel of the Service is copyright © GitHub, Inc. All rights reserve #### 3.5.2 Copyright Infringement and DMCA Policy. -If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millenium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 3.5.3 GitHub Trademarks and Logos. diff --git a/translations/ru-RU/content/github/site-policy/github-sensitive-data-removal-policy.md b/translations/ru-RU/content/github/site-policy/github-sensitive-data-removal-policy.md index b19c2c5061..f6ba5904ac 100644 --- a/translations/ru-RU/content/github/site-policy/github-sensitive-data-removal-policy.md +++ b/translations/ru-RU/content/github/site-policy/github-sensitive-data-removal-policy.md @@ -76,7 +76,7 @@ These guidelines are designed to make the processing of requests to remove sensi ### How to Submit Your Request -You can submit your request to remove sensitive data via our [contact form](https://support.github.com/contact). Please include a plain-text version of your request in the body of your message. Sending your request in an attachment may result in processing delays. +You can submit your request to remove sensitive data via our [contact form](https://support.github.com/contact?tags=docs-sensitive-data). Please include a plain-text version of your request in the body of your message. Sending your request in an attachment may result in processing delays. ### Disputes diff --git a/translations/ru-RU/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md b/translations/ru-RU/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md index 76f5daf6d7..06dfda34d0 100644 --- a/translations/ru-RU/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md +++ b/translations/ru-RU/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md @@ -175,7 +175,7 @@ The look and feel of the Service is copyright © GitHub, Inc. All rights reserve #### 2.5.2 Copyright Infringement and DMCA Policy. -If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millenium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 2.5.3 GitHub Trademarks and Logos. diff --git a/translations/ru-RU/content/github/site-policy/github-trademark-policy.md b/translations/ru-RU/content/github/site-policy/github-trademark-policy.md index 1ecf0a7a6c..0b49956f29 100644 --- a/translations/ru-RU/content/github/site-policy/github-trademark-policy.md +++ b/translations/ru-RU/content/github/site-policy/github-trademark-policy.md @@ -23,7 +23,7 @@ When we receive reports of trademark policy violations from holders of federal o ### How Do I Report a Trademark Policy Violation? -Holders of registered trademarks can report possible trademark policy violations to GitHub via our [contact form](https://support.github.com/contact). Please submit trademark-related requests using your company email address and include all the information requested below to help expedite our response. Also be sure to clearly describe to us why the account may cause confusion with your mark or how the account may dilute or tarnish your mark. +Holders of registered trademarks can report possible trademark policy violations to GitHub via our [contact form](https://support.github.com/contact?tags=docs-trademark). Please submit trademark-related requests using your company email address and include all the information requested below to help expedite our response. Also be sure to clearly describe to us why the account may cause confusion with your mark or how the account may dilute or tarnish your mark. ### What Information is Required When Reporting Trademark Policy Violations? diff --git a/translations/ru-RU/content/github/using-git/changing-a-remotes-url.md b/translations/ru-RU/content/github/using-git/changing-a-remotes-url.md index a58e91e1fd..cba6c94780 100644 --- a/translations/ru-RU/content/github/using-git/changing-a-remotes-url.md +++ b/translations/ru-RU/content/github/using-git/changing-a-remotes-url.md @@ -50,7 +50,7 @@ git@{% data variables.command_line.codeblock %}:USERNAME/REPOSITORY > origin https://{% data variables.command_line.codeblock %}/USERNAME/REPOSITORY.git (push) ``` -The next time you `git fetch`, `git pull`, or `git push` to the remote repository, you'll be asked for your GitHub username and password. +The next time you `git fetch`, `git pull`, or `git push` to the remote repository, you'll be asked for your GitHub username and password. {% data reusables.user_settings.password-authentication-deprecation %} - If you have [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) enabled, you must [create a personal access token](/github/authenticating-to-github/creating-a-personal-access-token) to use instead of your GitHub password. - You can [use a credential helper](/github/using-git/caching-your-github-credentials-in-git) so Git will remember your GitHub username and password every time it talks to GitHub. diff --git a/translations/ru-RU/content/github/using-git/pushing-commits-to-a-remote-repository.md b/translations/ru-RU/content/github/using-git/pushing-commits-to-a-remote-repository.md index 4a3c19532c..1c09f34707 100644 --- a/translations/ru-RU/content/github/using-git/pushing-commits-to-a-remote-repository.md +++ b/translations/ru-RU/content/github/using-git/pushing-commits-to-a-remote-repository.md @@ -97,3 +97,4 @@ For more information on working with forks, see "[Syncing a fork](/articles/sync - [`git remote` man page](https://git-scm.com/docs/git-remote.html) - "[Git cheatsheet](/articles/git-cheatsheet)" - "[Git workflows](/articles/git-workflows)" +- "[Git Handbook](https://guides.github.com/introduction/git-handbook/)" diff --git a/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md index 2861876f6d..470c45178f 100644 --- a/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md +++ b/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md @@ -47,9 +47,9 @@ You can use the dependency graph to: {% if currentVersion == "free-pro-team@latest" %}To generate a dependency graph, {% data variables.product.product_name %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private repositories. For information about enabling or disabling it for private repositories, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md index 0ab57b85eb..ef8331f03b 100644 --- a/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md +++ b/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md @@ -35,7 +35,7 @@ If vulnerabilities have been detected in the repository, these are shown at the {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to {% data variables.product.prodname_dependabot_short %} alerts. @@ -55,7 +55,7 @@ Any direct and indirect dependencies that are specified in the repository's mani {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to security alerts. {% note %} diff --git a/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md b/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md index f70a3bb2d6..f8a642bf2f 100644 --- a/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md +++ b/translations/ru-RU/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md @@ -13,7 +13,7 @@ versions: ### About contributors -You can view the top 100 contributors to a repository{% if currentVersion != "free-pro-team@latest" %}, including commit co-authors,{% endif %} in the contributors graph. Merge commits and empty commits aren't counted as contributions for this graph. +You can view the top 100 contributors to a repository{% if enterpriseServerVersions contains currentVersion %}, including commit co-authors,{% endif %} in the contributors graph. Merge commits and empty commits aren't counted as contributions for this graph. {% if currentVersion == "free-pro-team@latest" %} You can also see a list of people who have contributed to the project's Python dependencies. To access this list of community contributors, visit `https://github.com/REPO-OWNER/REPO-NAME/community_contributors`. diff --git a/translations/ru-RU/content/github/working-with-github-pages/about-github-pages-and-jekyll.md b/translations/ru-RU/content/github/working-with-github-pages/about-github-pages-and-jekyll.md index 80bc0ea4cc..39bad3c9df 100644 --- a/translations/ru-RU/content/github/working-with-github-pages/about-github-pages-and-jekyll.md +++ b/translations/ru-RU/content/github/working-with-github-pages/about-github-pages-and-jekyll.md @@ -27,7 +27,7 @@ versions: Jekyll is a static site generator with built-in support for {% data variables.product.prodname_pages %} and a simplified build process. Jekyll takes Markdown and HTML files and creates a complete static website based on your choice of layouts. Jekyll supports Markdown and Liquid, a templating language that loads dynamic content on your site. For more information, see [Jekyll](https://jekyllrb.com/). -Jekyll is not officially supported for Windows. For more information, see "[Jekyll on Windows](http://jekyllrb.com/docs/windows/#installation)" in the Jekyll documenation. +Jekyll is not officially supported for Windows. For more information, see "[Jekyll on Windows](http://jekyllrb.com/docs/windows/#installation)" in the Jekyll documentation. We recommend using Jekyll with {% data variables.product.prodname_pages %}. If you prefer, you can use other static site generators or customize your own build process locally or on another server. For more information, see "[About {% data variables.product.prodname_pages %}](/articles/about-github-pages#static-site-generators)." diff --git a/translations/ru-RU/content/github/working-with-github-pages/about-github-pages.md b/translations/ru-RU/content/github/working-with-github-pages/about-github-pages.md index e904b6ba11..ace326a288 100644 --- a/translations/ru-RU/content/github/working-with-github-pages/about-github-pages.md +++ b/translations/ru-RU/content/github/working-with-github-pages/about-github-pages.md @@ -45,7 +45,7 @@ For more information about how custom domains affect the URL for your site, see You can only create one user or organization site for each {% data variables.product.product_name %} account. Project sites, whether owned by an organization or a user account, are unlimited. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} The URL where your site is available depends on whether subdomain isolation is enabled for {% data variables.product.product_location %}. diff --git a/translations/ru-RU/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md b/translations/ru-RU/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md index b351f3c651..1fa72e4fe3 100644 --- a/translations/ru-RU/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md +++ b/translations/ru-RU/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md @@ -80,7 +80,7 @@ gem "github-pages", "~> VERSION", group: :jekyll_plugins ``` 10. Save and close the Gemfile. 11. Optionally, test your site locally. For more information, see "[Testing your {% data variables.product.prodname_pages %} site locally with Jekyll](/articles/testing-your-github-pages-site-locally-with-jekyll)." -12. Add your {% data variables.product.product_name %} repository as a remote, replacing {% if currentVersion != "free-pro-team@latest" %}_HOSTNAME_ with your appliance's hostname,{% endif %} _USER_ with the account that owns the repository{% if currentVersion != "free-pro-team@latest" %},{% endif %} and _REPOSITORY_ with the name of the repository. +12. Add your {% data variables.product.product_name %} repository as a remote, replacing {% if enterpriseServerVersions contains currentVersion %}_HOSTNAME_ with your appliance's hostname,{% endif %} _USER_ with the account that owns the repository{% if enterpriseServerVersions contains currentVersion %},{% endif %} and _REPOSITORY_ with the name of the repository. ```shell {% if currentVersion == "free-pro-team@latest" %} $ git remote add origin https://github.com/USER/REPOSITORY.git diff --git a/translations/ru-RU/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md b/translations/ru-RU/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md index 77541da4f6..11133ee7d5 100644 --- a/translations/ru-RU/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md +++ b/translations/ru-RU/content/github/working-with-github-pages/setting-a-markdown-processor-for-your-github-pages-site-using-jekyll.md @@ -13,7 +13,7 @@ versions: People with write permissions for a repository can set the Markdown processor for a {% data variables.product.prodname_pages %} site. -{% data variables.product.prodname_pages %} supports two Markdown processors: [kramdown](http://kramdown.gettalong.org/) and {% data variables.product.prodname_dotcom %}'s own extended [CommonMark](https://commonmark.org/) processer, which is used to render {% data variables.product.prodname_dotcom %} Flavored Markdown throughout {% data variables.product.product_name %}. For more information, see "[About writing and formatting on {% data variables.product.prodname_dotcom %}](/articles/about-writing-and-formatting-on-github)." +{% data variables.product.prodname_pages %} supports two Markdown processors: [kramdown](http://kramdown.gettalong.org/) and {% data variables.product.prodname_dotcom %}'s own extended [CommonMark](https://commonmark.org/) processor, which is used to render {% data variables.product.prodname_dotcom %} Flavored Markdown throughout {% data variables.product.product_name %}. For more information, see "[About writing and formatting on {% data variables.product.prodname_dotcom %}](/articles/about-writing-and-formatting-on-github)." You can use {% data variables.product.prodname_dotcom %} Flavored Markdown with either processor, but only our CommonMark processor will always match the results you see on {% data variables.product.product_name %}. diff --git a/translations/ru-RU/content/github/writing-on-github/creating-gists.md b/translations/ru-RU/content/github/writing-on-github/creating-gists.md index 495822dd49..588b471cfd 100644 --- a/translations/ru-RU/content/github/writing-on-github/creating-gists.md +++ b/translations/ru-RU/content/github/writing-on-github/creating-gists.md @@ -17,9 +17,9 @@ Every gist is a Git repository, which means that it can be forked and cloned. If Gists can be public or secret. Public gists show up in {% data variables.gists.discover_url %}, where people can browse new gists as they're created. They're also searchable, so you can use them if you'd like other people to find and see your work. {% data reusables.gist.cannot-convert-public-gists-to-secret %} -Secret gists don't show up in {% data variables.gists.discover_url %}{% if currentVersion != "free-pro-team@latest" %},{% endif %} and are not searchable. {% data reusables.gist.cannot-convert-public-gists-to-secret %} Secret gists aren't private. If you send the URL of a secret gist to a friend, they'll be able to see it. However, if someone you don't know discovers the URL, they'll also be able to see your gist. If you need to keep your code away from prying eyes, you may want to [create a private repository](/articles/creating-a-new-repository) instead. +Secret gists don't show up in {% data variables.gists.discover_url %} and are not searchable. {% data reusables.gist.cannot-convert-public-gists-to-secret %} Secret gists aren't private. If you send the URL of a secret gist to a friend, they'll be able to see it. However, if someone you don't know discovers the URL, they'll also be able to see your gist. If you need to keep your code away from prying eyes, you may want to [create a private repository](/articles/creating-a-new-repository) instead. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your site administrator has disabled private mode, you can also use anonymous gists, which can be public or secret. diff --git a/translations/ru-RU/content/insights/installing-and-configuring-github-insights/updating-github-insights.md b/translations/ru-RU/content/insights/installing-and-configuring-github-insights/updating-github-insights.md index df02d3fc47..e17b23f341 100644 --- a/translations/ru-RU/content/insights/installing-and-configuring-github-insights/updating-github-insights.md +++ b/translations/ru-RU/content/insights/installing-and-configuring-github-insights/updating-github-insights.md @@ -6,7 +6,6 @@ redirect_from: - /github/installing-and-configuring-github-insights/updating-github-insights permissions: 'People with read permissions to the `github/insights-releases` repository and administrative access to the application server can update {% data variables.product.prodname_insights %}.' versions: - free-pro-team: '*' enterprise-server: '*' --- diff --git a/translations/ru-RU/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md b/translations/ru-RU/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md index 702b2af741..8516292b81 100644 --- a/translations/ru-RU/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md +++ b/translations/ru-RU/content/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images.md @@ -78,7 +78,7 @@ If you have a {% data variables.product.prodname_actions %} workflow that uses a 2. In your {% data variables.product.prodname_actions %} workflow file, update the package url from `https://docker.pkg.github.com` to `ghcr.io`. -3. Add your new {% data variables.product.prodname_container_registry %} authentication personal access token (PAT) as a GitHub ACtions secret. {% data variables.product.prodname_github_container_registry %} does not support using `GITHUB_TOKEN` for your PAT so you must use a different custom variable, such as `CR_PAT`. For more information, see "[Creating and storing encrypted secrets](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)." +3. Add your new {% data variables.product.prodname_container_registry %} authentication personal access token (PAT) as a GitHub Actions secret. {% data variables.product.prodname_github_container_registry %} does not support using `GITHUB_TOKEN` for your PAT so you must use a different custom variable, such as `CR_PAT`. For more information, see "[Creating and storing encrypted secrets](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)." 4. In your {% data variables.product.prodname_actions %} workflow file, update the authentication PAT by replacing your Docker registry PAT ({% raw %}`${{ secrets.GITHUB_TOKEN }}`{% endraw %}) with a new variable for your {% data variables.product.prodname_container_registry %} PAT, such as {% raw %}`${{ secrets.CR_PAT }}`{% endraw %}. diff --git a/translations/ru-RU/content/packages/publishing-and-managing-packages/about-github-packages.md b/translations/ru-RU/content/packages/publishing-and-managing-packages/about-github-packages.md index e6ff8074db..550545310a 100644 --- a/translations/ru-RU/content/packages/publishing-and-managing-packages/about-github-packages.md +++ b/translations/ru-RU/content/packages/publishing-and-managing-packages/about-github-packages.md @@ -100,7 +100,7 @@ If {% data variables.product.product_location_enterprise %} has subdomain isolat | Ruby | RubyGems package manager | `Gemfile` | `gem` | `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` | | Java | Apache Maven project management and comprehension tool | `pom.xml` | `mvn` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` | | Java | Gradle build automation tool for Java | `build.gradle` or `build.gradle.kts` | `gradle` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` | -| .NET | NuGet package management for .NET | `nupkg` | `dotnet` CLI | nuget.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` | +| .NET | NuGet package management for .NET | `nupkg` | `dotnet` CLI | `nuget.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` | {% else %} diff --git a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md index a68065ec0d..0b670a2b7d 100644 --- a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md +++ b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md @@ -27,13 +27,13 @@ You can authenticate to {% data variables.product.prodname_registry %} with Apac In the `servers` tag, add a child `server` tag with an `id`, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, and *TOKEN* with your personal access token. -In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. {% data reusables.package_registry.lowercase-name-field %} +In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. {% data reusables.package_registry.lowercase-name-field %} If you want to interact with multiple repositories, you can add each repository to separate `repository` children in the `repositories` tag, mapping the `id` of each to the credentials in the `servers` tag. {% data reusables.package_registry.apache-maven-snapshot-versions-supported %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -76,7 +76,7 @@ If your instance has subdomain isolation enabled: ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ``` @@ -133,8 +133,8 @@ For more information on creating a package, see the [maven.apache.org documentat 1. Edit the `distributionManagement` element of the *pom.xml* file located in your package directory, replacing -{% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. - {% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} ``` @@ -146,7 +146,7 @@ For more information on creating a package, see the [maven.apache.org documentat     ``` - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ``` diff --git a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md index 95b829e226..05a6a047b7 100644 --- a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md +++ b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md @@ -21,7 +21,7 @@ versions: When installing or publishing a docker image, {% data variables.product.prodname_registry %} does not currently support foreign layers, such as Windows images. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Before you can use the Docker registry on {% data variables.product.prodname_registry %}, the site administrator for {% data variables.product.product_location_enterprise %} must enable Docker support and subdomain isolation for your instance. For more information, see "[Managing GitHub Packages for your enterprise](/enterprise/admin/packages)." @@ -49,7 +49,7 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% raw %} ```shell $ cat ~/TOKEN.txt | docker login docker.HOSTNAME -u USERNAME --password-stdin @@ -57,7 +57,7 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if currentVersion != "free-pro-team@latest" %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. +To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if enterpriseServerVersions contains currentVersion %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. For more information, see "[Docker login](https://docs.docker.com/engine/reference/commandline/login/#provide-a-password-using-stdin)." @@ -83,7 +83,7 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen > IMAGE_NAME VERSION IMAGE_ID 4 weeks ago 1.11MB ``` 2. Using the Docker image ID, tag the docker image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, -{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. +{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker tag IMAGE_ID docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION @@ -94,7 +94,7 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen ``` {% endif %} 3. If you haven't already built a docker image for the package, build the image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, *VERSION* with package version at build time, -{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s +{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker build -t docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH @@ -185,7 +185,7 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0 {% data reusables.package_registry.docker_registry_deprecation_status %} -You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} +You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} {% if currentVersion == "free-pro-team@latest" %} ```shell diff --git a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md index dbf7bdd09b..8ba3b3a401 100644 --- a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md +++ b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md @@ -29,7 +29,7 @@ To authenticate to {% data variables.product.prodname_registry %} with the `dotn You must replace: - `USERNAME` with the name of your user account on {% data variables.product.prodname_dotcom %}. - `TOKEN` with your personal access token. -- `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} +- `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} - `HOSTNAME` with the host name for your {% data variables.product.prodname_ghe_server %} instance. If your instance has subdomain isolation enabled: @@ -51,7 +51,7 @@ If your instance has subdomain isolation enabled: ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```xml @@ -89,7 +89,7 @@ You can publish a package to {% data variables.product.prodname_registry %} by a 3. Add your project's specific information to your project's file, which ends in *.csproj*. You must replace: - `OWNER` with the name of the user or organization account that owns the repository containing your project. - `REPOSITORY` with the name of the repository containing the package you want to publish. - - `1.0.0` with the version number of the package.{% if currentVersion != "free-pro-team@latest" %} + - `1.0.0` with the version number of the package.{% if enterpriseServerVersions contains currentVersion %} - `HOSTNAME` with the host name for your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` xml diff --git a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md index 5e9c8e4f9a..e5c80dc6f0 100644 --- a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md +++ b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md @@ -25,7 +25,7 @@ versions: You can authenticate to {% data variables.product.prodname_registry %} with Gradle using either Gradle Groovy or Kotlin DSL by editing your *build.gradle* file (Gradle Groovy) or *build.gradle.kts* file (Kotlin DSL) file to include your personal access token. You can also configure Gradle Groovy and Kotlin DSL to recognize a single package or multiple packages in a repository. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Replace *REGISTRY-URL* with the URL for your instance's Maven registry. If your instance has subdomain isolation enabled, use `maven.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/maven`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance. {% endif %} diff --git a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md index 4b390f513b..39ae1839ce 100644 --- a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md +++ b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md @@ -25,9 +25,9 @@ versions: You can authenticate to {% data variables.product.prodname_registry %} with npm by either editing your per-user *~/.npmrc* file to include your personal access token or by logging in to npm on the command line using your username and personal access token. -To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. Create a new *~/.npmrc* file if one doesn't exist. +To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. Create a new *~/.npmrc* file if one doesn't exist. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -35,7 +35,7 @@ If your instance has subdomain isolation enabled: //{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}/:_authToken=TOKEN ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell @@ -45,7 +45,7 @@ If your instance has subdomain isolation disabled: To authenticate by logging in to npm, use the `npm login` command, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *PUBLIC-EMAIL-ADDRESS* with your email address. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} @@ -56,7 +56,7 @@ $ npm login --registry=https://{% if currentVersion == "free-pro-team@latest" %} > Email: PUBLIC-EMAIL-ADDRESS ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell @@ -98,20 +98,20 @@ You can use an *.npmrc* file to configure the scope mapping for your project. In You can use `publishConfig` element in the *package.json* file to specify the registry where you want the package published. For more information, see "[publishConfig](https://docs.npmjs.com/files/package.json#publishconfig)" in the npm documentation. 1. Edit the *package.json* file for your package and include a `publishConfig` entry. - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} ```shell - "publishConfig": { - "registry":"https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}" - }, + "publishConfig": { + "registry":"https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}" + }, ``` - {% if currentVersion != "free-pro-team@latest" %} + {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell - "publishConfig": { - "registry":"https://HOSTNAME/_registry/npm/" - }, + "publishConfig": { + "registry":"https://HOSTNAME/_registry/npm/" + }, ``` {% endif %} {% data reusables.package_registry.verify_repository_field %} @@ -137,7 +137,7 @@ To ensure the repository's URL is correct, replace REPOSITORY with the name of t You can install packages from {% data variables.product.prodname_registry %} by adding the packages as dependencies in the *package.json* file for your project. For more information on using a *package.json* in your project, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" in the npm documentation. -By default, you can add packages from one organization. For more information, see [Installing packages from other organizations](#installing-packages-from-other-organizations) +By default, you can add packages from one organization. For more information, see "[Installing packages from other organizations](#installing-packages-from-other-organizations)." You also need to add the *.npmrc* file to your project so all requests to install packages will go through {% data variables.product.prodname_registry %}. When you route all package requests through {% data variables.product.prodname_registry %}, you can use both scoped and unscoped packages from *npmjs.com*. For more information, see "[npm-scope](https://docs.npmjs.com/misc/scope)" in the npm documentation. @@ -167,19 +167,19 @@ You also need to add the *.npmrc* file to your project so all requests to instal #### Installing packages from other organizations -By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} +By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation enabled: {% endif %} ```shell -registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}OWNER +registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME{% endif %}/OWNER @OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %} @OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %} ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: ```shell diff --git a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md index a14209a989..3b3995244e 100644 --- a/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md +++ b/translations/ru-RU/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md @@ -56,7 +56,7 @@ For example, you would create or edit a *~/.gem/credentials* to include the foll To install gems, you need to authenticate to {% data variables.product.prodname_registry %} by editing the *~/.gemrc* file for your project to include `https://USERNAME:TOKEN@{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER/`. You must replace: - `USERNAME` with your {% data variables.product.prodname_dotcom %} username. - `TOKEN` with your personal access token. - - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} + - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} - `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance. {% endif %} @@ -74,7 +74,7 @@ If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this exa ``` -To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} {% data reusables.package_registry.lowercase-name-field %} @@ -97,7 +97,7 @@ $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygem ```shell gem build OCTO-GEM.gemspec ``` -3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ```shell $ gem push --key github \ @@ -107,7 +107,7 @@ $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygem ### Publishing multiple packages to the same repository -To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if currentVersion != "free-pro-team@latest" %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if enterpriseServerVersions contains currentVersion %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` gem.metadata = { "github_repo" => "ssh://{% if currentVersion == "free-pro-team@latest" %}github.com{% else %}HOSTNAME{% endif %}/OWNER/REPOSITORY" } @@ -118,7 +118,7 @@ gem.metadata = { "github_repo" => "ssh://{% if currentVersion == "free-pro-team@ You can use gems from {% data variables.product.prodname_registry %} much like you use gems from *rubygems.org*. You need to authenticate to {% data variables.product.prodname_registry %} by adding your {% data variables.product.prodname_dotcom %} user or organization as a source in the *~/.gemrc* file or by using Bundler and editing you *Gemfile*. {% data reusables.package_registry.authenticate-step %} -2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` source "https://rubygems.org" diff --git a/translations/ru-RU/content/rest/overview/api-previews.md b/translations/ru-RU/content/rest/overview/api-previews.md index 997d6e49e7..f03f3732bd 100644 --- a/translations/ru-RU/content/rest/overview/api-previews.md +++ b/translations/ru-RU/content/rest/overview/api-previews.md @@ -42,7 +42,7 @@ Get a [list of events](/v3/issues/timeline/) for an issue or pull request. **Custom media type:** `mockingbird-preview` **Announced:** [2016-05-23](https://developer.github.com/changes/2016-05-23-timeline-preview-api/) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Pre-receive environments Create, list, update, and delete environments for pre-receive hooks. @@ -50,7 +50,7 @@ Create, list, update, and delete environments for pre-receive hooks. **Custom media type:** `eye-scream-preview` **Announced:** [2015-07-29](/rest/reference/enterprise-admin#pre-receive-environments) {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### Integrations Manage [integrations](/early-access/integrations/) through the API. @@ -98,7 +98,7 @@ View all [codes of conduct](/v3/codes_of_conduct) or get which code of conduct a **Custom media type:** `scarlet-witch-preview` -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### Nested teams Include nested team content in [team](/v3/teams/) payloads. @@ -107,7 +107,7 @@ Include nested team content in [team](/v3/teams/) payloads. {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Global webhooks @@ -117,7 +117,7 @@ Enables [global webhooks](/v3/enterprise-admin/global_webhooks/) for [organizat {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### Repository transfer Transfer a [repository](/v3/repos/) to an organization or user. @@ -125,7 +125,7 @@ Transfer a [repository](/v3/repos/) to an organization or user. **Custom media type:** `nightshade-preview` **Announced:** [2017-11-09](https://developer.github.com/changes/2017-11-09-repository-transfer-api-preview) {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### Add lock reason You can now add a reason when you [lock an issue](/v3/issues/#lock-an-issue). @@ -145,7 +145,7 @@ You can now [require multiple approving reviews](/v3/repos/branches) for a pull **Custom media type:** `luke-cage-preview` **Announced:** [2018-03-16](https://developer.github.com/changes/2018-03-16-protected-branches-required-approving-reviews) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.19" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.19" %} ### Retrieve hovercard information Retrieve information from [someone's hovercard](/v3/users/#get-contextual-information-for-a-user). @@ -162,7 +162,7 @@ Allows a GitHub App to run external checks on a repository's code. See the [Chec **Custom media type:** `antiope-preview` **Announced:** [2018-05-07](https://developer.github.com/changes/2018-05-07-new-checks-api-public-beta/) {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Anonymous Git access to repositories @@ -216,7 +216,7 @@ Allows you to temporarily restrict interactions, such as commenting, opening iss {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### Draft pull requests You can use the Draft Pull Requests API and its [pull request](/v3/pulls/) endpoints to see whether a pull request is in draft state. To learn more about draft pull requests, see "[About pull requests](/articles/about-pull-requests/)". @@ -237,7 +237,7 @@ You can use two new endpoints in the [Commits API](/v3/repos/commits/) to list b **Custom media types:** `groot-preview` **Announced:** [2019-04-11](https://developer.github.com/changes/2019-04-11-pulls-branches-for-commit/) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### Uninstall a GitHub App Owners of GitHub Apps can now uninstall an app using the [Apps API](/v3/apps/#delete-an-installation-for-the-authenticated-app). diff --git a/translations/ru-RU/content/rest/overview/endpoints-available-for-github-apps.md b/translations/ru-RU/content/rest/overview/endpoints-available-for-github-apps.md index 99648a4323..9ae64ab8c3 100644 --- a/translations/ru-RU/content/rest/overview/endpoints-available-for-github-apps.md +++ b/translations/ru-RU/content/rest/overview/endpoints-available-for-github-apps.md @@ -11,7 +11,7 @@ versions: You must use an installation access token to access endpoints using your {% data variables.product.prodname_github_app %}. For more information, see "[Authenticating with {% data variables.product.prodname_github_apps %}](/apps/building-github-apps/authenticating-with-github-apps/#authenticating-as-an-installation)." -{% for thing in rest.operationsEnabledForApps[currentVersion] %} +{% for thing in rest.operationsEnabledForGitHubApps[currentVersion] %} {% assign category = thing[0] %} {% assign operations = thing[1] %} {% if operations.size > 0 %} diff --git a/translations/ru-RU/content/rest/overview/resources-in-the-rest-api.md b/translations/ru-RU/content/rest/overview/resources-in-the-rest-api.md index 0c73a72f62..b747ea7a1c 100644 --- a/translations/ru-RU/content/rest/overview/resources-in-the-rest-api.md +++ b/translations/ru-RU/content/rest/overview/resources-in-the-rest-api.md @@ -35,13 +35,12 @@ $ curl -i {% data variables.product.api_url_pre %}/users/octocat/orgs > Server: nginx > Date: Fri, 12 Oct 2012 23:33:14 GMT > Content-Type: application/json; charset=utf-8 -> Connection: keep-alive > Status: 200 OK > ETag: "a00049ba79152d03380c34652f2cb612" > X-GitHub-Media-Type: github.v3 > X-RateLimit-Limit: 5000 > X-RateLimit-Remaining: 4987 -> X-RateLimit-Reset: 1350085394{% if currentVersion != "free-pro-team@latest" %} +> X-RateLimit-Reset: 1350085394{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: {{ currentVersion }}.0{% endif %} > Content-Length: 5 > Cache-Control: max-age=0, private, must-revalidate @@ -108,7 +107,7 @@ curl -u my_client_id:my_client_secret '{% data variables.product.api_url_pre %}/ Using your `client_id` and `client_secret` does _not_ authenticate as a user, it will only identify your OAuth application to increase your rate limit. Permissions are only granted to users, not applications, and you will only get back data that an unauthenticated user would see. For this reason, you should only use the OAuth2 key/secret in server-to-server scenarios. Don't leak your OAuth application's client secret to your users. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} You will be unable to authenticate using your OAuth2 key and secret while in private mode, and trying to authenticate will return `401 Unauthorized`. For more information, see "[Enabling private mode](/enterprise/admin/installation/enabling-private-mode)". {% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -164,10 +163,10 @@ $ curl -i -u username -d '{"scopes":["public_repo"]}' {% data variables.product. You can issue a `GET` request to the root endpoint to get all the endpoint categories that the REST API supports: ```shell -$ curl {% if currentVersion != "free-pro-team@latest" %}-u username:password {% endif %}{% data variables.product.api_url_pre %} +$ curl {% if enterpriseServerVersions contains currentVersion %}-u username:password {% endif %}{% data variables.product.api_url_pre %} ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/ru-RU/content/rest/reference/apps.md b/translations/ru-RU/content/rest/reference/apps.md index 7ff187a1f2..f92e27ab6f 100644 --- a/translations/ru-RU/content/rest/reference/apps.md +++ b/translations/ru-RU/content/rest/reference/apps.md @@ -61,3 +61,12 @@ Be sure to replace stubbed endpoints with production endpoints before deploying {% endfor %} {% endif %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +## Webhooks + +{% for operation in currentRestOperations %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} +{% endfor %} + +{% endif %} \ No newline at end of file diff --git a/translations/ru-RU/content/rest/reference/enterprise-admin.md b/translations/ru-RU/content/rest/reference/enterprise-admin.md index 64157641c9..82e535cc62 100644 --- a/translations/ru-RU/content/rest/reference/enterprise-admin.md +++ b/translations/ru-RU/content/rest/reference/enterprise-admin.md @@ -21,7 +21,7 @@ You can use these endpoints to administer your enterprise. {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Endpoint URLs @@ -39,7 +39,7 @@ http(s)://hostname/ ### Authentication -Your {% data variables.product.product_name %} installation's API endpoints accept [the same authentication methods](/rest/overview/resources-in-the-rest-api#authentication) as the GitHub.com API. You can authenticate yourself with **[OAuth tokens](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** (which can be created using the [Authorizations API](/rest/reference/oauth-authorizations#create-a-new-authorization)) or **[basic authentication](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if currentVersion != "free-pro-team@latest" %} OAuth tokens must have the `site_admin` [OAuth scope](/developers/apps/scopes-for-oauth-apps#available-scopes) when used with Enterprise-specific endpoints.{% endif %} +Your {% data variables.product.product_name %} installation's API endpoints accept [the same authentication methods](/rest/overview/resources-in-the-rest-api#authentication) as the GitHub.com API. You can authenticate yourself with **[OAuth tokens](/apps/building-integrations/setting-up-and-registering-oauth-apps/)** (which can be created using the [Authorizations API](/rest/reference/oauth-authorizations#create-a-new-authorization)) or **[basic authentication](/rest/overview/resources-in-the-rest-api#basic-authentication)**. {% if enterpriseServerVersions contains currentVersion %} OAuth tokens must have the `site_admin` [OAuth scope](/developers/apps/scopes-for-oauth-apps#available-scopes) when used with Enterprise-specific endpoints.{% endif %} Enterprise administration API endpoints are only accessible to authenticated {% data variables.product.product_name %} site administrators, except for the [Management Console](#management-console) API, which requires the [Management Console password](/enterprise/admin/articles/accessing-the-management-console/). @@ -135,7 +135,7 @@ GET /scim/v2/enterprises/{enterprise}/Users/{scim_user_id} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ## Admin stats diff --git a/translations/ru-RU/content/rest/reference/gists.md b/translations/ru-RU/content/rest/reference/gists.md index 5142c1c728..79e9079f1e 100644 --- a/translations/ru-RU/content/rest/reference/gists.md +++ b/translations/ru-RU/content/rest/reference/gists.md @@ -9,7 +9,7 @@ versions: ### Authentication -You can read public gists {% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "2.9" %}and create them for anonymous users without a token.{% else %} anonymously, but you must be signed into GitHub to create gists.{% endif %} To read or write gists on a user's behalf, you need the gist OAuth scope and a token. For more information, see "[Scopes for OAuth Apps](/developers/apps/scopes-for-oauth-apps)." +You can read public gists {% if enterpriseServerVersions contains currentVersion %}and create them for anonymous users without a token.{% else %} anonymously, but you must be signed into GitHub to create gists.{% endif %} To read or write gists on a user's behalf, you need the gist OAuth scope and a token. For more information, see "[Scopes for OAuth Apps](/developers/apps/scopes-for-oauth-apps)." diff --git a/translations/ru-RU/content/rest/reference/orgs.md b/translations/ru-RU/content/rest/reference/orgs.md index 07eaed5dcf..19fc2c63e2 100644 --- a/translations/ru-RU/content/rest/reference/orgs.md +++ b/translations/ru-RU/content/rest/reference/orgs.md @@ -56,5 +56,5 @@ For more best practices, [see our guide](/guides/best-practices-for-integrators/ {% data variables.product.product_name %} will send along several HTTP headers to differentiate between event types and payload identifiers. See [webhook headers](/webhooks/event-payloads/#delivery-headers) for details. {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} diff --git a/translations/ru-RU/content/rest/reference/permissions-required-for-github-apps.md b/translations/ru-RU/content/rest/reference/permissions-required-for-github-apps.md index 6b634b0325..70b539ef6e 100644 --- a/translations/ru-RU/content/rest/reference/permissions-required-for-github-apps.md +++ b/translations/ru-RU/content/rest/reference/permissions-required-for-github-apps.md @@ -577,7 +577,7 @@ _Teams_ - [`GET /orgs/:org/teams`](/v3/teams/#list-teams) (:read) - [`POST /orgs/:org/teams`](/v3/teams/#create-a-team) (:write) - [`GET /orgs/:org/teams/:team_slug`](/v3/teams/#get-a-team-by-name) (:read) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} - [`GET /teams/:team_id`](/v3/teams/#get-a-team) (:read) {% endif %} - [`PATCH /teams/:team_id`](/v3/teams/#update-a-team) (:write) @@ -619,7 +619,7 @@ _Teams_ _Teams_ - [`DELETE /teams/:team_id/projects/:project_id`](/v3/teams/#remove-a-project-from-a-team) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Permission on "organization pre receive hooks" - [`GET /orgs/:org/pre-receive-hooks`](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-an-organization) (:read) @@ -766,7 +766,7 @@ _Reviews_ - [`POST /repos/:owner/:repo/hooks/:hook_id/pings`](/v3/repos/hooks/#ping-a-repository-webhook) (:read) - [`POST /repos/:owner/:repo/hooks/:hook_id/tests`](/v3/repos/hooks/#test-the-push-repository-webhook) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Permission on "repository pre receive hooks" - [`GET /repos/:owner/:repo/pre-receive-hooks`](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-a-repository) (:read) diff --git a/translations/ru-RU/content/rest/reference/repos.md b/translations/ru-RU/content/rest/reference/repos.md index 156a2a3cb6..5b9a531037 100644 --- a/translations/ru-RU/content/rest/reference/repos.md +++ b/translations/ru-RU/content/rest/reference/repos.md @@ -263,7 +263,7 @@ The Repository Webhooks API allows repository admins to manage the post-receive If you would like to set up a single webhook to receive events from all of your organization's repositories, see our API documentation for [Organization Webhooks](/rest/reference/orgs#webhooks). {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} ### Receiving Webhooks @@ -292,14 +292,14 @@ The default format is what [existing post-receive hooks should expect](/post-rec #### Callback URLs Callback URLs can use the `http://` protocol. -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %}You can also `github://` callbacks to specify a GitHub service. +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %}You can also `github://` callbacks to specify a GitHub service. {% data reusables.apps.deprecating_github_services_ghe %} {% endif %} # Send updates to postbin.org http://postbin.org/123 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} # Send updates to Campfire github://campfire?subdomain=github&room=Commits&token=abc123 {% endif %} diff --git a/translations/ru-RU/data/glossaries/external.yml b/translations/ru-RU/data/glossaries/external.yml index 1cc4acd566..916512ab19 100644 --- a/translations/ru-RU/data/glossaries/external.yml +++ b/translations/ru-RU/data/glossaries/external.yml @@ -257,7 +257,7 @@ description: >- Git — это программа с открытым исходным кодом для отслеживания изменений в текстовых файлах. Она была разработана автором операционной системы Linux и является основной технологией, лежащей в основе социального и пользовательского интерфейса GitHub. - - term: Приложение GitHub + term: приложение GitHub description: >- Приложения GitHub предоставляют услуги для всей организации и используют собственные алгоритмы при выполнении своих функций. Их можно настроить непосредственно для учетных записей организаций и пользователей и предоставить им доступ к определенным репозиториям. У них имеются детальные разрешения и встроенные веб-перехватчики. - @@ -268,7 +268,7 @@ description: >- Инструмент для быстрого импорта репозиториев исходного кода, включая коммиты и журнал изменений, в GitHub для пользователей. - - term: Вакансии GitHub + term: вакансии GitHub description: >- Сайт GitHub, где работодатели могут публиковать вакансии, которые могут заинтересовать пользователей GitHub. - @@ -317,7 +317,7 @@ description: >- Автоматически создаваемое изображение, используемое в качестве стандартной фотографии профиля при регистрации пользователя в GitHub. Пользователи могут заменить свой идентикон на желаемую фотографию профиля. - - term: провайдер идентификации + term: поставщик удостоверений description: >- Также называется IdP. Доверенный поставщик, позволяющий использовать единый вход SAML для доступа к другим сайтам. - @@ -417,7 +417,7 @@ description: >- Дочерняя команда родительской команды. Может существовать несколько дочерних (или вложенных) команд. - - term: Сетевая диаграмма + term: Диаграмма сети description: >- Диаграмма репозитория, на которой показана история ветвей всей сети репозитория, включая ветви корневого репозитория и ветви ответвлений, которые содержат уникальные для сети коммиты. - diff --git a/translations/ru-RU/data/glossaries/internal.yml b/translations/ru-RU/data/glossaries/internal.yml index 77dcb04475..6599533df7 100644 --- a/translations/ru-RU/data/glossaries/internal.yml +++ b/translations/ru-RU/data/glossaries/internal.yml @@ -44,7 +44,7 @@ term: активы description: 'Отдельные файлы, например изображения, фотографии, видео и текстовые файлы.' - - term: канал Atom + term: веб-канал Atom description: Легкий XML-формат, упрощающий синдикацию веб-контента. - term: журнал аудита @@ -65,7 +65,7 @@ description: >- Чистый репозиторий обычно представляет собой каталог с соответствующим названием и с расширением .git, который не имеет локально выгруженных копий файлов, изменения которых контролируются. То есть все управляющие и контрольные файлы Git, которые обычно должны находиться в скрытом подкаталоге .git, вместо этого расположены в каталоге repository.git, а все остальные файлы отсутствуют и не выгружаются. Обычно издатели публичных репозиториев обеспечивают свободный доступ к чистым репозиториям. - - term: Средство очистки репозитория BFG + term: Инструмент очистки репозитория BFG description: BFG. Инструмент стороннего разработчика, предназначенный для удаления данных из журнала репозитория Git. - term: объект типа «большой двоичный объект» diff --git a/translations/ru-RU/data/reusables/actions/actions-not-verified.md b/translations/ru-RU/data/reusables/actions/actions-not-verified.md index cb26fa9d61..2ab85ce6c1 100644 --- a/translations/ru-RU/data/reusables/actions/actions-not-verified.md +++ b/translations/ru-RU/data/reusables/actions/actions-not-verified.md @@ -1 +1 @@ -Anyone can publish an action in {% data variables.product.prodname_marketplace %} as long as they meet the terms of service. Unlike apps, {% data variables.product.prodname_actions %} listed in {% data variables.product.prodname_marketplace %} are not verified by {% data variables.product.prodname_dotcom %}. +Anyone can publish an action in {% data variables.product.prodname_marketplace %}. {% data variables.product.prodname_dotcom %} verifies some partner organizations, but unlike verified apps, {% data variables.product.prodname_dotcom %} does not review or verify individual actions listed in {% data variables.product.prodname_marketplace %}. diff --git a/translations/ru-RU/data/reusables/actions/enterprise-beta.md b/translations/ru-RU/data/reusables/actions/enterprise-beta.md index 30eac75a91..5c456da70d 100644 --- a/translations/ru-RU/data/reusables/actions/enterprise-beta.md +++ b/translations/ru-RU/data/reusables/actions/enterprise-beta.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.22" %} {% note %} **Note:** {% data variables.product.prodname_actions %} support on {% data variables.product.prodname_ghe_server %} 2.22 is a limited public beta. To review the external storage requirements and request access to the beta, see "[Enabling {% data variables.product.prodname_actions %} and configuring storage](/enterprise/admin/github-actions/enabling-github-actions-and-configuring-storage)." diff --git a/translations/ru-RU/data/reusables/actions/enterprise-github-hosted-runners.md b/translations/ru-RU/data/reusables/actions/enterprise-github-hosted-runners.md index 178bf09abe..948121d881 100644 --- a/translations/ru-RU/data/reusables/actions/enterprise-github-hosted-runners.md +++ b/translations/ru-RU/data/reusables/actions/enterprise-github-hosted-runners.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} {% note %} **Note:** {% data variables.product.prodname_dotcom %}-hosted runners are not currently supported on {% data variables.product.prodname_ghe_server %}. You can see more information about planned future support on the [{% data variables.product.prodname_roadmap %}](https://github.com/github/roadmap/issues/72). diff --git a/translations/ru-RU/data/reusables/actions/enterprise-marketplace-actions.md b/translations/ru-RU/data/reusables/actions/enterprise-marketplace-actions.md index 5b5987de4b..6d326f2fb2 100644 --- a/translations/ru-RU/data/reusables/actions/enterprise-marketplace-actions.md +++ b/translations/ru-RU/data/reusables/actions/enterprise-marketplace-actions.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/ru-RU/data/reusables/actions/enterprise-setup-prereq.md b/translations/ru-RU/data/reusables/actions/enterprise-setup-prereq.md index 3ead3e20f9..6646511192 100644 --- a/translations/ru-RU/data/reusables/actions/enterprise-setup-prereq.md +++ b/translations/ru-RU/data/reusables/actions/enterprise-setup-prereq.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} #### Using self-hosted runners on {% data variables.product.prodname_ghe_server %} diff --git a/translations/ru-RU/data/reusables/apps/deprecating_auth_with_query_parameters.md b/translations/ru-RU/data/reusables/apps/deprecating_auth_with_query_parameters.md index c7642634c7..68d632051f 100644 --- a/translations/ru-RU/data/reusables/apps/deprecating_auth_with_query_parameters.md +++ b/translations/ru-RU/data/reusables/apps/deprecating_auth_with_query_parameters.md @@ -3,7 +3,7 @@ **Deprecation Notice:** {% data variables.product.prodname_dotcom %} will discontinue authentication to the API using query parameters. Authenticating to the API should be done with [HTTP basic authentication](/v3/auth/#via-oauth-and-personal-access-tokens).{% if currentVersion == "free-pro-team@latest" %} Using query parameters to authenticate to the API will no longer work on May 5, 2021. {% endif %} For more information, including scheduled brownouts, see the [blog post](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/). -{% if currentVersion != "free-pro-team@latest" %} Authentication to the API using query parameters while available is no longer supported due to security concerns. Instead we recommend integrators move their access token, `client_id`, or `client_secret` in the header. {% data variables.product.prodname_dotcom %} will announce the removal of authentication by query parameters with advanced notice. {% endif %} +{% if enterpriseServerVersions contains currentVersion %} Authentication to the API using query parameters while available is no longer supported due to security concerns. Instead we recommend integrators move their access token, `client_id`, or `client_secret` in the header. {% data variables.product.prodname_dotcom %} will announce the removal of authentication by query parameters with advanced notice. {% endif %} {% endwarning %} {% endif %} diff --git a/translations/ru-RU/data/reusables/apps/deprecating_github_services_ghe.md b/translations/ru-RU/data/reusables/apps/deprecating_github_services_ghe.md index ebdcd4af06..72e5d399fb 100644 --- a/translations/ru-RU/data/reusables/apps/deprecating_github_services_ghe.md +++ b/translations/ru-RU/data/reusables/apps/deprecating_github_services_ghe.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% note %} **Note:** GitHub Enterprise release 2.17 and higher no longer allows admins to install new GitHub Services, and existing services will stop working in GitHub Enterprise release 2.20 and higher. You can use the [Replacing GitHub Services guide](/v3/guides/replacing-github-services) to help you update your services to webhooks. diff --git a/translations/ru-RU/data/reusables/apps/deprecating_password_auth.md b/translations/ru-RU/data/reusables/apps/deprecating_password_auth.md index d10ba259e1..9fd86310d3 100644 --- a/translations/ru-RU/data/reusables/apps/deprecating_password_auth.md +++ b/translations/ru-RU/data/reusables/apps/deprecating_password_auth.md @@ -3,7 +3,7 @@ **Deprecation Notice:** {% data variables.product.prodname_dotcom %} will discontinue password authentication to the API. You must now authenticate to the {% data variables.product.prodname_dotcom %} API with an API token, such as an OAuth access token, GitHub App installation access token, or personal access token, depending on what you need to do with the token.{% if currentVersion == "free-pro-team@latest" %} Password authentication to the API will be removed on November 13, 2020.{% endif %} For more information,{% if currentVersion == "free-pro-team@latest" %} including scheduled brownouts,{% endif %} see the [blog post](https://developer.github.com/changes/2020-02-14-deprecating-password-auth/). -{% if currentVersion != "free-pro-team@latest" %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %} will announce the deprecation and provide advanced notice before removing support for this feature.{% endif %} +{% if enterpriseServerVersions contains currentVersion %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %} will announce the deprecation and provide advanced notice before removing support for this feature.{% endif %} {% endwarning %} {% endif %} diff --git a/translations/ru-RU/data/reusables/apps/deprecating_token_oauth_authorizations.md b/translations/ru-RU/data/reusables/apps/deprecating_token_oauth_authorizations.md index 7bd0d49516..333f7b3f53 100644 --- a/translations/ru-RU/data/reusables/apps/deprecating_token_oauth_authorizations.md +++ b/translations/ru-RU/data/reusables/apps/deprecating_token_oauth_authorizations.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% warning %} **Deprecation Notice:** The `token` attribute is deprecated in some OAuth Authorizations API responses: diff --git a/translations/ru-RU/data/reusables/code-scanning/choose-alert-dismissal-reason.md b/translations/ru-RU/data/reusables/code-scanning/choose-alert-dismissal-reason.md new file mode 100644 index 0000000000..e7abf5ece7 --- /dev/null +++ b/translations/ru-RU/data/reusables/code-scanning/choose-alert-dismissal-reason.md @@ -0,0 +1 @@ +It's important to choose the appropriate reason from the drop-down menu as this may affect whether a query continues to be included in future analysis. \ No newline at end of file diff --git a/translations/ru-RU/data/reusables/code-scanning/false-positive-fix-codeql.md b/translations/ru-RU/data/reusables/code-scanning/false-positive-fix-codeql.md index db3da9c9d5..011f129f12 100644 --- a/translations/ru-RU/data/reusables/code-scanning/false-positive-fix-codeql.md +++ b/translations/ru-RU/data/reusables/code-scanning/false-positive-fix-codeql.md @@ -1 +1 @@ -If you close a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." +If you {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." diff --git a/translations/ru-RU/data/reusables/dependabot/automated-tests-note.md b/translations/ru-RU/data/reusables/dependabot/automated-tests-note.md new file mode 100644 index 0000000000..1f15a27f8e --- /dev/null +++ b/translations/ru-RU/data/reusables/dependabot/automated-tests-note.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** It's good practice to have automated tests and acceptance processes in place so that checks are carried out before the pull request is merged. This is particularly important if the suggested version to upgrade to contains additional functionality, or a change that breaks your project's code. For more information about continuous integration, see "[About continuous integration](/actions/building-and-testing-code-with-continuous-integration/about-continuous-integration)." + +{% endnote %} diff --git a/translations/ru-RU/data/reusables/dependabot/pull-request-introduction.md b/translations/ru-RU/data/reusables/dependabot/pull-request-introduction.md new file mode 100644 index 0000000000..7494d21059 --- /dev/null +++ b/translations/ru-RU/data/reusables/dependabot/pull-request-introduction.md @@ -0,0 +1 @@ +{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot_short %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)." \ No newline at end of file diff --git a/translations/ru-RU/data/reusables/dependabot/supported-package-managers.md b/translations/ru-RU/data/reusables/dependabot/supported-package-managers.md index 22b7b86792..4d60df37bb 100644 --- a/translations/ru-RU/data/reusables/dependabot/supported-package-managers.md +++ b/translations/ru-RU/data/reusables/dependabot/supported-package-managers.md @@ -7,7 +7,7 @@ | Elm: `elm` | | | git submodule: `gitsubmodule` | | | GitHub Actions: `github-actions` | | -| Go modules: `gomod` | | +| Go modules: `gomod` | **X** | | Gradle: `gradle` | | | Maven: `maven` | | | Mix: `mix` | | diff --git a/translations/ru-RU/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md b/translations/ru-RU/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md new file mode 100644 index 0000000000..11f71b27bd --- /dev/null +++ b/translations/ru-RU/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md @@ -0,0 +1,5 @@ +1. Navigate to {% data variables.product.prodname_dotcom_the_website %}. + +1. In the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) + +1. In the list of enterprises, click the enterprise you want to view. ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png) diff --git a/translations/ru-RU/data/reusables/enterprise-accounts/access-enterprise.md b/translations/ru-RU/data/reusables/enterprise-accounts/access-enterprise.md index 2a7bee222c..66edf20433 100644 --- a/translations/ru-RU/data/reusables/enterprise-accounts/access-enterprise.md +++ b/translations/ru-RU/data/reusables/enterprise-accounts/access-enterprise.md @@ -1,3 +1,17 @@ -1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on GitHub](/assets/images/help/enterprises/your-enterprises.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) 1. In the list of enterprises, click the enterprise you want to view. ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png) + +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %} + +1. Navigate to your enterprise account by visiting {% raw %}https://HOSTNAME/enterprises/ENTERPRISE-NAME{% endraw %}, replacing `HOSTNAME` with your instance's hostname and `ENTERPRISE-NAME` with your enterprise account's name. + +{% elsif enterpriseServerVersions contains currentVersion %} + +1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Enterprise settings**. !["Enterprise settings" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/enterprise/settings/enterprise-settings.png) + +{% endif %} diff --git a/translations/ru-RU/data/reusables/enterprise-accounts/license-tab.md b/translations/ru-RU/data/reusables/enterprise-accounts/license-tab.md index 45482a5843..f6f2068da3 100644 --- a/translations/ru-RU/data/reusables/enterprise-accounts/license-tab.md +++ b/translations/ru-RU/data/reusables/enterprise-accounts/license-tab.md @@ -1 +1,9 @@ -1. In the left sidebar, click **License**. ![License tab in the enterprise server settings sidebar](/assets/images/enterprise/business-accounts/license-tab.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. In the left sidebar, click **Enterprise licensing**. !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) + +{% else %} + +1. In the left sidebar, click **License**. !["License" tab in the enterprise account settings sidebar](/assets/images/enterprise/enterprises/license.png) + +{% endif %} diff --git a/translations/ru-RU/data/reusables/enterprise/rate_limit.md b/translations/ru-RU/data/reusables/enterprise/rate_limit.md index ddf01e8d88..7412078c13 100644 --- a/translations/ru-RU/data/reusables/enterprise/rate_limit.md +++ b/translations/ru-RU/data/reusables/enterprise/rate_limit.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Note that the limits mentioned above are the default rate limits for a {% data variables.product.prodname_ghe_server %} instance. Contact your site administrator to confirm if rate limits are enabled and how they are configured. {% endif %} diff --git a/translations/ru-RU/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md b/translations/ru-RU/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md index 42247032b4..7b4c3f1ab5 100644 --- a/translations/ru-RU/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md +++ b/translations/ru-RU/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md @@ -9,7 +9,7 @@ - Choose **{% data variables.product.support_ticket_priority_urgent %}** to report {% if currentVersion == "free-pro-team@latest" %}critical system failure{% else %}fatal system failures, outages impacting critical system operations, security incidents, and expired licenses{% endif %}. - Choose **{% data variables.product.support_ticket_priority_high %}** to report issues impacting business operations, including {% if currentVersion == "free-pro-team@latest" %}removing sensitive data (commits, issues, pull requests, uploaded attachments) from your own accounts and organization restorations{% else %}system performance issues{% endif %}, or to report critical bugs. - Choose **{% data variables.product.support_ticket_priority_normal %}** to {% if currentVersion == "free-pro-team@latest" %}request account recovery or spam unflagging, report user login issues{% else %}make technical requests like configuration changes and third-party integrations{% endif %}, and to report non-critical bugs. - - Choose **{% data variables.product.support_ticket_priority_low %}** to ask general questions and submit requests for new features, purchases, training, or health checks.{% if currentVersion != "free-pro-team@latest" %} + - Choose **{% data variables.product.support_ticket_priority_low %}** to ask general questions and submit requests for new features, purchases, training, or health checks.{% if enterpriseServerVersions contains currentVersion %} 1. From the " {% data variables.product.prodname_enterprise %} Series" drop-down menu, select the version of {% data variables.product.prodname_ghe_server %} you're using. ![{% data variables.product.prodname_enterprise %} Series drop-down menu](/assets/images/enterprise/support/support-ticket-ghes-series.png) diff --git a/translations/ru-RU/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md b/translations/ru-RU/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md index 67f68c6f7e..7ee7b5cb83 100644 --- a/translations/ru-RU/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md +++ b/translations/ru-RU/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md @@ -1,5 +1,5 @@ 1. Click **Submit**. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If you chose not to include diagnostics with your support ticket, you can share diagnostic information with {% data variables.product.prodname_enterprise %} Support after submitting your support request. For more information, see "[Providing data to {% data variables.product.prodname_dotcom %} Support](/enterprise/admin/guides/enterprise-support/providing-data-to-github-support)."{% endif %} diff --git a/translations/ru-RU/data/reusables/enterprise_installation/aws-recommended-instance-types.md b/translations/ru-RU/data/reusables/enterprise_installation/aws-recommended-instance-types.md index bd0ccf27d4..c70974f1cf 100644 --- a/translations/ru-RU/data/reusables/enterprise_installation/aws-recommended-instance-types.md +++ b/translations/ru-RU/data/reusables/enterprise_installation/aws-recommended-instance-types.md @@ -1,5 +1,5 @@ Based on your user license count, we recommend the following instance types. | -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} | User licenses | Recommended type | |:------------------------------ | ----------------:| | Trial, demo, or 10 light users | r4.large | diff --git a/translations/ru-RU/data/reusables/enterprise_installation/aws-supported-instance-types.md b/translations/ru-RU/data/reusables/enterprise_installation/aws-supported-instance-types.md index 7b4af4b392..5cf0c50693 100644 --- a/translations/ru-RU/data/reusables/enterprise_installation/aws-supported-instance-types.md +++ b/translations/ru-RU/data/reusables/enterprise_installation/aws-supported-instance-types.md @@ -28,9 +28,9 @@ | ----------------- | -------------------------------------------------------------------- | | R4 | r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge | -| EC2 instance type | Model | -| ----------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} +| EC2 instance type | Model | +| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} | EC2 instance type | Model | | ----------------- | ------------------------ | diff --git a/translations/ru-RU/data/reusables/files/add-file.md b/translations/ru-RU/data/reusables/files/add-file.md index daf8d37dba..9eaecc80e4 100644 --- a/translations/ru-RU/data/reusables/files/add-file.md +++ b/translations/ru-RU/data/reusables/files/add-file.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Above the list of files, click **Create new file**. !["Create new file" button](/assets/images/help/repository/create_new_file.png) {% else %} 1. Above the list of files, using the **Add file** drop-down, click **Create new file**. !["Create new file" in the "Add file" dropdown](/assets/images/help/repository/create_new_file.png) diff --git a/translations/ru-RU/data/reusables/gated-features/code-scanning.md b/translations/ru-RU/data/reusables/gated-features/code-scanning.md index a1aca3e675..2bcd80c1d4 100644 --- a/translations/ru-RU/data/reusables/gated-features/code-scanning.md +++ b/translations/ru-RU/data/reusables/gated-features/code-scanning.md @@ -1 +1 @@ -{% data variables.product.prodname_code_scanning_capc %} is available in public repositories, and in public and private repositories owned by organizations with a license for {% data variables.product.prodname_advanced_security %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +{% data variables.product.prodname_code_scanning_capc %} is available {% if currentVersion == "free-pro-team@latest" %}in public repositories, and in private repositories owned by organizations with {% else %}if you have {% endif %}an {% data variables.product.prodname_advanced_security %} license. {% data reusables.gated-features.more-info %} diff --git a/translations/ru-RU/data/reusables/gated-features/draft-prs.md b/translations/ru-RU/data/reusables/gated-features/draft-prs.md index 0379025602..52b7344ec8 100644 --- a/translations/ru-RU/data/reusables/gated-features/draft-prs.md +++ b/translations/ru-RU/data/reusables/gated-features/draft-prs.md @@ -1 +1 @@ -Draft pull requests are 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 %}{% if currentVersion != "free-pro-team@latest" %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +Draft pull requests are 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 %}{% if enterpriseServerVersions contains currentVersion %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} diff --git a/translations/ru-RU/data/reusables/gist/anonymous-gists-cannot-be-deleted.md b/translations/ru-RU/data/reusables/gist/anonymous-gists-cannot-be-deleted.md index 44325424b3..ade80ffc33 100644 --- a/translations/ru-RU/data/reusables/gist/anonymous-gists-cannot-be-deleted.md +++ b/translations/ru-RU/data/reusables/gist/anonymous-gists-cannot-be-deleted.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% warning %} **Warning:** Anonymous gists cannot be deleted from the web browser. To have an anonymous gist deleted, contact {% data variables.contact.contact_support %}. Please provide the URL of the gist you wish to delete. diff --git a/translations/ru-RU/data/reusables/github-actions/macos-runner-preview.md b/translations/ru-RU/data/reusables/github-actions/macos-runner-preview.md new file mode 100644 index 0000000000..88a2d482c4 --- /dev/null +++ b/translations/ru-RU/data/reusables/github-actions/macos-runner-preview.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** The MacOS 11.0 virtual environment is currently provided as a preview only. The `macos-latest` YAML workflow label still uses the MacOS 10.15 virtual environment. + +{% endnote %} diff --git a/translations/ru-RU/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md b/translations/ru-RU/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md index d23a898876..35bb629135 100644 --- a/translations/ru-RU/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md +++ b/translations/ru-RU/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md @@ -1,9 +1,9 @@ -A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. To manage a self-hosted runner, you must have the following permissions, depending on where the self-hosted runner was added: +A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. To manage a self-hosted runner, you must have the following permissions, depending on where the self-hosted runner was added: - **User repository**: You must be the repository owner. - **Organization**: You must be an organization owner. - **Organization repository**: You must be an organization owner, or have admin access to the repository. {% if currentVersion == "free-pro-team@latest" %} - **Enterprise account**: You must be an enterprise owner. -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} - **Enterprise**: You must be a {% data variables.product.prodname_enterprise %} site administrator. {% endif %} diff --git a/translations/ru-RU/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md b/translations/ru-RU/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md index 51b89e7e7a..37ea26c669 100644 --- a/translations/ru-RU/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md +++ b/translations/ru-RU/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md @@ -1,6 +1,6 @@ 1. Navigate to where your self-hosted runner is registered: * **In an organization or repository**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. - * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: 1. In the upper-right corner of any page, click {% octicon "rocket" aria-label="The rocket ship" %}. 1. In the left sidebar, click **Enterprise overview**. @@ -9,4 +9,4 @@ * **In an organization or repository**: click **Actions** in the left sidebar. ![Actions setting](/assets/images/help/settings/settings-sidebar-actions.png) - * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". diff --git a/translations/ru-RU/data/reusables/github-actions/supported-github-runners.md b/translations/ru-RU/data/reusables/github-actions/supported-github-runners.md index 0812cf7d05..37caf3e2cc 100644 --- a/translations/ru-RU/data/reusables/github-actions/supported-github-runners.md +++ b/translations/ru-RU/data/reusables/github-actions/supported-github-runners.md @@ -4,4 +4,5 @@ | Ubuntu 20.04 | `ubuntu-20.04` | | Ubuntu 18.04 | `ubuntu-latest` or `ubuntu-18.04` | | Ubuntu 16.04 | `ubuntu-16.04` | +| macOS Big Sur 11.0 | `macos-11.0` | | macOS Catalina 10.15 | `macos-latest` or `macos-10.15` | diff --git a/translations/ru-RU/data/reusables/github-actions/usage-matrix-limits.md b/translations/ru-RU/data/reusables/github-actions/usage-matrix-limits.md index 8ffadd1225..76d5a907a4 100644 --- a/translations/ru-RU/data/reusables/github-actions/usage-matrix-limits.md +++ b/translations/ru-RU/data/reusables/github-actions/usage-matrix-limits.md @@ -1 +1 @@ -- **Job matrix** - A job matrix can generate a maximum of 256 jobs per workflow run. This limit also applies to self-hosted runners. +A job matrix can generate a maximum of 256 jobs per workflow run. This limit also applies to self-hosted runners. diff --git a/translations/ru-RU/data/reusables/notifications/outbound_email_tip.md b/translations/ru-RU/data/reusables/notifications/outbound_email_tip.md index 5a7b57bc35..292e34810a 100644 --- a/translations/ru-RU/data/reusables/notifications/outbound_email_tip.md +++ b/translations/ru-RU/data/reusables/notifications/outbound_email_tip.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} You'll only receive email notifications if outbound email support is enabled on {% data variables.product.product_location_enterprise %}. For more information, contact your site administrator. diff --git a/translations/ru-RU/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md b/translations/ru-RU/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md new file mode 100644 index 0000000000..6b3de47d4c --- /dev/null +++ b/translations/ru-RU/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md @@ -0,0 +1,3 @@ +You can choose the delivery method for notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} on repositories that you are watching, as well as the frequency at which the notifications are sent to you. + + diff --git a/translations/ru-RU/data/reusables/notifications/vulnerable-dependency-notification-options.md b/translations/ru-RU/data/reusables/notifications/vulnerable-dependency-notification-options.md new file mode 100644 index 0000000000..29e67dd447 --- /dev/null +++ b/translations/ru-RU/data/reusables/notifications/vulnerable-dependency-notification-options.md @@ -0,0 +1,33 @@ +{% if currentVersion == "free-pro-team@latest" %} +By default, you will receive +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) + +You can customize the way you are notified about security alerts. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} diff --git a/translations/ru-RU/data/reusables/package_registry/admins-can-configure-package-types.md b/translations/ru-RU/data/reusables/package_registry/admins-can-configure-package-types.md index efe344932d..23e237356b 100644 --- a/translations/ru-RU/data/reusables/package_registry/admins-can-configure-package-types.md +++ b/translations/ru-RU/data/reusables/package_registry/admins-can-configure-package-types.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **Note:** This package type may not be available for your instance, because site administrators can enable or disable each supported package type. For more information, see "[Configuring packages support for your enterprise](/enterprise/admin/packages/configuring-packages-support-for-your-enterprise)." diff --git a/translations/ru-RU/data/reusables/package_registry/docker_registry_deprecation_status.md b/translations/ru-RU/data/reusables/package_registry/docker_registry_deprecation_status.md index 79e9650f34..2df9364c31 100644 --- a/translations/ru-RU/data/reusables/package_registry/docker_registry_deprecation_status.md +++ b/translations/ru-RU/data/reusables/package_registry/docker_registry_deprecation_status.md @@ -1,5 +1,5 @@ {% warning %} -**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if currentVersion != "free-pro-team@latest" %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} +**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if enterpriseServerVersions contains currentVersion %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} {% endwarning %} diff --git a/translations/ru-RU/data/reusables/package_registry/packages-ghes-release-stage.md b/translations/ru-RU/data/reusables/package_registry/packages-ghes-release-stage.md index 66d73926c6..03d9b25f84 100644 --- a/translations/ru-RU/data/reusables/package_registry/packages-ghes-release-stage.md +++ b/translations/ru-RU/data/reusables/package_registry/packages-ghes-release-stage.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **Note:** {% data variables.product.prodname_registry %} is currently in beta for {% data variables.product.prodname_ghe_server %} 2.22. To join the beta for your instance, use the [sign-up form](https://resources.github.com/beta-signup/). diff --git a/translations/ru-RU/data/reusables/pages/build-failure-email-server.md b/translations/ru-RU/data/reusables/pages/build-failure-email-server.md index d61fac9ecc..bd6581b553 100644 --- a/translations/ru-RU/data/reusables/pages/build-failure-email-server.md +++ b/translations/ru-RU/data/reusables/pages/build-failure-email-server.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} You will only receive an email if outbound email support is enabled on {% data variables.product.product_location_enterprise %}. For more information, contact your site administrator. diff --git a/translations/ru-RU/data/reusables/pages/private_pages_are_public_warning.md b/translations/ru-RU/data/reusables/pages/private_pages_are_public_warning.md index 2579c5d10f..eb8dfe837d 100644 --- a/translations/ru-RU/data/reusables/pages/private_pages_are_public_warning.md +++ b/translations/ru-RU/data/reusables/pages/private_pages_are_public_warning.md @@ -1,5 +1,5 @@ {% warning %} - **Warning**: {% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. If you have sensitive data in your site's repository, you may want to remove it before publishing. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." + **Warning**: {% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. If you have sensitive data in your site's repository, you may want to remove it before publishing. For more information, see{% if enterpriseServerVersions contains currentVersion %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." {% endwarning %} diff --git a/translations/ru-RU/data/reusables/pre-release-program/fury-pre-release.md b/translations/ru-RU/data/reusables/pre-release-program/fury-pre-release.md index 5e63be7160..25b74a97ea 100644 --- a/translations/ru-RU/data/reusables/pre-release-program/fury-pre-release.md +++ b/translations/ru-RU/data/reusables/pre-release-program/fury-pre-release.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% note %} **Note:** {% data variables.product.prodname_github_app %} Manifests are currently available for developers to preview. To access this API during the preview period, you must provide a custom [media type](/v3/media) in the `Accept` header: diff --git a/translations/ru-RU/data/reusables/pre-release-program/machine-man-preview.md b/translations/ru-RU/data/reusables/pre-release-program/machine-man-preview.md index bdcee03dec..d18399b663 100644 --- a/translations/ru-RU/data/reusables/pre-release-program/machine-man-preview.md +++ b/translations/ru-RU/data/reusables/pre-release-program/machine-man-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **Note:** To access the API with your GitHub App, you must provide a custom [media type](/v3/media) in the `Accept` Header for your requests. diff --git a/translations/ru-RU/data/reusables/pre-release-program/sailor-v-preview.md b/translations/ru-RU/data/reusables/pre-release-program/sailor-v-preview.md index 271ed23002..fcf2e98e68 100644 --- a/translations/ru-RU/data/reusables/pre-release-program/sailor-v-preview.md +++ b/translations/ru-RU/data/reusables/pre-release-program/sailor-v-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **Note:** You can now use the REST API to add a reason when you lock an issue, and you will see lock reasons in responses that include issues or pull requests. You will also see lock reasons in `locked` events. This feature is currently available for developers to preview. See the [blog post](https://developer.github.com/changes/2018-01-10-lock-reason-api-preview) for full details. To access this feature, you must provide a custom [media type](/v3/media) in the `Accept` header: diff --git a/translations/ru-RU/data/reusables/profile/user_profile_page_block_or_report.md b/translations/ru-RU/data/reusables/profile/user_profile_page_block_or_report.md index 0af470cffd..65e0ff56f1 100644 --- a/translations/ru-RU/data/reusables/profile/user_profile_page_block_or_report.md +++ b/translations/ru-RU/data/reusables/profile/user_profile_page_block_or_report.md @@ -1 +1 @@ -1. In the left sidebar, under the user's profile picture, click **Block or report user**. ![Block or report user link](/assets/images/help/profile/profile-block-or-report-button.png) +1. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Block or report user**. ![Block or report user link](/assets/images/help/profile/profile-block-or-report-button.png) diff --git a/translations/ru-RU/data/reusables/project-management/project-progress-locations.md b/translations/ru-RU/data/reusables/project-management/project-progress-locations.md index d8863f3c3b..9ac6c41be9 100644 --- a/translations/ru-RU/data/reusables/project-management/project-progress-locations.md +++ b/translations/ru-RU/data/reusables/project-management/project-progress-locations.md @@ -1 +1 @@ -When project board automation is enabled, a progress bar appears above the project board, on the project listing page, in the issue sidebar and in references to the project on other project boards. +If progress tracking is enabled, a progress bar appears above the project board, on the project listing page, in the issue sidebar, and in references to the project on other project boards. diff --git a/translations/ru-RU/data/reusables/pull_requests/pull_request_merges_and_contributions.md b/translations/ru-RU/data/reusables/pull_requests/pull_request_merges_and_contributions.md index 1117b51b1e..10c8bdf4b3 100644 --- a/translations/ru-RU/data/reusables/pull_requests/pull_request_merges_and_contributions.md +++ b/translations/ru-RU/data/reusables/pull_requests/pull_request_merges_and_contributions.md @@ -1,6 +1,6 @@ {% note %} -**Notes:**{% if currentVersion != "free-pro-team@latest" %} +**Notes:**{% if enterpriseServerVersions contains currentVersion %} - To appear on your profile contributions graph, co-authored commits must meet the same criteria as commits with one author.{% endif %} - When rebasing commits, the original authors of the commit and the person who rebased the commits, whether on the command line or on {% data variables.product.product_location %}, receive contribution credit. diff --git a/translations/ru-RU/data/reusables/repositories/about-internal-repos.md b/translations/ru-RU/data/reusables/repositories/about-internal-repos.md index d921cfd133..cfa9b36198 100644 --- a/translations/ru-RU/data/reusables/repositories/about-internal-repos.md +++ b/translations/ru-RU/data/reusables/repositories/about-internal-repos.md @@ -1 +1 @@ -You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if currentVersion != "free-pro-team@latest" %}, even with private mode disabled{% endif %}. +You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if enterpriseServerVersions contains currentVersion %}, even with private mode disabled{% endif %}. diff --git a/translations/ru-RU/data/reusables/repositories/copy-clone-url.md b/translations/ru-RU/data/reusables/repositories/copy-clone-url.md index 2f24104d3c..6d0bfc9d9c 100644 --- a/translations/ru-RU/data/reusables/repositories/copy-clone-url.md +++ b/translations/ru-RU/data/reusables/repositories/copy-clone-url.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Under the repository name, click **Clone or download**. ![Clone or download button](/assets/images/help/repository/clone-repo-clone-url-button.png) 2. To clone the repository using HTTPS, under "Clone with HTTPS", click {% octicon "clippy" aria-label="The clipboard icon" %}. diff --git a/translations/ru-RU/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md b/translations/ru-RU/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md index 9a8ba68745..3e567182d1 100644 --- a/translations/ru-RU/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md +++ b/translations/ru-RU/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md @@ -2,7 +2,7 @@ **Warning:** -- If you remove a person’s access to a private repository, any of their forks of that private repository are deleted. Local clones of the private repository are retained. If a team's access to a private repository is revoked or a team with access to a private repository is deleted, and team members do not have access to the repository through another team, private forks of the repository will be deleted.{% if currentVersion != "free-pro-team@latest" %} +- If you remove a person’s access to a private repository, any of their forks of that private repository are deleted. Local clones of the private repository are retained. If a team's access to a private repository is revoked or a team with access to a private repository is deleted, and team members do not have access to the repository through another team, private forks of the repository will be deleted.{% if enterpriseServerVersions contains currentVersion %} - When [LDAP Sync is enabled](/enterprise/admin/authentication/using-ldap#enabling-ldap-sync), if you remove a person from a repository, they will lose access but their forks will not be deleted. If the person is added to a team with access to the original organization repository within three months, their access to the forks will be automatically restored on the next sync.{% endif %} - You are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property. diff --git a/translations/ru-RU/data/reusables/repositories/enable-security-alerts.md b/translations/ru-RU/data/reusables/repositories/enable-security-alerts.md index 4ab63edcb3..d47e84d4f6 100644 --- a/translations/ru-RU/data/reusables/repositories/enable-security-alerts.md +++ b/translations/ru-RU/data/reusables/repositories/enable-security-alerts.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Your site administrator must enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location_enterprise %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/ru-RU/data/reusables/repositories/new-pull-request.md b/translations/ru-RU/data/reusables/repositories/new-pull-request.md index 59aa6d504b..6f072a6271 100644 --- a/translations/ru-RU/data/reusables/repositories/new-pull-request.md +++ b/translations/ru-RU/data/reusables/repositories/new-pull-request.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. To the right of the Branch menu, click **New pull request**. !["Pull request" link above list of files](/assets/images/help/pull_requests/pull-request-start-review-button.png) {% else %} 1. Above the list of files, click diff --git a/translations/ru-RU/data/reusables/repositories/open-with-github-desktop.md b/translations/ru-RU/data/reusables/repositories/open-with-github-desktop.md index 1759292143..068cce834c 100644 --- a/translations/ru-RU/data/reusables/repositories/open-with-github-desktop.md +++ b/translations/ru-RU/data/reusables/repositories/open-with-github-desktop.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Under your repository name, click **Clone or download**. ![Clone or download button](/assets/images/help/repository/clone-repo-clone-url-button.png) 1. Click **Open in Desktop** to clone the repository and open it in {% data variables.product.prodname_desktop %}. diff --git a/translations/ru-RU/data/reusables/repositories/releases.md b/translations/ru-RU/data/reusables/repositories/releases.md index 8805fe71ad..0281e389b2 100644 --- a/translations/ru-RU/data/reusables/repositories/releases.md +++ b/translations/ru-RU/data/reusables/repositories/releases.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. Under your repository name, click **Releases**. ![Releases tab](/assets/images/help/releases/release-link.png) diff --git a/translations/ru-RU/data/reusables/repositories/tracks-vulnerabilities.md b/translations/ru-RU/data/reusables/repositories/tracks-vulnerabilities.md index d2ad199b79..f0d6decd8f 100644 --- a/translations/ru-RU/data/reusables/repositories/tracks-vulnerabilities.md +++ b/translations/ru-RU/data/reusables/repositories/tracks-vulnerabilities.md @@ -3,4 +3,3 @@ We add vulnerabilities to the {% data variables.product.prodname_advisory_databa - A combination of machine learning and human review to detect vulnerabilities in public commits on {% data variables.product.prodname_dotcom %} - Security advisories reported on {% data variables.product.prodname_dotcom %} - The [npm Security advisories](https://www.npmjs.com/advisories) database -- [FriendsOfPHP](https://github.com/FriendsOfPHP/security-advisories) diff --git a/translations/ru-RU/data/reusables/search/syntax_tips.md b/translations/ru-RU/data/reusables/search/syntax_tips.md index 6dc749ad94..d757af82e4 100644 --- a/translations/ru-RU/data/reusables/search/syntax_tips.md +++ b/translations/ru-RU/data/reusables/search/syntax_tips.md @@ -1,6 +1,6 @@ {% tip %} -**Tips:**{% if currentVersion != "free-pro-team@latest" %} +**Tips:**{% if enterpriseServerVersions contains currentVersion %} - This article contains example searches on the {% data variables.product.prodname_dotcom %}.com website, but you can use the same search filters on {% data variables.product.product_location_enterprise %}.{% endif %} - For a list of search syntaxes that you can add to any search qualifier to further improve your results, see "[Understanding the search syntax](/articles/understanding-the-search-syntax)". - Use quotations around multi-word search terms. For example, if you want to search for issues with the label "In progress," you'd search for `label:"in progress"`. Search is not case sensitive. diff --git a/translations/ru-RU/data/reusables/two_fa/auth_methods_2fa.md b/translations/ru-RU/data/reusables/two_fa/auth_methods_2fa.md index 35524bd9ba..57703189c2 100644 --- a/translations/ru-RU/data/reusables/two_fa/auth_methods_2fa.md +++ b/translations/ru-RU/data/reusables/two_fa/auth_methods_2fa.md @@ -1,10 +1,10 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Authentication methods that support 2FA -| Authentication Method | Description | Two-factor authentication support | -| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Built-in | Authentication is performed against user accounts that are stored on the {% data variables.product.prodname_ghe_server %} appliance. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization administrators can require 2FA to be enabled for members of the organization. |{% if currentVersion != "free-pro-team@latest" %} +| Authentication Method | Description | Two-factor authentication support | +| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Built-in | Authentication is performed against user accounts that are stored on the {% data variables.product.prodname_ghe_server %} appliance. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization administrators can require 2FA to be enabled for members of the organization. |{% if enterpriseServerVersions contains currentVersion %} | Built-in authentication with an identity provider | Authentication is performed against user accounts that are stored on the identity provider. | Dependant on the identity provider.{% endif %} -| LDAP | Allows integration with your company directory service for authentication. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization administrators can require 2FA to be enabled for members of the organization. | +| LDAP | Allows integration with your company directory service for authentication. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization administrators can require 2FA to be enabled for members of the organization. | | SAML | Authentication is performed on an external identity provider. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %} | CAS | Single sign-on service is provided by an external server. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %}{% endif %} diff --git a/translations/ru-RU/data/reusables/webhooks/webhooks-rest-api-links.md b/translations/ru-RU/data/reusables/webhooks/webhooks-rest-api-links.md new file mode 100644 index 0000000000..3882222b05 --- /dev/null +++ b/translations/ru-RU/data/reusables/webhooks/webhooks-rest-api-links.md @@ -0,0 +1,4 @@ +You can use the repository, organization, and app webhook REST APIs to create, update, delete, and ping webhooks. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}You can also use the REST API to change the configuration of the webhook. For example, you can modify the payload URL, content type, SSL verification, and secret. {% endif %}For more information, see: +- [Repository Webhooks REST API](/rest/reference/repos#webhooks) +- [Organization Webhooks REST API](/rest/reference/orgs#webhooks){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +- [GitHub App Webhooks REST API](/rest/reference/apps#webhooks){% endif %} diff --git a/translations/zh-CN/content/actions/creating-actions/creating-a-composite-run-steps-action.md b/translations/zh-CN/content/actions/creating-actions/creating-a-composite-run-steps-action.md index 9c046cca64..857325f15f 100644 --- a/translations/zh-CN/content/actions/creating-actions/creating-a-composite-run-steps-action.md +++ b/translations/zh-CN/content/actions/creating-actions/creating-a-composite-run-steps-action.md @@ -36,7 +36,7 @@ versions: echo "Goodbye" ``` -3. From your terminal, make `goodbye.sh` executable. +3. 从您的终端创建 `goodbye.sh` 可执行文件。 ```shell chmod +x goodbye.sh @@ -93,7 +93,7 @@ versions: git push ``` -1. From your terminal, add a tag. This example uses a tag called `v1`. 更多信息请参阅“[关于操作](/actions/creating-actions/about-actions#using-release-management-for-actions)”。 +1. 从终端添加标记。 此示例使用名为 `v1` 的标记。 更多信息请参阅“[关于操作](/actions/creating-actions/about-actions#using-release-management-for-actions)”。 ```shell git tag -a -m "Description of this release" v1 @@ -104,7 +104,7 @@ versions: 以下工作流程代码使用您在“[创建操作元数据文件](/actions/creating-actions/creating-a-composite-run-steps-action#creating-an-action-metadata-file)”中设置的已完成 hello world 操作。 -Copy the workflow code into a `.github/workflows/main.yml` file in another repository, but replace `actions/hello-world-composite-run-steps-action@v1` with the repository and tag you created. 您还可以将 `who-to-greet` 输入替换为您的名称。 +将工作流程代码复制到另一个仓库中的 `.github/workflows/main.yml` 文件，但用您创建的仓库和标记替换 `actions/hello-world-compposite-run-steps-action@v1`。 您还可以将 `who-to-greet` 输入替换为您的名称。 {% raw %} **.github/workflows/main.yml** diff --git a/translations/zh-CN/content/actions/creating-actions/creating-a-javascript-action.md b/translations/zh-CN/content/actions/creating-actions/creating-a-javascript-action.md index be4c196a2e..f93c36204b 100644 --- a/translations/zh-CN/content/actions/creating-actions/creating-a-javascript-action.md +++ b/translations/zh-CN/content/actions/creating-actions/creating-a-javascript-action.md @@ -262,4 +262,4 @@ jobs: ![在工作流中使用操作的屏幕截图](/assets/images/help/repository/javascript-action-workflow-run-updated.png) {% else %} ![在工作流中使用操作的屏幕截图](/assets/images/help/repository/javascript-action-workflow-run.png) -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/zh-CN/content/actions/guides/building-and-testing-nodejs.md b/translations/zh-CN/content/actions/guides/building-and-testing-nodejs.md index 6576aec10c..9e30bec773 100644 --- a/translations/zh-CN/content/actions/guides/building-and-testing-nodejs.md +++ b/translations/zh-CN/content/actions/guides/building-and-testing-nodejs.md @@ -33,7 +33,7 @@ versions: 要快速开始，请将模板添加到仓库的 `.github/workflows` 目录中。 {% raw %} -```yaml +```yaml{:copy} name: Node.js CI on: [push] diff --git a/translations/zh-CN/content/actions/guides/caching-dependencies-to-speed-up-workflows.md b/translations/zh-CN/content/actions/guides/caching-dependencies-to-speed-up-workflows.md index 9b682ec0f4..964a58b8ab 100644 --- a/translations/zh-CN/content/actions/guides/caching-dependencies-to-speed-up-workflows.md +++ b/translations/zh-CN/content/actions/guides/caching-dependencies-to-speed-up-workflows.md @@ -36,9 +36,9 @@ versions: 使用 `cache` 操作的 `v2`，可以访问具有 `GITHUB_REF` 的任何事件所触发的工作流程中的缓存。 如果使用 `cache` 操作的 `v1`，您只能访问由 `push` 和 `pull_request` 事件触发的工作流程中的缓存，`pull_request` `closed` 事件除外。 更多信息请参阅“[触发工作流程的事件](/actions/reference/events-that-trigger-workflows)”。 -A workflow can access and restore a cache created in the current branch, the base branch (including base branches of forked repositories), or the default branch (usually `main`). For example, a cache created on the default branch would be accessible from any pull request. Also, if the branch `feature-b` has the base branch `feature-a`, a workflow triggered on `feature-b` would have access to caches created in the default branch (`main`), `feature-a`, and `feature-b`. +工作流程可以访问和还原当前分支、基础分支（包括复刻的仓库的基本分支）或默认分支（通常是 `main`）中创建的缓存 例如，在默认分支上创建的缓存可从任何拉取请求访问。 另外，如果分支 `feature-b` 具有基础分支 `feature-a`，则触发于 `feature-b` 的工作流程可以访问默认分支 (`main`)、`feature-a` 和 `feature-b` 中创建的缓存。 -访问限制通过在不同工作流程和分支之间创建逻辑边界来提供缓存隔离和安全。 For example, a cache created for the branch `feature-a` (with the base `main`) would not be accessible to a pull request for the branch `feature-b` (with the base `main`). +访问限制通过在不同工作流程和分支之间创建逻辑边界来提供缓存隔离和安全。 例如， 为分支 `feature-a`（具有基础分支 `main`）创建的缓存将无法访问分支 `feature-b`（具有基础分支 `main`）的拉取请求。 ### 使用 `cache` 操作 @@ -178,14 +178,14 @@ restore-keys: | npm- ``` -For example, if a pull request contains a `feature` branch (the current scope) and targets the default branch (`main`), the action searches for `key` and `restore-keys` in the following order: +例如，如果拉取请求包含 `feature` 分支（当前范围）并针对默认分支 (`main`)，操作将按以下顺序搜索 `key` 和 `restore-keys`： 1. `feature` 分支范围中的键值 `npm-feature-d5ea0750` 1. `feature` 分支范围中的键值 `npm-feature-` 2. `feature` 分支范围中的键值 `npm-` -1. Key `npm-feature-d5ea0750` in the `main` branch scope -3. Key `npm-feature-` in the `main` branch scope -4. Key `npm-` in the `main` branch scope +1. `main` 分支范围中的键值 `npm-feature-d5ea0750` +3. `main` 分支范围中的键值 `npm-feature-` +4. `main` 分支范围中的键值 `npm` ### 使用限制和收回政策 diff --git a/translations/zh-CN/content/actions/guides/storing-workflow-data-as-artifacts.md b/translations/zh-CN/content/actions/guides/storing-workflow-data-as-artifacts.md index 0d48fdd81d..f6a0e16308 100644 --- a/translations/zh-CN/content/actions/guides/storing-workflow-data-as-artifacts.md +++ b/translations/zh-CN/content/actions/guides/storing-workflow-data-as-artifacts.md @@ -20,7 +20,7 @@ versions: 构件允许您在作业完成后保留数据，并与同一工作流程中的另一个作业共享该数据。 构件是指在工作流程运行过程中产生的文件或文件集。 例如，在工作流程运行结束后，您可以使用构件保存您的构建和测试输出。 -{% data reusables.github-actions.artifact-log-retention-statement %} The retention period for a pull request restarts each time someone pushes a new commit to the pull request. +{% data reusables.github-actions.artifact-log-retention-statement %} 每当有人向拉取请求推送新提交时，拉取请求的保留期将重新开始。 以下是您可以上传的一些常见构件： @@ -74,7 +74,7 @@ versions: | ``` -本例向您展示如何创建 Node.js 项目的工作流程，该项目在 `src` 目录中 `builds` 代码，并在 `tests` 目录中运行测试。 您可以假设运行 `npm test` 会产生名为 `code-coverage.html`、存储在 `output/test/` 目录中的代码覆盖报告。 +本例向您展示如何创建 Node.js 项目的工作流程，该项目在 src 目录中 `builds` 代码，并在 `tests` 目录中运行测试。 您可以假设运行 `npm test` 会产生名为 `code-coverage.html`、存储在 `output/test/` 目录中的代码覆盖报告。 工作流程上传 `dist` 目录中的生产构件，但不包括任何 markdown 文件。 它还会上传 `code-coverage.html` 报告作为另一个构件。 @@ -111,9 +111,9 @@ jobs: ![工作流程上传构件工作流程运行的图像](/assets/images/help/repository/upload-build-test-artifact.png) {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -### Configuring a custom artifact retention period +### 配置自定义构件保留期 -You can define a custom retention period for individual artifacts created by a workflow. When using a workflow to create a new artifact, you can use `retention-days` with the `upload-artifact` action. This example demonstrates how to set a custom retention period of 5 days for the artifact named `my-artifact`: +您可以为工作流程创建的单个构件自定义保留期。 使用工作流程创建新构件时，可以同时使用 `retention-days` with the `upload-artifact` 操作。 此示例演示如何为名为 `my-artifact` 的构件设置 5 天的自定义保留期： ``` - name: 'Upload Artifact' @@ -124,18 +124,18 @@ You can define a custom retention period for individual artifacts created by a w retention-days: 5 ``` -The `retention-days` value cannot exceed the retention limit set by the repository, organization, or enterprise. +`retention-days` 值不能超过仓库、组织或企业设置的保留时间限制。 {% endif %} ### 下载或删除构件 -During a workflow run, you can use the [`download-artifact`](https://github.com/actions/download-artifact)action to download artifacts that were previously uploaded in the same workflow run. +在工作流程运行期间，您可以使用 [`download-artifact`](https://github.com/actions/download-artifact) 操作下载以前在同一工作流程运行中上传的构件。 -After a workflow run has been completed, you can download or delete artifacts on {% data variables.product.prodname_dotcom %} or using the REST API. For more information, see "[Downloading workflow artifacts](/actions/managing-workflow-runs/downloading-workflow-artifacts)," "[Removing workflow artifacts](/actions/managing-workflow-runs/removing-workflow-artifacts)," and the "[Artifacts REST API](/v3/actions/artifacts/)." +工作流程运行完成后，您可以在 {% data variables.product.prodname_dotcom %} 上或使用 REST API 下载或删除构件。 更多信息请参阅“[下载工作流程构件](/actions/managing-workflow-runs/downloading-workflow-artifacts)”、“[删除工作流程构件](/actions/managing-workflow-runs/removing-workflow-artifacts)”和“[构件 REST API](/v3/actions/artifacts/)”。 #### 在工作流程运行期间下载构件 -The [`actions/download-artifact`](https://github.com/actions/download-artifact) action can be used to download previously uploaded artifacts during a workflow run. +[`actions/download-artifact`](https://github.com/actions/download-artifact) 操作可用于下载工作流程运行期间之前上传的构件。 {% note %} diff --git a/translations/zh-CN/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/zh-CN/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index 8d7c6be700..1c24c35969 100644 --- a/translations/zh-CN/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/translations/zh-CN/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -91,7 +91,7 @@ versions: - macOS 10.13 (High Sierra) 或更高版本 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 自托管运行器与 {% data variables.product.prodname_dotcom %} 之间的通信 diff --git a/translations/zh-CN/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md b/translations/zh-CN/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md index 5ca1eff5e5..69ac359a30 100644 --- a/translations/zh-CN/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md +++ b/translations/zh-CN/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md @@ -50,14 +50,14 @@ versions: {% if currentVersion == "free-pro-team@latest" %} 要将自托管的运行器添加到企业帐户，您必须是组织所有者。 -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} 要在 {% data variables.product.product_location %} 的企业级添加自托管运行器，您必须是网站管理员。 {% endif %} {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/zh-CN/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/translations/zh-CN/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index 1d54b0a0f2..7f61f60663 100644 --- a/translations/zh-CN/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/translations/zh-CN/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -56,7 +56,7 @@ versions: {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/zh-CN/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md b/translations/zh-CN/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md index 5b8afaea26..c543531e51 100644 --- a/translations/zh-CN/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md +++ b/translations/zh-CN/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md @@ -62,16 +62,16 @@ versions: {% if currentVersion == "free-pro-team@latest" %} 要从企业帐户删除自托管运行器，您必须是组织所有者。 建议您也访问自托管的运行器机器。 -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} 要在 -{% data variables.product.product_location %} 的企业级添加自托管运行器，您必须是网站管理员。 建议您也访问自托管的运行器机器。 +{% data variables.product.product_location %} 的企业级删除自托管运行器，您必须是网站管理员。 建议您也访问自托管的运行器机器。 {% endif %} {% data reusables.github-actions.self-hosted-runner-reusing %} {% if currentVersion == "free-pro-team@latest" %} {% data reusables.enterprise-accounts.access-enterprise %} -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%} {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} {% endif %} diff --git a/translations/zh-CN/content/actions/index.md b/translations/zh-CN/content/actions/index.md index 3f1b7f7290..ec0dc1857d 100644 --- a/translations/zh-CN/content/actions/index.md +++ b/translations/zh-CN/content/actions/index.md @@ -37,7 +37,7 @@ versions:
    -

    {% data ui.toc.getting_started %}

    +

    {% data ui.toc.guides %}

      {% for link in featuredLinks.gettingStarted %} @@ -68,34 +68,10 @@ versions:
    - -
    -
    - -
    {% octicon "bookmark" width="24" %}
    -

    创建操作

    -

    创建操作并与社区分享的完整指南

    -     -
    -
    - -
    {% octicon "rocket" width="24" %}
    -

    初学者工作流程

    -

    工作流程文件的集合，以帮助您开始使用 GitHub Actions。

    -     -
    -
    - -
    {% octicon "light-bulb" width="24" %}
    -

    GitHub Actions Marketplace

    -

    探索社区操作并增强您的工作流程。

    -     -
    -
    -

    指南

    +

    更多指南

    @@ -181,10 +157,10 @@ versions:
    -

    发布 Node.js 包

    -

    使用 GitHub Actions 将 Node.js 包发布到 GitHub Packages 或 npm。

    +

    Publishing Node.js packages

    +

    Use GitHub Actions to push your Node.js package to GitHub Packages or npm.

    - Java + JavaScript/TypeScript CI
    @@ -196,5 +172,5 @@ versions:
    - 更多指南 {% octicon "arrow-right" %} + 显示所有指南 {% octicon "arrow-right" %}
    diff --git a/translations/zh-CN/content/actions/learn-github-actions/essential-features-of-github-actions.md b/translations/zh-CN/content/actions/learn-github-actions/essential-features-of-github-actions.md index 2c52a74f78..a38a150a5c 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/essential-features-of-github-actions.md +++ b/translations/zh-CN/content/actions/learn-github-actions/essential-features-of-github-actions.md @@ -57,9 +57,9 @@ jobs: ### 在作业之间共享数据 -If your job generates files that you want to share with another job in the same workflow, or if you want to save the files for later reference, you can store them in {% data variables.product.prodname_dotcom %} as _artifacts_. 构件是创建并测试代码时所创建的文件。 例如，构件可能包含二进制或包文件、测试结果、屏幕截图或日志文件。 Artifacts are associated with the workflow run where they were created and can be used by another job. +如果作业生成您要与同一工作流程中的另一个作业共享的文件，或者您要保存这些文件供以后参考，可以将它们作为_构件_存储在 {% data variables.product.prodname_dotcom %} 中。 构件是创建并测试代码时所创建的文件。 例如，构件可能包含二进制或包文件、测试结果、屏幕截图或日志文件。 构件与其创建时所在的工作流程运行相关，可被另一个作业使用。 -For example, you can create a file and then upload it as an artifact. +例如，您可以创建一个文件，然后将其作为构件上传。 ```yaml jobs: @@ -76,7 +76,7 @@ jobs: path: output.log ``` -To download an artifact from a separate workflow run, you can use the `actions/download-artifact` action. For example, you can download the artifact named `output-log-file`. +要从单独的工作流程运行下载构件，您可以使用 `actions/download-artifact` 操作。 例如，您可以下载名为 `output-log-file` 的构件。 ```yaml jobs: @@ -88,8 +88,8 @@ jobs: name: output-log-file ``` -For more information about artifacts, see "[Persisting workflow data using artifacts](/actions/configuring-and-managing-workflows/persisting-workflow-data-using-artifacts)." +有关构件的更多信息，请参阅“[使用构件持久化工作流程](/actions/configuring-and-managing-workflows/persisting-workflow-data-using-artifacts)”。 ### 后续步骤 -To continue learning about {% data variables.product.prodname_actions %}, see "[Managing complex workflows](/actions/learn-github-actions/managing-complex-workflows)." +要继续了解 {% data variables.product.prodname_actions %}，请参阅“[管理复杂的工作流](/actions/learn-github-actions/managing-complex-workflows)”。 diff --git a/translations/zh-CN/content/actions/learn-github-actions/finding-and-customizing-actions.md b/translations/zh-CN/content/actions/learn-github-actions/finding-and-customizing-actions.md index c0eeb93d8e..f25fdcce50 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/finding-and-customizing-actions.md +++ b/translations/zh-CN/content/actions/learn-github-actions/finding-and-customizing-actions.md @@ -1,7 +1,7 @@ --- -title: Finding and customizing actions -shortTitle: Finding and customizing actions -intro: 'Actions are the building blocks that power your workflow. A workflow can contain actions created by the community, or you can create your own actions directly within your application''s repository. This guide will show you how to discover, use, and customize actions.' +title: 查找和自定义操作 +shortTitle: 查找和自定义操作 +intro: '操作是支持工作流程的构建块。 工作流程可以包含社区创建的操作，您也可以直接在应用程序的仓库中创建您自己的操作。 本指南说明如何发现、使用和自定义操作。' redirect_from: - /actions/automating-your-workflow-with-github-actions/using-github-marketplace-actions - /actions/automating-your-workflow-with-github-actions/using-actions-from-github-marketplace-in-your-workflow @@ -17,32 +17,32 @@ versions: ### 概览 -The actions you use in your workflow can be defined in: +在工作流程中使用的操作可以定义于： - 公共仓库 -- The same repository where your workflow file references the action +- 工作流程文件引用操作的同一仓库 - Docker Hub 上发布的 Docker 容器图像 -{% data variables.product.prodname_marketplace %} 是一个中心位置，可供查找由 {% data variables.product.prodname_dotcom %} 社区构建的操作。 [{% data variables.product.prodname_marketplace %} page](https://github.com/marketplace/actions/) enables you to filter for actions by category. +{% data variables.product.prodname_marketplace %} 是一个中心位置，可供查找由 {% data variables.product.prodname_dotcom %} 社区构建的操作。 [{% data variables.product.prodname_marketplace %} 页面](https://github.com/marketplace/actions/)允许您按类别过滤操作。 {% data reusables.actions.enterprise-marketplace-actions %} -### Browsing Marketplace actions in the workflow editor +### 在工作流程编辑器中浏览 Marketplace 操作 您可以直接在仓库的工作流程编辑器中搜索和浏览操作。 从边栏可以搜索特定的操作、查看特色操作和浏览特色类别。 您也可以查看操作从 {% data variables.product.prodname_dotcom %} 社区获得的星标数。 1. 在仓库中，浏览至要编辑的工作流程文件。 1. 要打开工作流程编辑器，在文件视图右上角单击 {% octicon "pencil" aria-label="The edit icon" %}。 ![编辑工作流程文件按钮](/assets/images/help/repository/actions-edit-workflow-file.png) -1. 在编辑器右侧，使用 {% data variables.product.prodname_marketplace %} 边栏浏览操作。 Actions with the {% octicon "verified" aria-label="The verified badge" %} badge indicate {% data variables.product.prodname_dotcom %} has verified the creator of the action as a partner organization. ![Marketplace 工作流程边栏](/assets/images/help/repository/actions-marketplace-sidebar.png) +1. 在编辑器右侧，使用 {% data variables.product.prodname_marketplace %} 边栏浏览操作。 带有 {% octicon "verified" aria-label="The verified badge" %} 徽章的操作表示 {% data variables.product.prodname_dotcom %} 已验证操作的创建者为合作伙伴组织。 ![Marketplace 工作流程边栏](/assets/images/help/repository/actions-marketplace-sidebar.png) -### Adding an action to your workflow +### 添加操作到工作流程 -操作的列表页包括操作的版本以及使用操作所需的工作流程语法。 To keep your workflow stable even when updates are made to an action, you can reference the version of the action to use by specifying the Git or Docker tag number in your workflow file. +操作的列表页包括操作的版本以及使用操作所需的工作流程语法。 为使工作流程在操作有更新时也保持稳定，您可以在工作流程文件中指定 Git 或 Docker 标记号以引用所用操作的版本。 1. 导航到要在工作流程中使用的操作。 1. 在“Installation（安装）”下，单击 {% octicon "clippy" aria-label="The edit icon" %} 复制工作流程语法。 ![查看操作列表](/assets/images/help/repository/actions-sidebar-detailed-view.png) 1. 将语法粘贴为工作流程中的新步骤。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idsteps)”。 -1. If the action requires you to provide inputs, set them in your workflow. For information on inputs an action might require, see "[Using inputs and outputs with an action](/actions/learn-github-actions/finding-and-customizing-actions#using-inputs-and-outputs-with-an-action)." +1. 如果操作要求您提供输入，请将其设置在工作流程中。 有关操作可能需要的输入的更多信息，请参阅“[对操作使用输入和输出](/actions/learn-github-actions/finding-and-customizing-actions#using-inputs-and-outputs-with-an-action)”。 {% if currentVersion == "free-pro-team@latest" %} @@ -50,48 +50,48 @@ The actions you use in your workflow can be defined in: {% endif %} -### Using release management for your custom actions +### 对自定义操作使用发行版管理 -The creators of a community action have the option to use tags, branches, or SHA values to manage releases of the action. Similar to any dependency, you should indicate the version of the action you'd like to use based on your comfort with automatically accepting updates to the action. +社区操作的创建者可以选择使用标记、分支或 SHA 值来管理操作的版本。 与任何依赖项类似，您应该根据自动接受操作更新的舒适程度来指示要使用的操作版本。 -You will designate the version of the action in your workflow file. Check the action's documentation for information on their approach to release management, and to see which tag, branch, or SHA value to use. +您将在工作流程文件中指定操作的版本。 检查操作的文档，了解其发行版管理方法的信息，并查看要使用的标记、分支或 SHA 值。 -#### Using tags +#### 使用标记 -Tags are useful for letting you decide when to switch between major and minor versions, but these are more ephemeral and can be moved or deleted by the maintainer. This example demonstrates how to target an action that's been tagged as `v1.0.1`: +标记可用于让您决定何时在主要版本和次要版本之间切换，但这只是临时的，可能被维护员移动或删除。 此示例演示如何定位已标记为 `v1.0.1` 的操作： ```yaml steps: - uses: actions/javascript-action@v1.0.1 ``` -#### Using SHAs +#### 使用 SHA -If you need more reliable versioning, you should use the SHA value associated with the version of the action. SHAs are immutable and therefore more reliable than tags or branches. However this approach means you will not automatically receive updates for an action, including important bug fixes and security updates. This example targets an action's SHA: +如果需要更可靠的版本控制，应使用与操作版本关联的 SHA 值。 SHA 是不可变的，因此比标记或分支更可靠。 但是，此方法意味着您不会自动接收操作的更新，包括重要的 Bug 修复和安全更新。 此示例针对操作的 SHA： ```yaml steps: - uses: actions/javascript-action@172239021f7ba04fe7327647b213799853a9eb89 ``` -#### Using branches +#### 使用分支 -Referring to a specific branch means that the action will always use include the latest updates on the target branch, but can create problems if those updates include breaking changes. This example targets a branch named `@main`: +引用特定分支意味着操作将始终使用包括目标分支上的最新更新，但如果这些更新包括重大更改，则可能会造成问题。 此示例针对名为 `@main`的分支： ```yaml steps: - uses: actions/javascript-action@main ``` -For more information, see "[Using release management for actions](/actions/creating-actions/about-actions#using-release-management-for-actions)." +更多信息请参阅“[对操作使用发行版管理](/actions/creating-actions/about-actions#using-release-management-for-actions)”。 -### Using inputs and outputs with an action +### 对操作使用输入和输出 -An action often accepts or requires inputs and generates outputs that you can use. For example, an action might require you to specify a path to a file, the name of a label, or other data it will uses as part of the action processing. +操作通常接受或需要输入并生成可以使用的输出。 例如，操作可能要求您指定文件的路径、标签的名称或它将用作操作处理一部分的其他数据。 -To see the inputs and outputs of an action, check the `action.yml` or `action.yaml` in the root directory of the repository. +要查看操作的输入和输出，请检查仓库根目录中的 `action.yml` 或 `action.yaml`。 -In this example `action.yml`, the `inputs` keyword defines a required input called `file-path`, and includes a default value that will be used if none is specified. The `outputs` keyword defines an output called `results-file`, which tells you where to locate the results. +在此示例 `.yml` 中， `inputs` 关键字定义名为 `file-path` 的必需输入，并且包括在未指定任何输入时使用的默认值。 `outputs` 关键字定义名为 `results-file` 的输出，告诉您到何处查找结果。 ```yaml name: 'Example' @@ -135,7 +135,7 @@ jobs: - uses: ./.github/actions/hello-world-action ``` -The `action.yml` file is used to provide metadata for the action. Learn about the content of this file in "[Metadata syntax for GitHub Actions](/actions/creating-actions/metadata-syntax-for-github-actions)" +`action.yml` 文件用于提供操作的元数据。 要了解此文件的内容，请参阅“[GitHub Actions 的元数据语法](/actions/creating-actions/metadata-syntax-for-github-actions)” ### 引用 Docker Hub 上的容器 @@ -153,4 +153,4 @@ jobs: ### 后续步骤 -To continue learning about {% data variables.product.prodname_actions %}, see "[Essential features of {% data variables.product.prodname_actions %}](/actions/learn-github-actions/essential-features-of-github-actions)." +要继续了解 {% data variables.product.prodname_actions %}，请参阅“[{% data variables.product.prodname_actions %} 的基本功能](/actions/learn-github-actions/essential-features-of-github-actions)”。 diff --git a/translations/zh-CN/content/actions/learn-github-actions/index.md b/translations/zh-CN/content/actions/learn-github-actions/index.md index 8bc97d038f..cef99cb0e4 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/index.md +++ b/translations/zh-CN/content/actions/learn-github-actions/index.md @@ -1,7 +1,7 @@ --- -title: Learn GitHub Actions -shortTitle: Learn GitHub Actions -intro: 'Whether you are new to {% data variables.product.prodname_actions %} or interested in learning all they have to offer, this guide will help you use {% data variables.product.prodname_actions %} to accelerate your application development workflows.' +title: 了解 GitHub Actions +shortTitle: 了解 GitHub Actions +intro: '无论您是 {% data variables.product.prodname_actions %} 的新用户还是有兴趣学习他们提供的内容，本指南都可帮助您使用 {% data variables.product.prodname_actions %} 来加快应用程序开发工作流程。' redirect_from: - /articles/about-github-actions - /github/automating-your-workflow-with-github-actions/about-github-actions diff --git a/translations/zh-CN/content/actions/learn-github-actions/introduction-to-github-actions.md b/translations/zh-CN/content/actions/learn-github-actions/introduction-to-github-actions.md index 8d1a4f66de..5c281ad549 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/introduction-to-github-actions.md +++ b/translations/zh-CN/content/actions/learn-github-actions/introduction-to-github-actions.md @@ -1,7 +1,7 @@ --- -title: Introduction to GitHub Actions -shortTitle: Introduction to GitHub Actions -intro: 'Learn about the core concepts and various components of {% data variables.product.prodname_actions %}, and see an example that shows you how to add automation to your repository.' +title: GitHub Actions 简介 +shortTitle: GitHub Actions 简介 +intro: '了解 {% data variables.product.prodname_actions %} 的核心概念和各种组件，并查看说明如何为仓库添加自动化的示例。' redirect_from: - /github/automating-your-workflow-with-github-actions/core-concepts-for-github-actions - /actions/automating-your-workflow-with-github-actions/core-concepts-for-github-actions @@ -16,52 +16,52 @@ versions: ### 概览 -{% data variables.product.prodname_actions %} help you automate tasks within your software development life cycle. {% data variables.product.prodname_actions %} are event-driven, meaning that you can run a series of commands after a specified event has occurred. For example, every time someone creates a pull request for a repository, you can automatically run a command that executes a software testing script. +{% data variables.product.prodname_actions %} 帮助您自动完成软件开发周期内的任务。 {% data variables.product.prodname_actions %} 是事件驱动的，意味着您可以在指定事件发生后运行一系列命令。 例如，每次有人为仓库创建拉取请求时，您都可以自动运行命令来执行软件测试脚本。 -This diagram demonstrates how you can use {% data variables.product.prodname_actions %} to automatically run your software testing scripts. An event automatically triggers the _workflow_, which contains a _job_. The job then uses _steps_ to control the order in which _actions_ are run. These actions are the commands that automate your software testing. +此示意图说明如何使用 {% data variables.product.prodname_actions %} 自动运行软件测试脚本。 事件会自动触发其中包_作业_的_工作流程_。 然后，作业使用_步骤_来控制_操作_运行的顺序。 这些操作是自动化软件测试的命令。 -![Workflow overview](/assets/images/help/images/overview-actions-simple.png) +![工作流程概述](/assets/images/help/images/overview-actions-simple.png) -### The components of {% data variables.product.prodname_actions %} +### {% data variables.product.prodname_actions %} 的组件 -Below is a list of the multiple {% data variables.product.prodname_actions %} components that work together to run jobs. You can see how these components interact with each other. +下面是一起运行作业的多个 {% data variables.product.prodname_actions %} 组件列表。 您可以查看这些组件如何相互作用。 -![Component and service overview](/assets/images/help/images/overview-actions-design.png) +![组件和服务概述](/assets/images/help/images/overview-actions-design.png) #### 工作流程 -The workflow is an automated procedure that you add to your repository. Workflows are made up of one or more jobs and can be scheduled or triggered by an event. The workflow can be used to build, test, package, release, or deploy a project on {% data variables.product.prodname_dotcom %}. +工作流程是您添加到仓库的自动化过程。 工作流程由一项或多项作业组成，可以计划或由事件触发。 工作流程可用于在 {% data variables.product.prodname_dotcom %} 上构建、测试、打包、发布或部署项目。 #### 事件 -An event is a specific activity that triggers a workflow. 例如，当有推送提交到仓库或者创建议题或拉取请求时，{% data variables.product.prodname_dotcom %} 就可能产生活动。 You can also use the repository dispatch webhook to trigger a workflow when an external event occurs. For a complete list of events that can be used to trigger workflows, see [Events that trigger workflows](/actions/reference/events-that-trigger-workflows). +事件是触发工作流程的特定活动。 例如，当有推送提交到仓库或者创建议题或拉取请求时，{% data variables.product.prodname_dotcom %} 就可能产生活动。 您也可以使用仓库调度 web 挂钩在发生外部事件时触发工作流程。 有关可用于触发工作流程的事件的完整列表，请参阅[触发工作流程的事件](/actions/reference/events-that-trigger-workflows)。 #### Jobs -A job is a set of steps that execute on the same runner. By default, a workflow with multiple jobs will run those jobs in parallel. You can also configure a workflow to run jobs sequentially. 例如，工作流程可以有两个连续的任务来构建和测试代码，其中测试作业取决于构建作业的状态。 如果构建作业失败，测试作业将不会运行。 +作业是在同一运行服务器上执行的一组步骤。 默认情况下，包含多个作业的工作流程将同时运行这些作业。 您也可以配置工作流程按顺序运行作业。 例如，工作流程可以有两个连续的任务来构建和测试代码，其中测试作业取决于构建作业的状态。 如果构建作业失败，测试作业将不会运行。 -#### Steps +#### 步骤 -A step is an individual task that can run commands (known as _actions_). Each step in a job executes on the same runner, allowing the actions in that job to share data with each other. +步骤是可以运行命令（称为_操作_）的单个任务。 作业中的每个步骤在同一运行器上执行，可让该作业中的操作互相共享数据。 #### 操作 -_Actions_ are standalone commands that are combined into _steps_ to create a _job_. 操作是工作流程最小的便携式构建块。 You can create your own actions, or use actions created by the {% data variables.product.prodname_dotcom %} community. 要在工作流程中使用操作，必须将其作为一个步骤。 +_操作_ 是独立命令，它们组合到_步骤_以创建_作业_。 操作是工作流程最小的便携式构建块。 您可以创建自己的操作，也可以使用 {% data variables.product.prodname_dotcom %} 社区创建的操作。 要在工作流程中使用操作，必须将其作为一个步骤。 -#### Runners +#### 运行器 -A runner is a server that has the {% data variables.product.prodname_actions %} runner application installed. You can use a runner hosted by {% data variables.product.prodname_dotcom %}, or you can host your own. A runner listens for available jobs, runs one job at a time, and reports the progress, logs, and results back to {% data variables.product.prodname_dotcom %}. For {% data variables.product.prodname_dotcom %}-hosted runners, each job in a workflow runs in a fresh virtual environment. +运行器是安装了 {% data variables.product.prodname_actions %} 运行器应用程序的服务器。 您可以使用 {% data variables.product.prodname_dotcom %} 托管的运行器或托管您自己的运行器。 运行器将侦听可用的作业，每次运行一个作业，并将进度、日志和结果报告回 {% data variables.product.prodname_dotcom %}。 对于 {% data variables.product.prodname_dotcom %} 托管的运行器，工作流程中的每项作业都会在一个新的虚拟环境中运行。 -{% data variables.product.prodname_dotcom %}-hosted runners are based on Ubuntu Linux, Microsoft Windows, and macOS. For information on {% data variables.product.prodname_dotcom %}-hosted runners, see "[Virtual environments for {% data variables.product.prodname_dotcom %}-hosted runners](/actions/reference/virtual-environments-for-github-hosted-runners)." If you need a different operating system or require a specific hardware configuration, you can host your own runners. For information on self-hosted runners, see "[Hosting your own runners](/actions/hosting-your-own-runners)." +{% data variables.product.prodname_dotcom %} 托管的运行器基于 Ubuntu Linux、Microsoft Windows 和 macOS 。 有关 {% data variables.product.prodname_dotcom %} 托管的运行器的信息，请参阅“[ {% data variables.product.prodname_dotcom %} 托管运行器的虚拟环境](/actions/reference/virtual-environments-for-github-hosted-runners)”。 如果您需要不同的操作系统或需要特定的硬件配置，可以托管自己的运行器。 有关自托管运行器的信息，请参阅“[托管您自己的运行器](/actions/hosting-your-own-runners)”。 -### Create an example workflow +### 创建示例工作流程 -{% data variables.product.prodname_actions %} uses YAML syntax to define the events, jobs, and steps. These YAML files are stored in your code repository, in a directory called `.github/workflows`. +{% data variables.product.prodname_actions %} 使用 YAML 语法来定义事件、作业和步骤。 这些 YAML 文件存储在代码仓库中名为 `.github/workflows` 的目录中。 -You can create an example workflow in your repository that automatically triggers a series of commands whenever code is pushed. In this workflow, {% data variables.product.prodname_actions %} checks out the pushed code, installs the software dependencies, and runs `bats -v`. +您可以在仓库中创建示例工作流程，只要推送代码，该工作流程就会自动触发一系列命令。 在此工作流程中，{% data variables.product.prodname_actions %} 检出推送的代码，安装软件依赖项，并运行 `-v`。 -1. In your repository, create the `.github/workflows/` directory to store your workflow files. -1. In the `.github/workflows/` directory, create a new file called `learn-github-actions.yml` and add the following code. +1. 在您的仓库中，创建 `.github/workflows/` 目录来存储工作流程文件。 +1. 在 `.github/workflows/` 目录中，创建一个名为 `learn-github-actions.yml` 的新文件并添加以下代码。 ```yaml name: learn-github-actions on: [push] @@ -199,7 +199,7 @@ To help you understand how YAML syntax is used to create a workflow file, this s In this diagram, you can see the workflow file you just created and how the {% data variables.product.prodname_actions %} components are organized in a hierarchy. Each step executes a single action. Steps 1 and 2 use prebuilt community actions. To find more prebuilt actions for your workflows, see "[Finding and customizing actions](/actions/learn-github-actions/finding-and-customizing-actions)." -![Workflow overview](/assets/images/help/images/overview-actions-event.png) +![工作流程概述](/assets/images/help/images/overview-actions-event.png) ### Viewing the job's activity diff --git a/translations/zh-CN/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md b/translations/zh-CN/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md index 625f2365b2..a21319268b 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md +++ b/translations/zh-CN/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md @@ -67,7 +67,7 @@ jobs: -### Runners +### 运行器 Runners are machines on which the jobs run. Both GitLab CI/CD and {% data variables.product.prodname_actions %} offer managed and self-hosted variants of runners. In GitLab CI/CD, `tags` are used to run jobs on different platforms, while in {% data variables.product.prodname_actions %} it is done with the `runs-on` key. diff --git a/translations/zh-CN/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/translations/zh-CN/content/actions/learn-github-actions/security-hardening-for-github-actions.md index 69f0326747..6de684cf13 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/security-hardening-for-github-actions.md +++ b/translations/zh-CN/content/actions/learn-github-actions/security-hardening-for-github-actions.md @@ -95,3 +95,40 @@ versions: 您还应考虑自托管运行器机器的环境： - 配置为自托管运行器的计算机上存储哪些敏感信息？ 例如，私有 SSH 密钥、API 访问令牌等。 - 计算机是否可通过网络访问敏感服务？ 例如，Azure 或 AWS 元数据服务。 此环境中的敏感信息量应保持在最低水平，您应该始终注意，任何能够调用工作流程的用户都有权访问此环境。 + +### Auditing {% data variables.product.prodname_actions %} events + +You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account perfomed the action. + +For example, you can use the audit log to track the `action:org.update_actions_secret` event, which tracks changes to organization secrets: ![Audit log entries](/assets/images/help/repository/audit-log-entries.png) + +The following tables describe the {% data variables.product.prodname_actions %} events that you can find in the audit log. For more information on using the audit log, see "[Reviewing the audit log for your organization](/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization#searching-the-audit-log)." + +#### Events for secret management +| 操作 | 描述 | +| ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `action:org.create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization). | +| `action:org.remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret. | +| `action:org.update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret. | +| `action:repo.create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository). | +| `action:repo.remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret. | +| `action:repo.update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret. | + +#### Events for self-hosted runners +| 操作 | 描述 | +| ----------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). | +| `action:org.remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). | +| `action:repo.register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). | +| `action:repo.remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). | + +#### Events for self-hosted runner groups +| 操作 | 描述 | +| ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action:org.runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). | +| `action:org.runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. | +| `action:org.runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. | +| `action:org.runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). | +| `action:org.runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. | + + diff --git a/translations/zh-CN/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md b/translations/zh-CN/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md index 9b513b448c..03dca5eb43 100644 --- a/translations/zh-CN/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md +++ b/translations/zh-CN/content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md @@ -1,6 +1,6 @@ --- title: Disabling and enabling a workflow -intro: 您可以使用 {% data variables.product.prodname_dotcom %} 或 REST API 禁用和重新启用工作流程。 +intro: '您可以使用 {% data variables.product.prodname_dotcom %} 或 REST API 禁用和重新启用工作流程。' product: '{% data reusables.gated-features.actions %}' versions: free-pro-team: '*' diff --git a/translations/zh-CN/content/actions/managing-workflow-runs/removing-workflow-artifacts.md b/translations/zh-CN/content/actions/managing-workflow-runs/removing-workflow-artifacts.md index 7273e1d132..94fd8a64d3 100644 --- a/translations/zh-CN/content/actions/managing-workflow-runs/removing-workflow-artifacts.md +++ b/translations/zh-CN/content/actions/managing-workflow-runs/removing-workflow-artifacts.md @@ -38,4 +38,4 @@ versions: ### 查找构件的到期日期 您可以使用 API 确认构件计划删除的日期。 更多信息请参阅“[列出仓库的构件](/rest/reference/actions#artifacts)”返回的 `expires_at` 值。 -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/zh-CN/content/actions/quickstart.md b/translations/zh-CN/content/actions/quickstart.md index dbcb827533..1e80cf9fca 100644 --- a/translations/zh-CN/content/actions/quickstart.md +++ b/translations/zh-CN/content/actions/quickstart.md @@ -21,7 +21,7 @@ versions: 1. 从 {% data variables.product.prodname_dotcom %} 上的仓库，在 `.github/workflow` 目录中创建一个名为 `superlinter.yml` 的新文件。 更多信息请参阅“[创建新文件](/github/managing-files-in-a-repository/creating-new-files)”。 2. 将以下 YAML 内容复制到 `superlinter.yml` 文件中。 **注：** 如果您的默认分支不是 `main`，请更新 `DEFAULT_BRANCH` 的值以匹配您仓库的默认分支名称。 {% raw %} - ```yaml + ```yaml{:copy} name: Super-Linter # Run this workflow every time a new commit pushed to your repository diff --git a/translations/zh-CN/content/actions/reference/context-and-expression-syntax-for-github-actions.md b/translations/zh-CN/content/actions/reference/context-and-expression-syntax-for-github-actions.md index b7ad502c9e..cea7fe9d24 100644 --- a/translations/zh-CN/content/actions/reference/context-and-expression-syntax-for-github-actions.md +++ b/translations/zh-CN/content/actions/reference/context-and-expression-syntax-for-github-actions.md @@ -59,7 +59,7 @@ env: | ---------- | ---- | ----------------------------------------------------------------------------------------------------------------------------------- | | `github` | `对象` | 工作流程运行的相关信息。 更多信息请参阅 [`github` 上下文](#github-context)。 | | `env` | `对象` | 包含工作流程、作业或步骤中设置的环境变量。 更多信息请参阅 [`env` 上下文](#env-context)。 | -| `job` | `对象` | 当前执行的作业相关信息。 更多信息请参阅 [`job` 上下文](#job-context)。 | +| `作业` | `对象` | 当前执行的作业相关信息。 更多信息请参阅 [`job` 上下文](#job-context)。 | | `steps` | `对象` | 此作业中已经运行的步骤的相关信息。 更多信息请参阅 [`steps` 上下文](#steps-context)。 | | `runner` | `对象` | 运行当前作业的运行程序相关信息。 更多信息请参阅 [`runner` 上下文](#runner-context)。 | | `secrets` | `对象` | 启用对密码的访问权限。 有关密码的更多信息，请参阅“[创建和使用加密密码](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)”。 | @@ -93,7 +93,7 @@ env: | `github.event_path` | `字符串` | 运行器上完整事件 web 挂钩有效负载的路径。 | | `github.head_ref` | `字符串` | 工作流程运行中拉取请求的 `head_ref` 或来源分支。 此属性仅在触发工作流程运行的事件为 `pull_request` 时才可用。 | | `github.job` | `字符串` | 当前作业的 [`job_id`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_id)。 | -| `github.ref` | `字符串` | 触发工作流程的分支或标记参考。 | +| `github.ref` | `字符串` | 触发工作流程的分支或标记参考。 对于分支，使用格式 `refs/heads/`，对于标记是 `refs/tags/`。 | | `github.repository` | `字符串` | 所有者和仓库名称。 例如 `Codertocat/Hello-World`。 | | `github.repository_owner` | `字符串` | 仓库所有者的名称。 例如 `Codertocat`。 | | `github.run_id` | `字符串` | {% data reusables.github-actions.run_id_description %} @@ -123,7 +123,7 @@ env: | 属性名称 | 类型 | 描述 | | ----------------------------------------- | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `job` | `对象` | 此上下文针对工作流程运行中的每项作业而改变。 您可以从作业中的任何步骤访问此上下文。 | +| `作业` | `对象` | 此上下文针对工作流程运行中的每项作业而改变。 您可以从作业中的任何步骤访问此上下文。 | | `job.container` | `对象` | 作业的容器相关信息。 有关容器的更多信息，请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/articles/workflow-syntax-for-github-actions#jobsjob_idcontainer)”。 | | `job.container.id` | `字符串` | 容器的 id。 | | `job.container.network` | `字符串` | 容器网络的 id。 运行程序创建作业中所有容器使用的网络。 | diff --git a/translations/zh-CN/content/actions/reference/specifications-for-github-hosted-runners.md b/translations/zh-CN/content/actions/reference/specifications-for-github-hosted-runners.md index debaf3b891..26547db687 100644 --- a/translations/zh-CN/content/actions/reference/specifications-for-github-hosted-runners.md +++ b/translations/zh-CN/content/actions/reference/specifications-for-github-hosted-runners.md @@ -50,6 +50,7 @@ Windows 虚拟机配置为以禁用了用户帐户控制 (UAC) 的管理员身 {% data reusables.github-actions.supported-github-runners %} {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} Workflow logs list the runner used to run a job. For more information, see "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history)." @@ -63,8 +64,10 @@ The software tools included in {% data variables.product.prodname_dotcom %}-host * [Windows Server 2019](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md) * [Windows Server 2016](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md) * [MacOS 10.15](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md) +* [MacOS 11.0](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md) {% data reusables.github-actions.ubuntu-runner-preview %} +{% data reusables.github-actions.macos-runner-preview %} {% data variables.product.prodname_dotcom %} 托管的运行器除了上述参考中列出的包之外，还包括操作系统的默认内置工具。 例如，Ubuntu 和 macOS 运行器除了其他默认工具之外，还包括 `grep`、`find` 和 `which`。 diff --git a/translations/zh-CN/content/actions/reference/usage-limits-billing-and-administration.md b/translations/zh-CN/content/actions/reference/usage-limits-billing-and-administration.md index e319382a3b..61f26adb39 100644 --- a/translations/zh-CN/content/actions/reference/usage-limits-billing-and-administration.md +++ b/translations/zh-CN/content/actions/reference/usage-limits-billing-and-administration.md @@ -57,20 +57,20 @@ In addition to the usage limits, you must ensure that you use {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -### 构件和日志保留策略 +### Artifact and log retention policy -您可以为仓库、组织或企业帐户配置构件和日志保留期。 +You can configure the artifact and log retention period for your repository, organization, or enterprise account. {% data reusables.actions.about-artifact-log-retention %} 更多信息请参阅： -- [为仓库中构件和日志的 {% data variables.product.prodname_actions %} 配置保留期](/github/administering-a-repository/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-repository) -- [为组织中构件和日志的 {% data variables.product.prodname_actions %} 配置保留期](/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization) -- [为企业中构件和日志的 {% data variables.product.prodname_actions %} 配置保留期](/github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account) +- [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your repository](/github/administering-a-repository/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-repository) +- [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your organization](/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization) +- [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your enterprise](/github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account) {% endif %} -### 禁用或限制仓库或组织的 {% data variables.product.prodname_actions %} +### Disabling or limiting {% data variables.product.prodname_actions %} for your repository or organization {% data reusables.github-actions.disabling-github-actions %} diff --git a/translations/zh-CN/content/actions/reference/workflow-commands-for-github-actions.md b/translations/zh-CN/content/actions/reference/workflow-commands-for-github-actions.md index 009dd3e200..5557c98dd5 100644 --- a/translations/zh-CN/content/actions/reference/workflow-commands-for-github-actions.md +++ b/translations/zh-CN/content/actions/reference/workflow-commands-for-github-actions.md @@ -53,13 +53,15 @@ core.setOutput('SELECTED_COLOR', 'green'); 您可以在工作流程中使用 `set-output` 命令来设置相同的值： +{% raw %} ``` yaml - name: Set selected color run: echo '::set-output name=SELECTED_COLOR::green' id: random-color-generator - name: Get color - run: echo 'The selected color is' ${steps.random-color-generator.outputs.SELECTED_COLOR} + run: echo "The selected color is ${{ steps.random-color-generator.outputs.SELECTED_COLOR }}" ``` +{% endraw %} 下表显示了在工作流程中可用的工具包功能： diff --git a/translations/zh-CN/content/actions/reference/workflow-syntax-for-github-actions.md b/translations/zh-CN/content/actions/reference/workflow-syntax-for-github-actions.md index 4b7f9872a2..45e50ee3e2 100644 --- a/translations/zh-CN/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/translations/zh-CN/content/actions/reference/workflow-syntax-for-github-actions.md @@ -946,7 +946,7 @@ jobs: #### **`jobs..container.image`** -要用作运行操作的容器的 Docker 图像。 值可以是 Docker Hub 映像名称或 {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} 注册表名称。 +要用作运行操作的容器的 Docker 图像。 值可以是 Docker Hub 映像名称或{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}公共{% endif %}注册表名称。 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..container.credentials`** @@ -1029,7 +1029,7 @@ services: #### **`jobs..services..image`** -要用作运行操作的服务容器的 Docker 图像。 值可以是 Docker Hub 映像名称或 {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} 注册表名称。 +要用作运行操作的服务容器的 Docker 图像。 值可以是 Docker Hub 映像名称或{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}公共{% endif %}注册表名称。 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..services..credentials`** diff --git a/translations/zh-CN/content/admin/configuration/configuring-the-ip-address-using-the-virtual-machine-console.md b/translations/zh-CN/content/admin/configuration/configuring-the-ip-address-using-the-virtual-machine-console.md index 0cbb9658b4..1dff159640 100644 --- a/translations/zh-CN/content/admin/configuration/configuring-the-ip-address-using-the-virtual-machine-console.md +++ b/translations/zh-CN/content/admin/configuration/configuring-the-ip-address-using-the-virtual-machine-console.md @@ -10,7 +10,7 @@ versions: {% note %} -**Note:** We do not support adding additional network adapters to {% data variables.product.prodname_ghe_server %}. +**注意：** 我们不支持向 {% data variables.product.prodname_ghe_server %} 添加额外的网络适配器。 {% endnote %} diff --git a/translations/zh-CN/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/translations/zh-CN/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md index a14ff97b17..c4acdf18db 100644 --- a/translations/zh-CN/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md +++ b/translations/zh-CN/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md @@ -18,10 +18,13 @@ versions: 将 {% data variables.product.product_location_enterprise %} 连接到 {% data variables.product.prodname_dotcom_the_website %} 并为易受攻击的依赖项启用 {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}安全{% endif %}警报后，每个小时都会将漏洞数据从 {% data variables.product.prodname_dotcom_the_website %} 同步到您的实例一次。 您还可以随时选择手动同步漏洞数据。 代码和关于代码的信息不会从 {% data variables.product.product_location_enterprise %} 上传到 {% data variables.product.prodname_dotcom_the_website %}。 -{% if currentVersion ver_gt "enterprise-server@2.21" %}当 {% data variables.product.product_location_enterprise %} 接收到有关漏洞的信息时，它将识别实例中使用受影响版本依赖项的仓库，并向这些仓库中具有管理员访问权限的所有者和人员发送 {% data variables.product.prodname_dependabot_short %} 警报。 他们可以自定义接收 {% data variables.product.prodname_dependabot_short %} 警报的方式。 更多信息请参阅“[关于易受攻击的依赖项的警报](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)”。 +{% if currentVersion ver_gt "enterprise-server@2.21" %}当 {% data variables.product.product_location_enterprise %} 接收到有关漏洞的信息时，它将识别实例中使用受影响依赖项版本的仓库，并发送 {% data variables.product.prodname_dependabot_short %} 警报。 您可以自定义接收 {% data variables.product.prodname_dependabot_short %} 警报的方式。 更多信息请参阅“[为易受攻击的依赖项配置通知](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)”。 {% endif %} -{% if currentVersion ver_lt "enterprise-server@2.21" or currentVersion == "enterprise-server@2.21" %}当 {% data variables.product.product_location_enterprise %} 接收到有关漏洞的信息时，它将识别实例中使用受影响版本依赖项的仓库，并向这些仓库中具有管理员访问权限的所有者和人员发送安全警报。 您可以自定义接收安全警报的方式。 更多信息请参阅“[关于易受攻击的依赖项的警报](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)”。 +{% if currentVersion == "enterprise-server@2.21" %}当 {% data variables.product.product_location_enterprise %} 接收到有关漏洞的信息时，它将识别实例中使用受影响依赖项版本的仓库，并发送安全警报。 您可以自定义接收安全警报的方式。 更多信息请参阅“[为易受攻击的依赖项配置通知](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)”。 +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.21" %}当 {% data variables.product.product_location_enterprise %} 接收到有关漏洞的信息时，它将识别实例中使用受影响依赖项版本的仓库，并发送安全警报。 您可以自定义接收安全警报的方式。 更多信息请参阅“[选择通知的递送方式](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications#choosing-the-delivery-method-for-security-alerts-for-vulnerable-dependencies)”。 {% endif %} {% if currentVersion ver_gt "enterprise-server@2.21" %} @@ -45,7 +48,14 @@ versions: ``` shell $ ghe-dep-graph-enable ``` + {% note %} + + **注**：有关启用通过 SSH 访问管理 shell 的更多信息，请参阅“[访问管理 shell (SSH)](/enterprise/{{ currentVersion }}/admin/configuration/accessing-the-administrative-shell-ssh)”。 + + {% endnote %} + 3. 返回到 + {% data variables.product.prodname_ghe_server %}. {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.business %} diff --git a/translations/zh-CN/content/admin/enterprise-management/initializing-the-cluster.md b/translations/zh-CN/content/admin/enterprise-management/initializing-the-cluster.md index a4d88cc080..96595a66ec 100644 --- a/translations/zh-CN/content/admin/enterprise-management/initializing-the-cluster.md +++ b/translations/zh-CN/content/admin/enterprise-management/initializing-the-cluster.md @@ -17,7 +17,7 @@ versions: ### 配置第一个节点 -1. Connect to the node that will be designated as MySQL primary in `cluster.conf`. For more information, see "[About the cluster configuration file](/enterprise/{{ currentVersion }}/admin/guides/clustering/initializing-the-cluster/#about-the-cluster-configuration-file)." +1. 连接到将在 `cluster.conf` 中指定为 MySQL 主要节点的节点。 更多信息请参阅“[关于集群配置文件](/enterprise/{{ currentVersion }}/admin/guides/clustering/initializing-the-cluster/#about-the-cluster-configuration-file)”。 2. 在 Web 浏览器中，访问 `https://:8443/setup/`。 {% data reusables.enterprise_installation.upload-a-license-file %} {% data reusables.enterprise_installation.save-settings-in-web-based-mgmt-console %} @@ -43,7 +43,7 @@ versions: 节点的名称可以是您选择的任何有效主机名。 名称被设置为每个节点的主机名，并且还将添加到每个节点上的 `/etc/hosts` 中，以便节点可以在本地相互解析。 -Specify the first cluster node you configured as the MySQL primary via `mysql-server` and `mysql-master`. +通过 `mysql-server` 和 `mysql-master` 指定您配置为 MySQL 主要节点的第一个集群节点。 ``` [cluster] diff --git a/translations/zh-CN/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md b/translations/zh-CN/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md index cc4d281c05..498c702d84 100644 --- a/translations/zh-CN/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md +++ b/translations/zh-CN/content/admin/enterprise-management/initiating-a-failover-to-your-replica-appliance.md @@ -30,6 +30,15 @@ versions: 5. 将 DNS 记录更新为指向副本的 IP 地址。 流量会在经过 TTL 周期后定向到副本。 如果您要使用负载均衡器，请务必将其配置为向副本发送流量。 6. 通知用户他们可以恢复正常操作。 7. 如有需要，请设置从新的主设备复制到现有设备和之前的主设备。 更多信息请参阅“[关于高可用性配置](/enterprise/{{ currentVersion }}/admin/guides/installation/about-high-availability-configuration/#utilities-for-replication-management)”。 +8. 您不打算在故障转移之前将复制设置为高可用性配置一部分的设备需由 UUID 从高可用性配置中删除。 + - 在以前的设备上，通过 `cat /data/user/common/uuid` 获取其 UUID。 + ```shell + $ cat /data/user/common/uuid + ``` + - 在新的主设备上，使用 `ghe-repl-teardown` 删除 UUID。 请将 *`UUID`* 替换为您在上一步中检索到的 UUID。 + ```shell + $ ghe-repl-teardown -u UUNID + ``` ### 延伸阅读 diff --git a/translations/zh-CN/content/admin/enterprise-management/upgrade-requirements.md b/translations/zh-CN/content/admin/enterprise-management/upgrade-requirements.md index 915bd70951..b1e1f0f564 100644 --- a/translations/zh-CN/content/admin/enterprise-management/upgrade-requirements.md +++ b/translations/zh-CN/content/admin/enterprise-management/upgrade-requirements.md @@ -21,7 +21,7 @@ versions: ### 建议 -- 尽量减少升级过程中的升级次数。 例如，不要从 {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} 升级到 {{ enterpriseVersions.supported[1] }} 再升级到 {{ enterpriseVersions.latest }}，而应从 {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} 升级到 {{ enterpriseVersions.latest }}。 +- 尽量减少升级过程中的升级次数。 例如，不要从 {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} 升级到 {{ enterpriseServerReleases.supported[1] }} 再升级到 {{ enterpriseServerReleases.latest }}，而应从 {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} 升级到 {{ enterpriseServerReleases.latest }}。 - 如果您的版本比最新版本低几个版本，请通过升级过程的每一步骤尽量将 {% data variables.product.product_location_enterprise %} 升级为更高版本。 在每次升级时尽可能使用最新版本，这样一来您可以充分利用性能改进和错误修复。 例如，您可以从 {% data variables.product.prodname_enterprise %} 2.7 升级到 2.8 再升级到 2.10，但从 {% data variables.product.prodname_enterprise %} 2.7 升级到 2.9 再升级到 2.10 会在第二步中使用更高版本。 - 升级时使用最新补丁版本。 {% data reusables.enterprise_installation.enterprise-download-upgrade-pkg %} - 使用暂存实例测试升级步骤。 更多信息请参阅“[设置暂存实例](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-staging-instance/)”。 @@ -29,7 +29,7 @@ versions: ### 要求 -- 您必须从**最近**两个版本的功能版本开始升级。 例如，要升级到 {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.latest }}，您必须使用 {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[1] }} 或 {{ enterpriseVersions.supported[2] }}。 +- 您必须从**最近**两个版本的功能版本开始升级。 例如，要升级到 {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.latest }}，您必须使用 {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[1] }} 或 {{ enterpriseServerReleases.supported[2] }}。 - {% data reusables.enterprise_installation.hotpatching-explanation %} - 如果受影响的服务（例如内核、MySQL 或 Elasticsearch）需要重启 VM 或服务，热补丁可能需要停机一段时间。 需要重启时，系统会通知您。 您可以在稍后完成重启。 - 通过热补丁升级时，必须提供额外的根存储，因为热补丁会安装某些服务的多个版本，直至升级完成。 如果根磁盘存储空间不足，运行前检查将发出通知。 diff --git a/translations/zh-CN/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/zh-CN/content/admin/enterprise-support/about-github-enterprise-support.md index 22beaebd35..94a993a756 100644 --- a/translations/zh-CN/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/zh-CN/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,21 +59,21 @@ versions: {% data variables.contact.enterprise_support %} observes these U.S. holidays. {{ site.data.variables.contact.enterprise_support }} 会庆祝这些美国节假日，但我们的全球支持团队可以回答紧急事件单。 -| 美国 美国节假日 | Date observed | -| ----------- | ------------------------- | -| 元旦 | 1 月 1 日 | -| 马丁·路德·金纪念 日 | 1 月的第三个星期一 | -| 总统日 | 2 月的第三个星期一 | -| 阵亡将士纪念日 | 5 月的最后一个星期一 | -| 独立日 | 7 月 4 日 | -| 劳动节 | 9 月的第一个星期一 | -| 老兵节 | 11 月 12 日 | -| 感恩节 | 11 月的第四个星期四 | -| 感恩节后的第一天 | 11 月的第四个星期五 | -| 平安夜 | 12 月 24 日 | -| 圣诞节 | 12 月 25 日 | -| 圣诞节后的第一天 | 12 月 26 日 | -| 新年除夕 | 12 月 31 日 | +| 美国 美国节假日 | 观察日期 | +| ----------- | ----------- | +| 元旦 | 1 月 1 日 | +| 马丁·路德·金纪念 日 | 1 月的第三个星期一 | +| 总统日 | 2 月的第三个星期一 | +| 阵亡将士纪念日 | 5 月的最后一个星期一 | +| 独立日 | 7 月 4 日 | +| 劳动节 | 9 月的第一个星期一 | +| 老兵节 | 11 月 12 日 | +| 感恩节 | 11 月的第四个星期四 | +| 感恩节后的第一天 | 11 月的第四个星期五 | +| 平安夜 | 12 月 24 日 | +| 圣诞节 | 12 月 25 日 | +| 圣诞节后的第一天 | 12 月 26 日 | +| 新年除夕 | 12 月 31 日 | #### 日本节假日 diff --git a/translations/zh-CN/content/admin/enterprise-support/providing-data-to-github-support.md b/translations/zh-CN/content/admin/enterprise-support/providing-data-to-github-support.md index 5421c8461e..bfa8f58690 100644 --- a/translations/zh-CN/content/admin/enterprise-support/providing-data-to-github-support.md +++ b/translations/zh-CN/content/admin/enterprise-support/providing-data-to-github-support.md @@ -99,9 +99,9 @@ $ ssh -p122 admin@hostname -- 'ghe-diagnostics' > diagnostics.txt #### 使用您的企业帐户上传支持包 -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. 在左侧边栏中，单击 **Enterprise licensing（企业许可）**。 ![企业帐户设置侧边栏中的"Enterprise licensing（企业许可）"选项卡](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. 在“{% data variables.product.prodname_enterprise %} 帮助”下，单击 **Upload a support bundle（上传支持包）**。 ![上传支持包链接](/assets/images/enterprise/support/upload-support-bundle.png) 5. 在“Select an enterprise account（选择企业帐户）”下，从下拉菜单选择支持包的相关帐户。 ![选择支持包的企业帐户](/assets/images/enterprise/support/support-bundle-account.png) 6. 在“为 {% data variables.contact.enterprise_support %} 上传支持包”下，选择您的支持包，单击 **Choose file（选择文件）**，或将您的支持包文件拖到 **Choose file（选择文件）**上。 ![上传支持包文件](/assets/images/enterprise/support/choose-support-bundle-file.png) diff --git a/translations/zh-CN/content/admin/enterprise-support/submitting-a-ticket.md b/translations/zh-CN/content/admin/enterprise-support/submitting-a-ticket.md index 2de058a4b5..f3aaa095c0 100644 --- a/translations/zh-CN/content/admin/enterprise-support/submitting-a-ticket.md +++ b/translations/zh-CN/content/admin/enterprise-support/submitting-a-ticket.md @@ -22,9 +22,9 @@ versions: ### 使用企业帐户提交事件单 -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. 在左侧边栏中，单击 **Enterprise licensing（企业许可）**。 ![企业帐户设置侧边栏中的"Enterprise licensing（企业许可）"选项卡](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. 在“{% data variables.product.prodname_enterprise %} 帮助”下，单击 **{% data variables.contact.enterprise_support %} Portal（门户）**。 ![导航至 Enterprise 支持站点的链接](/assets/images/enterprise/support/enterprise-support-link.png) 5. 单击 **Submit a Ticket（提交事件单）** ![将事件单提交至 Enterprise 支持团队](/assets/images/enterprise/support/submit-ticket-button.png) {% data reusables.enterprise_enterprise_support.submit-support-ticket-first-section %} diff --git a/translations/zh-CN/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md b/translations/zh-CN/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md index 6c1380c828..087c32c0bb 100644 --- a/translations/zh-CN/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md +++ b/translations/zh-CN/content/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access.md @@ -69,7 +69,7 @@ versions: path: ${{runner.tool_cache}}/tool_cache.tar.gz ``` {% endraw %} -1. 从工作流程运行下载工具缓存构件。 For instructions on downloading artifacts, see "[Downloading workflow artifacts](/actions/managing-workflow-runs/downloading-workflow-artifacts)." +1. 从工作流程运行下载工具缓存构件。 有关下载构件的说明，请参阅“[下载工作流程构件](/actions/managing-workflow-runs/downloading-workflow-artifacts)”。 1. 将工具缓存构件传输到自托管的运行器，并将其提取到本地工具缓存目录。 默认工具缓存目录是 `RUNNER_DIR/_work/_tool`。 如果运行器尚未处理任何任务，您可能需要创建 `_work/_tool` 目录。 提取上述示例中上传的工具缓存构件后，自托管运行器上应具有类似于以下示例的目录结构： diff --git a/translations/zh-CN/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md b/translations/zh-CN/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md index d75b38d01b..96ad00480d 100644 --- a/translations/zh-CN/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md +++ b/translations/zh-CN/content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md @@ -25,8 +25,7 @@ versions: #### 支持的机器类型 以下 Google Compute Engine (GCE) 机器类型支持 {% data variables.product.prodname_ghe_server %}。 更多信息请参阅 [Google Cloud Platform 机器类型文章](https://cloud.google.com/compute/docs/machine-types)。 -| -{% if currentVersion != "free-pro-team@latest" %} + | | 高内存 | | | ------------- | | | n1-highmem-4 | @@ -35,7 +34,6 @@ versions: | | n1-highmem-32 | | | n1-highmem-64 | | | n1-highmem-96 | -{% endif %} #### 建议的机器类型 diff --git a/translations/zh-CN/content/admin/overview/managing-your-github-enterprise-license.md b/translations/zh-CN/content/admin/overview/managing-your-github-enterprise-license.md index 107141d679..a2ac32b6b2 100644 --- a/translations/zh-CN/content/admin/overview/managing-your-github-enterprise-license.md +++ b/translations/zh-CN/content/admin/overview/managing-your-github-enterprise-license.md @@ -30,9 +30,9 @@ versions: 如果您想续订用户许可或将其添加至 {% data variables.product.prodname_enterprise %}，请联系 {% data variables.contact.contact_enterprise_sales %}。 完成订单后，您可以立即下载新的许可文件。 -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. 在左侧边栏中，单击 **Enterprise licensing（企业许可）**。 ![企业帐户设置侧边栏中的"Enterprise licensing（企业许可）"选项卡](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. 在“Enterprise Server Instances（企业服务器实例）”下，单击 {% octicon "download" aria-label="The download icon" %} 下载您的许可文件。 ![下载 GitHub Enterprise Server 许可](/assets/images/help/business-accounts/download-ghes-license.png) 5. 作为站点管理员登录到 您的 {% data variables.product.prodname_ghe_server %} 实例。 @@ -46,9 +46,9 @@ versions: ### 查看许可使用情况 -{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +3. 在左侧边栏中，单击 **Enterprise licensing（企业许可）**。 ![企业帐户设置侧边栏中的"Enterprise licensing（企业许可）"选项卡](/assets/images/help/enterprises/enterprise-licensing-tab.png) 4. 检查您当前的 {% data variables.product.prodname_enterprise %} 许可，以及已使用和可用的用户许可。 ### 自动将用户许可使用情况同步到 {% data variables.product.prodname_ghe_cloud %} @@ -63,11 +63,12 @@ versions: {% data reusables.enterprise_site_admin_settings.business %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.license-tab %} -5. 在“Quick links”下，要下载包含 {% data variables.product.prodname_ghe_server %} 上当前许可使用情况的文件，请单击 **Export license usage**。 ![Export license usage 链接](/assets/images/enterprise/business-accounts/export-license-usage-link.png) -6. 导航到 -{% data variables.product.prodname_ghe_cloud %}. -{% data reusables.enterprise-accounts.access-enterprise %} +5. 在“Quick links（快速链接）”下，下载包含 +{% data variables.product.prodname_ghe_server %} 上当前许可证使用情况的文件，单击 **Export license usage（导出许可证使用情况）**。 + ![Export license usage 链接](/assets/images/enterprise/business-accounts/export-license-usage-link.png) +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} +8. 在左侧边栏中，单击 **Enterprise licensing（企业许可）**。 ![企业帐户设置侧边栏中的"Enterprise licensing（企业许可）"选项卡](/assets/images/help/enterprises/enterprise-licensing-tab.png) +{% data reusables.enterprise-accounts.license-tab %} 10. 在“Enterprise Server Instances（Enterprise Server 实例）”下，单击 **Add server usage（添加服务器使用情况）**。 ![Upload GitHub Enterprise Servers usage 链接](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png) 11. 上传从 {% data variables.product.prodname_ghe_server %} 下载的 JSON 文件。 ![拖放或选择要上传的文件](/assets/images/help/business-accounts/upload-ghe-server-usage-file.png) diff --git a/translations/zh-CN/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md b/translations/zh-CN/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md index 636b0d93e2..606f864653 100644 --- a/translations/zh-CN/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md +++ b/translations/zh-CN/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md @@ -11,7 +11,7 @@ versions: {% data reusables.enterprise_user_management.external_auth_disables_2fa %} -更多信息请参阅[支持双重身份验证的身份验证方法图表](/enterprise/{{ currentVersion }}/user/articles/about-two-factor-authentication/#authentication-methods-that-support-2fa)。 +更多信息请参阅“[关于双重身份验证](/github/authenticating-to-github/about-two-factor-authentication)”。 ### 强制执行双重身份验证的要求 diff --git a/translations/zh-CN/content/developers/apps/authenticating-with-github-apps.md b/translations/zh-CN/content/developers/apps/authenticating-with-github-apps.md index 729710ff0d..bd1fc401be 100644 --- a/translations/zh-CN/content/developers/apps/authenticating-with-github-apps.md +++ b/translations/zh-CN/content/developers/apps/authenticating-with-github-apps.md @@ -10,7 +10,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -92,7 +92,7 @@ puts jwt 创建 JWT 后，在 API 请求的 `Header` 中对它进行设置。 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -H "Authorization: Bearer YOUR_JWT" -H "Accept: application/vnd.github.machine-man-preview+json" {% data variables.product.api_url_pre %}/app ``` @@ -127,7 +127,7 @@ $ curl -i -H "Authorization: Bearer YOUR_JWT" -H "Accept: application/vnd.github 要创建安装访问令牌，请在 API 请求的“授权”标头中加入[上文生成的](#jwt-payload) JWT： -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i -X POST \ -H "Authorization: Bearer YOUR_JWT" \ @@ -147,7 +147,7 @@ $ curl -i -X POST \ 要使用安装访问令牌进行身份验证，请将其加入 API 请求的“授权”标头中。 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ```shell $ curl -i \ -H "Authorization: token YOUR_INSTALLATION_ACCESS_TOKEN" \ diff --git a/translations/zh-CN/content/developers/apps/authorizing-oauth-apps.md b/translations/zh-CN/content/developers/apps/authorizing-oauth-apps.md index 87f8be6975..d5376cc14e 100644 --- a/translations/zh-CN/content/developers/apps/authorizing-oauth-apps.md +++ b/translations/zh-CN/content/developers/apps/authorizing-oauth-apps.md @@ -1,5 +1,5 @@ --- -title: Authorizing OAuth Apps +title: 授权 OAuth 应用程序 intro: '{% data reusables.shortdesc.authorizing_oauth_apps %}' redirect_from: - /apps/building-integrations/setting-up-and-registering-oauth-apps/about-authorization-options-for-oauth-apps/ @@ -21,76 +21,75 @@ If you want to skip authorizing your app in the standard way, such as when testi To authorize your OAuth app, consider which authorization flow best fits your app. -- [web application flow](#web-application-flow): Used to authorize users for standard OAuth apps that run in the browser. (The [implicit grant type](https://tools.ietf.org/html/rfc6749#section-4.2) is not supported.) +- [web application flow](#web-application-flow): Used to authorize users for standard OAuth apps that run in the browser. （不支持[隐式授予类型](https://tools.ietf.org/html/rfc6749#section-4.2)。） - [device flow](#device-flow): Used for headless apps, such as CLI tools. {% else %} -For standard apps that run in the browser, use the [web application flow](#web-application-flow) to obtain an authorization code and exchange it for a token. (The [implicit grant type](https://tools.ietf.org/html/rfc6749#section-4.2) is not supported.) +For standard apps that run in the browser, use the [web application flow](#web-application-flow) to obtain an authorization code and exchange it for a token. （不支持[隐式授予类型](https://tools.ietf.org/html/rfc6749#section-4.2)。） {% endif %} -### Web application flow +### Web 应用程序流程 {% note %} -**Note:** If you are building a GitHub App, you can still use the OAuth web application flow, but the setup has some important differences. See "[Identifying and authorizing users for GitHub Apps](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)" for more information. +**注：**如果您要构建 GitHub 应用程序，依然可以使用 OAuth web 应用程序流程，但设置方面有一些重要差异。 See "[Identifying and authorizing users for GitHub Apps](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)" for more information. {% endnote %} The web application flow to authorize users for your app is: -1. Users are redirected to request their GitHub identity -2. Users are redirected back to your site by GitHub -3. Your app accesses the API with the user's access token +1. 用户被重定向，以请求他们的 GitHub 身份 +2. 用户被 GitHub 重定向回您的站点 +3. 您的应用程序使用用户的访问令牌访问 API -#### 1. Request a user's GitHub identity +#### 1. 请求用户的 GitHub 身份 GET {% data variables.product.oauth_host_code %}/login/oauth/authorize -When your GitHub App specifies a `login` parameter, it prompts users with a specific account they can use for signing in and authorizing your app. +当您的 GitHub 应用程序指定 `login` 参数后，它将提示拥有特定账户的用户可以用来登录和授权您的应用程序。 -##### Parameters +##### 参数 -Name | Type | Description ------|------|-------------- -`client_id`|`string` | **Required**. The client ID you received from GitHub when you {% if currentVersion == "free-pro-team@latest" %}[registered](https://github.com/settings/applications/new){% else %}registered{% endif %}. -`redirect_uri`|`string` | The URL in your application where users will be sent after authorization. See details below about [redirect urls](#redirect-urls). -`login` | `string` | Suggests a specific account to use for signing in and authorizing the app. -`scope`|`string` | A space-delimited list of [scopes](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/). If not provided, `scope` defaults to an empty list for users that have not authorized any scopes for the application. For users who have authorized scopes for the application, the user won't be shown the OAuth authorization page with the list of scopes. Instead, this step of the flow will automatically complete with the set of scopes the user has authorized for the application. For example, if a user has already performed the web flow twice and has authorized one token with `user` scope and another token with `repo` scope, a third web flow that does not provide a `scope` will receive a token with `user` and `repo` scope. -`state` | `string` | {% data reusables.apps.state_description %} -`allow_signup`|`string` | Whether or not unauthenticated users will be offered an option to sign up for GitHub during the OAuth flow. The default is `true`. Use `false` when a policy prohibits signups. +| 名称 | 类型 | 描述 | +| -------------- | ----- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `字符串` | **必填**。 The client ID you received from GitHub when you {% if currentVersion == "free-pro-team@latest" %}[registered](https://github.com/settings/applications/new){% else %}registered{% endif %}. | +| `redirect_uri` | `字符串` | 用户获得授权后被发送到的应用程序中的 URL。 有关[重定向 url](#redirect-urls)，请参阅下方的详细信息。 | +| `login` | `字符串` | 提供用于登录和授权应用程序的特定账户。 | +| `作用域` | `字符串` | 用空格分隔的[作用域](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/)列表。 如果未提供，对于未向应用程序授权任何作用域的用户，`scope` 将默认为空白列表。 对于已向应用程序授权作用域的用户，不会显示含作用域列表的 OAuth 授权页面。 相反，通过用户向应用程序授权的作用域集，此流程步骤将自动完成。 例如，如果用户已执行两次 web 流程，且授权了一个拥有 `user` 作用域的令牌和一个拥有 `repo` 作用域的令牌，未提供 `scope` 的第三次 web 流程将收到拥有 `user` 和 `repo` 作用域的令牌。 | +| `state` | `字符串` | {% data reusables.apps.state_description %} +| `allow_signup` | `字符串` | 在 OAuth 流程中，是否向经过验证的用户提供注册 GitHub 的选项。 默认值为 `true`。 如有政策禁止注册，请使用 `false`。 | -#### 2. Users are redirected back to your site by GitHub +#### 2. 用户被 GitHub 重定向回您的站点 -If the user accepts your request, {% data variables.product.product_name %} redirects back to your site with a temporary `code` in a code parameter as well as the state you provided in the previous step in a `state` parameter. The temporary code will expire after 10 minutes. If the states don't match, then a third party created the request, and you should abort the process. +如果用户接受您的请求，{% data variables.product.product_name %} 将重定向回您的站点，其中，代码参数为临时 `code`，`state` 参数为您在上一步提供的状态。 临时代码将在 10 分钟后到期。 如果状态不匹配，然后第三方创建了请求，您应该中止此过程。 -Exchange this `code` for an access token: +用此 `code` 换访问令牌： POST {% data variables.product.oauth_host_code %}/login/oauth/access_token -##### Parameters +##### 参数 -Name | Type | Description ------|------|-------------- -`client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_github_app %}. -`client_secret` | `string` | **Required.** The client secret you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_github_app %}. -`code` | `string` | **Required.** The code you received as a response to Step 1. -`redirect_uri` | `string` | The URL in your application where users are sent after authorization. -`state` | `string` | The unguessable random string you provided in Step 1. +| 名称 | 类型 | 描述 | +| --------------- | ----- | ------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `字符串` | **必填。**您从 {% data variables.product.product_name %} 收到的 {% data variables.product.prodname_github_app %} 的客户端 ID。 | +| `client_secret` | `字符串` | **必填。**您从 {% data variables.product.product_name %} 收到的 {% data variables.product.prodname_github_app %} 的客户端密钥。 | +| `代码` | `字符串` | **必填。**您收到的响应第 1 步的代码。 | +| `redirect_uri` | `字符串` | 用户获得授权后被发送到的应用程序中的 URL。 | +| `state` | `字符串` | 您在第 1 步提供的不可猜测的随机字符串。 | -##### Response +##### 响应 -By default, the response takes the following form: +默认情况下，响应采用以下形式： access_token=e72e16c7e42f292c6912e7710c838347ae178b4a&token_type=bearer -You can also receive the content in different formats depending on the Accept -header: +您也可以根据“接受”标头接收不同格式的内容： Accept: application/json {"access_token":"e72e16c7e42f292c6912e7710c838347ae178b4a", "scope":"repo,gist", "token_type":"bearer"} - + Accept: application/xml bearer @@ -98,14 +97,14 @@ header: e72e16c7e42f292c6912e7710c838347ae178b4a -#### 3. Use the access token to access the API +#### 3. 使用访问令牌访问 API -The access token allows you to make requests to the API on a behalf of a user. +访问令牌可用于代表用户向 API 提出请求。 Authorization: token OAUTH-TOKEN GET {% data variables.product.api_url_code %}/user -For example, in curl you can set the Authorization header like this: +例如，您可以像以下这样在 curl 中设置“授权”标头： ```shell curl -H "Authorization: token OAUTH-TOKEN" {% data variables.product.api_url_pre %}/user @@ -136,12 +135,12 @@ Your app must request a user verification code and verification URL that the app ##### Input Parameters -Name | Type | Description ------|------|-------------- -`client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your app. -`scope` | `string` | The scope that your app is requesting access to. +| 名称 | 类型 | 描述 | +| ----------- | ----- | ----------------------------------------------------------------------------------------------------- | +| `client_id` | `字符串` | **Required.** The client ID you received from {% data variables.product.product_name %} for your app. | +| `作用域` | `字符串` | The scope that your app is requesting access to. | -##### Response +##### 响应 {% if currentVersion == "free-pro-team@latest" %} ```JSON @@ -167,13 +166,13 @@ Name | Type | Description ##### Response parameters -Name | Type | Description ------|------|-------------- -`device_code` | `string` | The device verification code is 40 characters and used to verify the device. -`user_code` | `string` | The user verification code is displayed on the device so the user can enter the code in a browser. This code is 8 characters with a hyphen in the middle. -`verification_uri` | `string` | The verification URL where users need to enter the `user_code`: {% data variables.product.device_authorization_url %}. -`expires_in` | `integer`| The number of seconds before the `device_code` and `user_code` expire. The default is 900 seconds or 15 minutes. -`interval` | `integer` | The minimum number of seconds that must pass before you can make a new access token request (`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`) to complete the device authorization. For example, if the interval is 5, then you cannot make a new request until 5 seconds pass. If you make more than one request over 5 seconds, then you will hit the rate limit and receive a `slow_down` error. +| 名称 | 类型 | 描述 | +| ------------------ | ----- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `device_code` | `字符串` | The device verification code is 40 characters and used to verify the device. | +| `user_code` | `字符串` | The user verification code is displayed on the device so the user can enter the code in a browser. This code is 8 characters with a hyphen in the middle. | +| `verification_uri` | `字符串` | The verification URL where users need to enter the `user_code`: {% data variables.product.device_authorization_url %}. | +| `expires_in` | `整数` | The number of seconds before the `device_code` and `user_code` expire. The default is 900 seconds or 15 minutes. | +| `interval` | `整数` | The minimum number of seconds that must pass before you can make a new access token request (`POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`) to complete the device authorization. For example, if the interval is 5, then you cannot make a new request until 5 seconds pass. If you make more than one request over 5 seconds, then you will hit the rate limit and receive a `slow_down` error. | #### Step 2: Prompt the user to enter the user code in a browser @@ -193,13 +192,13 @@ Once the user has authorized, the app will receive an access token that can be u ##### Input parameters -Name | Type | Description ------|------|-------------- -`client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_oauth_app %}. -`device_code` | `string` | **Required.** The device verification code you received from the `POST {% data variables.product.oauth_host_code %}/login/device/code` request. -`grant_type` | `string` | **Required.** The grant type must be `urn:ietf:params:oauth:grant-type:device_code`. +| 名称 | 类型 | 描述 | +| ------------- | ----- | ----------------------------------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `字符串` | **必填。**您从 {% data variables.product.product_name %} 收到的 {% data variables.product.prodname_oauth_app %} 的客户端 ID。 | +| `device_code` | `字符串` | **Required.** The device verification code you received from the `POST {% data variables.product.oauth_host_code %}/login/device/code` request. | +| `grant_type` | `字符串` | **Required.** The grant type must be `urn:ietf:params:oauth:grant-type:device_code`. | -##### Response +##### 响应 ```json { @@ -217,42 +216,36 @@ If you make more than one access token request (`POST {% data variables.product. #### Error codes for the device flow -| Error code | Description | -|----|----| -| `authorization_pending`| This error occurs when the authorization request is pending and the user hasn't entered the user code yet. The app is expected to keep polling the `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token` request without exceeding the [`interval`](#response-parameters), which requires a minimum number of seconds between each request. | -| `slow_down` | When you receive the `slow_down` error, 5 extra seconds are added to the minimum `interval` or timeframe required between your requests using `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`. For example, if the starting interval required at least 5 seconds between requests and you get a `slow_down` error response, you must now wait a minimum of 10 seconds before making a new request for an OAuth access token. The error response includes the new `interval` that you must use. -| `expired_token` | If the device code expired, then you will see the `token_expired` error. You must make a new request for a device code. -| `unsupported_grant_type` | The grant type must be `urn:ietf:params:oauth:grant-type:device_code` and included as an input parameter when you poll the OAuth token request `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`. -| `incorrect_client_credentials` | For the device flow, you must pass your app's client ID, which you can find on your app settings page. The `client_secret` is not needed for the device flow. -| `incorrect_device_code` | The device_code provided is not valid. -| `access_denied` | When a user clicks cancel during the authorization process, you'll receive a `access_denied` error and the user won't be able to use the verification code again. +| Error code | 描述 | +| ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `authorization_pending` | This error occurs when the authorization request is pending and the user hasn't entered the user code yet. The app is expected to keep polling the `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token` request without exceeding the [`interval`](#response-parameters), which requires a minimum number of seconds between each request. | +| `slow_down` | When you receive the `slow_down` error, 5 extra seconds are added to the minimum `interval` or timeframe required between your requests using `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`. For example, if the starting interval required at least 5 seconds between requests and you get a `slow_down` error response, you must now wait a minimum of 10 seconds before making a new request for an OAuth access token. The error response includes the new `interval` that you must use. | +| `expired_token` | If the device code expired, then you will see the `token_expired` error. You must make a new request for a device code. | +| `unsupported_grant_type` | The grant type must be `urn:ietf:params:oauth:grant-type:device_code` and included as an input parameter when you poll the OAuth token request `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`. | +| `incorrect_client_credentials` | For the device flow, you must pass your app's client ID, which you can find on your app settings page. The `client_secret` is not needed for the device flow. | +| `incorrect_device_code` | The device_code provided is not valid. | +| `access_denied` | When a user clicks cancel during the authorization process, you'll receive a `access_denied` error and the user won't be able to use the verification code again. | For more information, see the "[OAuth 2.0 Device Authorization Grant](https://tools.ietf.org/html/rfc8628#section-3.5)." {% endif %} -### Non-Web application flow +### 非 Web 应用程序流程 -Non-web authentication is available for limited situations like testing. If you need to, you can use [Basic Authentication](/v3/auth#basic-authentication) to create a personal access token using your [Personal access tokens settings page](/articles/creating-an-access-token-for-command-line-use). This technique enables the user to revoke access at any time. +非 web 身份验证适用于测试等有限的情况。 如果您需要，可以使用[基本验证](/v3/auth#basic-authentication)，通过[个人访问令牌设置页面](/articles/creating-an-access-token-for-command-line-use)创建个人访问令牌。 此方法支持用户随时撤销访问权限。 {% note %} -**Note:** When using the non-web application flow to create an OAuth2 token, make sure to understand how to [work with -two-factor authentication](/v3/auth/#working-with-two-factor-authentication) if -you or your users have two-factor authentication enabled. +**注：**使用非 web 应用流程创建 OAuth2 令牌时，如果您或您的用户已启用双重身份验证，请确保明白如何[使用双重身份验证](/v3/auth/#working-with-two-factor-authentication)。 {% endnote %} -### Redirect URLs +### 重定向 URL -The `redirect_uri` parameter is optional. If left out, GitHub will -redirect users to the callback URL configured in the OAuth Application -settings. If provided, the redirect URL's host and port must exactly -match the callback URL. The redirect URL's path must reference a -subdirectory of the callback URL. +`redirect_uri` 参数是可选参数。 如果遗漏，GitHub 则将用户重定向到 OAuth 应用程序设置中配置的回调 URL。 如果提供，重定向 URL 的主机和端口必须完全匹配回调 URL。 重定向 URL 的路径必须引用回调 URL 的子目录。 CALLBACK: http://example.com/path - + GOOD: http://example.com/path GOOD: http://example.com/path/subdir/other BAD: http://example.com/bar @@ -261,29 +254,29 @@ subdirectory of the callback URL. BAD: http://oauth.example.com:8080/path BAD: http://example.org -#### Localhost redirect urls +#### 本地主机重定向 URL -The optional `redirect_uri` parameter can also be used for localhost URLs. If the application specifies a localhost URL and a port, then after authorizing the application users will be redirected to the provided URL and port. The `redirect_uri` does not need to match the port specified in the callback url for the app. +可选的 `redirect_uri` 参数也可用于本地主机 URL。 如果应用程序指定 URL 和端口，授权后，应用程序用户将被重定向到提供的 URL 和端口。 `redirect_uri` 不需要匹配应用程序回调 url 中指定的端口。 -For the `http://localhost/path` callback URL, you can use this `redirect_uri`: +对于 `http://localhost/path` 回调 URL，您可以使用此 `redirect_uri`： http://localhost:1234/path -### Creating multiple tokens for OAuth Apps +### 为 OAuth 应用程序创建多个令牌 -You can create multiple tokens for a user/application/scope combination to create tokens for specific use cases. +您可以为用户/应用程序/作用域组合创建多个令牌，以便为特定用例创建令牌。 -This is useful if your OAuth App supports one workflow that uses GitHub for sign-in and only requires basic user information. Another workflow may require access to a user's private repositories. Using multiple tokens, your OAuth App can perform the web flow for each use case, requesting only the scopes needed. If a user only uses your application to sign in, they are never required to grant your OAuth App access to their private repositories. +如果您的 OAuth 应用程序支持一个使用 GitHub 登录且只需基本用户信息的工作流程，此方法将非常有用。 另一个工作流程可能需要访问用户的私有仓库。 您的 OAuth 应用程序可以使用多个令牌为每个用例执行 web 流程，只需要所需的作用域。 如果用户仅使用您的应用程序登录，则无需向他们的私有仓库授予您的 OAuth 应用程序访问权限。 -There is a limit to the number of tokens that are issued per user/application/scope combination. If your application requests enough tokens to go over one of the limits, older tokens _with the same scope being requested_ will stop working. +每个用户/应用程序/作用域组合签发的令牌数量有限。 如果您的应用程序请求足够的令牌超越其中一个限制，_所请求的作用域相同的_旧令牌将停止工作。 {% data reusables.apps.deletes_ssh_keys %} -### Directing users to review their access +### 指示用户审查其访问权限 -You can link to authorization information for an OAuth App so that users can review and revoke their application authorizations. +您可以链接至 OAuth 应用程序的授权信息，以便用户审查和撤销其应用程序授权。 -To build this link, you'll need your OAuth Apps `client_id` that you received from GitHub when you registered the application. +要构建此链接，需要使用注册应用程序时从 GitHub 收到的 OAuth 应用程序 `client_id`。 ``` {% data variables.product.oauth_host_code %}/settings/connections/applications/:client_id @@ -291,14 +284,14 @@ To build this link, you'll need your OAuth Apps `client_id` that you received fr {% tip %} -**Tip:** To learn more about the resources that your OAuth App can access for a user, see "[Discovering resources for a user](/v3/guides/discovering-resources-for-a-user/)." +**提示：**要详细了解您的 OAuth 应用程序可以为用户访问的资源，请参阅“[为用户发现资源](/v3/guides/discovering-resources-for-a-user/)。” {% endtip %} -### Troubleshooting +### 疑难解答 -* "[Troubleshooting authorization request errors](/apps/managing-oauth-apps/troubleshooting-authorization-request-errors)" -* "[Troubleshooting OAuth App access token request errors](/apps/managing-oauth-apps/troubleshooting-oauth-app-access-token-request-errors)" +* "[对授权请求错误进行故障排除](/apps/managing-oauth-apps/troubleshooting-authorization-request-errors)" +* "[对 OAuth 应用程序访问令牌请求错误进行故障排除](/apps/managing-oauth-apps/troubleshooting-oauth-app-access-token-request-errors)" {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} * "[Device flow errors](#errors-for-the-device-flow)" {% endif %} diff --git a/translations/zh-CN/content/developers/apps/creating-a-github-app-from-a-manifest.md b/translations/zh-CN/content/developers/apps/creating-a-github-app-from-a-manifest.md index cc98ff80aa..c4d492bda3 100644 --- a/translations/zh-CN/content/developers/apps/creating-a-github-app-from-a-manifest.md +++ b/translations/zh-CN/content/developers/apps/creating-a-github-app-from-a-manifest.md @@ -162,7 +162,7 @@ You must complete this step of the GitHub App Manifest flow within one hour. {% endnote %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% data reusables.pre-release-program.fury-pre-release %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/zh-CN/content/developers/apps/creating-a-github-app-using-url-parameters.md b/translations/zh-CN/content/developers/apps/creating-a-github-app-using-url-parameters.md index d718d3f89b..275bd3126f 100644 --- a/translations/zh-CN/content/developers/apps/creating-a-github-app-using-url-parameters.md +++ b/translations/zh-CN/content/developers/apps/creating-a-github-app-using-url-parameters.md @@ -27,93 +27,93 @@ The complete list of available query parameters, permissions, and events is list ### {% data variables.product.prodname_github_app %} configuration parameters - Name | Type | Description ------|------|------------- -`name` | `string` | The name of the {% data variables.product.prodname_github_app %}. Give your app a clear and succinct name. Your app cannot have the same name as an existing GitHub user, unless it is your own user or organization name. A slugged version of your app's name will be shown in the user interface when your integration takes an action. -`description` | `string` | A description of the {% data variables.product.prodname_github_app %}. -`url` | `string` | The full URL of your {% data variables.product.prodname_github_app %}'s website homepage. -`callback_url` | `string` | The full URL to redirect to after someone authorizes an installation. This URL is used if your app needs to identify and authorize user-to-server requests. -`request_oauth_on_install` | `boolean` | If your app authorizes users using the OAuth flow, you can set this option to `true` to allow people to authorize the app when they install it, saving a step. If you select this option, the `setup_url` becomes unavailable and users will be redirected to your `callback_url` after installing the app. -`setup_url` | `string` | The full URL to redirect to after someone installs the {% data variables.product.prodname_github_app %} if the app requires additional setup after installation. -`setup_on_update` | `boolean` | Set to `true` to redirect people to the setup URL when installations have been updated, for example, after repositories are added or removed. -`public` | `boolean` | Set to `true` when your {% data variables.product.prodname_github_app %} is available to the public or `false` when it is only accessible to the owner of the app. -`webhook_url` | `string` | The full URL that you would like to send webhook event payloads to. -`webhook_secret` | `string` | You can specify a secret to secure your webhooks. See "[Securing your webhooks](/webhooks/securing/)" for more details. -`events` | `array of strings` | Webhook events. Some webhook events require `read` or `write` permissions for a resource before you can select the event when registering a new {% data variables.product.prodname_github_app %}. See the "[{% data variables.product.prodname_github_app %} webhook events](#github-app-webhook-events)" section for available events and their required permissions. You can select multiple events in a query string. For example, `events[]=public&events[]=label`. -`domain` | `string` | The URL of a content reference. -`single_file_name` | `string` | When you grant `read` or `write` access to the `single_file` permission, this field provides the path to the single file your {% data variables.product.prodname_github_app %} will manage. + | 名称 | 类型 | 描述 | + | -------------------------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | + | `name` | `字符串` | The name of the {% data variables.product.prodname_github_app %}. Give your app a clear and succinct name. Your app cannot have the same name as an existing GitHub user, unless it is your own user or organization name. A slugged version of your app's name will be shown in the user interface when your integration takes an action. | + | `说明` | `字符串` | A description of the {% data variables.product.prodname_github_app %}. | + | `url` | `字符串` | The full URL of your {% data variables.product.prodname_github_app %}'s website homepage. | + | `callback_url` | `字符串` | The full URL to redirect to after someone authorizes an installation. This URL is used if your app needs to identify and authorize user-to-server requests. | + | `request_oauth_on_install` | `布尔值` | If your app authorizes users using the OAuth flow, you can set this option to `true` to allow people to authorize the app when they install it, saving a step. If you select this option, the `setup_url` becomes unavailable and users will be redirected to your `callback_url` after installing the app. | + | `setup_url` | `字符串` | The full URL to redirect to after someone installs the {% data variables.product.prodname_github_app %} if the app requires additional setup after installation. | + | `setup_on_update` | `布尔值` | Set to `true` to redirect people to the setup URL when installations have been updated, for example, after repositories are added or removed. | + | `public` | `布尔值` | Set to `true` when your {% data variables.product.prodname_github_app %} is available to the public or `false` when it is only accessible to the owner of the app. | + | `webhook_url` | `字符串` | The full URL that you would like to send webhook event payloads to. | + | `webhook_secret` | `字符串` | You can specify a secret to secure your webhooks. See "[Securing your webhooks](/webhooks/securing/)" for more details. | + | `事件` | `字符串数组` | Web 挂钩事件. Some webhook events require `read` or `write` permissions for a resource before you can select the event when registering a new {% data variables.product.prodname_github_app %}. See the "[{% data variables.product.prodname_github_app %} webhook events](#github-app-webhook-events)" section for available events and their required permissions. You can select multiple events in a query string. For example, `events[]=public&events[]=label`. | + | `域` | `字符串` | The URL of a content reference. | + | `single_file_name` | `字符串` | When you grant `read` or `write` access to the `single_file` permission, this field provides the path to the single file your {% data variables.product.prodname_github_app %} will manage. | ### {% data variables.product.prodname_github_app %} permissions You can select permissions in a query string using the permission name in the following table as the query parameter name and the permission type as the query value. For example, to select `Read & write` permissions in the user interface for `contents`, your query string would include `&contents=write`. To select `Read-only` permissions in the user interface for `blocking`, your query string would include `&blocking=read`. To select `no-access` in the user interface for `checks`, your query string would not include the `checks` permission. -Permission | Description ----------- | ----------- -[`administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-administration) | Grants access to various endpoints for organization and repository administration. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} -[`blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-blocking) | Grants access to the [Blocking Users API](/v3/users/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} -[`checks`](/rest/reference/permissions-required-for-github-apps/#permission-on-checks) | Grants access to the [Checks API](/v3/checks/). Can be one of: `none`, `read`, or `write`. -`content_references` | Grants access to the "[Create a content attachment](/v3/apps/installations/#create-a-content-attachment)" endpoint. Can be one of: `none`, `read`, or `write`. -[`contents`](/rest/reference/permissions-required-for-github-apps/#permission-on-contents) | Grants access to various endpoints that allow you to modify repository contents. Can be one of: `none`, `read`, or `write`. -[`deployments`](/rest/reference/permissions-required-for-github-apps/#permission-on-deployments) | Grants access to the [Deployments API](/rest/reference/repos#deployments). Can be one of: `none`, `read`, or `write`. -[`emails`](/rest/reference/permissions-required-for-github-apps/#permission-on-emails) | Grants access to the [Emails API](/v3/users/emails/). Can be one of: `none`, `read`, or `write`. -[`followers`](/rest/reference/permissions-required-for-github-apps/#permission-on-followers) | Grants access to the [Followers API](/v3/users/followers/). Can be one of: `none`, `read`, or `write`. -[`gpg_keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-gpg-keys) | Grants access to the [GPG Keys API](/v3/users/gpg_keys/). Can be one of: `none`, `read`, or `write`. -[`issues`](/rest/reference/permissions-required-for-github-apps/#permission-on-issues) | Grants access to the [Issues API](/v3/issues/). Can be one of: `none`, `read`, or `write`. -[`keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-keys) | Grants access to the [Public Keys API](/v3/users/keys/). Can be one of: `none`, `read`, or `write`. -[`members`](/rest/reference/permissions-required-for-github-apps/#permission-on-members) | Grants access to manage an organization's members. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} -[`metadata`](/rest/reference/permissions-required-for-github-apps/#metadata-permissions) | Grants access to read-only endpoints that do not leak sensitive data. Can be `read` or `none`. Defaults to `read` when you set any permission, or defaults to `none` when you don't specify any permissions for the {% data variables.product.prodname_github_app %}. -[`organization_administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-administration) | Grants access to "[Update an organization](/v3/orgs/#update-an-organization)" endpoint and the [Organization Interaction Restrictions API](/v3/interactions/orgs/#set-interaction-restrictions-for-an-organization). Can be one of: `none`, `read`, or `write`.{% endif %} -[`organization_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-hooks) | Grants access to the [Organization Webhooks API](/rest/reference/orgs#webhooks/). Can be one of: `none`, `read`, or `write`. -`organization_plan` | Grants access to get information about an organization's plan using the "[Get an organization](/v3/orgs/#get-an-organization)" endpoint. Can be one of: `none` or `read`. -[`organization_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`.{% if currentVersion == "free-pro-team@latest" %} -[`organization_user_blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Blocking Organization Users API](/v3/orgs/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} -[`pages`](/rest/reference/permissions-required-for-github-apps/#permission-on-pages) | Grants access to the [Pages API](/rest/reference/repos#pages). Can be one of: `none`, `read`, or `write`. -`plan` | Grants access to get information about a user's GitHub plan using the "[Get a user](/v3/users/#get-a-user)" endpoint. Can be one of: `none` or `read`. -[`pull_requests`](/rest/reference/permissions-required-for-github-apps/#permission-on-pull-requests) | Grants access to various pull request endpoints. Can be one of: `none`, `read`, or `write`. -[`repository_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-hooks) | Grants access to the [Repository Webhooks API](/v3/repos/hooks/). Can be one of: `none`, `read`, or `write`. -[`repository_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`. -[`single_file`](/rest/reference/permissions-required-for-github-apps/#permission-on-single-file) | Grants access to the [Contents API](/v3/repos/contents/). Can be one of: `none`, `read`, or `write`. -[`starring`](/rest/reference/permissions-required-for-github-apps/#permission-on-starring) | Grants access to the [Starring API](/v3/activity/starring/). Can be one of: `none`, `read`, or `write`. -[`statuses`](/rest/reference/permissions-required-for-github-apps/#permission-on-statuses) | Grants access to the [Statuses API](/v3/repos/statuses/). Can be one of: `none`, `read`, or `write`. -[`team_discussions`](/rest/reference/permissions-required-for-github-apps/#permission-on-team-discussions) | Grants access to the [Team Discussions API](/v3/teams/discussions/) and the [Team Discussion Comments API](/v3/teams/discussion_comments/). Can be one of: `none`, `read`, or `write`. -`vulnerability_alerts`| Grants access to receive security alerts for vulnerable dependencies in a repository. See "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies)" to learn more. Can be one of: `none` or `read`. -`watching` | Grants access to list and change repositories a user is subscribed to. Can be one of: `none`, `read`, or `write`. +| 权限 | 描述 | +| -------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| [`管理`](/rest/reference/permissions-required-for-github-apps/#permission-on-administration) | Grants access to various endpoints for organization and repository administration. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} +| [`blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-blocking) | Grants access to the [Blocking Users API](/v3/users/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} +| [`检查`](/rest/reference/permissions-required-for-github-apps/#permission-on-checks) | Grants access to the [Checks API](/v3/checks/). Can be one of: `none`, `read`, or `write`. | +| `content_references` | Grants access to the "[Create a content attachment](/v3/apps/installations/#create-a-content-attachment)" endpoint. Can be one of: `none`, `read`, or `write`. | +| [`内容`](/rest/reference/permissions-required-for-github-apps/#permission-on-contents) | Grants access to various endpoints that allow you to modify repository contents. Can be one of: `none`, `read`, or `write`. | +| [`部署`](/rest/reference/permissions-required-for-github-apps/#permission-on-deployments) | Grants access to the [Deployments API](/rest/reference/repos#deployments). Can be one of: `none`, `read`, or `write`. | +| [`emails`](/rest/reference/permissions-required-for-github-apps/#permission-on-emails) | Grants access to the [Emails API](/v3/users/emails/). Can be one of: `none`, `read`, or `write`. | +| [`关注者`](/rest/reference/permissions-required-for-github-apps/#permission-on-followers) | Grants access to the [Followers API](/v3/users/followers/). Can be one of: `none`, `read`, or `write`. | +| [`gpg_keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-gpg-keys) | Grants access to the [GPG Keys API](/v3/users/gpg_keys/). Can be one of: `none`, `read`, or `write`. | +| [`issues`](/rest/reference/permissions-required-for-github-apps/#permission-on-issues) | Grants access to the [Issues API](/v3/issues/). Can be one of: `none`, `read`, or `write`. | +| [`键`](/rest/reference/permissions-required-for-github-apps/#permission-on-keys) | Grants access to the [Public Keys API](/v3/users/keys/). Can be one of: `none`, `read`, or `write`. | +| [`members`](/rest/reference/permissions-required-for-github-apps/#permission-on-members) | Grants access to manage an organization's members. Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" %} +| [`元数据`](/rest/reference/permissions-required-for-github-apps/#metadata-permissions) | Grants access to read-only endpoints that do not leak sensitive data. Can be `read` or `none`. Defaults to `read` when you set any permission, or defaults to `none` when you don't specify any permissions for the {% data variables.product.prodname_github_app %}. | +| [`organization_administration`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-administration) | Grants access to "[Update an organization](/v3/orgs/#update-an-organization)" endpoint and the [Organization Interaction Restrictions API](/v3/interactions/orgs/#set-interaction-restrictions-for-an-organization). Can be one of: `none`, `read`, or `write`.{% endif %} +| [`organization_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-hooks) | Grants access to the [Organization Webhooks API](/rest/reference/orgs#webhooks/). Can be one of: `none`, `read`, or `write`. | +| `organization_plan` | Grants access to get information about an organization's plan using the "[Get an organization](/v3/orgs/#get-an-organization)" endpoint. Can be one of: `none` or `read`. | +| [`organization_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`.{% if currentVersion == "free-pro-team@latest" %} +| [`organization_user_blocking`](/rest/reference/permissions-required-for-github-apps/#permission-on-organization-projects) | Grants access to the [Blocking Organization Users API](/v3/orgs/blocking/). Can be one of: `none`, `read`, or `write`.{% endif %} +| [`页面`](/rest/reference/permissions-required-for-github-apps/#permission-on-pages) | Grants access to the [Pages API](/rest/reference/repos#pages). Can be one of: `none`, `read`, or `write`. | +| `plan` | Grants access to get information about a user's GitHub plan using the "[Get a user](/v3/users/#get-a-user)" endpoint. Can be one of: `none` or `read`. | +| [`pull_requests`](/rest/reference/permissions-required-for-github-apps/#permission-on-pull-requests) | Grants access to various pull request endpoints. Can be one of: `none`, `read`, or `write`. | +| [`repository_hooks`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-hooks) | Grants access to the [Repository Webhooks API](/v3/repos/hooks/). Can be one of: `none`, `read`, or `write`. | +| [`repository_projects`](/rest/reference/permissions-required-for-github-apps/#permission-on-repository-projects) | Grants access to the [Projects API](/v3/projects/). Can be one of: `none`, `read`, `write`, or `admin`. | +| [`single_file`](/rest/reference/permissions-required-for-github-apps/#permission-on-single-file) | Grants access to the [Contents API](/v3/repos/contents/). Can be one of: `none`, `read`, or `write`. | +| [`标星`](/rest/reference/permissions-required-for-github-apps/#permission-on-starring) | Grants access to the [Starring API](/v3/activity/starring/). Can be one of: `none`, `read`, or `write`. | +| [`statuses`](/rest/reference/permissions-required-for-github-apps/#permission-on-statuses) | Grants access to the [Statuses API](/v3/repos/statuses/). Can be one of: `none`, `read`, or `write`. | +| [`team_discussions`](/rest/reference/permissions-required-for-github-apps/#permission-on-team-discussions) | Grants access to the [Team Discussions API](/v3/teams/discussions/) and the [Team Discussion Comments API](/v3/teams/discussion_comments/). Can be one of: `none`, `read`, or `write`. | +| `vulnerability_alerts` | Grants access to receive security alerts for vulnerable dependencies in a repository. See "[About security alerts for vulnerable dependencies](/articles/about-security-alerts-for-vulnerable-dependencies)" to learn more. Can be one of: `none` or `read`. | +| `关注` | Grants access to list and change repositories a user is subscribed to. Can be one of: `none`, `read`, or `write`. | ### {% data variables.product.prodname_github_app %} webhook events -Webhook event name | Required permission | Description ------------------- | ------------------- | ----------- -[`check_run`](/webhooks/event-payloads/#check_run) |`checks` | {% data reusables.webhooks.check_run_short_desc %} -[`check_suite`](/webhooks/event-payloads/#check_suite) |`checks` | {% data reusables.webhooks.check_suite_short_desc %} -[`commit_comment`](/webhooks/event-payloads/#commit_comment) | `contents` | {% data reusables.webhooks.commit_comment_short_desc %} -[`content_reference`](/webhooks/event-payloads/#content_reference) |`content_references` | {% data reusables.webhooks.content_reference_short_desc %} -[`create`](/webhooks/event-payloads/#create) | `contents` | {% data reusables.webhooks.create_short_desc %} -[`delete`](/webhooks/event-payloads/#delete) | `contents` | {% data reusables.webhooks.delete_short_desc %} -[`deployment`](/webhooks/event-payloads/#deployment) | `deployments` | {% data reusables.webhooks.deployment_short_desc %} -[`deployment_status`](/webhooks/event-payloads/#deployment_status) | `deployments` | {% data reusables.webhooks.deployment_status_short_desc %} -[`fork`](/webhooks/event-payloads/#fork) | `contents` | {% data reusables.webhooks.fork_short_desc %} -[`gollum`](/webhooks/event-payloads/#gollum) | `contents` | {% data reusables.webhooks.gollum_short_desc %} -[`issues`](/webhooks/event-payloads/#issues) | `issues` | {% data reusables.webhooks.issues_short_desc %} -[`issue_comment`](/webhooks/event-payloads/#issue_comment) | `issues` | {% data reusables.webhooks.issue_comment_short_desc %} -[`label`](/webhooks/event-payloads/#label) | `metadata` | {% data reusables.webhooks.label_short_desc %} -[`member`](/webhooks/event-payloads/#member) | `members` | {% data reusables.webhooks.member_short_desc %} -[`membership`](/webhooks/event-payloads/#membership) | `members` | {% data reusables.webhooks.membership_short_desc %} -[`milestone`](/webhooks/event-payloads/#milestone) | `pull_request` | {% data reusables.webhooks.milestone_short_desc %}{% if currentVersion == "free-pro-team@latest" %} -[`org_block`](/webhooks/event-payloads/#org_block) | `organization_administration` | {% data reusables.webhooks.org_block_short_desc %}{% endif %} -[`organization`](/webhooks/event-payloads/#organization) | `members` | {% data reusables.webhooks.organization_short_desc %} -[`page_build`](/webhooks/event-payloads/#page_build) | `pages` | {% data reusables.webhooks.page_build_short_desc %} -[`project`](/webhooks/event-payloads/#project) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_short_desc %} -[`project_card`](/webhooks/event-payloads/#project_card) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_card_short_desc %} -[`project_column`](/webhooks/event-payloads/#project_column) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_column_short_desc %} -[`public`](/webhooks/event-payloads/#public) | `metadata` | {% data reusables.webhooks.public_short_desc %} -[`pull_request`](/webhooks/event-payloads/#pull_request) | `pull_requests` | {% data reusables.webhooks.pull_request_short_desc %} -[`pull_request_review`](/webhooks/event-payloads/#pull_request_review) | `pull_request` | {% data reusables.webhooks.pull_request_review_short_desc %} -[`pull_request_review_comment`](/webhooks/event-payloads/#pull_request_review_comment) | `pull_request` | {% data reusables.webhooks.pull_request_review_comment_short_desc %} -[`push`](/webhooks/event-payloads/#push) | `contents` | {% data reusables.webhooks.push_short_desc %} -[`release`](/webhooks/event-payloads/#release) | `contents` | {% data reusables.webhooks.release_short_desc %} -[`repository`](/webhooks/event-payloads/#repository) |`metadata` | {% data reusables.webhooks.repository_short_desc %}{% if currentVersion == "free-pro-team@latest"%} -[`repository_dispatch`](/webhooks/event-payloads/#repository_dispatch) | `contents` | Allows integrators using GitHub Actions to trigger custom events.{% endif %} -[`status`](/webhooks/event-payloads/#status) | `statuses` | {% data reusables.webhooks.status_short_desc %} -[`team`](/webhooks/event-payloads/#team) | `members` | {% data reusables.webhooks.team_short_desc %} -[`team_add`](/webhooks/event-payloads/#team_add) | `members` | {% data reusables.webhooks.team_add_short_desc %} -[`watch`](/webhooks/event-payloads/#watch) | `metadata` | {% data reusables.webhooks.watch_short_desc %} +| Web 挂钩事件名称 | Required permission | 描述 | +| -------------------------------------------------------------------------------------- | ------------------------------------------------ | ----------------------------------------------------------------------------------------------------- | +| [`check_run`](/webhooks/event-payloads/#check_run) | `检查` | {% data reusables.webhooks.check_run_short_desc %} +| [`check_suite`](/webhooks/event-payloads/#check_suite) | `检查` | {% data reusables.webhooks.check_suite_short_desc %} +| [`commit_comment`](/webhooks/event-payloads/#commit_comment) | `内容` | {% data reusables.webhooks.commit_comment_short_desc %} +| [`content_reference`](/webhooks/event-payloads/#content_reference) | `content_references` | {% data reusables.webhooks.content_reference_short_desc %} +| [`create`](/webhooks/event-payloads/#create) | `内容` | {% data reusables.webhooks.create_short_desc %} +| [`delete`](/webhooks/event-payloads/#delete) | `内容` | {% data reusables.webhooks.delete_short_desc %} +| [`deployment`](/webhooks/event-payloads/#deployment) | `部署` | {% data reusables.webhooks.deployment_short_desc %} +| [`deployment_status`](/webhooks/event-payloads/#deployment_status) | `部署` | {% data reusables.webhooks.deployment_status_short_desc %} +| [`复刻`](/webhooks/event-payloads/#fork) | `内容` | {% data reusables.webhooks.fork_short_desc %} +| [`gollum`](/webhooks/event-payloads/#gollum) | `内容` | {% data reusables.webhooks.gollum_short_desc %} +| [`issues`](/webhooks/event-payloads/#issues) | `issues` | {% data reusables.webhooks.issues_short_desc %} +| [`issue_comment`](/webhooks/event-payloads/#issue_comment) | `issues` | {% data reusables.webhooks.issue_comment_short_desc %} +| [`标签`](/webhooks/event-payloads/#label) | `元数据` | {% data reusables.webhooks.label_short_desc %} +| [`成员`](/webhooks/event-payloads/#member) | `members` | {% data reusables.webhooks.member_short_desc %} +| [`membership`](/webhooks/event-payloads/#membership) | `members` | {% data reusables.webhooks.membership_short_desc %} +| [`里程碑`](/webhooks/event-payloads/#milestone) | `pull_request` | {% data reusables.webhooks.milestone_short_desc %}{% if currentVersion == "free-pro-team@latest" %} +| [`org_block`](/webhooks/event-payloads/#org_block) | `organization_administration` | {% data reusables.webhooks.org_block_short_desc %}{% endif %} +| [`组织`](/webhooks/event-payloads/#organization) | `members` | {% data reusables.webhooks.organization_short_desc %} +| [`page_build`](/webhooks/event-payloads/#page_build) | `页面` | {% data reusables.webhooks.page_build_short_desc %} +| [`project`](/webhooks/event-payloads/#project) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_short_desc %} +| [`project_card`](/webhooks/event-payloads/#project_card) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_card_short_desc %} +| [`project_column`](/webhooks/event-payloads/#project_column) | `repository_projects` or `organization_projects` | {% data reusables.webhooks.project_column_short_desc %} +| [`public`](/webhooks/event-payloads/#public) | `元数据` | {% data reusables.webhooks.public_short_desc %} +| [`pull_request`](/webhooks/event-payloads/#pull_request) | `pull_requests` | {% data reusables.webhooks.pull_request_short_desc %} +| [`pull_request_review`](/webhooks/event-payloads/#pull_request_review) | `pull_request` | {% data reusables.webhooks.pull_request_review_short_desc %} +| [`pull_request_review_comment`](/webhooks/event-payloads/#pull_request_review_comment) | `pull_request` | {% data reusables.webhooks.pull_request_review_comment_short_desc %} +| [`推送`](/webhooks/event-payloads/#push) | `内容` | {% data reusables.webhooks.push_short_desc %} +| [`发行版`](/webhooks/event-payloads/#release) | `内容` | {% data reusables.webhooks.release_short_desc %} +| [`仓库`](/webhooks/event-payloads/#repository) | `元数据` | {% data reusables.webhooks.repository_short_desc %}{% if currentVersion == "free-pro-team@latest"%} +| [`repository_dispatch`](/webhooks/event-payloads/#repository_dispatch) | `内容` | Allows integrators using GitHub Actions to trigger custom events.{% endif %} +| [`状态`](/webhooks/event-payloads/#status) | `statuses` | {% data reusables.webhooks.status_short_desc %} +| [`团队`](/webhooks/event-payloads/#team) | `members` | {% data reusables.webhooks.team_short_desc %} +| [`team_add`](/webhooks/event-payloads/#team_add) | `members` | {% data reusables.webhooks.team_add_short_desc %} +| [`查看`](/webhooks/event-payloads/#watch) | `元数据` | {% data reusables.webhooks.watch_short_desc %} diff --git a/translations/zh-CN/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/translations/zh-CN/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md index 95d7ec2ffc..f00fd92dde 100644 --- a/translations/zh-CN/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md +++ b/translations/zh-CN/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md @@ -25,30 +25,30 @@ To authorize users for standard apps that run in the browser, use the [web appli To authorize users for headless apps without direct access to the browser, such as CLI tools or Git credential managers, use the [device flow](#device-flow). The device flow uses the OAuth 2.0 [Device Authorization Grant](https://tools.ietf.org/html/rfc8628). {% endif %} -### Web application flow +### Web 应用程序流程 Using the web application flow, the process to identify users on your site is: -1. Users are redirected to request their GitHub identity -2. Users are redirected back to your site by GitHub +1. 用户被重定向，以请求他们的 GitHub 身份 +2. 用户被 GitHub 重定向回您的站点 3. Your GitHub App accesses the API with the user's access token If you select **Request user authorization (OAuth) during installation** when creating or modifying your app, step 1 will be completed during app installation. For more information, see "[Authorizing users during installation](/apps/installing-github-apps/#authorizing-users-during-installation)." -#### 1. Request a user's GitHub identity +#### 1. 请求用户的 GitHub 身份 GET {% data variables.product.oauth_host_code %}/login/oauth/authorize -When your GitHub App specifies a `login` parameter, it prompts users with a specific account they can use for signing in and authorizing your app. +当您的 GitHub 应用程序指定 `login` 参数后，它将提示拥有特定账户的用户可以用来登录和授权您的应用程序。 -##### Parameters +##### 参数 -Name | Type | Description ------|------|------------ -`client_id` | `string` | **Required.** The client ID for your GitHub App. You can find this in your [GitHub App settings](https://github.com/settings/apps) when you select your app. -`redirect_uri` | `string` | The URL in your application where users will be sent after authorization. This must be an exact match to the URL you provided in the **User authorization callback URL** field when setting up your GitHub App and can't contain any additional parameters. -`state` | `string` | This should contain a random string to protect against forgery attacks and could contain any other arbitrary data. -`login` | `string` | Suggests a specific account to use for signing in and authorizing the app. +| 名称 | 类型 | 描述 | +| -------------- | ----- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `client_id` | `字符串` | **Required.** The client ID for your GitHub App. You can find this in your [GitHub App settings](https://github.com/settings/apps) when you select your app. | +| `redirect_uri` | `字符串` | 用户获得授权后被发送到的应用程序中的 URL。 This must be an exact match to the URL you provided in the **User authorization callback URL** field when setting up your GitHub App and can't contain any additional parameters. | +| `state` | `字符串` | This should contain a random string to protect against forgery attacks and could contain any other arbitrary data. | +| `login` | `字符串` | 提供用于登录和授权应用程序的特定账户。 | {% note %} @@ -56,7 +56,7 @@ Name | Type | Description {% endnote %} -#### 2. Users are redirected back to your site by GitHub +#### 2. 用户被 GitHub 重定向回您的站点 If the user accepts your request, GitHub redirects back to your site with a temporary `code` in a code parameter as well as the state you provided in the previous step in a `state` parameter. If the states don't match, the request was created by a third party and the process should be aborted. @@ -72,17 +72,17 @@ Expiring user tokens are currently part of the user-to-server token expiration b POST {% data variables.product.oauth_host_code %}/login/oauth/access_token -##### Parameters +##### 参数 -Name | Type | Description ------|------|------------ -`client_id` | `string` | **Required.** The client ID for your GitHub App. -`client_secret` | `string` | **Required.** The client secret for your GitHub App. -`code` | `string` | **Required.** The code you received as a response to Step 1. -`redirect_uri` | `string` | The URL in your application where users are sent after authorization. -`state` | `string` | The unguessable random string you provided in Step 1. +| 名称 | 类型 | 描述 | +| --------------- | ----- | ----------------------------------------------------- | +| `client_id` | `字符串` | **Required.** The client ID for your GitHub App. | +| `client_secret` | `字符串` | **Required.** The client secret for your GitHub App. | +| `代码` | `字符串` | **必填。**您收到的响应第 1 步的代码。 | +| `redirect_uri` | `字符串` | 用户获得授权后被发送到的应用程序中的 URL。 | +| `state` | `字符串` | 您在第 1 步提供的不可猜测的随机字符串。 | -##### Response +##### 响应 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} @@ -100,7 +100,7 @@ By default, the response takes the following form. The response parameters `expi ``` {% else %} -By default, the response takes the following form: +默认情况下，响应采用以下形式： access_token=e72e16c7e42f292c6912e7710c838347ae178b4a&token_type=bearer @@ -113,7 +113,7 @@ The user's access token allows the GitHub App to make requests to the API on beh Authorization: token OAUTH-TOKEN GET {% data variables.product.api_url_code %}/user -For example, in curl you can set the Authorization header like this: +例如，您可以像以下这样在 curl 中设置“授权”标头： ```shell curl -H "Authorization: token OAUTH-TOKEN" {% data variables.product.api_url_pre %}/user @@ -136,7 +136,7 @@ For more information about authorizing users using the device flow, see "[Author ### Check which installation's resources a user can access -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.machine-man-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -208,7 +208,7 @@ While most of your API interaction should occur using your server-to-server inst {% endif %} {% if currentVersion == "free-pro-team@latest" %} -##### Artifacts +##### 构件 * [List artifacts for a repository](/v3/actions/artifacts/#list-artifacts-for-a-repository) * [List workflow run artifacts](/v3/actions/artifacts/#list-workflow-run-artifacts) @@ -217,7 +217,7 @@ While most of your API interaction should occur using your server-to-server inst * [Download an artifact](/v3/actions/artifacts/#download-an-artifact) {% endif %} -##### Check Runs +##### 检查运行 * [Create a check run](/v3/checks/runs/#create-a-check-run) * [Get a check run](/v3/checks/runs/#get-a-check-run) @@ -226,7 +226,7 @@ While most of your API interaction should occur using your server-to-server inst * [List check runs in a check suite](/v3/checks/runs/#list-check-runs-in-a-check-suite) * [List check runs for a Git reference](/v3/checks/runs/#list-check-runs-for-a-git-reference) -##### Check Suites +##### 检查套件 * [Create a check suite](/v3/checks/suites/#create-a-check-suite) * [Get a check suite](/v3/checks/suites/#get-a-check-suite) @@ -245,19 +245,19 @@ While most of your API interaction should occur using your server-to-server inst * [Create a deployment status](/rest/reference/repos#create-a-deployment-status) * [Get a deployment status](/rest/reference/repos#get-a-deployment-status) -##### Deployments +##### 部署 * [List deployments](/rest/reference/repos#list-deployments) * [Create a deployment](/rest/reference/repos#create-a-deployment) * [Get a deployment](/rest/reference/repos#get-a-deployment){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} * [Delete a deployment](/rest/reference/repos#delete-a-deployment){% endif %} -##### Events +##### 事件 * [List public events for a network of repositories](/rest/reference/activity#list-public-events-for-a-network-of-repositories) * [List public organization events](/rest/reference/activity#list-public-organization-events) -##### Feeds +##### 馈送 * [Get feeds](/rest/reference/activity#get-feeds) @@ -293,7 +293,7 @@ While most of your API interaction should occur using your server-to-server inst * [Get all gitignore templates](/v3/gitignore/#get-all-gitignore-templates) * [Get a gitignore template](/v3/gitignore/#get-a-gitignore-template) -##### Installations +##### 安装设施 * [List repositories accessible to the user access token](/v3/apps/installations/#list-repositories-accessible-to-the-user-access-token) @@ -330,13 +330,13 @@ While most of your API interaction should occur using your server-to-server inst * [List timeline events for an issue](/v3/issues/timeline/#list-timeline-events-for-an-issue) -##### Issues +##### 议题 * [List issues assigned to the authenticated user](/v3/issues/#list-issues-assigned-to-the-authenticated-user) * [List assignees](/v3/issues/assignees/#list-assignees) * [Check if a user can be assigned](/v3/issues/assignees/#check-if-a-user-can-be-assigned) * [List repository issues](/v3/issues/#list-repository-issues) -* [Create an issue](/v3/issues/#create-an-issue) +* [创建议题](/v3/issues/#create-an-issue) * [Get an issue](/v3/issues/#get-an-issue) * [Update an issue](/v3/issues/#update-an-issue) * [Lock an issue](/v3/issues/#lock-an-issue) @@ -350,7 +350,7 @@ While most of your API interaction should occur using your server-to-server inst * [List jobs for a workflow run](/v3/actions/workflow-jobs/#list-jobs-for-a-workflow-run) {% endif %} -##### Labels +##### 标签 * [List labels for an issue](/v3/issues/labels/#list-labels-for-an-issue) * [Add labels to an issue](/v3/issues/labels/#add-labels-to-an-issue) @@ -364,7 +364,7 @@ While most of your API interaction should occur using your server-to-server inst * [Delete a label](/v3/issues/labels/#delete-a-label) * [Get labels for every issue in a milestone](/v3/issues/labels/#list-labels-for-issues-in-a-milestone) -##### Licenses +##### 许可 * [Get all commonly used licenses](/v3/licenses/#get-all-commonly-used-licenses) * [Get a license](/v3/licenses/#get-a-license) @@ -374,11 +374,11 @@ While most of your API interaction should occur using your server-to-server inst * [Render a Markdown document](/v3/markdown/#render-a-markdown-document) * [Render a markdown document in raw mode](/v3/markdown/#render-a-markdown-document-in-raw-mode) -##### Meta +##### 元数据 -* [Meta](/v3/meta/#meta) +* [元数据](/v3/meta/#meta) -##### Milestones +##### 里程碑 * [List milestones](/v3/issues/milestones/#list-milestones) * [Create a milestone](/v3/issues/milestones/#create-a-milestone) @@ -422,7 +422,7 @@ While most of your API interaction should occur using your server-to-server inst * [Convert an organization member to outside collaborator](/v3/orgs/outside_collaborators/#convert-an-organization-member-to-outside-collaborator) * [Remove outside collaborator from an organization](/v3/orgs/outside_collaborators/#remove-outside-collaborator-from-an-organization) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Organization Pre Receive Hooks * [List pre-receive hooks for an organization](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-an-organization) @@ -442,7 +442,7 @@ While most of your API interaction should occur using your server-to-server inst ##### Organization Team Repositories -* [List team repositories](/v3/teams/#list-team-repositories) +* [列出团队仓库](/v3/teams/#list-team-repositories) * [Check team permissions for a repository](/v3/teams/#check-team-permissions-for-a-repository) * [Add or update team repository permissions](/v3/teams/#add-or-update-team-repository-permissions) * [Remove a repository from a team](/v3/teams/#remove-a-repository-from-a-team) @@ -460,7 +460,7 @@ While most of your API interaction should occur using your server-to-server inst * [List teams](/v3/teams/#list-teams) * [Create a team](/v3/teams/#create-a-team) * [Get a team by name](/v3/teams/#get-a-team-by-name) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} * [Get a team](/v3/teams/#get-a-team) {% endif %} * [Update a team](/v3/teams/#update-a-team) @@ -475,7 +475,7 @@ While most of your API interaction should occur using your server-to-server inst * [List child teams](/v3/teams/#list-child-teams) * [List teams for the authenticated user](/v3/teams/#list-teams-for-the-authenticated-user) -##### Organizations +##### 组织 * [List organizations](/v3/orgs/#list-organizations) * [Get an organization](/v3/orgs/#get-an-organization) @@ -524,7 +524,7 @@ While most of your API interaction should occur using your server-to-server inst * [Remove project collaborator](/v3/projects/collaborators/#remove-project-collaborator) * [Get project permission for a user](/v3/projects/collaborators/#get-project-permission-for-a-user) -##### Projects +##### 项目 * [List organization projects](/v3/projects/#list-organization-projects) * [Create an organization project](/v3/projects/#create-an-organization-project) @@ -574,7 +574,7 @@ While most of your API interaction should occur using your server-to-server inst * [Update a review for a pull request](/v3/pulls/reviews/#update-a-review-for-a-pull-request) * [List comments for a pull request review](/v3/pulls/reviews/#list-comments-for-a-pull-request-review) -##### Pulls +##### 拉取 * [List pull requests](/v3/pulls/#list-pull-requests) * [Create a pull request](/v3/pulls/#create-a-pull-request) @@ -585,7 +585,7 @@ While most of your API interaction should occur using your server-to-server inst * [Check if a pull request has been merged](/v3/pulls/#check-if-a-pull-request-has-been-merged) * [Merge a pull request (Merge Button)](/v3/pulls/#merge-a-pull-request) -##### Reactions +##### 反应 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}* [Delete a reaction](/v3/reactions/#delete-a-reaction-legacy){% else %}* [Delete a reaction](/v3/reactions/#delete-a-reaction){% endif %} * [List reactions for a commit comment](/v3/reactions/#list-reactions-for-a-commit-comment) @@ -607,16 +607,16 @@ While most of your API interaction should occur using your server-to-server inst * [Delete team discussion reaction](/v3/reactions/#delete-team-discussion-reaction) * [Delete team discussion comment reaction](/v3/reactions/#delete-team-discussion-comment-reaction){% endif %} -##### Repositories +##### 仓库 -* [List organization repositories](/v3/repos/#list-organization-repositories) +* [列出组织仓库](/v3/repos/#list-organization-repositories) * [Create a repository for the authenticated user](/v3/repos/#create-a-repository-for-the-authenticated-user) -* [Get a repository](/v3/repos/#get-a-repository) +* [获取仓库](/v3/repos/#get-a-repository) * [Update a repository](/v3/repos/#update-a-repository) * [Delete a repository](/v3/repos/#delete-a-repository) * [Compare two commits](/v3/repos/commits/#compare-two-commits) * [List repository contributors](/v3/repos/#list-repository-contributors) -* [List forks](/rest/reference/repos#list-forks) +* [列出复刻](/rest/reference/repos#list-forks) * [Create a fork](/v3/repos/forks/#create-a-fork) * [List repository languages](/v3/repos/#list-repository-languages) * [List repository tags](/v3/repos/#list-repository-tags) @@ -624,7 +624,7 @@ While most of your API interaction should occur using your server-to-server inst * [Transfer a repository](/v3/repos/#transfer-a-repository) * [List public repositories](/v3/repos/#list-public-repositories) * [List repositories for the authenticated user](/v3/repos/#list-repositories-for-the-authenticated-user) -* [List repositories for a user](/v3/repos/#list-repositories-for-a-user) +* [列出用户的仓库](/v3/repos/#list-repositories-for-a-user) * [Create repository using a repository template](/v3/repos/#create-repository-using-a-repository-template) ##### Repository Activity @@ -635,7 +635,7 @@ While most of your API interaction should occur using your server-to-server inst * [Check if a repository is starred by the authenticated user](/rest/reference/activity#check-if-a-repository-is-starred-by-the-authenticated-user) * [Star a repository for the authenticated user](/rest/reference/activity#star-a-repository-for-the-authenticated-user) * [Unstar a repository for the authenticated user](/rest/reference/activity#unstar-a-repository-for-the-authenticated-user) -* [List repositories watched by a user](/rest/reference/activity#list-repositories-watched-by-a-user) +* [列出用户关注的仓库](/rest/reference/activity#list-repositories-watched-by-a-user) {% if currentVersion == "free-pro-team@latest" %} ##### Repository Automated Security Fixes @@ -762,7 +762,7 @@ While most of your API interaction should occur using your server-to-server inst * [Get GitHub Pages build](/rest/reference/repos#get-github-pages-build) * [Get latest pages build](/rest/reference/repos#get-latest-pages-build) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### Repository Pre Receive Hooks * [List pre-receive hooks for a repository](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-a-repository) @@ -773,10 +773,10 @@ While most of your API interaction should occur using your server-to-server inst ##### Repository Releases -* [List releases](/rest/reference/repos/#list-releases) +* [列出发行版](/rest/reference/repos/#list-releases) * [Create a release](/rest/reference/repos/#create-a-release) * [Get a release](/rest/reference/repos/#get-a-release) -* [Update a release](/rest/reference/repos/#update-a-release) +* [更新发行版](/rest/reference/repos/#update-a-release) * [Delete a release](/rest/reference/repos/#delete-a-release) * [List release assets](/rest/reference/repos/#list-release-assets) * [Get a release asset](/rest/reference/repos/#get-a-release-asset) @@ -794,28 +794,28 @@ While most of your API interaction should occur using your server-to-server inst * [Get the hourly commit count for each day](/v3/repos/statistics/#get-the-hourly-commit-count-for-each-day) {% if currentVersion == "free-pro-team@latest" %} -##### Repository Vulnerability Alerts +##### 仓库漏洞警报 * [Enable vulnerability alerts](/v3/repos/#enable-vulnerability-alerts) * [Disable vulnerability alerts](/v3/repos/#disable-vulnerability-alerts) {% endif %} -##### Root +##### 根 -* [Root endpoint](/v3/#root-endpoint) -* [Emojis](/v3/emojis/#emojis) +* [根端点](/v3/#root-endpoint) +* [表情符号](/v3/emojis/#emojis) * [Get rate limit status for the authenticated user](/v3/rate_limit/#get-rate-limit-status-for-the-authenticated-user) -##### Search +##### 搜索 * [Search code](/v3/search/#search-code) * [Search commits](/v3/search/#search-commits) * [Search labels](/v3/search/#search-labels) -* [Search repositories](/v3/search/#search-repositories) +* [搜索仓库](/v3/search/#search-repositories) * [Search topics](/v3/search/#search-topics) * [Search users](/v3/search/#search-users) -##### Statuses +##### 状态 * [Get the combined status for a specific reference](/v3/repos/statuses/#get-the-combined-status-for-a-specific-reference) * [List commit statuses for a reference](/v3/repos/statuses/#list-commit-statuses-for-a-reference) @@ -834,13 +834,13 @@ While most of your API interaction should occur using your server-to-server inst * [Update a discussion comment](/v3/teams/discussion_comments/#update-a-discussion-comment) * [Delete a discussion comment](/v3/teams/discussion_comments/#delete-a-discussion-comment) -##### Topics +##### 主题 * [Get all repository topics](/v3/repos#get-all-repository-topics) * [Replace all repository topics](/v3/repos/#replace-all-repository-topics) {% if currentVersion == "free-pro-team@latest" %} -##### Traffic +##### 流量 * [Get repository clones](/v3/repos/traffic/#get-repository-clones) * [Get top referral paths](/v3/repos/traffic/#get-top-referral-paths) @@ -896,7 +896,7 @@ While most of your API interaction should occur using your server-to-server inst * [Delete a public SSH key for the authenticated user](/v3/users/keys/#delete-a-public-ssh-key-for-the-authenticated-user) * [List public keys for a user](/v3/users/keys/#list-public-keys-for-a-user) -##### Users +##### 用户 * [Get the authenticated user](/v3/users/#get-the-authenticated-user) * [List app installations accessible to the user access token](/v3/apps/installations/#list-app-installations-accessible-to-the-user-access-token) @@ -920,7 +920,7 @@ While most of your API interaction should occur using your server-to-server inst {% endif %} {% if currentVersion == "free-pro-team@latest" %} -##### Workflows +##### 工作流程 * [List repository workflows](/v3/actions/workflows/#list-repository-workflows) * [Get a workflow](/v3/actions/workflows/#get-a-workflow) diff --git a/translations/zh-CN/content/developers/apps/installing-github-apps.md b/translations/zh-CN/content/developers/apps/installing-github-apps.md index 85a635fff5..ff6dd370a9 100644 --- a/translations/zh-CN/content/developers/apps/installing-github-apps.md +++ b/translations/zh-CN/content/developers/apps/installing-github-apps.md @@ -52,7 +52,7 @@ These steps assume you have [built a {% data variables.product.prodname_github_a You can simplify the authorization process by completing it during app installation. To do this, select **Request user authorization (OAuth) during installation** when creating or modifying your app in GitHub. See "[Creating a GitHub App](/apps/building-github-apps/creating-a-github-app/)" to learn more. -Once someone has installed your app, you will need to get an access token for the user. See steps 2 and 3 in "[Identifying a users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. +Once someone has installed your app, you will need to get an access token for the user. See steps 2 and 3 in "[Identifying users on your site](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-users-on-your-site)" to learn more. ### Preserving an application state during installation You can provide a `state` parameter in an app's installation URL to preserve the state of the application page and return people back to that state after they install, authenticate, or accept updates to your GitHub App. For example, you could use the `state` to correlate an installation to a user or account. diff --git a/translations/zh-CN/content/developers/apps/scopes-for-oauth-apps.md b/translations/zh-CN/content/developers/apps/scopes-for-oauth-apps.md index ff5b4dc331..d9d1ac1e92 100644 --- a/translations/zh-CN/content/developers/apps/scopes-for-oauth-apps.md +++ b/translations/zh-CN/content/developers/apps/scopes-for-oauth-apps.md @@ -19,7 +19,8 @@ When setting up an OAuth App on GitHub, requested scopes are displayed to the us {% endnote %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -If your {% data variables.product.prodname_oauth_app %} doesn't have access to a browser, such as a CLI tool, then you don't need to specify a scope for users to authenticate to your app. For more information, see "[Authorizing OAuth apps](/developers/apps/authorizing-oauth-apps#device-flow)." +If your +{% data variables.product.prodname_oauth_app %} doesn't have access to a browser, such as a CLI tool, then you don't need to specify a scope for users to authenticate to your app. For more information, see "[Authorizing OAuth apps](/developers/apps/authorizing-oauth-apps#device-flow)." {% endif %} Check headers to see what OAuth scopes you have, and what the API action accepts: @@ -36,47 +37,46 @@ X-Accepted-OAuth-Scopes: user ### Available scopes -Name | Description ------|-----------| -**`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if currentVersion != "free-pro-team@latest" %} -**`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/v3/enterprise-admin).{% endif %} -**`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects. - `repo:status`| Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. - `repo_deployment`| Grants access to [deployment statuses](/v3/repos/deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code. - `public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories. - `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21"%} - `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/v3/code-scanning).{% endif %} -**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. - `write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories. - `read:repo_hook`| Grants read and ping access to hooks in public or private repositories. -**`admin:org`** | Fully manage the organization and its teams, projects, and memberships. - `write:org`| Read and write access to organization membership, organization projects, and team membership. - `read:org`| Read-only access to organization membership, organization projects, and team membership. -**`admin:public_key`** | Fully manage public keys. - `write:public_key`| Create, list, and view details for public keys. - `read:public_key`| List and view details for public keys. -**`admin:org_hook`** | Grants read, write, ping, and delete access to organization hooks. **Note:** OAuth tokens will only be able to perform these actions on organization hooks which were created by the OAuth App. Personal access tokens will only be able to perform these actions on organization hooks created by a user. -**`gist`** | Grants write access to gists. -**`notifications`** | Grants:
    * read access to a user's notifications
    * mark as read access to threads
    * watch and unwatch access to a repository, and
    * read, write, and delete access to thread subscriptions. -**`user`** | Grants read/write access to profile info only. Note that this scope includes `user:email` and `user:follow`. - `read:user`| Grants access to read a user's profile data. - `user:email`| Grants read access to a user's email addresses. - `user:follow`| Grants access to follow or unfollow other users. -**`delete_repo`** | Grants access to delete adminable repositories. -**`write:discussion`** | Allows read and write access for team discussions. - `read:discussion` | Allows read access for team discussions.{% if currentVersion == "free-pro-team@latest" %} -**`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[Publishing a package](/github/managing-packages-with-github-packages/publishing-a-package)". -**`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[Installing a package](/github/managing-packages-with-github-packages/installing-a-package)". -**`delete:packages`** | Grants access to delete packages from {% data variables.product.prodname_registry %}. For more information, see "[Deleting packages](/github/managing-packages-with-github-packages/deleting-a-package)".{% endif %} -**`admin:gpg_key`** | Fully manage GPG keys. - `write:gpg_key`| Create, list, and view details for GPG keys. - `read:gpg_key`| List and view details for GPG keys.{% if currentVersion == "free-pro-team@latest" %} -**`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository.{% endif %} +| 名称 | 描述 | +| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **`(no scope)`** | Grants read-only access to public information (includes public user profile info, public repository info, and gists){% if enterpriseServerVersions contains currentVersion %} +| **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/v3/enterprise-admin).{% endif %} +| **`repo`** | Grants full access to private and public repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for public and private repositories and organizations. Also grants ability to manage user projects. | +|  `repo:status` | Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code. | +|  `repo_deployment` | Grants access to [deployment statuses](/v3/repos/deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code. | +|  `public_repo` | Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories. | +|  `repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites *without* granting access to the code.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21"%} +|  `security_events` | Grants read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/v3/code-scanning).{% endif %} +| **`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in public and private repositories. The `repo` and `public_repo` scopes grants full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks. | +|  `write:repo_hook` | Grants read, write, and ping access to hooks in public or private repositories. | +|  `read:repo_hook` | Grants read and ping access to hooks in public or private repositories. | +| **`admin:org`** | Fully manage the organization and its teams, projects, and memberships. | +|  `write:org` | Read and write access to organization membership, organization projects, and team membership. | +|  `read:org` | Read-only access to organization membership, organization projects, and team membership. | +| **`admin:public_key`** | Fully manage public keys. | +|  `write:public_key` | Create, list, and view details for public keys. | +|  `read:public_key` | List and view details for public keys. | +| **`admin:org_hook`** | Grants read, write, ping, and delete access to organization hooks. **Note:** OAuth tokens will only be able to perform these actions on organization hooks which were created by the OAuth App. Personal access tokens will only be able to perform these actions on organization hooks created by a user. | +| **`gist`** | Grants write access to gists. | +| **`通知`** | Grants:
    * read access to a user's notifications
    * mark as read access to threads
    * watch and unwatch access to a repository, and
    * read, write, and delete access to thread subscriptions. | +| **`用户`** | Grants read/write access to profile info only. Note that this scope includes `user:email` and `user:follow`. | +|  `read:user` | Grants access to read a user's profile data. | +|  `user:email` | Grants read access to a user's email addresses. | +|  `user:follow` | Grants access to follow or unfollow other users. | +| **`delete_repo`** | Grants access to delete adminable repositories. | +| **`write:discussion`** | Allows read and write access for team discussions. | +|  `read:discussion` | Allows read access for team discussions.{% if currentVersion == "free-pro-team@latest" %} +| **`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[Publishing a package](/github/managing-packages-with-github-packages/publishing-a-package)". | +| **`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[Installing a package](/github/managing-packages-with-github-packages/installing-a-package)". | +| **`delete:packages`** | Grants access to delete packages from {% data variables.product.prodname_registry %}. For more information, see "[Deleting packages](/github/managing-packages-with-github-packages/deleting-a-package)".{% endif %} +| **`admin:gpg_key`** | Fully manage GPG keys. | +|  `write:gpg_key` | Create, list, and view details for GPG keys. | +|  `read:gpg_key` | List and view details for GPG keys.{% if currentVersion == "free-pro-team@latest" %} +| **`工作流程`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes, see https://docs.github.com/en/free-pro-team@latest/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token for details.{% endif %} {% note %} -**Note:** Your OAuth App can request the scopes in the initial redirection. You -can specify multiple scopes by separating them with a space: +**Note:** Your OAuth App can request the scopes in the initial redirection. You can specify multiple scopes by separating them with a space: https://github.com/login/oauth/authorize? client_id=...& @@ -86,29 +86,14 @@ can specify multiple scopes by separating them with a space: ### Requested scopes and granted scopes -The `scope` attribute lists scopes attached to the token that were granted by -the user. Normally, these scopes will be identical to what you requested. -However, users can edit their scopes, effectively -granting your application less access than you originally requested. Also, users -can edit token scopes after the OAuth flow is completed. -You should be aware of this possibility and adjust your application's behavior -accordingly. +The `scope` attribute lists scopes attached to the token that were granted by the user. Normally, these scopes will be identical to what you requested. However, users can edit their scopes, effectively granting your application less access than you originally requested. Also, users can edit token scopes after the OAuth flow is completed. You should be aware of this possibility and adjust your application's behavior accordingly. -It's important to handle error cases where a user chooses to grant you -less access than you originally requested. For example, applications can warn -or otherwise communicate with their users that they will see reduced -functionality or be unable to perform some actions. +It's important to handle error cases where a user chooses to grant you less access than you originally requested. For example, applications can warn or otherwise communicate with their users that they will see reduced functionality or be unable to perform some actions. -Also, applications can always send users back through the flow again to get -additional permission, but don’t forget that users can always say no. +Also, applications can always send users back through the flow again to get additional permission, but don’t forget that users can always say no. -Check out the [Basics of Authentication guide](/guides/basics-of-authentication/), which -provides tips on handling modifiable token scopes. +Check out the [Basics of Authentication guide](/guides/basics-of-authentication/), which provides tips on handling modifiable token scopes. ### Normalized scopes -When requesting multiple scopes, the token is saved with a normalized list -of scopes, discarding those that are implicitly included by another requested -scope. For example, requesting `user,gist,user:email` will result in a -token with `user` and `gist` scopes only since the access granted with -`user:email` scope is included in the `user` scope. +When requesting multiple scopes, the token is saved with a normalized list of scopes, discarding those that are implicitly included by another requested scope. For example, requesting `user,gist,user:email` will result in a token with `user` and `gist` scopes only since the access granted with `user:email` scope is included in the `user` scope. diff --git a/translations/zh-CN/content/developers/github-marketplace/about-github-marketplace.md b/translations/zh-CN/content/developers/github-marketplace/about-github-marketplace.md index 77b1e01b33..a3fd3b9745 100644 --- a/translations/zh-CN/content/developers/github-marketplace/about-github-marketplace.md +++ b/translations/zh-CN/content/developers/github-marketplace/about-github-marketplace.md @@ -14,7 +14,7 @@ versions: {% data reusables.actions.actions-not-verified %} -To learn about publishing {% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}, see "[{% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}](/marketplace/actions/)." +To learn about publishing {% data variables.product.prodname_actions %} in the {% data variables.product.prodname_marketplace %}, see "[Publishing actions in GitHub Marketplace](/actions/creating-actions/publishing-actions-in-github-marketplace)." ### 应用 diff --git a/translations/zh-CN/content/developers/overview/replacing-github-services.md b/translations/zh-CN/content/developers/overview/replacing-github-services.md index eb1925fc9e..7cc93257bf 100644 --- a/translations/zh-CN/content/developers/overview/replacing-github-services.md +++ b/translations/zh-CN/content/developers/overview/replacing-github-services.md @@ -29,7 +29,7 @@ As an alternative to the email service, you can now start using email notificati GitHub Services (sometimes referred to as Service Hooks) is the legacy method of integrating where GitHub hosted a portion of our integrator’s services via [the `github-services` repository](https://github.com/github/github-services). Actions performed on GitHub trigger these services, and you can use these services to trigger actions outside of GitHub. -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### Finding repositories that use GitHub Services We provide a command-line script that helps you identify which repositories on your appliance use GitHub Services. For more information, see [ghe-legacy-github-services-report](/enterprise/{{currentVersion}}/admin/articles/command-line-utilities/#ghe-legacy-github-services-report).{% endif %} diff --git a/translations/zh-CN/content/developers/webhooks-and-events/about-webhooks.md b/translations/zh-CN/content/developers/webhooks-and-events/about-webhooks.md index 64b973bcf5..abddd6a6a8 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/about-webhooks.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/about-webhooks.md @@ -1,5 +1,5 @@ --- -title: About webhooks +title: 关于 web 挂钩 intro: Learn the basics of how webhooks work to help you build and set up integrations. redirect_from: - /webhooks @@ -11,11 +11,11 @@ versions: Webhooks allow you to build or set up integrations, such as [{% data variables.product.prodname_github_app %}s](/apps/building-github-apps/) or [{% data variables.product.prodname_oauth_app %}s](/apps/building-oauth-apps/), which subscribe to certain events on GitHub.com. When one of those events is triggered, we'll send a HTTP POST payload to the webhook's configured URL. Webhooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server. You're only limited by your imagination. -Webhooks can be installed on{% if currentVersion != "free-pro-team@latest" %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. +Webhooks can be installed on{% if enterpriseServerVersions contains currentVersion %} a [{% data variables.product.prodname_ghe_server %} instance](/rest/reference/enterprise-admin#global-webhooks/),{% endif %} an [organization][org-hooks], a specific [repository][repo-hooks], or a {% data variables.product.prodname_github_app %}. Once installed, the webhook will be sent each time one or more subscribed events occurs. -You can create up to {% if currentVersion != "free-pro-team@latest" %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if currentVersion != "free-pro-team@latest" %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} +You can create up to {% if enterpriseServerVersions contains currentVersion %}250{% else %}20{% endif %} webhooks for each event on each installation target {% if enterpriseServerVersions contains currentVersion %}({% data variables.product.prodname_ghe_server %} instance, specific organization, or specific repository).{% else %}(specific organization or specific repository).{% endif %} -### Events +### 事件 {% data reusables.webhooks.webhooks_intro %} diff --git a/translations/zh-CN/content/developers/webhooks-and-events/creating-webhooks.md b/translations/zh-CN/content/developers/webhooks-and-events/creating-webhooks.md index 9e4e194378..db0788933c 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/creating-webhooks.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/creating-webhooks.md @@ -14,6 +14,9 @@ Now that we understand [the basics of webhooks][webhooks-overview], let's go thr Creating a webhook is a two-step process. You'll first need to set up how you want your webhook to behave through {% data variables.product.product_name %}--what events should it listen to. After that, you'll set up your server to receive and manage the payload. + +{% data reusables.webhooks.webhooks-rest-api-links %} + ### Setting up a Webhook You can install webhooks on an organization or on a specific repository. diff --git a/translations/zh-CN/content/developers/webhooks-and-events/github-event-types.md b/translations/zh-CN/content/developers/webhooks-and-events/github-event-types.md index de220b6922..36394624ab 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/github-event-types.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/github-event-types.md @@ -28,13 +28,13 @@ The event objects returned from the Events API endpoints have the same structure | `actor.id` | The unique identifier for the actor. | | `actor.login` | The username of the actor. | | `actor.display_login` | The specific display format of the username. | -| `actor.gravatar_id` | The unique indentifier of the Gravatar profile for the actor. | +| `actor.gravatar_id` | The unique identifier of the Gravatar profile for the actor. | | `actor.url` | The REST API URL used to retrieve the user object, which includes additional user information. | | `actor.avatar_url` | The URL of the actor's profile image. | | `repo` | The repository object where the event occurred. | | `repo.id` | The unique identifier of the repository. | | `repo.name` | The name of the repository, which includes the owner and repository name. For example, `octocat/hello-world` is the name of the `hello-world` repository owned by the `octocat` user account. | -| `repo.url` | The REST API URL used to retrive the repository object, which includes additional repository information. | +| `repo.url` | The REST API URL used to retrieve the repository object, which includes additional repository information. | | `payload` | The event payload object is unique to the event type. See the event type below for the event API `payload` object. | #### Example WatchEvent event object diff --git a/translations/zh-CN/content/developers/webhooks-and-events/issue-event-types.md b/translations/zh-CN/content/developers/webhooks-and-events/issue-event-types.md index c1156e9d0d..7842e8d347 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/issue-event-types.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/issue-event-types.md @@ -229,7 +229,7 @@ The issue or pull request was referenced from another issue or pull request. | --------------- | ----- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `actor` | `对象` | The person who generated the event. | | `created_at` | `字符串` | The timestamp indicating when the cross-reference was added. | -| `updated_at` | `字符串` | The timestamp indicating when the cross-refererence was updated or created, if the cross-reference is never updated. | +| `updated_at` | `字符串` | The timestamp indicating when the cross-reference was updated or created, if the cross-reference is never updated. | | `source` | `对象` | The issue or pull request that added a cross-reference. | | `source[type]` | `字符串` | This value will always be `"issue"` because pull requests are of type issue. Only cross-reference events triggered by issues or pull requests are returned in the Timeline Events API. To determine if the issue that triggered the event is a pull request, you can check if the `source[issue][pull_request` object exists. | | `source[issue]` | `对象` | The `issue` object that added the cross-reference. | @@ -347,7 +347,7 @@ The issue or pull request was locked. #### Event object properties -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} @@ -664,7 +664,7 @@ The issue was unlocked. #### Event object properties -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% data reusables.pre-release-program.sailor-v-preview %} {% data reusables.pre-release-program.api-preview-warning %} {% endif %} diff --git a/translations/zh-CN/content/developers/webhooks-and-events/securing-your-webhooks.md b/translations/zh-CN/content/developers/webhooks-and-events/securing-your-webhooks.md index 0a5ed84359..09dd7373c1 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/securing-your-webhooks.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/securing-your-webhooks.md @@ -12,6 +12,7 @@ versions: Once your server is configured to receive payloads, it'll listen for any payload sent to the endpoint you configured. For security reasons, you probably want to limit requests to those coming from GitHub. There are a few ways to go about this--for example, you could opt to allow requests from GitHub's IP address--but a far easier method is to set up a secret token and validate the information. +{% data reusables.webhooks.webhooks-rest-api-links %} ### Setting your secret token diff --git a/translations/zh-CN/content/developers/webhooks-and-events/testing-webhooks.md b/translations/zh-CN/content/developers/webhooks-and-events/testing-webhooks.md index 82c62d3e51..6b95c1024d 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/testing-webhooks.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/testing-webhooks.md @@ -13,7 +13,7 @@ Now that you've [configured your local server](/webhooks/configuring/), you migh ### Listing recent deliveries -Every webhook has its own "Recent Deliveries" section, which lists, at a glance whether a deployment was successful (green check) or failed (red x). You can also identify when each delivery was attempted. +Every webhook has its own "Recent Deliveries" section, which lists, at a glance whether a delivery was successful (green check) or failed (red x). You can also identify when each delivery was attempted. {% data variables.product.product_name %} keeps a log of each webhook delivery for {% if currentVersion == "free-pro-team@latest" %} 30 {% else %} 8 {% endif %} days. diff --git a/translations/zh-CN/content/developers/webhooks-and-events/webhook-events-and-payloads.md b/translations/zh-CN/content/developers/webhooks-and-events/webhook-events-and-payloads.md index 5908a354da..744611e50b 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/webhook-events-and-payloads.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/webhook-events-and-payloads.md @@ -47,7 +47,7 @@ Web 挂钩事件的独特属性与您使用 [Events API](/v3/activity/events/) | 标头 | 描述 | | ----------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `X-GitHub-Event` | 触发递送的事件名称。 | -| `X-GitHub-Delivery` | A [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) to identify the delivery.{% if currentVersion != "free-pro-team@latest" %} +| `X-GitHub-Delivery` | A [GUID](http://en.wikipedia.org/wiki/Globally_unique_identifier) to identify the delivery.{% if enterpriseServerVersions contains currentVersion %} | `X-GitHub-Enterprise-Version` | 发送 HTTP POST 有效负载的 {% data variables.product.prodname_ghe_server %} 实例的版本。 | | `X-GitHub-Enterprise-Host` | The hostname of the {% data variables.product.prodname_ghe_server %} instance that sent the HTTP POST payload.{% endif %}{% if currentVersion != "private-instances@latest" %} | `X-Hub-Signature` | This header is sent if the webhook is configured with a [`secret`](/v3/repos/hooks/#create-hook-config-params). This is the HMAC hex digest of the request body, and is generated using the SHA-1 hash function and the `secret` as the HMAC `key`.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} `X-Hub-Signature` is provided for compatibility with existing integrations, and we recommend that you use the more secure `X-Hub-Signature-256` instead.{% endif %}{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -61,7 +61,7 @@ Web 挂钩事件的独特属性与您使用 [Events API](/v3/activity/events/) > POST /payload HTTP/1.1 > Host: localhost:4567 -> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if currentVersion != "free-pro-team@latest" %} +> X-GitHub-Delivery: 72d3162e-cc78-11e3-81ab-4c9367dc0958{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: 2.15.0 > X-GitHub-Enterprise-Host: example.com{% endif %}{% if currentVersion != "private-instances@latest" %} > X-Hub-Signature: sha1=7d38cdd689735b008b3c702edd92eea23791c5f6{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "private-instances@latest" %} @@ -290,10 +290,10 @@ Web 挂钩事件是基于您注册的域的特异性而触发的。 例如，如 #### Web 挂钩有效负载对象 -| 键 | 类型 | 描述 | -| ------------ | --------------------------------------------------------------------------------------------------- | --------------------------------------------- |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} +| 键 | 类型 | 描述 | +| ------------ | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} | `action` | `字符串` | 执行的操作。 可以是 `created`。{% endif %} -| `deployment` | `对象` | [部署](/rest/reference/repos#list-deployments)。 | +| `deployment` | `对象` | The [deployment](/rest/reference/repos#list-deployments). | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -315,14 +315,14 @@ Web 挂钩事件是基于您注册的域的特异性而触发的。 例如，如 #### Web 挂钩有效负载对象 -| 键 | 类型 | 描述 | -| ---------------------------------- | --------------------------------------------------------------------------------------------------- | ------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} +| 键 | 类型 | 描述 | +| ---------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} | `action` | `字符串` | 执行的操作。 可以是 `created`。{% endif %} -| `deployment_status` | `对象` | [部署状态](/rest/reference/repos#list-deployment-statuses)。 | -| `deployment_status["state"]` | `字符串` | 新状态。 可以是 `pending`、`success`、`failure` 或 `error`。 | -| `deployment_status["target_url"]` | `字符串` | 添加到状态的可选链接。 | -| `deployment_status["description"]` | `字符串` | 添加到状态的可选人类可读说明。 | -| `deployment` | `对象` | 此状态关联的[部署](/rest/reference/repos#list-deployments)。 | +| `deployment_status` | `对象` | The [deployment status](/rest/reference/repos#list-deployment-statuses). | +| `deployment_status["state"]` | `字符串` | 新状态。 可以是 `pending`、`success`、`failure` 或 `error`。 | +| `deployment_status["target_url"]` | `字符串` | 添加到状态的可选链接。 | +| `deployment_status["description"]` | `字符串` | 添加到状态的可选人类可读说明。 | +| `deployment` | `对象` | The [deployment](/rest/reference/repos#list-deployments) that this status is associated with. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -332,7 +332,7 @@ Web 挂钩事件是基于您注册的域的特异性而触发的。 例如，如 {{ webhookPayloadsForCurrentVersion.deployment_status }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 企业 @@ -340,7 +340,7 @@ Web 挂钩事件是基于您注册的域的特异性而触发的。 例如，如 #### 可用性 -- GitHub Enterprise web 挂钩。 更多信息请参阅“[全局 web 挂钩](/rest/reference/enterprise-admin#global-webhooks/)”。 +- GitHub Enterprise web 挂钩。 For more information, "[Global webhooks](/rest/reference/enterprise-admin#global-webhooks/)." #### Web 挂钩有效负载对象 @@ -617,7 +617,7 @@ Web 挂钩事件是基于您注册的域的特异性而触发的。 例如，如 ### meta -配置此事件的 web 挂钩已被删除。 此事件将仅监听对安装此事件的特定挂钩的更改。 因此，必须为要接收元事件的每个挂钩选择它。 +配置此事件的 web 挂钩已被删除。 此事件将仅监听对安装此事件的特定挂钩的更改。 Therefore, it must be selected for each hook that you'd like to receive meta events for. #### 可用性 @@ -667,18 +667,18 @@ Web 挂钩事件是基于您注册的域的特异性而触发的。 例如，如 #### 可用性 -{% if currentVersion != "free-pro-team@latest" %} -- GitHub Enterprise web 挂钩只接收 `created` 和 `deleted` 事件。 更多信息请参阅“[全局 web 挂钩](/rest/reference/enterprise-admin#global-webhooks/)”。{% endif %} +{% if enterpriseServerVersions contains currentVersion %} +- GitHub Enterprise web 挂钩只接收 `created` 和 `deleted` 事件。 For more information, "[Global webhooks](/rest/reference/enterprise-admin#global-webhooks/).{% endif %} - 组织 web 挂钩只接收 `deleted`、`added`、`removed`、`renamed` 和 `invited` 事件 - 具有 `members` 权限的 {% data variables.product.prodname_github_app %} #### Web 挂钩有效负载对象 -| 键 | 类型 | 描述 | -| ------------ | ----- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `action` | `字符串` | 执行的操作内容. Can be one of:{% if currentVersion != "free-pro-team@latest" %} `created`,{% endif %} `deleted`, `renamed`, `member_added`, `member_removed`, or `member_invited`. | -| `邀请` | `对象` | 对用户的邀请或电子邮件邀请（如果操作为 `member_invited`）。 | -| `membership` | `对象` | 用户和组织之间的成员资格。 当操作为 `member_invited` 时不存在。 | +| 键 | 类型 | 描述 | +| ------------ | ----- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action` | `字符串` | 执行的操作内容. Can be one of:{% if enterpriseServerVersions contains currentVersion %} `created`,{% endif %} `deleted`, `renamed`, `member_added`, `member_removed`, or `member_invited`. | +| `邀请` | `对象` | 对用户的邀请或电子邮件邀请（如果操作为 `member_invited`）。 | +| `membership` | `对象` | 用户和组织之间的成员资格。 当操作为 `member_invited` 时不存在。 | {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} {% data reusables.webhooks.sender_desc %} @@ -974,13 +974,17 @@ Web 挂钩事件是基于您注册的域的特异性而触发的。 例如，如 | `before` | `字符串` | 推送之前在 `ref` 上最近提交的 SHA。 | | `after` | `字符串` | 推送之后在 `ref` 上最近提交的 SHA。 | | `commits` | `数组` | 描述所推送提交的提交对象数组。 （该数组最多包含 20 个提交。 如有必要，可使用 [Commits API](/v3/repos/commits/) 获取更多提交。 此限制仅适用于时间表事件，而不适用于 web 挂钩递送。） | -| `commits[][sha]` | `字符串` | 提交的 SHA。 | +| `commits[][id]` | `字符串` | 提交的 SHA。 | +| `commits[][timestamp]` | `字符串` | The ISO 8601 timestamp of the commit. | | `commits[][message]` | `字符串` | 提交消息. | | `commits[][author]` | `对象` | 提交的 Git 作者。 | | `commits[][author][name]` | `字符串` | Git 作者的名称。 | | `commits[][author][email]` | `字符串` | Git 作者的电子邮件地址。 | | `commits[][url]` | `url` | 指向提交 API 资源的 URL。 | | `commits[][distinct]` | `布尔值` | 此提交是否与之前推送的任何提交不同。 | +| `commits[][added]` | `数组` | An array of files added in the commit. | +| `commits[][modified]` | `数组` | An array of files modified by the commit. | +| `commits[][removed]` | `数组` | An array of files removed in the commit. | | `pusher` | `对象` | 推送提交的用户。 | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} @@ -1042,7 +1046,7 @@ Web 挂钩事件是基于您注册的域的特异性而触发的。 例如，如 | 键 | 类型 | 描述 | | -------- | ----- | -------------------------------------------- | -| `action` | `字符串` | 执行的操作内容. 可以是以下选项之一：
    • `created` - 创建了仓库。
    • `deleted` - 仓库被删除。 This event type is only available to [organization hooks](/rest/reference/orgs#webhooks/)
    • `archived` - 仓库被存档。
    • `unarchived` - 仓库被取消存档。
      • {% if currentVersion != "free-pro-team@latest" %}
    • `anonymous_access_enabled` - 仓库被[启用匿名 Git 访问](/v3/previews/#anonymous-git-access-to-repositories)，`anonymous_access_disabled` - 仓库被[禁用匿名 Git 访问](/v3/previews/#anonymous-git-access-to-repositories)
      • {% endif %}
    • `edited` - 仓库的信息被编辑。
    • `renamed` - 仓库被重命名。
    • `transferred` - 仓库被转让。
    • `publicized` - 仓库被设为公共。
    • `privatized` - 仓库被设为私有。
    | +| `action` | `字符串` | 执行的操作内容. 可以是以下选项之一：
    • `created` - 创建了仓库。
    • `deleted` - 仓库被删除。 This event type is only available to [organization hooks](/rest/reference/orgs#webhooks/)
    • `archived` - 仓库被存档。
    • `unarchived` - 仓库被取消存档。
      • {% if enterpriseServerVersions contains currentVersion %}
    • `anonymous_access_enabled` - 仓库被[启用匿名 Git 访问](/v3/previews/#anonymous-git-access-to-repositories)，`anonymous_access_disabled` - 仓库被[禁用匿名 Git 访问](/v3/previews/#anonymous-git-access-to-repositories)
      • {% endif %}
    • `edited` - 仓库的信息被编辑。
    • `renamed` - 仓库被重命名。
    • `transferred` - 仓库被转让。
    • `publicized` - 仓库被设为公共。
    • `privatized` - 仓库被设为私有。
    | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -1244,14 +1248,14 @@ Web 挂钩事件是基于您注册的域的特异性而触发的。 例如，如 {{ webhookPayloadsForCurrentVersion.team_add }} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 用户 当用户被 `created` 或 `deleted` 时。 #### 可用性 -- GitHub Enterprise web 挂钩。 更多信息请参阅“[全局 web 挂钩](/rest/reference/enterprise-admin#global-webhooks/)”。 +- GitHub Enterprise web 挂钩。 For more information, "[Global webhooks](/rest/reference/enterprise-admin#global-webhooks/)." #### Web 挂钩有效负载示例 diff --git a/translations/zh-CN/content/github/administering-a-repository/about-branch-restrictions.md b/translations/zh-CN/content/github/administering-a-repository/about-branch-restrictions.md index cf02042e79..311adfc7c6 100644 --- a/translations/zh-CN/content/github/administering-a-repository/about-branch-restrictions.md +++ b/translations/zh-CN/content/github/administering-a-repository/about-branch-restrictions.md @@ -17,7 +17,7 @@ People and apps with admin permissions to a repository are always able to push t {% tip %} -**Note:** If "Include administrators" is selected, you've enabled required status checks on the branch, and if any status checks fail, any attempt to push changes to the protected branch will also fail, even for people and apps with admin permissions. 更多信息请参阅“[启用必需状态检查](/articles/enabling-required-status-checks)”。 +**注：**如果选中“Include administrators（包括管理员）”，并且您对分支启用了必需状态检查，如有任何状态检查失败，则即使是具有管理员权限的人员和应用，将更改推送到受保护分支的任何尝试也会失败。 更多信息请参阅“[启用必需状态检查](/articles/enabling-required-status-checks)”。 {% endtip %} diff --git a/translations/zh-CN/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md b/translations/zh-CN/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md index 05c9bdb06b..d70878deb5 100644 --- a/translations/zh-CN/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md +++ b/translations/zh-CN/content/github/administering-a-repository/about-email-notifications-for-pushes-to-your-repository.md @@ -12,7 +12,7 @@ versions: enterprise-server: '*' --- -{% if currentVersion != "free-pro-team@latest" %}{% data reusables.notifications.outbound_email_tip %}{% endif %} +{% if enterpriseServerVersions contains currentVersion %}{% data reusables.notifications.outbound_email_tip %}{% endif %} 对于推送到仓库所发送的每封电子邮件通知都会列出新提交，以及只包含这些提交的差异的链接。 在电子邮件通知中，您会看到： diff --git a/translations/zh-CN/content/github/administering-a-repository/about-github-dependabot-version-updates.md b/translations/zh-CN/content/github/administering-a-repository/about-github-dependabot-version-updates.md index df926ead34..2da4bee757 100644 --- a/translations/zh-CN/content/github/administering-a-repository/about-github-dependabot-version-updates.md +++ b/translations/zh-CN/content/github/administering-a-repository/about-github-dependabot-version-updates.md @@ -17,7 +17,7 @@ versions: 当 {% data variables.product.prodname_dependabot_short %} 发现过时的依赖项时，它会发起拉取请求以将清单更新到依赖项的最新版本。 For vendored dependencies, {% data variables.product.prodname_dependabot_short %} raises a pull request to directly replace the outdated dependency with the new version. 检查测试是否通过，查看拉取请求摘要中包含的更改日志和发行说明，然后合并它。 更多信息请参阅“[启用和禁用版本更新](/github/administering-a-repository/enabling-and-disabling-version-updates)”。 -如果启用安全更新，{% data variables.product.prodname_dependabot %} 还会发起拉取请求以更新易受攻击依赖项。 更多信息请参阅“[配置 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)。” +如果启用安全更新，{% data variables.product.prodname_dependabot %} 还会发起拉取请求以更新易受攻击依赖项。 更多信息请参阅“[关于 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)”。 {% data reusables.dependabot.dependabot-tos %} diff --git a/translations/zh-CN/content/github/administering-a-repository/about-required-commit-signing.md b/translations/zh-CN/content/github/administering-a-repository/about-required-commit-signing.md index 4f9fffe30c..bc5bd09f88 100644 --- a/translations/zh-CN/content/github/administering-a-repository/about-required-commit-signing.md +++ b/translations/zh-CN/content/github/administering-a-repository/about-required-commit-signing.md @@ -11,9 +11,9 @@ versions: 如果您在仓库中实施了分支保护，便可设置必需提交签名。 更多信息请参阅“[配置受保护分支](/articles/configuring-protected-branches/)”。 -When you enable required commit signing on a branch, contibutors {% if currentVersion == "free-pro-team@latest" %}and bots{% endif %} can only push commits that have been signed and verified to the branch. 更多信息请参阅“[关于提交签名验证](/articles/about-commit-signature-verification)”。 +When you enable required commit signing on a branch, contributors {% if currentVersion == "free-pro-team@latest" %}and bots{% endif %} can only push commits that have been signed and verified to the branch. 更多信息请参阅“[关于提交签名验证](/articles/about-commit-signature-verification)”。 -如果提交已进行签名和验证，则始终可以将本地提交推送到分支。 {% if currentVersion == "free-pro-team@latest" %}You can also merge signed and verified commits into the branch using a pull request on {% data variables.product.product_name %}. However, you cannot squash and merge a pull request into the branch on {% data variables.product.product_name %} unless you are the author of the pull request.{% else %} However, you cannot merge pull requests into the branch on {% data variables.product.product_name %}.{% endif %} You can {% if currentVersion == "free-pro-team@latest" %}squash and {% endif %}merge pull requests locally. For more information, see "[Checking out pull requests locally](/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally)."{% if currentVersion == "free-pro-team@latest" %} For more information about merge methods, see "[About merge methods on {% data variables.product.prodname_dotcom %}](/github/administering-a-repository/about-merge-methods-on-github)."{% endif %} +如果提交已进行签名和验证，则始终可以将本地提交推送到分支。 {% if currentVersion == "free-pro-team@latest" %}You can also merge signed and verified commits into the branch using a pull request on {% data variables.product.product_name %}. 但除非您是拉取请求的作者，否则不能将拉取请求压缩并合并到 {% data variables.product.product_name %} 。{% else %}但不能将拉取请求合并到 {% data variables.product.product_name %} 上的分支。{% endif %} 您可以在本地 {% if currentVersion == "free-pro-team@latest" %}压缩和{% endif %}合并拉取请求。 更多信息请参阅“[本地检出拉取请求](/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally)”。{% if currentVersion == "free-pro-team@latest" %}有关合并方法的详细信息，请参阅“[关于 {% data variables.product.prodname_dotcom %}](/github/administering-a-repository/about-merge-methods-on-github) 上的合并方法”。{% endif %} {% note %} diff --git a/translations/zh-CN/content/github/administering-a-repository/about-securing-your-repository.md b/translations/zh-CN/content/github/administering-a-repository/about-securing-your-repository.md index 520338cdd8..a5e2a8303f 100644 --- a/translations/zh-CN/content/github/administering-a-repository/about-securing-your-repository.md +++ b/translations/zh-CN/content/github/administering-a-repository/about-securing-your-repository.md @@ -21,9 +21,13 @@ versions: 私下讨论并修复仓库代码中的安全漏洞。 然后，您可以发布安全通告，提醒您的社区注意漏洞并鼓励他们升级。 更多信息请参阅“[关于 {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)”。 -- **{% data variables.product.prodname_dependabot_short %} 警报** +- **{% data variables.product.prodname_dependabot_short %} alerts and security updates** - 查看有关已知包含安全漏洞的依赖项的警报，并选择是否自动生成拉取请求以更新这些依赖项。 更多信息请参阅“[查看和更新仓库中的漏洞依赖项](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)”和“[配置 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)”。 + 查看有关已知包含安全漏洞的依赖项的警报，并选择是否自动生成拉取请求以更新这些依赖项。 For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." + +- **{% data variables.product.prodname_dependabot_short %} version updates** + + Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. 更多信息请参阅“[关于 {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot-version-updates)”。 - **{% data variables.product.prodname_code_scanning_capc %} 警报** diff --git a/translations/zh-CN/content/github/administering-a-repository/classifying-your-repository-with-topics.md b/translations/zh-CN/content/github/administering-a-repository/classifying-your-repository-with-topics.md index 1adf59df66..9ad2de3ed8 100644 --- a/translations/zh-CN/content/github/administering-a-repository/classifying-your-repository-with-topics.md +++ b/translations/zh-CN/content/github/administering-a-repository/classifying-your-repository-with-topics.md @@ -1,6 +1,6 @@ --- -title: Classifying your repository with topics -intro: 'To help other people find and contribute to your project, you can add topics to your repository related to your project''s intended purpose, subject area, affinity groups, or other important qualities.' +title: 使用主题对仓库分类 +intro: '为帮助其他人找到并参与您的项目，可以为仓库添加主题，这些主题可以与项目的预期目的、学科领域、关联团队或其他重要特点相关。' redirect_from: - /articles/about-topics/ - /articles/classifying-your-repository-with-topics @@ -9,36 +9,30 @@ versions: enterprise-server: '*' --- -### About topics +### 关于主题 -With topics, you can explore repositories in a particular subject area, find projects to contribute to, and discover new solutions to a specific problem. Topics appear on the main page of a repository. You can click a topic name to {% if currentVersion == "free-pro-team@latest" %}see related topics and a list of other repositories classified with that topic{% else %}search for other repositories with that topic{% endif %}. +使用主题可以探索特定主题领域的仓库，查找要参与的项目，以及发现特定问题的新解决方案。 主题显示在仓库的主页面上。 您可以单击主题名称以{% if currentVersion == "free-pro-team@latest" %}查看相关主题及其他以该主题分类的仓库列表{% else %}搜索使用该主题的其他仓库{% endif %}。 -![Main page of the test repository showing topics](/assets/images/help/repository/os-repo-with-topics.png) +![显示主题的测试仓库主页面](/assets/images/help/repository/os-repo-with-topics.png) -To browse the most used topics, go to https://github.com/topics/. +要浏览最常用的主题，请访问 https://github.com/topics/ -{% if currentVersion == "free-pro-team@latest" %}You can contribute to {% data variables.product.product_name %}'s set of featured topics in the [github/explore](https://github.com/github/explore) repository. {% endif %} +{% if currentVersion == "free-pro-team@latest" %}您可以在 [github/explore](https://github.com/github/explore) 仓库中参与 {% data variables.product.product_name %} 的专有主题集。 {% endif %} -Repository admins can add any topics they'd like to a repository. Helpful topics to classify a repository include the repository's intended purpose, subject area, community, or language.{% if currentVersion == "free-pro-team@latest" %} Additionally, {% data variables.product.product_name %} analyzes public repository content and generates suggested topics that repository admins can accept or reject. Private repository content is not analyzed and does not receive topic suggestions.{% endif %} +仓库管理员可以添加他们喜欢的任何主题到仓库。 适用于对仓库分类的主题包括仓库的预期目的、主题领域、社区或语言。{% if currentVersion == "free-pro-team@latest" %}此外，{% data variables.product.product_name %} 也会分析公共仓库内容，生成建议的主题，仓库管理员可以接受或拒绝。 私有仓库内容不可分析，也不会收到主题建议。{% endif %} -Public and private repositories can have topics, although you will only see private repositories that you have access to in topic search results. +公共和私有仓库都可有主题，但在主题搜索结果中只能看到您可以访问的私有仓库。 -You can search for repositories that are associated with a particular topic. For more information, see "[Searching for repositories](/articles/searching-for-repositories#search-by-topic)." You can also search for a list of topics on {% data variables.product.product_name %}. For more information, see "[Searching topics](/articles/searching-topics)." +您可以搜索与公共仓库关联的仓库。 更多信息请参阅“[搜索仓库](/articles/searching-for-repositories#search-by-topic)”。 您也可以搜索 {% data variables.product.product_name %} 中的主题列表。 更多信息请参阅“[搜索主题](/articles/searching-topics)”。 -### Adding topics to your repository +### 添加主题到仓库 -{% data reusables.repositories.navigate-to-repo %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} -2. Under your repository description, click **Add topics**. - ![Add topics link on a repository's main page](/assets/images/help/repository/add-topics-link.png) -3. Type the topic you want to add to your repository, then type a space. - ![Form to enter topics](/assets/images/help/repository/add-topic-form.png) -4. After you've finished adding topics, click **Done**. - ![Form with a list of topics and Done button](/assets/images/help/repository/add-topics-done-button.png) +{% data reusables.repositories.navigate-to-repo %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +2. 在仓库说明下，单击 **Add topics（添加主题）**。 ![在仓库的主页面上添加主题链接](/assets/images/help/repository/add-topics-link.png) +3. 键入要添加到仓库的主题，然后键入空格。 ![输入主题的表单](/assets/images/help/repository/add-topic-form.png) +4. 完成添加主题后，单击 **Done（完成）**。 ![含主题列表和完成按钮的表单](/assets/images/help/repository/add-topics-done-button.png) {% else %} -2. To the right of "About", click {% octicon "gear" aria-label="The Gear icon" %}. - ![Gear icon on main page of a repository](/assets/images/help/repository/edit-repository-details-gear.png) -3. Under "Topics", type the topic you want to add to your repository, then type a space. - ![Form to enter topics](/assets/images/help/repository/add-topic-form.png) -4. After you've finished adding topics, click **Save changes**. - !["Save changes" button in "Edit repository details"](/assets/images/help/repository/edit-repository-details-save-changes-button.png) +2. 在“About（关于）”右侧，单击 {% octicon "gear" aria-label="The Gear icon" %}。 ![仓库主页上的齿轮图标](/assets/images/help/repository/edit-repository-details-gear.png) +3. 在“"Topics（主题）”下，键入要添加到仓库的主题，然后键入空格。 ![输入主题的表单](/assets/images/help/repository/add-topic-form.png) +4. 完成添加主题后，单击 **Save changes（保存更改）**。 !["Edit repository details（编辑仓库详细信息）"中的"Save changes（保存更改）"按钮](/assets/images/help/repository/edit-repository-details-save-changes-button.png) {% endif %} diff --git a/translations/zh-CN/content/github/administering-a-repository/configuration-options-for-dependency-updates.md b/translations/zh-CN/content/github/administering-a-repository/configuration-options-for-dependency-updates.md index f746607004..cc1f43f842 100644 --- a/translations/zh-CN/content/github/administering-a-repository/configuration-options-for-dependency-updates.md +++ b/translations/zh-CN/content/github/administering-a-repository/configuration-options-for-dependency-updates.md @@ -545,12 +545,6 @@ updates: Use the `vendor` option to tell {% data variables.product.prodname_dependabot_short %} to vendor dependencies when updating them. -{% note %} - -Currently, {% data variables.product.prodname_dependabot_short %} only supports vendoring dependencies for Bundler. - -{% endnote %} - ```yaml # Configure version updates for both dependencies defined in manifests and vendored dependencies @@ -564,7 +558,13 @@ updates: interval: "weekly" ``` -{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. For Bundler, the dependencies must be in the _vendor/cache_ directory. Other file paths are not supported. For more information, see the [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html). +{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. + +| 包管理器 | Required file path for vendored dependencies | 更多信息 | +| --------- | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------- | +| `bundler` | The dependencies must be in the _vendor/cache_ directory.
    Other file paths are not supported. | [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html) | +| `gomod` | No path requirement (dependencies are usually located in the _vendor_ directory) | [`go mod vendor` documentation](https://golang.org/ref/mod#go-mod-vendor) | + ### `versioning-strategy` diff --git a/translations/zh-CN/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/translations/zh-CN/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md index a58b62fe8f..6bd0c18013 100644 --- a/translations/zh-CN/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md +++ b/translations/zh-CN/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md @@ -17,7 +17,7 @@ versions: 此外，您可以在您的仓库中启用 {% data variables.product.prodname_actions %}，但限制工作流程可以运行的操作。 {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### 管理仓库的 {% data variables.product.prodname_actions %} 权限 diff --git a/translations/zh-CN/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md b/translations/zh-CN/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md index 3cb9b4f7eb..2a2834c757 100644 --- a/translations/zh-CN/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md +++ b/translations/zh-CN/content/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch.md @@ -1,32 +1,31 @@ --- -title: Enabling force pushes to a protected branch -intro: You can allow force pushes to a protected branch. +title: 启用强制推送到受保护分支 +intro: 您可以允许强制推送到受保护分支。 product: '{% data reusables.gated-features.protected-branches %}' versions: free-pro-team: '*' enterprise-server: '>=2.20' --- -Anyone with admin permissions to a repository can enable force pushes. +对仓库具有管理员权限的任何人都可以启用强制推送。 -### About force pushes to protected branches +### 关于强制推送到受保护分支 -By default, force pushes are blocked on all protected branches. When you enable force pushes to a protected branch, anyone with at least write permissions to the repository can force push to the branch, including those with admin permissions. +默认情况下，所有受保护分支上阻止强制推送。 对受保护分支启用强制推送时，只要具有仓库写入权限，任何人（包括具有管理员权限的人）都可以强制推送到该分支。 -Enabling force pushes will not override any other branch protection rules. For example, if a branch requires a linear commit history, you cannot force push merge commits to that branch. +启用强制推送不会覆盖任何其他分支保护规则。 例如，如果分支需要线性提交历史记录，则无法强制推送合并提交到该分支。 -{% if currentVersion != "free-pro-team@latest" %}You cannot enable force pushes for a protected branch if a site administrator has blocked force pushes to all branches in your repository. For more information, see "[Blocking force pushes to repositories owned by a user account or organization](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)." +{% if enterpriseServerVersions contains currentVersion %}如果站点管理员阻止了强制推送到仓库中的所有分支，则无法对受保护分支启用强制推送。 更多信息请参阅“[阻止强制推送到用户帐户或组织拥有的仓库](/enterprise/{{ currentVersion }}/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization)”。 -If a site administrator has blocked force pushes to the default branch only, you can still enable force pushes for any other protected branch.{% endif %} +如果站点管理员只阻止强制推送到默认分支，您仍然可以为任何其他受保护分支启用强制推送。{% endif %} {% data reusables.repositories.protected-branches-options %} -### Enabling force pushes +### 启用强制推送 {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.repositories.repository-branches %} {% data reusables.repositories.add-branch-protection-rules %} -6. Under "Rules applied to everyone including administrators", select **Allow force pushes**. -![Allow force pushes option](/assets/images/help/repository/allow-force-pushes.png) -7. Click **Create**. +6. 在“Rules applied to everyone including administrators（适用于包括管理员在内的所有人规则）”下，选择 **Allow force pushes（允许强制推送）**。 ![允许强制推送选项](/assets/images/help/repository/allow-force-pushes.png) +7. 单击 **Create（创建）**。 diff --git a/translations/zh-CN/content/github/administering-a-repository/index.md b/translations/zh-CN/content/github/administering-a-repository/index.md index 193dfab3cb..8aee725930 100644 --- a/translations/zh-CN/content/github/administering-a-repository/index.md +++ b/translations/zh-CN/content/github/administering-a-repository/index.md @@ -26,7 +26,7 @@ versions: {% link_in_list /viewing-deployment-activity-for-your-repository %} {% link_in_list /managing-the-forking-policy-for-your-repository %} - + {% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-repository %} {% link_in_list /disabling-or-limiting-github-actions-for-a-repository %} {% link_in_list /managing-git-lfs-objects-in-archives-of-your-repository %} diff --git a/translations/zh-CN/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/translations/zh-CN/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md index 33e5f55c74..accd77f433 100644 --- a/translations/zh-CN/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md +++ b/translations/zh-CN/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md @@ -9,9 +9,9 @@ versions: ### 关于 {% data variables.product.prodname_dependabot %} 拉取请求 -{% data variables.product.prodname_dependabot %} 提出拉取请求，以更新依赖项。 {% data variables.product.prodname_dependabot_short %} 可能会针对版本更新和/或安全更新提出拉取请求，具体取决于仓库的配置方式。 您可以按与任何其他拉取请求相同的方式管理这些拉取请求，但也有一些额外的可用命令。 有关启用 {% data variables.product.prodname_dependabot %} 依赖项更新的更多信息，请参阅“[配置 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)”和“[启用和禁用版本更新](/github/administering-a-repository/enabling-and-disabling-version-updates)”。 +{% data reusables.dependabot.pull-request-introduction %} -当 {% data variables.product.prodname_dependabot %} 提出拉取请求时，将以您为仓库选择的方式通知您。 每个拉取请求都包含关于来自包管理系统的拟议变更的详细信息。 这些拉取请求将遵循仓库中定义的正常检查和测试。 此外，如果有足够的信息，您将看到兼容性分数。 这也有助于您决定是否合并变更。 有关此分数的信息，请参阅“[配置 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)”。 +当 {% data variables.product.prodname_dependabot %} 提出拉取请求时，将以您为仓库选择的方式通知您。 Each pull request contains detailed information about the proposed change, taken from the package manager. 这些拉取请求将遵循仓库中定义的正常检查和测试。 此外，如果有足够的信息，您将看到兼容性分数。 这也有助于您决定是否合并变更。 For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." 如果您有多个依赖项要管理，可能会希望为每个包管理器自定义配置，以便拉取请求拥有特定的审查者、受理人和标签。 更多信息请参阅“[自定义依赖项更新](/github/administering-a-repository/customizing-dependency-updates)。” diff --git a/translations/zh-CN/content/github/administering-a-repository/setting-repository-visibility.md b/translations/zh-CN/content/github/administering-a-repository/setting-repository-visibility.md index 4a7f7fc1e3..5ed63a5c4f 100644 --- a/translations/zh-CN/content/github/administering-a-repository/setting-repository-visibility.md +++ b/translations/zh-CN/content/github/administering-a-repository/setting-repository-visibility.md @@ -23,7 +23,7 @@ versions: {% if currentVersion == "free-pro-team@latest" %}* If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. {% data reusables.gated-features.more-info %} * 任何已发布的 {% data variables.product.prodname_pages %} 站点都将自动取消发布。 如果您将自定义域添加到 {% data variables.product.prodname_pages %} 站点，应在将仓库设为私有之前删除或更新 DNS 记录，以避免域接管的风险。 更多信息请参阅“[管理 {% data variables.product.prodname_pages %} 网站的自定义域](/articles/managing-a-custom-domain-for-your-github-pages-site)。 * {% data variables.product.prodname_dotcom %} 不再在 {% data variables.product.prodname_archive %} 中包含该仓库。 更多信息请参阅“[关于在 {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program) 上存档内容和数据”。{% endif %} - {% if currentVersion != "free-pro-team@latest" %}* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} + {% if enterpriseServerVersions contains currentVersion %}* Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} #### 将仓库设为公共 diff --git a/translations/zh-CN/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md b/translations/zh-CN/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md index a8fddc6991..c7a6a49772 100644 --- a/translations/zh-CN/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md +++ b/translations/zh-CN/content/github/administering-a-repository/viewing-deployment-activity-for-your-repository.md @@ -14,7 +14,7 @@ versions: {% endnote %} -如果仓库的部署工作流程通过 Deployments API 或来自 [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment) 的应用程序与 {% data variables.product.product_name %} 集成，则具有读取权限的人员可以查看所有当前部署的概览以及过去部署活动的日志。 更多信息请参阅“[部署](/rest/reference/repos#deployments)”。 +如果仓库的部署工作流程通过 Deployments API 或来自 [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace/category/deployment) 的应用程序与 {% data variables.product.product_name %} 集成，则具有读取权限的人员可以查看所有当前部署的概览以及过去部署活动的日志。 For more information, see "[Deployments](/rest/reference/repos#deployments)." 您还可以在拉取请求的“Conversation（对话）”选项卡中查看部署信息。 diff --git a/translations/zh-CN/content/github/authenticating-to-github/error-permission-denied-publickey.md b/translations/zh-CN/content/github/authenticating-to-github/error-permission-denied-publickey.md index 75af14ce41..bafa418a21 100644 --- a/translations/zh-CN/content/github/authenticating-to-github/error-permission-denied-publickey.md +++ b/translations/zh-CN/content/github/authenticating-to-github/error-permission-denied-publickey.md @@ -1,6 +1,6 @@ --- -title: 'Error: Permission denied (publickey)' -intro: 'A "Permission denied" error means that the server rejected your connection. There could be several reasons why, and the most common examples are explained below.' +title: '错误：权限被拒绝（公钥）' +intro: '“权限被拒绝”错误表示服务器拒绝了您的连接。 可能有多个原因，最常见的如下所述。' redirect_from: - /articles/error-permission-denied-publickey versions: @@ -8,15 +8,15 @@ versions: enterprise-server: '*' --- -### Should the `sudo` command be used with Git? +### 对 Git 是否应该使用 `sudo` 命令？ -You should not be using the `sudo` command with Git. If you have a *very good reason* you must use `sudo`, then ensure you are using it with every command (it's probably just better to use `su` to get a shell as root at that point). If you [generate SSH keys](/articles/generating-an-ssh-key) without `sudo` and then try to use a command like `sudo git push`, you won't be using the same keys that you generated. +不应对 Git 使用 `sudo` 命令。 如果有*很好的原因*必须使用 `sudo`，请确保对每个命令使用它（可能使用 `su` 获取 shell 作为该点的根更好）。 如果[生成 SSH 密钥](/articles/generating-an-ssh-key)而不使用 `sudo`，则尝试使用 `sudo git push` 而不使用生成的相同密钥。 -### Check that you are connecting to the correct server +### 检查是否连接到正确的服务器 -Typing is hard, we all know it. Pay attention to what you type; you won't be able to connect to "githib.com" or "guthub.com". In some cases, a corporate network may cause issues resolving the DNS record as well. +我们知道，键入 Url 很麻烦。 请注意您键入的内容；您无法连接到 "githib.com" 或 "guthub.com"。 有某些情况下，公司网络可能导致解析 DNS 记录有问题。 -To make sure you are connecting to the right domain, you can enter the following command: +为确保连接到正确的域，可以输入以下命令： ```shell $ ssh -vT git@{% data variables.command_line.codeblock %} @@ -29,29 +29,29 @@ $ ssh -vT git@{% data variables.command_line.codeblock %} The connection should be made on port 22{% if currentVersion == "free-pro-team@latest" %}, unless you're overriding settings to use [SSH over HTTPS](/articles/using-ssh-over-the-https-port){% endif %}. -### Always use the "git" user +### 始终使用 "git" 用户 -All connections, including those for remote URLs, must be made as the "git" user. If you try to connect with your {% data variables.product.product_name %} username, it will fail: +所有连接（包括远程 URL 的连接）必须以 "git" 用户进行。 如果尝试以 {% data variables.product.product_name %} 用户名连接，将会失败： ```shell $ ssh -T GITHUB-USERNAME@{% data variables.command_line.codeblock %} > Permission denied (publickey). ``` -If your connection failed and you're using a remote URL with your {% data variables.product.product_name %} username, you can [change the remote URL to use the "git" user](/articles/changing-a-remote-s-url/). +如果连接失败且您通过 {% data variables.product.product_name %} 用户名使用远程 URL，可以[更改远程 URL 以使用 "git" 用户](/articles/changing-a-remote-s-url/)。 -You should verify your connection by typing: +应键入以下命令来验证连接： ```shell $ ssh -T git@{% data variables.command_line.codeblock %} > Hi username! You've successfully authenticated... ``` -### Make sure you have a key that is being used +### 确保您有使用的密钥 {% mac %} {% data reusables.command_line.open_the_multi_os_terminal %} -2. Verify that you have a private key generated and loaded into SSH. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +2. 确认您的私钥已生成并加载到 SSH。 {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell # start the ssh-agent in the background $ eval "$(ssh-agent -s)" @@ -60,7 +60,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + 如果使用的是 OpenSSH 6.8 或更新版本： ```shell # start the ssh-agent in the background $ eval "$(ssh-agent -s)" @@ -86,13 +86,13 @@ $ ssh -T git@{% data variables.command_line.codeblock %} 1. {% data reusables.desktop.windows_git_bash_turn_on_ssh_agent %} {% data reusables.desktop.windows_git_for_windows_turn_on_ssh_agent %} -2. Verify that you have a private key generated and loaded into SSH. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +2. 确认您的私钥已生成并加载到 SSH。 {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + 如果使用的是 OpenSSH 6.8 或更新版本： ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) @@ -108,7 +108,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} {% linux %} {% data reusables.command_line.open_the_multi_os_terminal %} -2. Verify that you have a private key generated and loaded into SSH. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +2. 确认您的私钥已生成并加载到 SSH。 {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell # start the ssh-agent in the background $ eval "$(ssh-agent -s)" @@ -117,7 +117,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + 如果使用的是 OpenSSH 6.8 或更新版本： ```shell # start the ssh-agent in the background $ eval "$(ssh-agent -s)" @@ -130,7 +130,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} $ ssh-add -l -E sha256 > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) ```{% endif %} - + {% endlinux %} @@ -162,7 +162,7 @@ $ ssh -vT git@{% data variables.command_line.codeblock %} > Permission denied (publickey). ``` -In that example, we did not have any keys for SSH to use. The "-1" at the end of the "identity file" lines means SSH couldn't find a file to use. Later on, the "Trying private key" lines also indicate that no file was found. If a file existed, those lines would be "1" and "Offering public key", respectively: +在该示例中，我们没有任何密钥供 SSH 使用。 "identity file" 行末的 "-1" 表示 SSH 找不到可使用的文件。 后面的 "Trying private key" 行也表示未找到文件。 如果文件存在，这些行将分别是 "1" 和 "Offering public key"： ```shell $ ssh -vT git@{% data variables.command_line.codeblock %} @@ -174,25 +174,25 @@ $ ssh -vT git@{% data variables.command_line.codeblock %} > debug1: Offering RSA public key: /Users/you/.ssh/id_rsa ``` -### Verify the public key is attached to your account +### 确认公钥已附加到您的帐户 -You must provide your public key to {% data variables.product.product_name %} to establish a secure connection. +必须向 {% data variables.product.product_name %} 提供公钥才可建立安全连接。 {% mac %} -1. Open Terminal. -2. Start SSH agent in the background. +1. 打开终端。 +2. 在后台启动 SSH 代理程序。 ```shell $ eval "$(ssh-agent -s)" > Agent pid 59566 ``` -3. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +3. 找到并记录公钥指纹。 {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + 如果使用的是 OpenSSH 6.8 或更新版本： ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -212,19 +212,19 @@ You must provide your public key to {% data variables.product.product_name %} to {% windows %} -1. Open the command line. -2. Start SSH agent in the background. +1. 打开命令行。 +2. 在后台启动 SSH 代理程序。 ```shell $ ssh-agent -s > Agent pid 59566 ``` -3. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +3. 找到并记录公钥指纹。 {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + 如果使用的是 OpenSSH 6.8 或更新版本： ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -244,19 +244,19 @@ You must provide your public key to {% data variables.product.product_name %} to {% linux %} -1. Open Terminal. -2. Start SSH agent in the background. +1. 打开终端。 +2. 在后台启动 SSH 代理程序。 ```shell $ eval "$(ssh-agent -s)" > Agent pid 59566 ``` -3. Find and take a note of your public key fingerprint. If you're using OpenSSH 6.7 or older: +3. 找到并记录公钥指纹。 如果使用的是 OpenSSH 6.7 或更早版本： ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + 如果使用的是 OpenSSH 6.8 或更新版本： ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -264,15 +264,14 @@ You must provide your public key to {% data variables.product.product_name %} to {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.ssh %} -6. Compare the list of SSH keys with the output from the `ssh-add` command. -![SSH key listing in {% data variables.product.product_name %}](/assets/images/help/settings/ssh_key_listing.png) +6. 比较 SSH 公钥列表与 `ssh-add` 命令的输出。 ![{% data variables.product.product_name %} 中的 SSH 密钥列表](/assets/images/help/settings/ssh_key_listing.png) {% endlinux %} -If you don't see your public key in {% data variables.product.product_name %}, you'll need to [add your SSH key to {% data variables.product.product_name %}](/articles/adding-a-new-ssh-key-to-your-github-account) to associate it with your computer. +如果在 {% data variables.product.product_name %} 中未看到公钥，则需要[添加 SSH 密钥到 {% data variables.product.product_name %}](/articles/adding-a-new-ssh-key-to-your-github-account) 并将其与您的计算机关联。 {% warning %} -**Warning**: If you see an SSH key you're not familiar with on {% data variables.product.product_name %}, delete it immediately and contact {% data variables.contact.contact_support %}, for further help. An unidentified public key may indicate a possible security concern. For more information, see "[Reviewing your SSH keys](/articles/reviewing-your-ssh-keys)." +**警告**：如果在 {% data variables.product.product_name %} 上看到您不熟悉的 SSH 密钥，请立即删除并联系 {% data variables.contact.contact_support %} 寻求进一步的帮助。 无法识别的公钥可能表示安全问题。 更多信息请参阅“[审查 SSH 密钥](/articles/reviewing-your-ssh-keys)”。 {% endwarning %} diff --git a/translations/zh-CN/content/github/authenticating-to-github/generating-a-new-gpg-key.md b/translations/zh-CN/content/github/authenticating-to-github/generating-a-new-gpg-key.md index 8aee0e6b15..24b940defa 100644 --- a/translations/zh-CN/content/github/authenticating-to-github/generating-a-new-gpg-key.md +++ b/translations/zh-CN/content/github/authenticating-to-github/generating-a-new-gpg-key.md @@ -29,7 +29,7 @@ versions: ```shell $ gpg --default-new-key-algo rsa4096 --gen-key ``` -4. 在提示时，指定要生成的密钥类型，或按 `Enter` 键接受默认的 `RSA and DSA`。 +4. 在提示时，指定要生成的密钥类型，或按 `Enter` 键接受默认的 `RSA and RSA`。 5. 输入所需的密钥长度。 密钥必须至少是 `4096` 位。 6. 输入密钥的有效时长。 按 `Enter` 键将指定默认选择，表示该密钥不会过期。 7. 验证您的选择是否正确。 diff --git a/translations/zh-CN/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md b/translations/zh-CN/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md index 1db4958f93..ddeaf6b475 100644 --- a/translations/zh-CN/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md +++ b/translations/zh-CN/content/github/authenticating-to-github/githubs-ssh-key-fingerprints.md @@ -9,7 +9,7 @@ versions: free-pro-team: '*' --- -以下是 {% data variables.product.prodname_dotcom %} 的公钥指纹 ： +These are {% data variables.product.prodname_dotcom %}'s public key fingerprints: - `SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8` (RSA) - `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA) diff --git a/translations/zh-CN/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md b/translations/zh-CN/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md index 3eef64f1f1..97755254e0 100644 --- a/translations/zh-CN/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md +++ b/translations/zh-CN/content/github/authenticating-to-github/removing-sensitive-data-from-a-repository.md @@ -134,7 +134,7 @@ $ bfg --replace-text passwords.txt {% endnote %} -## 避免将来的意外提交 +### 避免将来的意外提交 有一些简单的技巧可避免提交您不想要提交的内容： @@ -145,5 +145,5 @@ $ bfg --replace-text passwords.txt ### 延伸阅读 -- [`git filter-branch` 主页](https://git-scm.com/docs/git-filter-branch) +- [`git filter-branch` man page](https://git-scm.com/docs/git-filter-branch) - [Pro Git：Git 工具 - 重写历史记录](https://git-scm.com/book/en/Git-Tools-Rewriting-History) diff --git a/translations/zh-CN/content/github/authenticating-to-github/reviewing-your-security-log.md b/translations/zh-CN/content/github/authenticating-to-github/reviewing-your-security-log.md index 38e9334771..6ac475aa63 100644 --- a/translations/zh-CN/content/github/authenticating-to-github/reviewing-your-security-log.md +++ b/translations/zh-CN/content/github/authenticating-to-github/reviewing-your-security-log.md @@ -1,6 +1,6 @@ --- -title: Reviewing your security log -intro: You can review the security log for your user account to better understand actions you've performed and actions others have performed that involve you. +title: 审查您的安全日志 +intro: 您可以查看用户帐户的安全日志，以更好地了解您执行的操作以及其他人执行的与您有关的操作。 redirect_from: - /articles/reviewing-your-security-log versions: @@ -8,238 +8,233 @@ versions: enterprise-server: '*' --- -### Accessing your security log +### 访问安全日志 The security log lists all actions performed within the last 90 days{% if currentVersion ver_lt "enterprise-server@2.20" %}, up to 50{% endif %}. {% data reusables.user_settings.access_settings %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -2. In the user settings sidebar, click **Security log**. - ![Security log tab](/assets/images/help/settings/audit-log-tab.png) +2. 在用户设置侧边栏中，单击 **Security log（安全日志）**。 ![安全日志选项卡](/assets/images/help/settings/audit-log-tab.png) {% else %} {% data reusables.user_settings.security %} -3. Under "Security history," your log is displayed. - ![Security log](/assets/images/help/settings/user_security_log.png) -4. Click on an entry to see more information about the event. - ![Security log](/assets/images/help/settings/user_security_history_action.png) +3. 在“Security history（安全历史记录）”下，将显示您的日志。 ![安全日志](/assets/images/help/settings/user_security_log.png) +4. 单击条目以查看有关该事件的更多信息。 ![安全日志](/assets/images/help/settings/user_security_history_action.png) {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -### Searching your security log +### 搜索安全日志 {% data reusables.audit_log.audit-log-search %} -#### Search based on the action performed +#### 基于执行的操作搜索 {% else %} -### Understanding events in your security log +### 了解安全日志中的事件 -Actions listed in your security log are grouped within the following categories: -{% endif %} +安全日志中列出的操作分为以下类别： |{% endif %} +| 类别名称 | 描述 | +| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest" %} +| `account_recovery_token` | 包含与[添加恢复令牌](/articles/configuring-two-factor-authentication-recovery-methods)相关的所有活动。 | +| `计费，帐单` | 包含与帐单信息相关的所有活动。 | +| `marketplace_agreement_signature` | 包含与签署 {% data variables.product.prodname_marketplace %} 开发者协议相关的所有活动。 | +| `marketplace_listing` | 包含与 {% data variables.product.prodname_marketplace %} 中列出的应用程序相关的所有活动。{% endif %} +| `oauth_access` | Contains all activities related to [{% data variables.product.prodname_oauth_app %}s](/articles/authorizing-oauth-apps) you've connected with.{% if currentVersion == "free-pro-team@latest" %} +| `payment_method` | 包含与 {% data variables.product.prodname_dotcom %} 订阅支付相关的所有活动。{% endif %} +| `profile_picture` | 包含与头像相关的所有活动。 | +| `project` | 包含与项目板相关的所有活动。 | +| `public_key` | 包含与[公共 SSH 密钥](/articles/adding-a-new-ssh-key-to-your-github-account)相关的所有活动。 | +| `repo` | Contains all activities related to the repositories you own.{% if currentVersion == "free-pro-team@latest" %} +| `sponsors` | 包含与 {% data variables.product.prodname_sponsors %}和赞助者按钮相关的所有事件（请参阅“[关于 {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)”和“[在仓库中显示赞助者按钮](/articles/displaying-a-sponsor-button-in-your-repository)”）{% endif %}{% if enterpriseServerVersions contains currentVersion %} +| `团队` | 包含与您作为成员的团队相关的所有活动。{% endif %} +| `two_factor_authentication` | 包含与[双重身份验证](/articles/securing-your-account-with-two-factor-authentication-2fa)相关的所有活动。 | +| `用户` | 包含与您的帐户相关的所有活动。 | -| Category Name | Description -|------------------|-------------------{% if currentVersion == "free-pro-team@latest" %} -| `account_recovery_token` | Contains all activities related to [adding a recovery token](/articles/configuring-two-factor-authentication-recovery-methods). -| `billing` | Contains all activities related to your billing information. -| `marketplace_agreement_signature` | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. -| `marketplace_listing` | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %} -| `oauth_access` | Contains all activities related to [{% data variables.product.prodname_oauth_app %}s](/articles/authorizing-oauth-apps) you've connected with.{% if currentVersion == "free-pro-team@latest" %} -| `payment_method` | Contains all activities related to paying for your {% data variables.product.prodname_dotcom %} subscription.{% endif %} -| `profile_picture` | Contains all activities related to your profile picture. -| `project` | Contains all activities related to project boards. -| `public_key` | Contains all activities related to [your public SSH keys](/articles/adding-a-new-ssh-key-to-your-github-account). -| `repo` | Contains all activities related to the repositories you own.{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to {% data variables.product.prodname_sponsors %} and sponsor buttons (see "[About {% data variables.product.prodname_sponsors %}](/articles/about-github-sponsors)" and "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} -| `team` | Contains all activities related to teams you are a part of.{% endif %} -| `two_factor_authentication` | Contains all activities related to [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa). -| `user` | Contains all activities related to your account. - -A description of the events within these categories is listed below. +下面列出了这些类别中各事件的说明。 {% if currentVersion == "free-pro-team@latest" %} -#### The `account_recovery_token` category +#### `account_recovery_token` 类别 -| Action | Description -|------------------|------------------- -| confirm | Triggered when you successfully [store a new token with a recovery provider](/articles/configuring-two-factor-authentication-recovery-methods). -| recover | Triggered when you successfully [redeem an account recovery token](/articles/recovering-your-account-if-you-lose-your-2fa-credentials). -| recover_error | Triggered when a token is used but {% data variables.product.prodname_dotcom %} is not able to validate it. +| 操作 | 描述 | +| ------------- | ----------------------------------------------------------------------------------------- | +| confirm | 当您成功[使用恢复提供程序存储新令牌](/articles/configuring-two-factor-authentication-recovery-methods)时触发。 | +| recover | 当您成功[取回帐户恢复令牌](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)时触发。 | +| recover_error | 当 {% data variables.product.prodname_dotcom %} 无法验证所使用的令牌时触发。 | -#### The `billing` category +#### `billing` 类别 -| Action | Description -|------------------|------------------- -| change_billing_type | Triggered when you [change how you pay](/articles/adding-or-editing-a-payment-method) for {% data variables.product.prodname_dotcom %}. -| change_email | Triggered when you [change your email address](/articles/changing-your-primary-email-address). +| 操作 | 描述 | +| --------------------- | ----------------------------------------------------------------------------------------------------------- | +| change_billing_type | 当您[更改 {% data variables.product.prodname_dotcom %} 的支付方式](/articles/adding-or-editing-a-payment-method)时触发。 | +| change_email | 当您[更改您的电子邮件地址](/articles/changing-your-primary-email-address)时触发。 | -#### The `marketplace_agreement_signature` category +#### `marketplace_agreement_signature` 类别 -| Action | Description -|------------------|------------------- -| create | Triggered when you sign the {% data variables.product.prodname_marketplace %} Developer Agreement. +| 操作 | 描述 | +| ------ | --------------------------------------------------------------- | +| create | 在签署 {% data variables.product.prodname_marketplace %} 开发者协议时触发。 | -#### The `marketplace_listing` category +#### `marketplace_listing` 类别 -| Action | Description -|------------------|------------------- -| approve | Triggered when your listing is approved for inclusion in {% data variables.product.prodname_marketplace %}. -| create | Triggered when you create a listing for your app in {% data variables.product.prodname_marketplace %}. -| delist | Triggered when your listing is removed from {% data variables.product.prodname_marketplace %}. -| redraft | Triggered when your listing is sent back to draft state. -| reject | Triggered when your listing is not accepted for inclusion in {% data variables.product.prodname_marketplace %}. +| 操作 | 描述 | +| ------- | -------------------------------------------------------------------- | +| 批准 | 当您的列表被批准包含在 {% data variables.product.prodname_marketplace %} 中时触发。 | +| create | 当您在 {% data variables.product.prodname_marketplace %} 中为应用程序创建列表时触发。 | +| delist | 当您的列表从 {% data variables.product.prodname_marketplace %} 中被删除时触发。 | +| redraft | 将您的列表被返回到草稿状态时触发。 | +| reject | 当您的列表被拒绝包含在 {% data variables.product.prodname_marketplace %} 中时触发。 | {% endif %} -#### The `oauth_access` category +#### `oauth_access` 类别 -| Action | Description -|------------------|------------------- -| create | Triggered when you [grant access to an {% data variables.product.prodname_oauth_app %}](/articles/authorizing-oauth-apps). -| destroy | Triggered when you [revoke an {% data variables.product.prodname_oauth_app %}'s access to your account](/articles/reviewing-your-authorized-integrations). +| 操作 | 描述 | +| ------- | ------------------------------------------------------------------------------------------------------------------------ | +| create | 当您[授予 {% data variables.product.prodname_oauth_app %} 访问权限](/articles/authorizing-oauth-apps)时触发。 | +| destroy | 当您[撤销 {% data variables.product.prodname_oauth_app %} 对您帐户的访问权限](/articles/reviewing-your-authorized-integrations)时触发。 | {% if currentVersion == "free-pro-team@latest" %} -#### The `payment_method` category +#### `payment_method` 类别 -| Action | Description -|------------------|------------------- -| clear | Triggered when [a payment method](/articles/removing-a-payment-method) on file is removed. -| create | Triggered when a new payment method is added, such as a new credit card or PayPal account. -| update | Triggered when an existing payment method is updated. +| 操作 | 描述 | +| ------ | ------------------------------------------------------ | +| clear | 当存档的[付款方式](/articles/removing-a-payment-method)被删除时触发。 | +| create | 在添加新的付款方式（例如新的信用卡或 PayPal 帐户）时触发。 | +| update | 当现有付款方式被更新时触发。 | {% endif %} -#### The `profile_picture` category +#### `profile_picture` 类别 -| Action | Description -|------------------|------------------- -| update | Triggered when you [set or update your profile picture](/articles/setting-your-profile-picture/). +| 操作 | 描述 | +| ------ | ------------------------------------------------------------ | +| update | 当您[设置或更新个人资料图片](/articles/setting-your-profile-picture/)时触发。 | -#### The `project` category +#### `project` 类别 -| Action | Description -|--------------------|--------------------- -| `create` | Triggered when a project board is created. -| `rename` | Triggered when a project board is renamed. -| `update` | Triggered when a project board is updated. -| `delete` | Triggered when a project board is deleted. -| `link` | Triggered when a repository is linked to a project board. -| `unlink` | Triggered when a repository is unlinked from a project board. -| `project.access` | Triggered when a project board's visibility is changed. -| `update_user_permission` | Triggered when an outside collaborator is added to or removed from a project board or has their permission level changed. +| 操作 | 描述 | +| ------------------------ | --------------------------------- | +| `create` | 在创建项目板时触发。 | +| `rename` | 当项目板被重命名时触发。 | +| `update` | 当项目板被更新时触发。 | +| `delete` | 在删除项目板时触发。 | +| `link` | 当仓库被链接到项目板时触发。 | +| `unlink` | 当仓库从项目板解除链接时触发。 | +| `project.access` | 当项目板的可见性被更改时触发。 | +| `update_user_permission` | 在项目板中添加或删除外部协作者时，或者他们的权限级别被更改时触发。 | -#### The `public_key` category +#### `public_key` 类别 -| Action | Description -|------------------|------------------- -| create | Triggered when you [add a new public SSH key to your {% data variables.product.product_name %} account](/articles/adding-a-new-ssh-key-to-your-github-account). -| delete | Triggered when you [remove a public SSH key to your {% data variables.product.product_name %} account](/articles/reviewing-your-ssh-keys). +| 操作 | 描述 | +| ------ | ------------------------------------------------------------------------------------------------------------------------- | +| create | 当您[为 {% data variables.product.product_name %} 帐户添加新公共 SSH 密钥](/articles/adding-a-new-ssh-key-to-your-github-account)时触发。 | +| delete | 当您[删除 {% data variables.product.product_name %} 帐户的公共 SSH 密钥](/articles/reviewing-your-ssh-keys)时触发。 | -#### The `repo` category +#### `repo` 类别 -| Action | Description -|------------------|------------------- -| access | Triggered when you a repository you own is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). -| add_member | Triggered when a {% data variables.product.product_name %} user is {% if currentVersion == "free-pro-team@latest" %}[invited to have collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% else %}[given collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% endif %} to a repository. -| add_topic | Triggered when a repository owner [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. -| archived | Triggered when a repository owner [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} -| config.disable_anonymous_git_access | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. -| config.enable_anonymous_git_access | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. -| config.lock_anonymous_git_access | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). -| config.unlock_anonymous_git_access | Triggered when a repository's [anonymous Git read access setting is unlocked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access).{% endif %} -| create | Triggered when [a new repository is created](/articles/creating-a-new-repository). -| destroy | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} -| disable | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %}{% if currentVersion == "free-pro-team@latest" %} -| enable | Triggered when a repository is re-enabled.{% endif %} -| remove_member | Triggered when a {% data variables.product.product_name %} user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository). -| remove_topic | Triggered when a repository owner removes a topic from a repository. -| rename | Triggered when [a repository is renamed](/articles/renaming-a-repository). -| transfer | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). -| transfer_start | Triggered when a repository transfer is about to occur. -| unarchived | Triggered when a repository owner unarchives a repository. +| 操作 | 描述 | +| ------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| access | 当您拥有的仓库[从“私有”切换到“公共”](/articles/making-a-private-repository-public)（反之亦然）时触发。 | +| add_member | Triggered when a {% data variables.product.product_name %} user is {% if currentVersion == "free-pro-team@latest" %}[invited to have collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% else %}[given collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% endif %} to a repository. | +| add_topic | 当仓库所有者向仓库[添加主题](/articles/classifying-your-repository-with-topics)时触发。 | +| archived | 当仓库所有者[存档仓库](/articles/about-archiving-repositories)时触发。{% if enterpriseServerVersions contains currentVersion %} +| config.disable_anonymous_git_access | 当公共仓库中[禁用匿名 Git 读取权限](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)时触发。 | +| config.enable_anonymous_git_access | 当公共仓库中[启用匿名 Git 读取权限](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)时触发。 | +| config.lock_anonymous_git_access | 当仓库的[匿名 Git 读取权限设置被锁定](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access)时触发。 | +| config.unlock_anonymous_git_access | 当仓库的[匿名 Git 读取权限设置被解锁](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access)时触发。{% endif %} +| create | 在[创建新仓库](/articles/creating-a-new-repository)时触发。 | +| destroy | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} +| 禁用 | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| 启用 | 在重新启用仓库时触发。{% endif %} +| remove_member | 从[仓库中删除 {% data variables.product.product_name %} 用户的协作者身份](/articles/removing-a-collaborator-from-a-personal-repository)时触发。 | +| remove_topic | 当仓库所有者从仓库中删除主题时触发。 | +| rename | 当[仓库被重命名](/articles/renaming-a-repository)时触发。 | +| 转让 | 当[仓库被转让](/articles/how-to-transfer-a-repository)时触发。 | +| transfer_start | 在仓库转让即将发生时触发。 | +| unarchived | 当仓库所有者取消存档仓库时触发。 | {% if currentVersion == "free-pro-team@latest" %} -#### The `sponsors` category +#### `sponsors` 类别 -| Action | Description -|------------------|------------------- -| repo_funding_link_button_toggle | Triggered when you enable or disable a sponsor button in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") -| repo_funding_links_file_action | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") -| sponsor_sponsorship_cancel | Triggered when you cancel a sponsorship (see "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)") -| sponsor_sponsorship_create | Triggered when you sponsor a developer (see "[Sponsoring an open source contributor](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor#sponsoring-a-developer)") -| sponsor_sponsorship_preference_change | Triggered when you change whether you receive email updates from a sponsored developer (see "[Managing your sponsorship](/articles/managing-your-sponsorship)") -| sponsor_sponsorship_tier_change | Triggered when you upgrade or downgrade your sponsorship (see "[Upgrading a sponsorship](/articles/upgrading-a-sponsorship)" and "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)") -| sponsored_developer_approve | Triggered when your {% data variables.product.prodname_sponsors %} account is approved (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| sponsored_developer_create | Triggered when your {% data variables.product.prodname_sponsors %} account is created (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| sponsored_developer_profile_update | Triggered when you edit your sponsored developer profile (see "[Editing your profile details for {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/editing-your-profile-details-for-github-sponsors)") -| sponsored_developer_request_approval | Triggered when you submit your application for {% data variables.product.prodname_sponsors %} for approval (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| sponsored_developer_tier_description_update | Triggered when you change the description for a sponsorship tier (see "[Changing your sponsorship tiers](/articles/changing-your-sponsorship-tiers)") -| sponsored_developer_update_newsletter_send | Triggered when you send an email update to your sponsors (see "[Contacting your sponsors](/articles/contacting-your-sponsors)") -| waitlist_invite_sponsored_developer | Triggered when you are invited to join {% data variables.product.prodname_sponsors %} from the waitlist (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| waitlist_join | Triggered when you join the waitlist to become a sponsored developer (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") +| 操作 | 描述 | +| ----------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| repo_funding_link_button_toggle | 在仓库中启用或禁用赞助按钮时触发（请参阅“[在仓库中显示赞助按钮](/articles/displaying-a-sponsor-button-in-your-repository)”） | +| repo_funding_links_file_action | 更改仓库中的 FUNDING 文件时触发（请参阅“[在仓库中显示赞助按钮](/articles/displaying-a-sponsor-button-in-your-repository)”） | +| sponsor_sponsorship_cancel | 当您取消赞助时触发（请参阅“[降级赞助](/articles/downgrading-a-sponsorship)”） | +| sponsor_sponsorship_create | 当您赞助开发者时触发（请参阅“[赞助开源开发者](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor#sponsoring-a-developer)”） | +| sponsor_sponsorship_preference_change | 当您更改是否接收被赞助开发者的电子邮件更新时触发（请参阅“[管理赞助](/articles/managing-your-sponsorship)”） | +| sponsor_sponsorship_tier_change | 当您升级或降级赞助时触发（请参阅“[升级赞助](/articles/upgrading-a-sponsorship)”和“[降级赞助](/articles/downgrading-a-sponsorship)”） | +| sponsored_developer_approve | 当您的 {% data variables.product.prodname_sponsors %} 帐户被批准时触发（请参阅“[为您的用户帐户设置 {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)”） | +| sponsored_developer_create | 当您的 {% data variables.product.prodname_sponsors %} 帐户创建时触发（请参阅“[为您的用户帐户设置 {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)”） | +| sponsored_developer_profile_update | 在编辑您的被赞助开发者个人资料时触发（请参阅“[编辑 {% data variables.product.prodname_sponsors %} 的个人资料详细信息](/github/supporting-the-open-source-community-with-github-sponsors/editing-your-profile-details-for-github-sponsors)”） | +| sponsored_developer_request_approval | 提交您对 {% data variables.product.prodname_sponsors %} 的申请以供审批时触发（请参阅“[为您的用户帐户设置 {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)”） | +| sponsored_developer_tier_description_update | 当您更改赞助等级的说明时触发（请参阅“[更改赞助等级](/articles/changing-your-sponsorship-tiers)”） | +| sponsored_developer_update_newsletter_send | 当您向赞助者发送电子邮件更新时触发（请参阅“[联系赞助者](/articles/contacting-your-sponsors)”） | +| waitlist_invite_sponsored_developer | 当您从等候名单被邀请加入 {% data variables.product.prodname_sponsors %} 时触发（请参阅“[为您的用户帐户设置 {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)”） | +| waitlist_join | 当您加入成为被赞助开发者的等候名单时触发（请参阅“[为您的用户帐户设置 {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)”） | {% endif %} {% if currentVersion == "free-pro-team@latest" %} -#### The `successor_invitation` category +#### `successor_invitation` 类别 -| Action | Description -|------------------|------------------- -| accept | Triggered when you accept a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| cancel | Triggered when you cancel a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| create | Triggered when you create a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| decline | Triggered when you decline a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") -| revoke | Triggered when you revoke a succession invitation (see "[Maintaining ownership continuity of your user account's repositories](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)") +| 操作 | 描述 | +| ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| accept | 当您接受继承邀请时触发（请参阅“[保持用户帐户仓库的所有权连续性](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)”） | +| cancel | 当您取消继承邀请时触发（请参阅“[保持用户帐户仓库的所有权连续性](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)”） | +| create | 当您创建继承邀请时触发（请参阅“[保持用户帐户仓库的所有权连续性](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)”） | +| decline | 当您拒绝继承邀请时触发（请参阅“[保持用户帐户仓库的所有权连续性](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)”） | +| revoke | 当您撤销继承邀请时触发（请参阅“[保持用户帐户仓库的所有权连续性](/github/setting-up-and-managing-your-github-user-account/maintaining-ownership-continuity-of-your-user-accounts-repositories)”） | {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} -#### The `team` category +#### `team` 类别 -| Action | Description -|------------------|------------------- -| add_member | Triggered when a member of an organization you belong to [adds you to a team](/articles/adding-organization-members-to-a-team). -| add_repository | Triggered when a team you are a member of is given control of a repository. -| create | Triggered when a new team in an organization you belong to is created. -| destroy | Triggered when a team you are a member of is deleted from the organization. -| remove_member | Triggered when a member of an organization is [removed from a team](/articles/removing-organization-members-from-a-team) you are a member of. -| remove_repository | Triggered when a repository is no longer under a team's control. +| 操作 | 描述 | +| ----------------- | ------------------------------------------------------------------------ | +| add_member | 当您所属组织的成员[将您添加到团队](/articles/adding-organization-members-to-a-team)时触发。 | +| add_repository | 当您所属团队被授予控制仓库的权限时触发。 | +| create | 当您所属组织中创建了新团队时触发。 | +| destroy | 当您所属团队从组织中被删除时触发。 | +| remove_member | [从您所属团队中删除组织成员](/articles/removing-organization-members-from-a-team)时触发。 | +| remove_repository | 当仓库不再受团队控制时触发。 | {% endif %} -#### The `two_factor_authentication` category +#### `two_factor_authentication` 类别 -| Action | Description -|------------------|------------------- -| enabled | Triggered when [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) is enabled. -| disabled | Triggered when two-factor authentication is disabled. +| 操作 | 描述 | +| -------- | ----------------------------------------------------------------------------------- | +| enabled | 在启用[双重身份验证](/articles/securing-your-account-with-two-factor-authentication-2fa)时触发。 | +| disabled | 在禁用双重身份验证时触发。 | -#### The `user` category +#### `user` 类别 -| Action | Description -|--------------------|--------------------- -| add_email | Triggered when you [add a new email address](/articles/changing-your-primary-email-address). -| create | Triggered when you create a new user account. -| remove_email | Triggered when you remove an email address. -| rename | Triggered when you rename your account. -| change_password | Triggered when you change your password. -| forgot_password | Triggered when you ask for [a password reset](/articles/how-can-i-reset-my-password). -| login | Triggered when you log in to {% data variables.product.product_location %}. -| failed_login | Triggered when you failed to log in successfully. -| two_factor_requested | Triggered when {% data variables.product.product_name %} asks you for [your two-factor authentication code](/articles/accessing-github-using-two-factor-authentication). -| show_private_contributions_count | Triggered when you [publicize private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile). +| 操作 | 描述 | +| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| add_email | 当您[添加新电子邮件地址](/articles/changing-your-primary-email-address)时触发。 | +| create | 当您创建新用户帐户时触发。 | +| remove_email | 当您删除电子邮件地址时触发。 | +| rename | 当您重命名帐户时触发。 | +| change_password | 当您更改密码时触发。 | +| forgot_password | 当您要求[重置密码](/articles/how-can-i-reset-my-password)时触发。 | +| login | 当您登录 {% data variables.product.product_location %} 时触发。 | +| failed_login | 当您未能成功登录时触发。 | +| two_factor_requested | 当 {% data variables.product.product_name %} 要求您提供[双重身份验证代码](/articles/accessing-github-using-two-factor-authentication)时触发。 | +| show_private_contributions_count | 当您[在个人资料中公开私有贡献](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)时触发。 | | hide_private_contributions_count | Triggered when you [hide private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile).{% if currentVersion == "free-pro-team@latest" %} -| report_content | Triggered when you [report an issue or pull request, or a comment on an issue, pull request, or commit](/articles/reporting-abuse-or-spam).{% endif %} +| report_content | 当您[举报议题或拉取请求，或者举报对议题、拉取请求或提交的评论](/articles/reporting-abuse-or-spam)时触发。{% endif %} -#### The `user_status` category +#### `user_status` 类别 -| Action | Description -|--------------------|--------------------- -| update | Triggered when you set or change the status on your profile. For more information, see "[Setting a status](/articles/personalizing-your-profile/#setting-a-status)." -| destroy | Triggered when you clear the status on your profile. +| 操作 | 描述 | +| ------- | -------------------------------------------------------------------------------------------- | +| update | 当您在个人资料中设置或更改状态时触发。 更多信息请参阅“[设置状态](/articles/personalizing-your-profile/#setting-a-status)”。 | +| destroy | 当您在个人资料中清除状态时触发。 | {% if currentVersion == "free-pro-team@latest" %} -### Exporting your security log +### 导出安全日志 {% data reusables.audit_log.export-log %} {% data reusables.audit_log.exported-log-keys-and-values %} diff --git a/translations/zh-CN/content/github/authenticating-to-github/reviewing-your-ssh-keys.md b/translations/zh-CN/content/github/authenticating-to-github/reviewing-your-ssh-keys.md index 71ea5e3d05..be99eee574 100644 --- a/translations/zh-CN/content/github/authenticating-to-github/reviewing-your-ssh-keys.md +++ b/translations/zh-CN/content/github/authenticating-to-github/reviewing-your-ssh-keys.md @@ -1,6 +1,6 @@ --- -title: Reviewing your SSH keys -intro: 'To keep your credentials secure, you should regularly audit your SSH keys, deploy keys, and review authorized applications that access your {% data variables.product.product_name %} account.' +title: 审查 SSH 密钥 +intro: '为确保凭据安全，您应定期审核 SSH 密钥、部署密钥并审查访问 {% data variables.product.product_name %} 帐户的授权应用程序。' redirect_from: - /articles/keeping-your-application-access-tokens-safe/ - /articles/keeping-your-ssh-keys-and-application-access-tokens-safe/ @@ -10,32 +10,31 @@ versions: enterprise-server: '*' --- -You can delete unauthorized (or possibly compromised) SSH keys to ensure that an attacker no longer has access to your repositories. You can also approve existing SSH keys that are valid. +您可以删除未经授权（或可能已泄密）的 SSH 密钥，以确保攻击者无法再访问您的仓库。 您还可以批准有效的现有 SSH 密钥。 {% mac %} {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.ssh %} -3. On the SSH Settings page, take note of the SSH keys associated with your account. For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid SSH keys you'd like to keep, click **Approve**. - ![SSH key list](/assets/images/help/settings/settings-ssh-key-review.png) +3. 在 SSH Settings（SSH 设置）页面中，记下与您的帐户关联的 SSH 密钥。 对于您无法识别或已过期的密钥，请单击 **Delete（删除）**。 如果有您要保留的有效 SSH 密钥，请单击 **Approve（批准）**。 ![SSH 密钥列表](/assets/images/help/settings/settings-ssh-key-review.png) {% tip %} - **Note:** If you're auditing your SSH keys due to an unsuccessful Git operation, the unverified key that caused the [SSH key audit error](/articles/error-we-re-doing-an-ssh-key-audit) will be highlighted in the list of SSH keys. + **注：**如果您由于 Git 操作失败而审核 SSH 密钥，则导致 [SSH 密钥审核错误](/articles/error-we-re-doing-an-ssh-key-audit)的未验证密钥将在 SSH 密钥列表中突出显示。 {% endtip %} -4. Open Terminal. +4. 打开终端。 5. {% data reusables.command_line.start_ssh_agent %} -6. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +6. 找到并记录公钥指纹。 {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + 如果使用的是 OpenSSH 6.8 或更新版本： ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -54,8 +53,8 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.ssh %} -3. On the SSH Settings page, take note of the SSH keys associated with your account. For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid SSH keys you'd like to keep, click **Approve**. - ![SSH key list](/assets/images/help/settings/settings-ssh-key-review.png) +3. 在 SSH Settings（SSH 设置）页面中，记下与您的帐户关联的 SSH 密钥。 For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid SSH keys you'd like to keep, click **Approve**. + ![SSH key list](/assets/images/help/settings/settings-ssh-key-review.png) {% tip %} @@ -63,19 +62,19 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% endtip %} -4. Open Git Bash. If you're using Git Shell, which is included in {% data variables.product.prodname_desktop %}, open Git Shell and skip to step 6. +4. 打开 Git Bash。 如果您使用 {% data variables.product.prodname_desktop %} 中随附的 Git Shell，请打开 Git Shell 并跳至步骤 6。 5. {% data reusables.desktop.windows_git_bash_turn_on_ssh_agent %} {% data reusables.desktop.windows_git_for_windows_turn_on_ssh_agent %} -6. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +6. 找到并记录公钥指纹。 {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + 如果使用的是 OpenSSH 6.8 或更新版本： ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -94,8 +93,8 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.ssh %} -3. On the SSH Settings page, take note of the SSH keys associated with your account. For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid SSH keys you'd like to keep, click **Approve**. - ![SSH key list](/assets/images/help/settings/settings-ssh-key-review.png) +3. 在 SSH Settings（SSH 设置）页面中，记下与您的帐户关联的 SSH 密钥。 For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid SSH keys you'd like to keep, click **Approve**. + ![SSH key list](/assets/images/help/settings/settings-ssh-key-review.png) {% tip %} @@ -103,33 +102,31 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% endtip %} -4. Open Terminal. +4. 打开终端。 5. {% data reusables.command_line.start_ssh_agent %} -6. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: +6. 找到并记录公钥指纹。 {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` - If you're using OpenSSH 6.8 or newer: + 如果使用的是 OpenSSH 6.8 或更新版本： ```shell $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` {% else %} - ```shell - $ ssh-add -l -E sha256 - > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) - ```{% endif %} +```shell $ ssh-add -l -E sha256 +> 2048 *SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ* /Users/*USERNAME*/.ssh/id_rsa (RSA) ```{% endif %} -7. The SSH keys on {% data variables.product.product_name %} *should* match the same keys on your computer. +7. {% data variables.product.product_name %} 上的 SSH 密钥*应*匹配您计算机上的相同密钥。 {% endlinux %} {% warning %} -**Warning**: If you see an SSH key you're not familiar with on {% data variables.product.product_name %}, delete it immediately and contact {% data variables.contact.contact_support %} for further help. An unidentified public key may indicate a possible security concern. +**警告**：如果在 {% data variables.product.product_name %} 上看到您不熟悉的 SSH 密钥，请立即删除并联系 {% data variables.contact.contact_support %}寻求进一步的帮助。 无法识别的公钥可能表示安全问题。 {% endwarning %} diff --git a/translations/zh-CN/content/github/building-a-strong-community/adding-a-license-to-a-repository.md b/translations/zh-CN/content/github/building-a-strong-community/adding-a-license-to-a-repository.md index 99f83b82d8..7fd13d8897 100644 --- a/translations/zh-CN/content/github/building-a-strong-community/adding-a-license-to-a-repository.md +++ b/translations/zh-CN/content/github/building-a-strong-community/adding-a-license-to-a-repository.md @@ -32,7 +32,7 @@ versions: {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.files.add-file %} diff --git a/translations/zh-CN/content/github/building-a-strong-community/locking-conversations.md b/translations/zh-CN/content/github/building-a-strong-community/locking-conversations.md index 5e86b60383..ce5f972626 100644 --- a/translations/zh-CN/content/github/building-a-strong-community/locking-conversations.md +++ b/translations/zh-CN/content/github/building-a-strong-community/locking-conversations.md @@ -1,6 +1,6 @@ --- -title: Locking conversations -intro: 'Repository owners and collaborators, and people with write access to a repository, can lock conversations on issues, pull requests, and commits permanently or temporarily to defuse a heated interaction.' +title: 锁定对话 +intro: '仓库所有者和协作者以及对仓库具有写入权限的人员，能够永久或临时锁定关于议题、拉取请求和提交的对话，以缓和激烈的交互。' redirect_from: - /articles/locking-conversations versions: @@ -8,32 +8,28 @@ versions: enterprise-server: '*' --- -It's appropriate to lock a conversation when the entire conversation is not constructive or violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. When you lock a conversation, you can also specify a reason, which is publicly visible. +It's appropriate to lock a conversation when the entire conversation is not constructive or violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. 在锁定对话时，也可公开说明锁定的原因。 -Locking a conversation creates a timeline event that is visible to anyone with read access to the repository. However, the username of the person who locked the conversation is only visible to people with write access to the repository. For anyone without write access, the timeline event is anonymized. +锁定对话会创建对仓库具有读取权限的所有人可见的时间表事件。 但对话锁定者的用户名只有能够写入仓库的人可见。 对于没有写入权限的任何人，时间表事件会匿名化。 -![Anonymized timeline event for a locked conversation](/assets/images/help/issues/anonymized-timeline-entry-for-locked-conversation.png) +![已锁定对话的匿名化时间表事件](/assets/images/help/issues/anonymized-timeline-entry-for-locked-conversation.png) -While a conversation is locked, only [people with write access](/articles/repository-permission-levels-for-an-organization/) and [repository owners and collaborators](/articles/permission-levels-for-a-user-account-repository/#collaborator-access-on-a-repository-owned-by-a-user-account) can add, hide, and delete comments. +当对话锁定时，仅[具有写入权限的人员](/articles/repository-permission-levels-for-an-organization/)以及[仓库所有者和协作者](/articles/permission-levels-for-a-user-account-repository/#collaborator-access-on-a-repository-owned-by-a-user-account)才可添加、隐藏和删除评论。 -To search for locked conversations in a repository that is not archived, you can use the search qualifiers `is:locked` and `archived:false`. Conversations are automatically locked in archived repositories. For more information, see "[Searching issues and pull requests](/articles/searching-issues-and-pull-requests#search-based-on-whether-a-conversation-is-locked)." +要搜索仓库中未存档的已锁定对话，可以使用搜索限定符 `is:locked` 和 `archived:false`。 对话在存档的仓库中会自动锁定。 更多信息请参阅“[搜索议题和拉取请求](/articles/searching-issues-and-pull-requests#search-based-on-whether-a-conversation-is-locked)”。 -1. Optionally, write a comment explaining why you're locking the conversation. -2. In the right margin of the issue or pull request, or above the comment box on the commit page, click **Lock conversation**. -![Lock conversation link](/assets/images/help/repository/lock-conversation.png) -3. Optionally, choose a reason for locking the conversation. -![Reason for locking a conversation menu](/assets/images/help/repository/locking-conversation-reason-menu.png) -4. Read the information about locking conversations and click **Lock conversation on this issue**, **Lock conversation on this pull request**, or **Lock conversation on this commit**. -![Confirm lock with a reason dialog box](/assets/images/help/repository/lock-conversation-confirm-with-reason.png) -5. When you're ready to unlock the conversation, click **Unlock conversation**. -![Unlock conversation link](/assets/images/help/repository/unlock-conversation.png) +1. 也可选择撰写注释，解释您锁定对话的原因。 +2. 在议题或拉取请求的右边，或者提交页面中注释框的上方，单击 **Lock conversation（锁定对话）**。 ![锁定对话链接](/assets/images/help/repository/lock-conversation.png) +3. 可以选择锁定对话的原因。 ![锁定对话的原因菜单](/assets/images/help/repository/locking-conversation-reason-menu.png) +4. 阅读有关锁定对话的信息，然后单击 **Lock conversation on this issue（锁定关于此议题的对话）**、**Lock conversation on this pull request（锁定关于此拉取请求的对话）**或 **Lock conversation on this commit（锁定关于此提交的对话）**。 ![确定锁定并说明原因对话框](/assets/images/help/repository/lock-conversation-confirm-with-reason.png) +5. 准备好解锁对话时，单击 **Unlock conversation（解锁对话）**。 ![解锁对话链接](/assets/images/help/repository/unlock-conversation.png) -### Further reading +### 延伸阅读 -- "[Setting up your project for healthy contributions](/articles/setting-up-your-project-for-healthy-contributions)" -- "[Using templates to encourage useful issues and pull requests](/github/building-a-strong-community/using-templates-to-encourage-useful-issues-and-pull-requests)" +- "[设置健康参与的项目](/articles/setting-up-your-project-for-healthy-contributions)" +- "[使用模板鼓励有用的议题和拉取请求](/github/building-a-strong-community/using-templates-to-encourage-useful-issues-and-pull-requests)" - "[Managing disruptive comments](/articles/managing-disruptive-comments)"{% if currentVersion == "free-pro-team@latest" %} -- "[Maintaining your safety on {% data variables.product.prodname_dotcom %}](/github/building-a-strong-community/maintaining-your-safety-on-github)" -- "[Reporting abuse or spam](/articles/reporting-abuse-or-spam)" -- "[Limiting interactions in your repository](/github/building-a-strong-community/limiting-interactions-in-your-repository)" +- “[在 {% data variables.product.prodname_dotcom %} 上维护您的安全](/github/building-a-strong-community/maintaining-your-safety-on-github)” +- “[举报滥用或垃圾邮件](/articles/reporting-abuse-or-spam)” +- “[限制仓库中的交互](/github/building-a-strong-community/limiting-interactions-in-your-repository)” {% endif %} diff --git a/translations/zh-CN/content/github/building-a-strong-community/managing-disruptive-comments.md b/translations/zh-CN/content/github/building-a-strong-community/managing-disruptive-comments.md index 809825ccfb..e179b13522 100644 --- a/translations/zh-CN/content/github/building-a-strong-community/managing-disruptive-comments.md +++ b/translations/zh-CN/content/github/building-a-strong-community/managing-disruptive-comments.md @@ -1,5 +1,5 @@ --- -title: Managing disruptive comments +title: 管理破坏性评论 intro: 'You can {% if currentVersion == "free-pro-team@latest" %}hide, edit,{% else %}edit{% endif %} or delete comments on issues, pull requests, and commits.' redirect_from: - /articles/editing-a-comment/ @@ -10,76 +10,69 @@ versions: enterprise-server: '*' --- -### Hiding a comment +### 隐藏评论 -Anyone with write access to a repository can hide comments on issues, pull requests, and commits. +对仓库具有写入权限的任何人都可以隐藏议题、拉取请求及提交上的评论。 -If a comment is off-topic, outdated, or resolved, you may want to hide a comment to keep a discussion focused or make a pull request easier to navigate and review. Hidden comments are minimized but people with read access to the repository can expand them. +如果评论偏离主题、已过期或已解决，您可能想要隐藏评论，以保持讨论重点或使拉取请求更易于导航和审查。 隐藏的评论已最小化，但对仓库具有读取权限的人员可将其展开。 -![Minimized comment](/assets/images/help/repository/hidden-comment.png) +![最小化的评论](/assets/images/help/repository/hidden-comment.png) -1. Navigate to the comment you'd like to hide. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Hide**. - ![The horizontal kebab icon and comment moderation menu showing the edit, hide, delete options](/assets/images/help/repository/comment-menu.png) -3. Using the "Choose a reason" drop-down menu, click a reason to hide the comment. Then click, **Hide comment**. +1. 导航到您要隐藏的评论。 +2. 在评论的右上角，单击 {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}，然后单击 **Hide（隐藏）**。 ![显示编辑、隐藏、删除选项的水平烤肉串图标和评论调解菜单](/assets/images/help/repository/comment-menu.png) +3. 使用 "Choose a reason"（选择原因）下拉菜单，单击隐藏评论的原因。 然后单击 **Hide comment（隐藏评论）**。 {% if currentVersion == "free-pro-team@latest" %} - ![Choose reason for hiding comment drop-down menu](/assets/images/help/repository/choose-reason-for-hiding-comment.png) + ![选择隐藏评论的原因下拉菜单](/assets/images/help/repository/choose-reason-for-hiding-comment.png) {% else %} - ![Choose reason for hiding comment drop-down menu](/assets/images/help/repository/choose-reason-for-hiding-comment-ghe.png) + ![选择隐藏评论的原因下拉菜单](/assets/images/help/repository/choose-reason-for-hiding-comment-ghe.png) {% endif %} -### Unhiding a comment +### 取消隐藏评论 -Anyone with write access to a repository can unhide comments on issues, pull requests, and commits. +对仓库具有写入权限的任何人都可以取消隐藏议题、拉取请求及提交上的评论。 -1. Navigate to the comment you'd like to unhide. -2. In the upper-right corner of the comment, click **{% octicon "fold" aria-label="The fold icon" %} Show comment**. - ![Show comment text](/assets/images/help/repository/hidden-comment-show.png) -3. On the right side of the expanded comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then **Unhide**. - ![The horizontal kebab icon and comment moderation menu showing the edit, unhide, delete options](/assets/images/help/repository/comment-menu-hidden.png) +1. 导航到您要取消隐藏的评论。 +2. 在评论右上角，单击 **{% octicon "fold" aria-label="The fold icon" %} Show comment（显示评论）**。 ![显示评论文本](/assets/images/help/repository/hidden-comment-show.png) +3. 在展开的评论右上角，单击 {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}，然后单击 **Unhide（取消隐藏）**。 ![显示编辑、取消隐藏、删除选项的水平烤肉串图标和评论调解菜单](/assets/images/help/repository/comment-menu-hidden.png) -### Editing a comment +### 编辑评论 -Anyone with write access to a repository can edit comments on issues, pull requests, and commits. +对仓库具有写入权限的任何人都可以编辑议题、拉取请求及提交上的评论。 It's appropriate to edit a comment and remove content that doesn't contribute to the conversation and violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. -When you edit a comment, note the location that the content was removed from and optionally, the reason for removing it. +编辑评论时，请记下删除的内容所在的位置，也可记下删除的原因。 -Anyone with read access to a repository can view a comment's edit history. The **edited** dropdown at the top of the comment contains a history of edits showing the user and timestamp for each edit. +对仓库具有读取权限的任何人都可查看评论的编辑历史记录。 评论顶部的 **edited（已编辑）**下拉菜单包含编辑历史记录，其中会显示每次编辑的用户和时间戳。 -![Comment with added note that content was redacted](/assets/images/help/repository/content-redacted-comment.png) +![添加了表示内容编辑过的注释的评论](/assets/images/help/repository/content-redacted-comment.png) -Comment authors and anyone with write access to a repository can also delete sensitive information from a comment's edit history. For more information, see "[Tracking changes in a comment](/github/building-a-strong-community/tracking-changes-in-a-comment)." +评论作者和具有仓库写入权限的任何人也都可以删除评论编辑历史记录中的敏感信息。 更多信息请参阅“[跟踪评论中的更改](/github/building-a-strong-community/tracking-changes-in-a-comment)”。 -1. Navigate to the comment you'd like to edit. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Edit**. - ![The horizontal kebab icon and comment moderation menu showing the edit, hide, delete, and report options](/assets/images/help/repository/comment-menu.png) -3. In the comment window, delete the content you'd like to remove, then type `[REDACTED]` to replace it. - ![Comment window with redacted content](/assets/images/help/issues/redacted-content-comment.png) -4. At the bottom of the comment, type a note indicating that you have edited the comment, and optionally, why you edited the comment. - ![Comment window with added note that content was redacted](/assets/images/help/issues/note-content-redacted-comment.png) -5. Click **Update comment**. +1. 导航到您要编辑的评论。 +2. 在评论的右上角，单击 {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}，然后单击 **Edit（编辑）**。 ![显示编辑、隐藏、删除和报告选项的水平烤肉串图标和评论调解菜单](/assets/images/help/repository/comment-menu.png) +3. 在评论窗口中，删除要删除的评论，然后输入 `[REDACTED]` 进行替换。 ![包含编辑过的内容的评论窗口](/assets/images/help/issues/redacted-content-comment.png) +4. 在评论底部，输入注释，说明您已编辑评论，也可以输入编辑的原因。 ![添加了表示内容编辑过的注释的评论窗口](/assets/images/help/issues/note-content-redacted-comment.png) +5. 单击 **Update comment（更新评论）**。 -### Deleting a comment +### 删除评论 -Anyone with write access to a repository can delete comments on issues, pull requests, and commits. Organization owners, team maintainers, and the comment author can also delete a comment on a team page. +对仓库具有写入权限的任何人都可以删除议题、拉取请求及提交上的评论。 组织所有者、团队维护员和评论作者也可删除团队页面上的评论。 -Deleting a comment is your last resort as a moderator. It's appropriate to delete a comment if the entire comment adds no constructive content to a conversation and violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. +删除评论是调解员最后的选择。 It's appropriate to delete a comment if the entire comment adds no constructive content to a conversation and violates your community's code of conduct{% if currentVersion == "free-pro-team@latest" %} or GitHub's [Community Guidelines](/articles/github-community-guidelines){% endif %}. -Deleting a comment creates a timeline event that is visible to anyone with read access to the repository. However, the username of the person who deleted the comment is only visible to people with write access to the repository. For anyone without write access, the timeline event is anonymized. +删除评论会创建对仓库具有读取权限的所有人可见的时间表事件。 但评论删除者的用户名只有能够写入仓库的人可见。 对于没有写入权限的任何人，时间表事件会匿名化。 -![Anonymized timeline event for a deleted comment](/assets/images/help/issues/anonymized-timeline-entry-for-deleted-comment.png) +![已删除评论的匿名化时间表事件](/assets/images/help/issues/anonymized-timeline-entry-for-deleted-comment.png) -If a comment contains some constructive content that adds to the conversation in the issue or pull request, you can edit the comment instead. +如果评论包含一些对议题或拉取请求中的对话有建设性的内容，您可以编辑评论。 {% note %} -**Note:** The initial comment (or body) of an issue or pull request can't be deleted. Instead, you can edit issue and pull request bodies to remove unwanted content. +**注：**议题或拉取请求的初始评论（或正文）不能删除。 但可以编辑议题和拉取请求正文，以删除不需要的内容。 {% endnote %} -1. Navigate to the comment you'd like to delete. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Delete**. - ![The horizontal kebab icon and comment moderation menu showing the edit, hide, delete, and report options](/assets/images/help/repository/comment-menu.png) -3. Optionally, write a comment noting that you deleted a comment and why. +1. 导航到您要删除的评论。 +2. 在评论的右上角，单击 {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}，然后单击 **Delete（删除）**。 ![显示编辑、隐藏、删除和报告选项的水平烤肉串图标和评论调解菜单](/assets/images/help/repository/comment-menu.png) +3. 也可以说明您删除了哪些评论，为什么要删除。 diff --git a/translations/zh-CN/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md b/translations/zh-CN/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md index d261170b1d..fb39f25098 100644 --- a/translations/zh-CN/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md +++ b/translations/zh-CN/content/github/building-a-strong-community/manually-creating-a-single-issue-template-for-your-repository.md @@ -28,7 +28,7 @@ assignees: octocat ``` {% note %} -**注：**必须将 YAML 保留的字符（如 `:`）放在引号中。 例如 `":bug: Bug"`。 +**Note:** If a front matter value includes a YAML-reserved character such as `:` , you must put the whole value in quotes. For example, `":bug: Bug"` or `":new: triage needed, :bug: bug"`. {% endnote %} diff --git a/translations/zh-CN/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md b/translations/zh-CN/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md index 5b58bbe5a7..b93e6e3958 100644 --- a/translations/zh-CN/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md +++ b/translations/zh-CN/content/github/building-a-strong-community/unblocking-a-user-from-your-personal-account.md @@ -22,7 +22,7 @@ versions: ### 从用户的个人资料页面取消阻止该用户 {% data reusables.profile.user_profile_page_navigation %} -2. 在左侧边栏中用户的个人资料图片下，单击 **Unblock or report user（取消阻止或举报用户）**。 ![取消阻止或举报用户链接](/assets/images/help/profile/profile-unblock-or-report-user.png) +2. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Unblock or report user**. ![取消阻止或举报用户链接](/assets/images/help/profile/profile-unblock-or-report-user.png) 3. 单击 **Unblock user（取消阻止用户）**。 ![包含取消阻止用户或举报滥用选项的模态框](/assets/images/help/profile/profile-unblockuser.png) {% tip %} diff --git a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md index ee92ba8aaa..d08a3c12fd 100644 --- a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md +++ b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md @@ -53,6 +53,13 @@ versions: {% data reusables.pull_requests.mark-ready-review %} 您可以随时将拉取请求转换为草稿。 更多信息请参阅“[更改拉取请求的阶段](/articles/changing-the-stage-of-a-pull-request)”。 +### Differences between commits on compare and pull request pages + +The compare and pull request pages use different methods to calculate the diff for changed files: + +- Compare pages show the diff between the tip of the head ref and the current common ancestor (that is, the merge base) of the head and base ref. +- Pull request pages show the diff between the tip of the head ref and the common ancestor of the head and base ref at the time when the pull request was created. Consequently, the merge base used for the comparison might be different. + ### 延伸阅读 - {% data variables.product.prodname_dotcom %} 词汇中的“[拉取请求](/articles/github-glossary/#pull-request)” diff --git a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md index aebfe1cb07..d697f4e3f9 100644 --- a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md +++ b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/about-status-checks.md @@ -46,7 +46,7 @@ _检查_与_状态_的不同之处在于它们提供行注解、更详细的信 #### 跳过和申请个别提交的检查 -当仓库设置为自动申请检查推送时，您可以选择跳过所推送的个别提交的检查。 当仓库_未_设置为自动申请检查推送时，您可以申请检查您推送的个别提交。 有关这些设置的更多信息，请参阅“[检查套件](/rest/reference/checks#update-repository-preferences-for-check-suites)”。 +当仓库设置为自动申请检查推送时，您可以选择跳过所推送的个别提交的检查。 当仓库_未_设置为自动申请检查推送时，您可以申请检查您推送的个别提交。 For more information on these settings, see "[Check Suites](/rest/reference/checks#update-repository-preferences-for-check-suites)." 要跳过或申请检查提交，请在提交消息末添加以下尾行之一： diff --git a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md index 386012a895..8008a46a4d 100644 --- a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md +++ b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md @@ -20,6 +20,12 @@ versions: 4. 在基础分支下拉菜单中，选择要[用于比较更改](/github/committing-changes-to-your-project/comparing-commits#comparing-branches)的基础分支。 ![基本分支下拉菜单 ](/assets/images/help/pull_requests/pull-request-edit-base-branch.png) 5. 阅读有关更改基本分支的信息，然后单击 **Change base（更改基本分支）**。 ![基本分支更改确认按钮 ](/assets/images/help/pull_requests/pull-request-base-branch-confirm.png) +{% tip %} + +**Tip:** When you open a pull request, {% data variables.product.product_name %} will set the base to the commit that branch references. If the branch is updated in the future, {% data variables.product.product_name %} will not update the base branch's commit. + +{% endtip %} + ### 延伸阅读 - “[创建拉取请求](/articles/creating-a-pull-request)” diff --git a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md index 95ca378e1e..c301d48fee 100644 --- a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md +++ b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features.md @@ -1,6 +1,6 @@ --- -title: Collaborating on repositories with code quality features -intro: 'Workflow quality features like statuses, {% if currentVersion != "free-pro-team@latest" %}pre-receive hooks, {% endif %}protected branches, and required status checks help collaborators make contributions that meet conditions set by organization and repository administrators.' +title: 在具有代码质量功能的仓库上进行协作 +intro: '代码质量功能，例如状态、{% if enterpriseServerVersions contains currentVersion %}预接收挂钩、{% endif %}受保护分支和必需状态检查，可帮助协作者做出符合组织和仓库管理员设置条件的贡献。' mapTopic: true redirect_from: - /articles/collaborating-on-repositories-with-code-quality-features-enabled/ diff --git a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/index.md b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/index.md index 64bc059ba3..26506275ce 100644 --- a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/index.md +++ b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/index.md @@ -28,7 +28,7 @@ versions: {% link_in_list /what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility %} {% topic_link_in_list /collaborating-on-repositories-with-code-quality-features %} {% link_in_list /about-status-checks %} - + {% link_in_list /working-with-pre-receive-hooks %} {% topic_link_in_list /proposing-changes-to-your-work-with-pull-requests %} diff --git a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md index 1b9ed3f8d8..6cfdf87f84 100644 --- a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md +++ b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github.md @@ -1,6 +1,6 @@ --- -title: Resolving a merge conflict on GitHub -intro: 'You can resolve simple merge conflicts that involve competing line changes on GitHub, using the conflict editor.' +title: 在 GitHub 上解决合并冲突 +intro: '您可以使用冲突编辑器在 GitHub 上解决涉及竞争行更改的简单合并冲突。' redirect_from: - /articles/resolving-a-merge-conflict-on-github versions: @@ -8,56 +8,53 @@ versions: enterprise-server: '*' --- -You can only resolve merge conflicts on {% data variables.product.product_name %} that are caused by competing line changes, such as when people make different changes to the same line of the same file on different branches in your Git repository. For all other types of merge conflicts, you must resolve the conflict locally on the command line. For more information, see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line/)." +您只能在 {% data variables.product.product_name %} 上解决由竞争行更改引起的合并冲突，例如当人们对 Git 仓库中不同分支上同一文件的同一行进行不同的更改时。 对于所有其他类型的合并冲突，您必须在命令行上本地解决冲突。 更多信息请参阅“[使用命令行解决合并冲突](/articles/resolving-a-merge-conflict-using-the-command-line/)”。 -{% if currentVersion != "free-pro-team@latest" %} -If a site administrator disables the merge conflict editor for pull requests between repositories, you cannot use the conflict editor on {% data variables.product.product_name %} and must resolve merge conflicts on the command line. For example, if the merge conflict editor is disabled, you cannot use it on a pull request between a fork and upstream repository. +{% if enterpriseServerVersions contains currentVersion %} +If a site administrator disables the merge conflict editor for pull requests between repositories, you cannot use the conflict editor on +{% data variables.product.product_name %} and must resolve merge conflicts on the command line. 例如，如果禁用合并冲突编辑器，则无法在复刻和上游仓库之间的拉取请求中使用它。 {% endif %} {% warning %} {% if currentVersion ver_lt "enterprise-server@2.22" %} -**Warning:** When you resolve a merge conflict on {% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch), even if the head branch is the default branch of your repository or a protected branch. Make sure you really want to commit to this branch. +**Warning:** When you resolve a merge conflict on +{% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch), even if the head branch is the default branch of your repository or a protected branch. 确保您确实想要提交到此分支。 {% else %} -**Warning:** When you resolve a merge conflict on {% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch). Make sure you really want to commit to this branch. If the head branch is the default branch of your repository, you'll be given the option of creating a new branch to serve as the head branch for your pull request. If the head branch is protected you won't be able to merge your conflict resolution into it, so you'll be prompted to create a new head branch. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches)." +**Warning:** When you resolve a merge conflict on +{% data variables.product.product_name %}, the entire [base branch](/github/getting-started-with-github/github-glossary#base-branch) of your pull request is merged into the [head branch](/github/getting-started-with-github/github-glossary#head-branch). 确保您确实想要提交到此分支。 如果头部分支是仓库的默认分支，您可以选择创建一个新分支作为拉取请求的头部分支。 如果头部分支是受保护分支，则无法将冲突解决合并到其中，因此系统会提示您创建一个新的头部分支。 更多信息请参阅“[关于受保护分支](/github/administering-a-repository/about-protected-branches)”。 {% endif %} {% endwarning %} {% data reusables.repositories.sidebar-pr %} -1. In the "Pull Requests" list, click the pull request with a merge conflict that you'd like to resolve. -1. Near the bottom of your pull request, click **Resolve conflicts**. -![Resolve merge conflicts button](/assets/images/help/pull_requests/resolve-merge-conflicts-button.png) +1. 在“Pull Requests（拉取请求）”列表中，单击含有您想要解决的合并冲突的拉取请求。 +1. 在拉取请求底部附近，单击 **Resolve conflicts（解决冲突）**。 ![解决合并冲突按钮](/assets/images/help/pull_requests/resolve-merge-conflicts-button.png) {% tip %} - **Tip:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[Resolving a merge conflict using the command line](/articles/resolving-a-merge-conflict-using-the-command-line)." + **提示：**如果停用 **Resolve conflicts（解决冲突）**按钮，则拉取请求的合并冲突过于复杂而无法在 {% data variables.product.product_name %} 上解决{% if enterpriseServerVersions contains currentVersion %}或站点管理员已禁用仓库之间拉取请求的冲突编辑器{% endif %}。 必须使用备用 Git 客户端或在命令行上使用 Git 解决合并冲突。 更多信息请参阅“[使用命令行解决合并冲突](/articles/resolving-a-merge-conflict-using-the-command-line)”。 {% endtip %} {% data reusables.pull_requests.decide-how-to-resolve-competing-line-change-merge-conflict %} - ![View merge conflict example with conflict markers](/assets/images/help/pull_requests/view-merge-conflict-with-markers.png) -1. If you have more than one merge conflict in your file, scroll down to the next set of conflict markers and repeat steps four and five to resolve your merge conflict. -1. Once you've resolved all the conflicts in the file, click **Mark as resolved**. - ![Click mark as resolved button](/assets/images/help/pull_requests/mark-as-resolved-button.png) -1. If you have more than one file with a conflict, select the next file you want to edit on the left side of the page under "conflicting files" and repeat steps four through seven until you've resolved all of your pull request's merge conflicts. - ![Select next conflicting file if applicable](/assets/images/help/pull_requests/resolve-merge-conflict-select-conflicting-file.png) -1. Once you've resolved all your merge conflicts, click **Commit merge**. This merges the entire base branch into your head branch. - ![Resolve merge conflicts button](/assets/images/help/pull_requests/merge-conflict-commit-changes.png){% if currentVersion ver_lt "enterprise-server@2.22" %} -1. If prompted, review the branch that you are committing to. If you want to commit to this branch, click **I understand, update _BRANCH_**. -![Merge conflict confirmation window](/assets/images/help/pull_requests/merge-conflict-confirmation.png){% else %} -1. If prompted, review the branch that you are committing to. + ![查看带有冲突标记的合并冲突示例](/assets/images/help/pull_requests/view-merge-conflict-with-markers.png) +1. 如果文件中有多个合并冲突，请向下滚动到下一组冲突标记，然后重复步骤 4 和步骤 5 以解决合并冲突。 +1. 解决文件中的所有冲突后，单击 **Mark as resolved（标记为已解决）**。 ![单击“标记为已解决”按钮](/assets/images/help/pull_requests/mark-as-resolved-button.png) +1. 如果您有多个冲突文件，请在“冲突文件”下的页面左侧选择您要编辑的下一个文件，并重复步骤 4 到 7，直到您解决所有拉取请求的合并冲突。 ![适用时选择下一个冲突文件](/assets/images/help/pull_requests/resolve-merge-conflict-select-conflicting-file.png) +1. 解决所有合并冲突后，单击 **Commit merge（提交合并）**。 这会将整个基本分支合并到头部分支。 ![Resolve merge conflicts button](/assets/images/help/pull_requests/merge-conflict-commit-changes.png){% if currentVersion ver_lt "enterprise-server@2.22" %} +1. 如果出现提示，请审查您要提交的分支。 如果要提交到此分支，请单击 **I understand, update _BRANCH_（我已了解，请更新 BRANCH）**。 ![合并冲突确认窗口](/assets/images/help/pull_requests/merge-conflict-confirmation.png){% else %} +1. 如果出现提示，请审查您要提交的分支。 - If the head branch is the default branch of the repository, you can choose either to update this branch with the changes you made to resolve the conflict, or to create a new branch and use this as the head branch of the pull request. - ![Prompt to review the branch that will be updated](/assets/images/help/pull_requests/conflict-resolution-merge-dialog-box.png) - - If you choose to create a new branch, enter a name for the branch. - - If the head branch of your pull request is protected you must create a new branch. You won't get the option to update the protected branch. - - Click **Create branch and update my pull request** or **I understand, continue updating _BRANCH_**. The button text corresponds to the action you are performing. + 如果头部分支是仓库的默认分支，您可以选择使用为解决冲突所做的更改来更新此分支，或者选择创建一个新分支并将其用作拉取请求的头部分支。 ![提示审查将要更新的分支](/assets/images/help/pull_requests/conflict-resolution-merge-dialog-box.png) + + 如果您选择创建一个新分支，请输入该分支的名称。 + + 如果拉取请求的头部分支是受保护分支，则必须创建新分支。 您将无法选择更新受保护分支。 + + 单击 **Create branch and update my pull request（创建分支并更新我的拉取请求**或 **I understand, continue updating（我了解，继续更新）_BRANCH（分支）_**。 按钮文本对应于您正在执行的操作。 {% endif %} -1. To merge your pull request, click **Merge pull request**. For more information about other pull request merge options, see "[Merging a pull request](/articles/merging-a-pull-request/)." +1. 要合并拉取请求，请单击 **Merge pull request（合并拉取请求）**。 有关其他拉取请求合并选项的更多信息，请参阅“[合并拉取请求](/articles/merging-a-pull-request/)”。 -### Further reading +### 延伸阅读 -- "[About pull request merges](/articles/about-pull-request-merges)" +- "[关于拉取请求合并](/articles/about-pull-request-merges)" diff --git a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md index eba43cbd5f..e2c457aeba 100644 --- a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md +++ b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md @@ -20,16 +20,16 @@ versions: > remote: Total 62 (delta 27), reused 44 (delta 9) > Unpacking objects: 100% (62/62), done. > From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY - > * [new branch] master -> upstream/master + > * [new branch] main -> upstream/main ``` -4. 检出复刻的本地 `master` 分支。 +4. Check out your fork's local `main` branch. ```shell - $ git checkout master - > Switched to branch 'master' + $ git checkout main + > Switched to branch 'main' ``` -5. 将来自 `upstream/master` 的更改合并到本地 `master` 分支中。 这会使复刻的 `master` 分支与上游仓库同步，而不会丢失本地更改。 +5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes. ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating a422352..5fdff0f > Fast-forward > README | 9 ------- @@ -39,7 +39,7 @@ versions: > create mode 100644 README.md ``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward": ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating 34e91da..16c56ad > Fast-forward > README.md | 5 +++-- diff --git a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index 673c8625d2..0d5dd0cd77 100644 --- a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -29,7 +29,7 @@ versions: 换句话说，即使将父仓库设为私有后，公共仓库的复刻也将在其各自的仓库网络中保持公开。 这样复刻所有者便可继续工作和协作，而不会中断。 如果公共复刻没有通过这种方式移动到单独的网络中，则这些复刻的所有者将需要获得适当的[访问权限](/articles/access-permissions-on-github)以从（现在私有的）父仓库中拉取更改并提交拉取请求 — 即使它们以前不需要这些权限。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} 如果公共仓库启用了匿名 Git 读取权限并且该仓库设为私有，则所有仓库的复刻都将失去匿名 Git 读取权限并恢复为默认的禁用设置。 如果将复刻的仓库设为公共，则仓库管理员可以重新启用 Git 读取权限。 更多信息请参阅“[为仓库启用匿名 Git 读取权限](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)。” {% endif %} diff --git a/translations/zh-CN/content/github/committing-changes-to-your-project/changing-a-commit-message.md b/translations/zh-CN/content/github/committing-changes-to-your-project/changing-a-commit-message.md index 13825edc3a..18b75fc8e4 100644 --- a/translations/zh-CN/content/github/committing-changes-to-your-project/changing-a-commit-message.md +++ b/translations/zh-CN/content/github/committing-changes-to-your-project/changing-a-commit-message.md @@ -13,11 +13,11 @@ versions: 您可以使用 `git commit --amend` 命令更改最近的提交消息。 -在 Git 中，提交消息的文本是提交的一部分。 更改提交消息将更改提交 ID - 即用于命名提交的 SHA1 校验和。 实际上，您是创建一个新提交以替换旧提交。 +In Git, the text of the commit message is part of the commit. Changing the commit message will change the commit ID--i.e., the SHA1 checksum that names the commit. Effectively, you are creating a new commit that replaces the old one. -### 提交尚未推送上线 +### Commit has not been pushed online -如果提交仅存在于您的本地仓库中，尚未推送到 {% data variables.product.product_location %}，您可以使用 `git commit --amend` 命令修改提交消息。 +If the commit only exists in your local repository and has not been pushed to {% data variables.product.product_location %}, you can amend the commit message with the `git commit --amend` command. 1. 在命令行上，导航到包含要修改的提交的仓库。 2. 键入 `git commit --amend`，然后按 **Enter** 键。 @@ -31,21 +31,21 @@ versions: {% tip %} -通过更改 `core.editor` 设置可更改 Git 的默认文本编辑器。 更多信息请参阅 Git 手册中的“[基本客户端配置](https://git-scm.com/book/en/Customizing-Git-Git-Configuration#_basic_client_configuration)”。 +You can change the default text editor for Git by changing the `core.editor` setting. For more information, see "[Basic Client Configuration](https://git-scm.com/book/en/Customizing-Git-Git-Configuration#_basic_client_configuration)" in the Git manual. {% endtip %} -### 修改旧提交或多个提交的消息 +### Amending older or multiple commit messages -如果您已将提交推送到 {% data variables.product.product_location %}，则必须强制推送含有修正消息的提交。 +If you have already pushed the commit to {% data variables.product.product_location %}, you will have to force push a commit with an amended message. {% warning %} -我们很不提倡强制推送，因为这会改变仓库的历史记录。 如果强制推送，已克隆仓库的人员必须手动修复其本地历史记录。 更多信息请参阅 Git 手册中的“[从上游变基恢复](https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase)”。 +We strongly discourage force pushing, since this changes the history of your repository. If you force push, people who have already cloned your repository will have to manually fix their local history. For more information, see "[Recovering from upstream rebase](https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase)" in the Git manual. {% endwarning %} -**修改最近推送提交的消息** +**Changing the message of the most recently pushed commit** 1. 按照[上述步骤](/articles/changing-a-commit-message#commit-has-not-been-pushed-online)修改提交消息。 2. 使用 `push --force` 命令强制推送经修改的旧提交。 @@ -53,9 +53,9 @@ versions: $ git push --force example-branch ``` -**修改旧提交或多个提交的消息** +**Changing the message of older or multiple commit messages** -如果需要修改多个提交或旧提交的消息，您可以使用交互式变基，然后强制推送以更改提交历史记录。 +If you need to amend the message for multiple commits or an older commit, you can use interactive rebase, then force push to change the commit history. 1. 在命令行上，导航到包含要修改的提交的仓库。 2. 使用 `git rebase -i HEAD~n` 命令在默认文本编辑器中显示最近 `n` 个提交的列表。 @@ -97,22 +97,22 @@ versions: ``` 4. 保存并关闭提交列表文件。 5. 在每个生成的提交文件中，键入新的提交消息，保存文件，然后关闭它。 -6. $ git push --force +6. When you're ready to push your changes to GitHub, use the push --force command to force push over the old commit. ```shell $ git push --force example-branch ``` -有关交互式变基的更多信息，请参阅 Git 手册中的“[交互模式](https://git-scm.com/docs/git-rebase#_interactive_mode)”。 +For more information on interactive rebase, see "[Interactive mode](https://git-scm.com/docs/git-rebase#_interactive_mode)" in the Git manual. {% tip %} -如前文所述，修改提交消息会生成含有新 ID 的新提交。 但是，在这种情况下，该修改提交的每个后续提交也会获得一个新 ID，因为每个提交也包含其父提交的 ID。 +As before, amending the commit message will result in a new commit with a new ID. However, in this case, every commit that follows the amended commit will also get a new ID because each commit also contains the id of its parent. {% endtip %} {% warning %} -如果您的提交消息中包含敏感信息，则强制推送修改后的提交可能不会导致从 {% data variables.product.product_name %} 中删除原提交。 旧提交不会成为后续克隆的一部分；但是，它可能仍然缓存在 {% data variables.product.product_name %} 上，并且可通过提交 ID 访问。 您必须联系 {% data variables.contact.contact_support %} 并提供旧提交 ID，以便从远程仓库中清除它。 +If you have included sensitive information in a commit message, force pushing a commit with an amended commit may not remove the original commit from {% data variables.product.product_name %}. The old commit will not be a part of a subsequent clone; however, it may still be cached on {% data variables.product.product_name %} and accessible via the commit ID. You must contact {% data variables.contact.contact_support %} with the old commit ID to have it purged from the remote repository. {% endwarning %} diff --git a/translations/zh-CN/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md b/translations/zh-CN/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md index 079e81663f..01fd1dadf2 100644 --- a/translations/zh-CN/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md +++ b/translations/zh-CN/content/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.md @@ -1,6 +1,6 @@ --- -title: Creating a commit with multiple authors -intro: 'You can attribute a commit to more than one author by adding one or more `Co-authored-by` trailers to the commit''s message. Co-authored commits are visible on {% data variables.product.product_name %}{% if currentVersion != "free-pro-team@latest" %} and can be included in the profile contributions graph and the repository''s statistics{% endif %}.' +title: 创建有多个作者的提交 +intro: '通过在提交消息中添加一个或多个 `Co-authored-by` 尾行，可将提交归属于多个作者。 合作提交在 {% data variables.product.product_name %}{% if enterpriseServerVersions contains currentVersion %} 上可见，并且可包含在个人资料贡献图和仓库统计信息中{% endif %}。' redirect_from: - /articles/creating-a-commit-with-multiple-authors versions: @@ -8,41 +8,41 @@ versions: enterprise-server: '*' --- -### Required co-author information +### 必需的合作作者信息 -Before you can add a co-author to a commit, you must know the appropriate email to use for each co-author. For the co-author's commit to count as a contribution, you must use the email associated with their {% data variables.product.product_name %} account. +向提交添加合作作者之前，您必须知道用于每个合作作者的适当电子邮件地址。 对于计为贡献的合作作者提交，必须使用与其 {% data variables.product.product_name %} 帐户相关联的电子邮件地址。 {% if currentVersion == "free-pro-team@latest" %} -If a person chooses to keep their email address private, you should use their {% data variables.product.product_name %}-provided `no-reply` email to protect their privacy. Otherwise, the co-author's email will be available to the public in the commit message. If you want to keep your email private, you can choose to use a {% data variables.product.product_name %}-provided `no-reply` email for Git operations and ask other co-authors to list your `no-reply` email in commit trailers. +如果有人选择对其电子邮件地址保密，则应使用其 {% data variables.product.product_name %}-提供的 `no-reply` 电子邮件地址以保护其隐私。 否则，合作作者的电子邮件地址将在提交消息中公开。 如果要保密您的电子邮件地址，您可以选择使用 {% data variables.product.product_name %}-为 Git 操作提供的 `no-reply` 电子邮件地址，并要求其他合作作者在提交尾行中列出您的 `no-reply` 电子邮件地址。 -For more information, see "[Setting your commit email address](/articles/setting-your-commit-email-address)." +更多信息请参阅“[设置提交电子邮件地址](/articles/setting-your-commit-email-address)”。 {% tip %} - **Tip:** You can help a co-author find their preferred email address by sharing this information: - - To find your {% data variables.product.product_name %}-provided `no-reply` email, navigate to your email settings page under "Keep my email address private." - - To find the email you used to configure Git on your computer, run `git config user.email` on the command line. + **提示：**通过分享此信息可帮助合作作者找到其首选电子邮件地址： + - 要查找 {% data variables.product.product_name %}-提供的 `no-reply` 电子邮件地址，请导航至“Keep my email address private（对我的电子邮件地址保密）”下的电子邮件设置页面。 + - 要在计算机上查找用于配置 Git 的电子邮件地址，请在命令行上运行 `git config user.email`。 {% endtip %} {% endif %} -### Creating co-authored commits using {% data variables.product.prodname_desktop %} +### 使用 {% data variables.product.prodname_desktop %} 创建合作提交 -You can use {% data variables.product.prodname_desktop %} to create a commit with a co-author. For more information, see "[Write a commit message and push your changes](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)" and [{% data variables.product.prodname_desktop %}](https://desktop.github.com). +可以使用 {% data variables.product.prodname_desktop %} 创建合作提交。 更多信息请参阅“[编写提交消息并推送更改](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)”和 [{% data variables.product.prodname_desktop %}](https://desktop.github.com)。 -![Add a co-author to the commit message](/assets/images/help/desktop/co-authors-demo-hq.gif) +![添加合作作者到提交消息](/assets/images/help/desktop/co-authors-demo-hq.gif) -### Creating co-authored commits on the command line +### 在命令行上创建合作提交 {% data reusables.pull_requests.collect-co-author-commit-git-config-info %} {% data reusables.pull_requests.commit-message-with-trailer-beginning %} -3. On the next line of the commit message, type `Co-authored-by: name ` with specific information for each co-author. After the co-author information, add a closing quotation mark. +3. 在提交消息的下一行，根据每个合作作者的特定信息键入 `Co-authored-by: name `。 在合作作者的信息后面，添加一个右引号。 - If you're adding multiple co-authors, give each co-author their own line and `Co-authored-by:` commit trailer. + 如果要添加多个合作作者，请为每个合作作者键入一个 `Co-authored-by:` 提交尾行。 ```shell $ git commit -m "Refactor usability tests. > @@ -51,27 +51,26 @@ You can use {% data variables.product.prodname_desktop %} to create a commit wit Co-authored-by: another-name <another-name@example.com>" ``` -The new commit and message will appear on {% data variables.product.product_location %} the next time you push. For more information, see "[Pushing changes to a remote repository](/articles/pushing-commits-to-a-remote-repository/)." +在下次推送时，新的提交和消息将显示在 {% data variables.product.product_location %} 上。 更多信息请参阅“[推送更改到远程仓库](/articles/pushing-commits-to-a-remote-repository/)”。 -### Creating co-authored commits on {% data variables.product.product_name %} +### 在 {% data variables.product.product_name %} 上创建合作提交 -After you've made changes in a file using the web editor on {% data variables.product.product_name %}, you can create a co-authored commit by adding a `Co-authored-by:` trailer to the commit's message. +在 {% data variables.product.product_name %} 上使用 web 编辑器对文件进行更改后，您可以通过在提交消息中添加 `Co-authored-by:` 尾行来创建合作提交。 {% data reusables.pull_requests.collect-co-author-commit-git-config-info %} -2. After making your changes together, at the bottom of the page, type a short, meaningful commit message that describes the changes you made. - ![Commit message for your change](/assets/images/help/repository/write-commit-message-quick-pull.png) -3. In the text box below your commit message, add `Co-authored-by: name ` with specific information for each co-author. If you're adding multiple co-authors, give each co-author their own line and `Co-authored-by:` commit trailer. +2. 合作进行更改后，在页面底部键入简短、有意义的提交消息，以描述你们所做的更改。 ![有关更改的提交消息](/assets/images/help/repository/write-commit-message-quick-pull.png) +3. 在提交消息下方的文本框中，根据每个合作作者的特定信息添加 `Co-authored-by: name `。 如果要添加多个合作作者，请为每个合作作者键入一个 `Co-authored-by:` 提交尾行。 - ![Commit message co-author trailer example in second commit message text box](/assets/images/help/repository/write-commit-message-co-author-trailer.png) -4. Click **Commit changes** or **Propose changes**. + ![第二个提交消息文本框中的提交消息合作作者尾行示例](/assets/images/help/repository/write-commit-message-co-author-trailer.png) +4. 单击 **Commit changes（提交更改）**或 **Propose changes（提议更改）**。 -The new commit and message will appear on {% data variables.product.product_location %}. +新的提交和消息将显示在 {% data variables.product.product_location %} 上。 -### Further reading -{% if currentVersion != "free-pro-team@latest" %} -- "[Viewing contributions on your profile](/articles/viewing-contributions-on-your-profile)" -- "[Why are my contributions not showing up on my profile?](/articles/why-are-my-contributions-not-showing-up-on-my-profile)"{% endif %} -- "[Viewing a summary of repository activity](/articles/viewing-a-summary-of-repository-activity)" -- "[Viewing a project's contributors](/articles/viewing-a-projects-contributors)" -- "[Changing a commit message](/articles/changing-a-commit-message)" -- "[Committing and reviewing changes to your project](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)" in the {% data variables.product.prodname_desktop %} documentation +### 延伸阅读 +{% if enterpriseServerVersions contains currentVersion %} +- "[在个人资料中查看贡献](/articles/viewing-contributions-on-your-profile)" +- “[为什么我的贡献没有在我的个人资料中显示？](/articles/why-are-my-contributions-not-showing-up-on-my-profile)”{% endif %} +- “[查看仓库活动的摘要](/articles/viewing-a-summary-of-repository-activity)” +- “[查看项目的贡献者](/articles/viewing-a-projects-contributors)” +- “[更改提交消息](/articles/changing-a-commit-message)” +- {% data variables.product.prodname_desktop %} 文档中的“[提交和审查对项目的更改](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#3-write-a-commit-message-and-push-your-changes)” diff --git a/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md b/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md index d8c3f2ea37..d11d5eb499 100644 --- a/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md +++ b/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md @@ -1,35 +1,36 @@ --- -title: About repository visibility +title: 关于仓库可见性 intro: 'You can restrict who has access to a repository by choosing a repository''s visibility: {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}public, internal, or private{% else %} public or private{% endif %}.' versions: free-pro-team: '*' enterprise-server: '*' --- -### About repository visibility +### 关于仓库可见性 -When you create a repository, you can choose to make the repository public or private. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you're creating the repository in an organization{% if currentVersion == "free-pro-team@latest" %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %} +创建仓库时，您可以选择将仓库设为公共或私有仓库。 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you're creating the repository in an organization{% if currentVersion == "free-pro-team@latest" %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %} -{% if currentVersion != "free-pro-team@latest" %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if currentVersion != "free-pro-team@latest" %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to {% if currentVersion == "free-pro-team@latest" %}members of your enterprise account{% else %}members of any organization on your instance{% endif %}. For more information, see "[About internal repositories](#about-internal-repositories)."{% endif %} +{% if enterpriseServerVersions contains currentVersion %}If {% data variables.product.product_location_enterprise %} is not in private mode or behind a firewall, p{% else %}P{% endif %}ublic repositories are accessible to everyone on the internet.{% if enterpriseServerVersions contains currentVersion %} Otherwise, public repositories are available to everyone using {% data variables.product.product_location_enterprise %}, including outside collaborators.{% endif %} Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, [certain organization members](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization). {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}Internal repositories are accessible to members of your enterprise. 更多信息请参阅“[关于内部仓库](#about-internal-repositories)”。{% endif %} -Organization owners always have access to every repository created in an organization. For more information, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +组织所有者始终有权访问其组织中创建的每个仓库。 更多信息请参阅“[组织的仓库权限级别](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)”。 -People with admin permissions for a repository can change an existing repository's visibility. For more information, see "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)." +拥有仓库管理员权限的人可更改现有仓库的可见性。 更多信息请参阅“[设置仓库可见性](/github/administering-a-repository/setting-repository-visibility)”。 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} -### About internal repositories +### 关于内部仓库 {% note %} -**Note:** {% data reusables.gated-features.internal-repos %} +**注：**{% data reusables.gated-features.internal-repos %} {% endnote %} -{% data reusables.repositories.about-internal-repos %} For more information on innersource, see {% data variables.product.prodname_dotcom %}'s whitepaper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." +{% data reusables.repositories.about-internal-repos %} 有关内部资源的更多信息，请参阅 {% data variables.product.prodname_dotcom %} 的白皮书“[内部资源简介](https://resources.github.com/whitepapers/introduction-to-innersource/)”。 All {% if currentVersion == "free-pro-team@latest" %}enterprise members{% else %}organization members{% endif %} have read permissions to the internal repository, but internal repositories are not visible to people {% if currentVersion == "free-pro-team@latest" %}outside of the enterprise account{% else %}who are not members of an organization{% endif %}, including outside collaborators on organization repositories. For more information, see {% if currentVersion == "free-pro-team@latest" %}"[Roles for an enterprise account](/articles/roles-for-an-enterprise-account#enterprise-members)" and {% endif %}"[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)." {% data reusables.repositories.internal-repo-default %} +如果用户从 -If a user is removed from {% if currentVersion == "free-pro-team@latest" %}an enterprise account{% else %}all organizations on the instance{% endif %}, that user's forks of internal repositories are removed automatically. +{% if currentVersion == "free-pro-team@latest" %}an enterprise account{% else %}all organizations on the instance{% endif %}, that user's forks of internal repositories are removed automatically. {% endif %} diff --git a/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md b/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md index 5364873fbe..71f27d0754 100644 --- a/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md +++ b/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/backing-up-a-repository.md @@ -1,41 +1,43 @@ --- -title: Backing up a repository -intro: 'You can use{% if currentVersion != "free-pro-team@latest" %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' +title: 备份仓库 +intro: 'You can use{% if enterpriseServerVersions contains currentVersion %} Git and{% endif %} the API {% if currentVersion == "free-pro-team@latest" %}or a third-party tool {% endif %}to back up your repository.' redirect_from: - /articles/backing-up-a-repository versions: free-pro-team: '*' enterprise-server: '*' --- + {% if currentVersion == "free-pro-team@latest" %} -To download an archive of your repository, you can use the API for user or organization migrations. For more information, see "[Migrations](/v3/migrations/)." +要下载仓库的存档，您可以使用 API 进行用户或组织迁移。 更多信息请参阅“[迁移](/v3/migrations/)”。 {% else %} -You can download and back up your repositories manually: +您可以手动下载和备份仓库： -- To download a repository's Git data to your local machine, you'll need to clone the repository. For more information, see "[Cloning a repository](/articles/cloning-a-repository)." -- You can also download your repository's wiki. For more information, see "[Adding or editing wiki pages](/articles/adding-or-editing-wiki-pages)." +- 要将仓库的 Git 数据下载到本地计算机，您需要克隆该仓库。 更多信息请参阅“[克隆仓库](/articles/cloning-a-repository)”。 +- 还可以下载仓库的 wiki。 更多信息请参阅“[添加或删除 wiki 页面](/articles/adding-or-editing-wiki-pages)”。 -When you clone a repository or wiki, only Git data, such as project files and commit history, is downloaded. You can use our API to export other elements of your {% data variables.product.product_name %} repository to your local machine: +克隆仓库或 wiki 时，仅下载 Git 数据，例如项目文件和提交历史记录。 您可以使用我们的 API 将 {% data variables.product.product_name %} 仓库的其他元素导出到您的本地计算机： -- [Issues](/v3/issues/#list-issues-for-a-repository) -- [Pull requests](/v3/pulls/#list-pull-requests) -- [Forks](/rest/reference/repos#list-forks) -- [Comments](/rest/reference/issues#list-issue-comments-for-a-repository) -- [Milestones](/rest/reference/issues#list-milestones) -- [Labels](/rest/reference/issues#list-labels-for-a-repository) -- [Watchers](/rest/reference/activity#list-watchers) -- [Stargazers](/rest/reference/activity#list-stargazers) -- [Projects](/v3/projects/#list-repository-projects) +- [议题](/v3/issues/#list-issues-for-a-repository) +- [拉取请求](/v3/pulls/#list-pull-requests) +- [复刻](/rest/reference/repos#list-forks) +- [评论](/rest/reference/issues#list-issue-comments-for-a-repository) +- [里程碑](/rest/reference/issues#list-milestones) +- [标签](/rest/reference/issues#list-labels-for-a-repository) +- [关注者](/rest/reference/activity#list-watchers) +- [空想家](/rest/reference/activity#list-stargazers) +- [项目](/v3/projects/#list-repository-projects) {% endif %} -Once you have {% if currentVersion != "free-pro-team@latest" %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/). +一旦您拥有{% if enterpriseServerVersions contains currentVersion %}所有要备份内容的本地版本，您就可以创建一个 zip 存档并{% else %}下载您的存档。您可以{% endif %}将其复制到外部硬盘和/或将其上传到基于云的备份服务，例如 [Google Drive](https://www.google.com/drive/) 或 [Dropbox](https://www.dropbox.com/)。 {% if currentVersion == "free-pro-team@latest" %} -### Third-party backup tools +### 第三方备份工具 -A number of self-service tools exist that automate backups of repositories. Unlike archival projects, which archive _all_ public repositories on {% data variables.product.product_name %} that have not opted out and make the data accessible to anyone, backup tools will download data from _specific_ repositories and organize it within a new branch or directory. For more information about archival projects, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)." +有许多自助服务工具可自动备份仓库。 与存档项目不同，存档项目将将_所有_公共仓库存档在未选择退出的 {% data variables.product.product_name %} 上，并让任何人都可以访问数据，而备份工具将从_特定_仓库下载数据并组织在新分支或目录中。 有关存档项目的更多信息，请参阅“[关于在 {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program) 上存档内容和数据”。 +You can back up all of a repository's Git data (such as project files and commit history), as well as much data from -You can back up all of a repository's Git data (such as project files and commit history), as well as much data from {% data variables.product.product_name %} (such as issues and pull requests), with [BackHub](https://github.com/marketplace/backhub), which creates daily recurring backups of your repositories with snapshots up to 30 days back in time. BackHub is available in {% data variables.product.prodname_marketplace %}. +{% data variables.product.product_name %} (such as issues and pull requests), with [BackHub](https://github.com/marketplace/backhub), which creates daily recurring backups of your repositories with snapshots up to 30 days back in time. BackHub 可在 {% data variables.product.prodname_marketplace %} 中找到。 {% endif %} diff --git a/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md b/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md index 985918901d..3bc29baf19 100644 --- a/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md +++ b/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/creating-a-template-repository.md @@ -1,6 +1,7 @@ --- -title: Creating a template repository +title: 创建模板仓库 intro: 'You can make an existing repository a template, so you and others can generate new repositories with the same directory structure{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}, branches,{% endif %} and files.' +permissions: '任何对仓库有管理员权限的人都可以将该仓库设置为模板。' redirect_from: - /articles/creating-a-template-repository versions: @@ -8,13 +9,16 @@ versions: enterprise-server: '*' --- -Anyone with admin permissions to a repository can make the repository a template. +{% note %} -To create a template repository, you must create a repository, then make the repository a template. For more information about creating a repository, see "[Creating a new repository](/articles/creating-a-new-repository)." +**Note**: Your template repository cannot include files stored using {% data variables.large_files.product_name_short %}. + +{% endnote %} + +要创建模板仓库，必须先创建一个仓库，然后将该仓库设置为模板。 关于创建仓库的更多信息，请参阅“[创建新仓库](/articles/creating-a-new-repository)”。 After you make your repository a template, anyone with access to the repository can generate a new repository with the same directory structure and files as your default branch.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} They can also choose to include all the other branches in your repository.{% endif %} For more information, see "[Creating a repository from a template](/articles/creating-a-repository-from-a-template)." {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -3. Select **Template repository**. - ![Checkbox to make a repository a template](/assets/images/help/repository/template-repository-checkbox.png) +1. 选择 **Template repository（模板仓库）**。 ![将仓库设置为模板的复选框](/assets/images/help/repository/template-repository-checkbox.png) diff --git a/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md b/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md index d8fd8dd73c..836e3b35f4 100644 --- a/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md +++ b/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md @@ -42,7 +42,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} 更多信息请参阅[添加 SSH 密钥到 GitHub 帐户](/articles/adding-a-new-ssh-key-to-your-github-account)。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 检查实例是否处于私有模式 diff --git a/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md b/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md index c31f68f23d..54e8c38c18 100644 --- a/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md +++ b/translations/zh-CN/content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md @@ -70,7 +70,7 @@ $ git remote -v {% tip %} -**提示**：如果不想在每次与远程仓库交互时都输入用户名和密码，您可以打开[凭据缓存](/github/using-git/caching-your-github-credentials-in-git)。 +**提示**：如果不想在每次与远程仓库交互时都输入用户名和密码，您可以打开[凭据缓存](/github/using-git/caching-your-github-credentials-in-git)。 If you are already using credential caching, please make sure that your computer has the correct credentials cached. Incorrect or out of date credentials will cause authentication to fail. {% endtip %} diff --git a/translations/zh-CN/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md b/translations/zh-CN/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md index 2736f65981..38dc34267d 100644 --- a/translations/zh-CN/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md +++ b/translations/zh-CN/content/github/customizing-your-github-workflow/github-extensions-and-integrations.md @@ -10,7 +10,7 @@ versions: ### 编辑器工具 -要简化工作流程，您可以在第三方编辑器工具中连接到 {% data variables.product.product_name %} 仓库，例如 Atom、Unity 和 Visual Studio 等工具。 +You can connect to {% data variables.product.product_name %} repositories within third-party editor tools, such as Atom, Unity, and Visual Studio. #### {% data variables.product.product_name %} for Atom @@ -30,8 +30,12 @@ versions: ### 项目管理工具 -要简化工作流程，您可以将 {% data variables.product.product_name %} 个人帐户或组织与 Jira 等第三方项目管理工具集成。 +You can integrate your {% data variables.product.product_name %} personal account or organization with third-party project management tools, such as Jira or Slack. #### Jira Cloud 与 {% data variables.product.product_name %}.com 集成 -您可以将 Jira Cloud 与个人或组织帐户集成，以扫描提交和拉取请求，在任何提及的 Jira 议题中创建相关的元数据和超链接。 +您可以将 Jira Cloud 与个人或组织帐户集成，以扫描提交和拉取请求，在任何提及的 Jira 议题中创建相关的元数据和超链接。 For more information, visit the [Jira integration app](https://github.com/marketplace/jira-software-github) in the marketplace. + +#### Slack and {% data variables.product.product_name %} integration + +You can integrate Slack with your personal or organization account to subscribe for notifications, close or open issues, and provide rich references to issues and pull requests without leaving Slack. For more information, visit the [Slack integration app](https://github.com/marketplace/slack-github) in the marketplace. diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md index 09829181e9..b3e1b3bf9b 100644 --- a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/about-integration-with-code-scanning.md @@ -22,5 +22,5 @@ You can use {% data variables.product.prodname_code_scanning %} webhooks to buil ### 延伸阅读 * "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" -* "[Using {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} with your existing CI system +* "[Using {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} with your existing CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/using-codeql-code-scanning-with-your-existing-ci-system)" * "[SARIF support for {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning)" diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md index af2300e7a3..0cc08d5b3c 100644 --- a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning.md @@ -48,7 +48,7 @@ By default, the {% data variables.product.prodname_codeql_workflow %} uses the ` #### Scanning pull requests -The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on the `HEAD` commit of a pull request against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} +The default {% data variables.product.prodname_codeql_workflow %} uses the `pull_request` event to trigger a code scan on pull requests targeted against the default branch. {% if currentVersion ver_gt "enterprise-server@2.21" %}The `pull_request` event is not triggered if the pull request was opened from a private fork.{% else %}If a pull request is from a private fork, the `pull_request` event will only be triggered if you've selected the "Run workflows from fork pull requests" option in the repository settings. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks)."{% endif %} For more information about the `pull_request` event, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags)." @@ -150,8 +150,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - with: - fetch-depth: 2 - name: Set up Python uses: actions/setup-python@v2 with: @@ -165,8 +163,6 @@ jobs: # Set the `CODEQL-PYTHON` environment variable to the Python executable # that includes the dependencies echo "::set-env name=CODEQL_PYTHON::$(which python)" - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md index f4cabb2462..897fc3a74f 100644 --- a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md @@ -42,7 +42,7 @@ You decide how you generate {% data variables.product.prodname_code_scanning %} ![Choose where to commit](/assets/images/help/repository/start-commit-choose-where-to-commit.png) 8. Click **Commit new file** or **Propose new file**. -In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch or any protected branches. As a result, {% data variables.product.prodname_code_scanning %} will now commence. +In the default {% data variables.product.prodname_codeql_workflow %}, {% data variables.product.prodname_code_scanning %} is configured to analyze your code each time you either push a change to the default branch or any protected branches, or raise a pull request against the default branch. As a result, {% data variables.product.prodname_code_scanning %} will now commence. ### Viewing the logging output from {% data variables.product.prodname_code_scanning %} @@ -90,7 +90,7 @@ After {% data variables.product.prodname_code_scanning %} has analyzed the code There are other situations where there may be no analysis for the latest commit to the base branch for a pull request. These include: -* The pull request has been raised against a branch other than the default branch or a protected branch, and this branch hasn't been analyzed. +* The pull request has been raised against a branch other than the default branch, and this branch hasn't been analyzed. To check whether a branch has been scanned, go to the {% data variables.product.prodname_code_scanning_capc %} page, click the **Branch** drop-down and select the relevant branch. diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md index 946d0f99fc..d16e99fca4 100644 --- a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/index.md @@ -1,5 +1,6 @@ --- title: 查找代码中的安全漏洞和错误 +shortTitle: Finding vulnerabilities and coding errors product: '{% data reusables.gated-features.code-scanning %}' redirect_from: - /github/managing-security-vulnerabilities/finding-security-vulnerabilities-in-your-projects-code @@ -18,6 +19,7 @@ versions: {% link_in_list /configuring-code-scanning %} {% link_in_list /configuring-the-codeql-workflow-for-compiled-languages %} {% link_in_list /troubleshooting-the-codeql-workflow %} + {% link_in_list /running-codeql-code-scanning-in-a-container %} {% topic_link_in_list /managing-results-from-code-scanning %} {% link_in_list /about-integration-with-code-scanning %} {% link_in_list /uploading-a-sarif-file-to-github %} diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md index 7c557b3fd1..36848994c0 100644 --- a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md @@ -1,7 +1,7 @@ --- title: Managing code scanning alerts for your repository shortTitle: 管理警报 -intro: '您可以查看、修复和关闭项目代码中潜在漏洞或错误的警报。' +intro: 'You can view, fix, {% if currentVersion == "enterprise-server@2.22" %}or close{% else %}dismiss, or delete{% endif %} alerts for potential vulnerabilities or errors in your project''s code.' product: '{% data reusables.gated-features.code-scanning %}' permissions: 'People with write permission to a repository can manage {% data variables.product.prodname_code_scanning %} alerts for the repository.' versions: @@ -37,25 +37,89 @@ Anyone with read permission for a repository can see {% data variables.product.p {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} -{% data reusables.code-scanning.click-alert-in-list %} -5. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. ![数据流警报示例](/assets/images/help/repository/code-scanning-show-paths.png) +1. Under "{% data variables.product.prodname_code_scanning_capc %}," click the alert you'd like to explore. ![Summary of alerts](/assets/images/help/repository/code-scanning-click-alert.png) +1. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. ![The "Show paths" link on an alert](/assets/images/help/repository/code-scanning-show-paths.png) +1. Alerts from {% data variables.product.prodname_codeql %} analysis include a description of the problem. Click **Show more** for guidance on how to fix your code. ![Details for an alert](/assets/images/help/repository/code-scanning-alert-details.png) ### Fixing an alert Anyone with write permission for a repository can fix an alert by committing a correction to the code. If the repository has {% data variables.product.prodname_code_scanning %} scheduled to run on pull requests, it's best to raise a pull request with your correction. This will trigger {% data variables.product.prodname_code_scanning %} analysis of the changes and test that your fix doesn't introduce any new problems. For more information, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)" and "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)." +If you have write permission for a repository, you can view fixed alerts by viewing the summary of alerts and clicking **Closed**. For more information, see "[Viewing an alert](#viewing-an-alert)." The "Closed" list shows fixed alerts and alerts that users have {% if currentVersion == "enterprise-server@2.22" %}closed{% else %}dismissed{% endif %}. + +Alerts may be fixed in one branch but not in another. You can use the "Branch" drop-down menu, on the summary of alerts, to check whether an alert is fixed in a particular branch. + +![Filtering alerts by branch](/assets/images/help/repository/code-scanning-branch-filter.png) + +{% if currentVersion == "enterprise-server@2.22" %} + ### 关闭警报 Closing an alert is a way to resolve an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} +{% else %} + +### Dismissing or deleting alerts + +There are two ways of closing an alert. You can fix the problem in the code, or you can dismiss the alert. Alternatively, if you have admin permissions for the repository, you can delete alerts. Deleting alerts is useful in situations where you have enabled a {% data variables.product.prodname_code_scanning %} tool and then decided to remove it, or where you have enabled {% data variables.product.prodname_codeql %} analysis with a larger set of queries than you want to continue using, and you've then removed some queries from the tool. In both cases, deleting alerts allows you to clean up your {% data variables.product.prodname_code_scanning %} results. You can delete alerts from the summary list within the **Security** tab. + +Dismissing an alert is a way of closing an alert that you don't think needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} You can dismiss alerts from {% data variables.product.prodname_code_scanning %} annotations in code, or from the summary list within the **Security** tab. + +When you dismiss an alert: + +- It's dismissed in all branches. +- The alert is removed from the number of current alerts for your project. +- The alert is moved to the "Closed" list in the summary of alerts, from where you can reopen it, if required. +- The reason why you closed the alert is recorded. +- Next time {% data variables.product.prodname_code_scanning %} runs, the same code won't generate an alert. + +When you delete an alert: + +- It's deleted in all branches. +- The alert is removed from the number of current alerts for your project. +- It is _not_ added to the "Closed" list in the summary of alerts. +- If the code that generated the alert stays the same, and the same {% data variables.product.prodname_code_scanning %} tool runs again without any configuration changes, the alert will be shown again in your analysis results. + +To dismiss or delete alerts: + +{% endif %} + {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-code-scanning-alerts %} +{% if currentVersion == "enterprise-server@2.22" %} {% data reusables.code-scanning.click-alert-in-list %} -5. Select the Close drop-down menu and click a reason for closing the alert. ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) +1. Select the **Close** drop-down menu and click a reason for closing the alert. + ![Choosing reason for closing the alert via the Close drop-down](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) {% data reusables.code-scanning.false-positive-fix-codeql %} +{% else %} + +1. If you have admin permissions for the repository, and you want to delete alerts for this {% data variables.product.prodname_code_scanning %} tool, select some or all of the check boxes and click **Delete**. + + ![Deleting alerts](/assets/images/help/repository/code-scanning-delete-alerts.png) + + Optionally, you can use the filters to display a subset of alerts and then delete all matching alerts at once. For example, if you have removed a query from {% data variables.product.prodname_codeql %} analysis, you can use the "Rule" filter to list just the alerts for that query and then select and delete all of those alerts. + + ![Filter alerts by rule](/assets/images/help/repository/code-scanning-filter-by-rule.png) + +1. If you want to dismiss an alert, it's important to explore the alert first, so that you can choose the correct dismissal reason. Click the alert you'd like to explore. + + ![Open an alert from the summary list](/assets/images/help/repository/code-scanning-click-alert.png) + +1. Review the alert, then click **Dismiss** and choose a reason for closing the alert. ![Choosing a reason for dismissing an alert](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + + {% data reusables.code-scanning.choose-alert-dismissal-reason %} + + {% data reusables.code-scanning.false-positive-fix-codeql %} + +#### Dismissing multiple alerts at once + +If a project has multiple alerts that you want to dismiss for the same reason, you can bulk dismiss them from the summary of alerts. Typically, you'll want to filter the list and then dismiss all of the matching alerts. For example, you might want to dismiss all of the current alerts in the project that have been tagged for a particular Common Weakness Enumeration (CWE) vulnerability. + +{% endif %} + ### 延伸阅读 - "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)" diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md new file mode 100644 index 0000000000..07451d0a95 --- /dev/null +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md @@ -0,0 +1,69 @@ +--- +title: Running CodeQL code scanning in a container +shortTitle: '{% data variables.product.prodname_code_scanning_capc %} in a container' +intro: 'You can run {% data variables.product.prodname_code_scanning %} in a container by ensuring that all processes run in the same container.' +product: '{% data reusables.gated-features.code-scanning %}' +versions: + free-pro-team: '*' + enterprise-server: '>=2.22' +--- + +{% data reusables.code-scanning.beta %} + +### About {% data variables.product.prodname_code_scanning %} with a containerized build + +If you're setting up {% data variables.product.prodname_code_scanning %} for a compiled language, and you're building the code in a containerized environment, the analysis may fail with the error message "No source code was seen during the build." This indicates that {% data variables.product.prodname_codeql %} was unable to monitor your code as it was compiled. + +You must run {% data variables.product.prodname_codeql %} in the same container in which you build your code. This applies whether you are using the {% data variables.product.prodname_codeql_runner %}, or {% data variables.product.prodname_actions %}. If you're using the {% data variables.product.prodname_codeql_runner %}, run it in the container where your code builds. 有关 {% data variables.product.prodname_codeql_runner %} 的更多信息，请参阅“[在 CI 系统中运行 {% data variables.product.prodname_codeql %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-code-scanning-in-your-ci-system)”。 If you're using {% data variables.product.prodname_actions %}, configure your workflow to run all the actions in the same container. For more information, see "[Example workflow](#example-workflow)." + +### 依赖项 + +You may have difficulty running {% data variables.product.prodname_code_scanning %} if the container you're using is missing certain dependencies (for example, Git must be installed and added to the PATH variable). If you encounter dependency issues, review the list of software typically included on {% data variables.product.prodname_dotcom %}'s virtual environments. For more information, see the version-specific `readme` files in these locations: + +* Linux: https://github.com/actions/virtual-environments/tree/main/images/linux +* MacOS: https://github.com/actions/virtual-environments/tree/main/images/macos +* Windows: https://github.com/actions/virtual-environments/tree/main/images/win + +### Example workflow + +This sample workflow uses {% data variables.product.prodname_actions %} to run {% data variables.product.prodname_codeql %} analysis in a containerized environment. The value of `container.image` identifies the container to use. In this example the image is named `codeql-container`, with a tag of `f0f91db`. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)." + +``` yaml +name: "{% data variables.product.prodname_codeql %}" + +on: + push: + branches: [main] + pull_request: + branches: [main] + schedule: + - cron: '0 0 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: [java] + + # Specify the container in which actions will run + container: + image: codeql-container:f0f91db + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Initialize {% data variables.product.prodname_codeql %} + uses: github/codeql-action/init@v1 + with: + languages: {% raw %}${{ matrix.language }}{% endraw %} + - name: Build + run: | + ./configure + make + - name: Perform {% data variables.product.prodname_codeql %} Analysis + uses: github/codeql-action/analyze@v1 +``` diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md index 5b7faf0e62..610ead5433 100644 --- a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md @@ -1,6 +1,6 @@ --- title: Running CodeQL code scanning in your CI system -shortTitle: Running in your CI +shortTitle: 在 CI 中运行 intro: 'You can use the {% data variables.product.prodname_codeql_runner %} to perform {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} in a third-party continuous integration system.' product: '{% data reusables.gated-features.code-scanning %}' redirect_from: @@ -10,6 +10,8 @@ versions: enterprise-server: '>=2.22' --- + + {% data reusables.code-scanning.beta-codeql-runner %} {% data reusables.code-scanning.beta %} {% data reusables.code-scanning.enterprise-enable-code-scanning %} @@ -18,76 +20,83 @@ versions: If you use a continuous integration or continuous delivery/deployment (CI/CD) system other than {% data variables.product.prodname_actions %}, you can use your existing system to run {% data variables.product.prodname_dotcom %}'s {% data variables.product.prodname_codeql %} analysis and upload the results to {% data variables.product.prodname_dotcom %}. To do this, use the {% data variables.product.prodname_codeql_runner %}. -### About the {% data variables.product.prodname_codeql_runner %} +### 关于 {% data variables.product.prodname_codeql_runner %} -{% data reusables.code-scanning.about-code-scanning %} For information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)." +{% data reusables.code-scanning.about-code-scanning %} 更多信息请参阅“[关于 {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)”。 -You can use the {% data variables.product.prodname_codeql_runner %} to run {% data variables.product.prodname_code_scanning %} on code that you're processing in a third-party continuous integration (CI) system. Alternatively, you can use {% data variables.product.prodname_actions %} to run {% data variables.product.prodname_code_scanning %} on {% data variables.product.product_location %}. For information, see "[Enabling {% data variables.product.prodname_code_scanning %} for a repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository)." +您可以使用 {% data variables.product.prodname_codeql_runner %} 在第三方持续集成 (CI) 系统中处理的代码上运行 {% data variables.product.prodname_code_scanning %}。 您也可以使用 {% data variables.product.prodname_actions %} 在 {% data variables.product.product_location %} 上运行 {% data variables.product.prodname_code_scanning %}。 更多信息请参阅“[为仓库启用 {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository)”。 -The {% data variables.product.prodname_codeql_runner %} is a command-line tool that runs {% data variables.product.prodname_codeql %} analysis on a checkout of a {% data variables.product.prodname_dotcom %} repository. You add the runner to your third-party system, then call the runner to analyze code and upload the results to {% data variables.product.product_location %}. These results are displayed as {% data variables.product.prodname_code_scanning %} alerts in the repository. +{% data variables.product.prodname_codeql_runner %} 是在 {% data variables.product.prodname_dotcom %} 仓库的检出上运行 {% data variables.product.prodname_codeql %} 分析的命令行工具。 您可以将运行器添加到第三方系统，然后调用运行器以分析代码并将结果上传到 {% data variables.product.product_location %}。 这些结果在仓库中显示为 {% data variables.product.prodname_code_scanning %} 警报。 {% data reusables.code-scanning.codeql-runner-license %} -### Downloading the {% data variables.product.prodname_codeql_runner %} +### 下载 {% data variables.product.prodname_codeql_runner %} -You can download the {% data variables.product.prodname_codeql_runner %} from https://github.com/github/codeql-action/releases. On some operating systems, you may need to change permissions for the downloaded file before you can run it. +您可以从 https://github.com/github/codeql-action/releases 下载 {% data variables.product.prodname_codeql_runner %}。 在某些操作系统上，您可能需要更改下载文件的权限才能运行它。 -On Linux: +在 Linux 上： ```shell chmod +x codeql-runner-linux ``` -On MacOS: +在 MacOS 上： ```shell chmod +x codeql-runner-macos sudo xattr -d com.apple.quarantine codeql-runner-macos ``` -On Windows, the `codeql-runner-win.exe` file usually requires no change to permissions. - -### Adding the {% data variables.product.prodname_codeql_runner %} to your CI system - -Once you have downloaded the {% data variables.product.prodname_codeql_runner %} and verified that it can be executed, you should make the runner available to each CI server that you intend to use for {% data variables.product.prodname_code_scanning %}. It is important to notice that each CI server that you intend to use for {% data variables.product.prodname_code_scanning %} needs to have the {% data variables.product.prodname_codeql_runner %}. You might configure each server to copy the runner from a central, internal location, or you could use the REST API to get the runner direct from GitHub, for example: - -```shell -wget https://github.com/github/codeql-action/releases/download/codeql-bundle-20200826/codeql-runner-linux -chmod +x codeql-runner-linux -``` - -In addition to this, each CI server also needs: - -- A {% data variables.product.prodname_github_apps %} or personal access token for the {% data variables.product.prodname_codeql_runner %} to use. For private repositories the token must have the `repo` scope. For public the token needs only the `public_repo` and `repo:security_events` scopes. For information, see "[Building {% data variables.product.prodname_github_apps %}](/developers/apps/building-github-apps)" and "[Creating a personal access token](/github/authenticating-to-github/creating-a-personal-access-token)." -- Access to the {% data variables.product.prodname_codeql %} bundle associated with this release of the {% data variables.product.prodname_codeql_runner %}. This package contains the {% data variables.product.prodname_codeql %} CLI, queries, and libraries needed for {% data variables.product.prodname_codeql %} analysis. For information, see "[{% data variables.product.prodname_codeql %} CLI](https://help.semmle.com/codeql/codeql-cli.html)." - -The options for providing access to the {% data variables.product.prodname_codeql %} bundle are: - -1. Allow the CI servers access to {% data variables.product.prodname_dotcom_the_website %} so that the {% data variables.product.prodname_codeql_runner %} can download the bundle automatically. -1. Manually download/extract the bundle, store it with other central resources, and use the `--codeql-path` flag to specify the location of the bundle in calls to initialize the {% data variables.product.prodname_codeql_runner %}. -{% if currentVersion != "free-pro-team@latest" %} -1. You can mirror the `github/codeql-action` repository on {% data variables.product.product_location %}. Unless you specify the `--codeql-path` flag, the runner automatically checks for the bundle in this location and on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} - -### Calling the {% data variables.product.prodname_codeql_runner %} - You should call the {% data variables.product.prodname_codeql_runner %} from the checkout location of the repository you want to analyze. The two main commands are: -1. `init` required to initialize the runner and create a {% data variables.product.prodname_codeql %} database for each language to be analyzed. These databases are populated and analyzed by subsequent commands. -1. `analyze` required to populate the {% data variables.product.prodname_codeql %} databases, analyze them, and upload results to {% data variables.product.product_location %}. +### 将 {% data variables.product.prodname_codeql_runner %} 添加到 CI 系统 -For both commands, you must specify the URL of {% data variables.product.product_location %}, the repository *OWNER/NAME*, and the GitHub Apps or personal access token to use for authentication. You also need to specify the location of the CodeQL bundle unless the CI server has access to download it directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}. +下载 {% data variables.product.prodname_codeql_runner %} 并确认它可执行后，应将运行器提供给您打算用于 {% data variables.product.prodname_code_scanning %} 的每个 CI 服务器。 It is important to notice that each CI server that you intend to use for {% data variables.product.prodname_code_scanning %} needs to have the {% data variables.product.prodname_codeql_runner %}. You might configure each server to copy the runner from a central, internal location, or you could use the REST API to get the runner direct from GitHub, for example: -You can configure where the {% data variables.product.prodname_codeql_runner %} stores the CodeQL bundle for future analysis on a server using the `--tools-dir` flag and where it stores temporary files during analysis using `--temp-dir`. +```shell +$ /path/to-runner/codeql-runner-linux init --repository octo-org/example-repo-2 + --github-url {% data variables.command_line.git_url_example %} --github-auth TOKEN + > Cleaning temp directory /srv/checkout/example-repo-2/codeql-runner + > ... + > CodeQL environment output to "/srv/checkout/example-repo-2/codeql-runner/codeql-env.json" + and "/srv/checkout/example-repo-2/codeql-runner/codeql-env.sh". + Please export these variables to future processes so the build can be traced, for example by running " + . /srv/checkout/example-repo-2/codeql-runner/codeql-env.sh". +``` -To view the command-line reference for the runner, use the `-h` flag. For example, to list all commands run: `codeql-runner-OS -h`, or to list all the flags available for the `init` command run: `codeql-runner-OS init -h` (where `OS` varies according to the executable that you are using). For more information, see "[Configuring {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-codeql-code-scanning-in-your-ci-system#codeql-runner-command-reference)." +除此之外，每个 CI 服务器还需要： -#### Basic example +- {% data variables.product.prodname_github_apps %} 或供 {% data variables.product.prodname_codeql_runner %} 使用的个人访问令牌。 对于私有仓库，令牌必须具有 `repo` 作用域。 对于公共仓库，令牌只需要 `public_repo` 和 `repo:security_events` 作用域。 更多信息请参阅“[构建 {% data variables.product.prodname_github_apps %}](/developers/apps/building-github-apps)”和“[创建个人访问令牌](/github/authenticating-to-github/creating-a-personal-access-token)”。 +- 访问与此 {% data variables.product.prodname_codeql_runner %} 发行版相关联的 {% data variables.product.prodname_codeql %} 包。 此包包含 {% data variables.product.prodname_codeql %} 分析所需的 {% data variables.product.prodname_codeql %} CLI、查询和库。 更多信息请参阅“[{% data variables.product.prodname_codeql %} CLI](https://help.semmle.com/codeql/codeql-cli.html)”。 -This example runs {% data variables.product.prodname_codeql %} analysis on a Linux CI server for the `octo-org/example-repo` repository hosted on `{% data variables.command_line.git_url_example %}`. The process is very simple because the repository contains only languages that can be analyzed by {% data variables.product.prodname_codeql %} directly, without being built (that is, Go, JavaScript, Python, and TypeScript). +提供 {% data variables.product.prodname_codeql %} 包访问权限的选项： -1. Check out the repository to analyze. -1. Move into the directory where the repository is checked out. -1. Initialize the {% data variables.product.prodname_codeql_runner %} and create {% data variables.product.prodname_codeql %} databases for the languages detected. +1. 允许 CI 服务器访问 {% data variables.product.prodname_dotcom_the_website %}，以便 {% data variables.product.prodname_codeql_runner %} 可以自动下载包。 +1. Manually download/extract the bundle, store it with other central resources, and use the `--codeql-path` flag to specify the location of the bundle in calls to initialize the +{% data variables.product.prodname_codeql_runner %}. +{% if enterpriseServerVersions contains currentVersion %} +1. 您可以在 {% data variables.product.product_location %} 上镜像 `github/codeql-action` 仓库。 除非您指定 `--codeql-path` 标志，否则运行器将在此位置和 {% data variables.product.prodname_dotcom_the_website %}上自动检查包。{% endif %} + +### 调用 {% data variables.product.prodname_codeql_runner %} + +您应该从要分析的仓库的检出位置调用 {% data variables.product.prodname_codeql_runner %}。 两个主要命令是： + +1. `init` 需要初始化运行器并为需要分析的每种语言创建一个 {% data variables.product.prodname_codeql %} 数据库。 这些数据库由后续命令填充和分析。 +1. `analyze` 需要填充 {% data variables.product.prodname_codeql %} 数据库、进行分析并将结果上传到 {% data variables.product.product_location %}。 + +对于这两个命令，都必须指定 {% data variables.product.product_location %} 的 URL、仓库*所有者/名称*以及 GitHub 应用程序或用于身份验证的个人访问令牌。 您还需要指定 CodeQL 包的位置，除非 CI 服务器有权直接从 {% data variables.product.prodname_dotcom_the_website %} 上{% if enterpriseServerVersions contains currentVersion %}或在 {% data variables.product.product_location %} 上镜像{% endif %}的 `github/codeql-action` 仓库下载它。 + +您可以配置 {% data variables.product.prodname_codeql_runner %} 存储 CodeQL 包的位置以便将来在服务器上进行分析，使用： `--tools-dir` 标志；并配置在分析过程中存储临时文件的位置，使用： `--temp-dir`. + +要查看运行器的命令行引用，请使用 `-h` 标志。 例如，要列出所有运行的命令：`codeql-runner-OS -h`，或列出所有可用于 `init` 命令运行的标志：`codeql-runner-OS init -h`（其中 `OS` 因使用的可执行文件而异）。 For more information, see "[Configuring {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-codeql-code-scanning-in-your-ci-system#codeql-runner-command-reference)." + +#### 基本示例 + +此示例在 Linux CI 服务器上对托管在 `{% data variables.command_line.git_url_example %}` 上的 `octo-org/example-repo` 仓库运行 {% data variables.product.prodname_codeql %} 分析。 这个过程非常简单，因为仓库只包含可通过 {% data variables.product.prodname_codeql %} 直接分析的语言，而无需构建（例如 Go、JavaScript、Python 和 TypeScript）。 + +1. 检出要分析的仓库。 +1. 移至检出仓库的目录。 +1. 初始化 {% data variables.product.prodname_codeql_runner %} 并为检测到的语言创建 {% data variables.product.prodname_codeql %}。 ```shell $ /path/to-runner/codeql-runner-linux init --repository octo-org/example-repo @@ -97,7 +106,7 @@ This example runs {% data variables.product.prodname_codeql %} analysis on a Lin > Created CodeQL database at /srv/checkout/example-repo/codeql-runner/codeql_databases/javascript. ``` -1. Populate the {% data variables.product.prodname_codeql_runner %} databases, analyze them, and upload the results to {% data variables.product.product_name %}. +1. 填充 {% data variables.product.prodname_codeql_runner %} 数据库、进行分析并将结果上传到 {% data variables.product.product_name %}。 ```shell $ /path/to-runner/codeql-runner-linux analyze --repository octo-org/example-repo @@ -109,15 +118,15 @@ This example runs {% data variables.product.prodname_codeql %} analysis on a Lin > Successfully uploaded results ``` -The server has access to download the {% data variables.product.prodname_codeql %} bundle directly from the `github/codeql-action` repository on {% data variables.product.prodname_dotcom_the_website %}{% if currentVersion != "free-pro-team@latest" %} or mirrored on {% data variables.product.product_location %}{% endif %}, so there is no need to use the `--codeql-path` flag. When the analysis is complete, the {% data variables.product.prodname_codeql_runner %} uploads the results to the {% data variables.product.prodname_code_scanning %} view. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +服务器有权直接从 {% data variables.product.prodname_dotcom_the_website %} 上{% if enterpriseServerVersions contains currentVersion %}或在 {% data variables.product.product_location %} 上镜像{% endif %}的 `github/codeql-action` 仓库下载 {% data variables.product.prodname_codeql %} 包，因此无需使用 `--codeql-path` 标志。 分析完成后， {% data variables.product.prodname_codeql_runner %} 会将结果上传到 {% data variables.product.prodname_code_scanning %} 视图。 For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." -#### Compiled language example +#### 编译语言示例 -This example is similar to the previous example, however this time the repository has code in C/C++, C#, or Java. To create a {% data variables.product.prodname_codeql %} database for these languages, the CLI needs to monitor the build. At the end of the initialization process, the runner reports the command you need to set up the environment before building the code. You need to run this command, before calling the normal CI build process, and then running the `analyze` command. +此示例与前面的示例相似，但此例中的仓库含有用 C/C++、C# 或 Java 编写的代码。 To create a {% data variables.product.prodname_codeql %} database for these languages, the CLI needs to monitor the build. 在初始化过程结束时，运行器会报告您需要在构建代码之前设置环境的命令。 您需要在调用正常的 CI 构建进程之前运行此命令，然后运行 `analyze` 命令。 -1. Check out the repository to analyze. -1. Move into the directory where the repository is checked out. -1. Initialize the {% data variables.product.prodname_codeql_runner %} and create {% data variables.product.prodname_codeql %} databases for the languages detected. +1. 检出要分析的仓库。 +1. 移至检出仓库的目录。 +1. 初始化 {% data variables.product.prodname_codeql_runner %} 并为检测到的语言创建 {% data variables.product.prodname_codeql %}。 ```shell $ /path/to-runner/codeql-runner-linux init --repository octo-org/example-repo-2 @@ -136,8 +145,8 @@ This example is similar to the previous example, however this time the repositor $ . /srv/checkout/example-repo-2/codeql-runner/codeql-env.sh ``` -1. Build the code. -1. Populate the {% data variables.product.prodname_codeql %} databases, analyze them, and upload the results to GitHub. +1. 构建代码。 +1. 填充 {% data variables.product.prodname_codeql %} 数据库、进行分析并将结果上传到 GitHub。 ```shell $ /path/to-runner/codeql-runner-linux analyze --repository octo-org/example-repo-2 @@ -151,11 +160,11 @@ This example is similar to the previous example, however this time the repositor {% note %} -**Note:** If you use a containerized build, you need to run the {% data variables.product.prodname_codeql_runner %} in the container where your build task takes place. +**注：**如果使用容器化构建，您需要在进行构建任务的容器中运行 {% data variables.product.prodname_codeql_runner %}。 {% endnote %} -### Further reading +### 延伸阅读 -- "[Configuring {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-codeql-code-scanning-in-your-ci-system)" -- "[Troubleshooting {% data variables.product.prodname_code_scanning %} in your CI system](/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system)" +- "[在 CI 系统中配置 {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-codeql-code-scanning-in-your-ci-system)" +- "[CI 系统中的{% data variables.product.prodname_code_scanning %} 故障排除](/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system)" diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md index d1e0bfc748..546a05176b 100644 --- a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md @@ -36,6 +36,8 @@ If you upload a SARIF file without fingerprint data using the `/code-scanning/sa ### Validating your SARIF file + + You can check a SARIF file is compatible with {% data variables.product.prodname_code_scanning %} by testing it against the {% data variables.product.prodname_dotcom %} ingestion rules. For more information, visit the [Microsoft SARIF validator](https://sarifweb.azurewebsites.net/). ### 支持的 SARIF 输出文件属性 diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md index 53790163b8..0fdf4c0f80 100644 --- a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md @@ -13,11 +13,11 @@ versions: ### About {% data variables.product.prodname_code_scanning %} results on pull requests -In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch or protected branches, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." +In repositories where {% data variables.product.prodname_code_scanning %} is configured as a pull request check, {% data variables.product.prodname_code_scanning %} checks the code in the pull request. By default, this is limited to pull requests that target the default branch, but you can change this configuration within {% data variables.product.prodname_actions %} or in a third-party CI/CD system. If merging the changes would introduce new {% data variables.product.prodname_code_scanning %} alerts to the target branch, these are reported as check results in the pull request. The alerts are also shown as annotations in the **Files changed** tab of the pull request. If you have write permission for the repository, you can see any existing {% data variables.product.prodname_code_scanning %} alerts on the **Security** tab. For information about repository alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository)." -If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch, and the repository owner has configured required status checks, then you must either fix or close any error alerts before the pull request can be merged. 更多信息请参阅“[关于必要的状态检查](/github/administering-a-repository/about-required-status-checks)”。 +If {% data variables.product.prodname_code_scanning %} has any results with a severity of `error`, the check fails and the error is reported in the check results. If all the results found by {% data variables.product.prodname_code_scanning %} have lower severities, the alerts are treated as warnings or notices and the check succeeds. If your pull request targets a protected branch that has been enabled for {% data variables.product.prodname_code_scanning %}, and the repository owner has configured required status checks, then you must either fix or {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} all error alerts before the pull request can be merged. 更多信息请参阅“[关于必要的状态检查](/github/administering-a-repository/about-required-status-checks)”。 -![Example pull request check status with {% data variables.product.prodname_code_scanning %} alert](/assets/images/help/repository/code-scanning-check-failure.png) +![Failed {% data variables.product.prodname_code_scanning %} check on a pull request](/assets/images/help/repository/code-scanning-check-failure.png) ### About {% data variables.product.prodname_code_scanning %} as a pull request check @@ -29,20 +29,38 @@ If the repository uses the {% data variables.product.prodname_codeql_workflow %} When you look at the **Files changed** tab for a pull request, you see annotations for any lines of code that triggered the alert. -![Example {% data variables.product.prodname_code_scanning %} alert shown as an annotation in the "Files changed" view of a pull request](/assets/images/help/repository/code-scanning-pr-annotation.png) +![Alert annotation within a pull request diff](/assets/images/help/repository/code-scanning-pr-annotation.png) Some annotations contain links with extra context for the alert. In the example above, from {% data variables.product.prodname_codeql %} analysis, you can click **user-provided value** to see where the untrusted data enters the data flow (this is referred to as the source). In this case you can view the full path from the source to the code that uses the data (the sink) by clicking **Show paths**. This makes it easy to check whether the data is untrusted or if the analysis failed to recognize a data sanitization step between the source and the sink. For information about analyzing data flow using {% data variables.product.prodname_codeql %}, see "[About data flow analysis](https://help.semmle.com/QL/learn-ql/intro-to-data-flow.html)." For more information about an alert, click **Show more details** on the annotation. This allows you to see all of the context and metadata provided by the tool in an alert view. In the example below, you can see tags showing the severity, type, and relevant common weakness enumerations (CWEs) for the problem. The view also shows which commit introduced the problem. -Alerts from some tools, like {% data variables.product.prodname_codeql %}, also include a description and a **Show more** link for guidance on how to fix the problem in the code. +In the detailed view for an alert, some {% data variables.product.prodname_code_scanning %} tools, like {% data variables.product.prodname_codeql %} analysis, also include a description of the problem and a **Show more** link for guidance on how to fix your code. -![Example of "Show more details" for a {% data variables.product.prodname_code_scanning %} alert in a pull request](/assets/images/help/repository/code-scanning-pr-alert.png) +![Alert description and link to show more information](/assets/images/help/repository/code-scanning-pr-alert.png) -### Resolving an alert on your pull request +### {% if currentVersion == "enterprise-server@2.22" %}Resolving{% else %}Fixing{% endif %} an alert on your pull request -Anyone with write permission for a repository can resolve alerts on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is resolved and the annotation removed. +Anyone with write permission for a repository can fix a {% data variables.product.prodname_code_scanning %} alert that's identified on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is closed and the annotation removed. + +{% if currentVersion == "enterprise-server@2.22" %} If you don't think that an alert needs to be fixed, you can close the alert manually. {% data reusables.code-scanning.close-alert-examples %} The **Close** button is available in annotations and in the alerts view if you have write permission for the repository. {% data reusables.code-scanning.false-positive-fix-codeql %} + +{% else %} + +### Dismissing an alert on your pull request + +An alternative way of closing an alert is to dismiss it. You can dismiss an alert if you don't think it needs to be fixed. {% data reusables.code-scanning.close-alert-examples %} If you have write permission for the repository, the **Dismiss** button is available in code annotations and in the alerts summary. When you click **Dismiss** you will be prompted to choose a reason for closing the alert. + +![Choosing a reason for dismissing an alert](/assets/images/help/repository/code-scanning-alert-close-drop-down.png) + +{% data reusables.code-scanning.choose-alert-dismissal-reason %} + +{% data reusables.code-scanning.false-positive-fix-codeql %} + +For more information about dismissing alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#dismissing-or-deleting-alerts)." + +{% endif %} \ No newline at end of file diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md index 93dc769fe5..068aded2d7 100644 --- a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-codeql-code-scanning-in-your-ci-system.md @@ -49,4 +49,4 @@ If the `analyze` command for the {% data variables.product.prodname_codeql_runne {% endnote %} -1. The code is built in a container or on a separate machine. If you use a containerized build or if you outsource the build to another machine, make sure to run the {% data variables.product.prodname_codeql_runner %} in the container or on the machine where your build task takes place. +1. The code is built in a container or on a separate machine. If you use a containerized build or if you outsource the build to another machine, make sure to run the {% data variables.product.prodname_codeql_runner %} in the container or on the machine where your build task takes place. For more information, see "[Running CodeQL code scanning in a container](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)." diff --git a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md index f42dbb3db6..9dd5a07a90 100644 --- a/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md +++ b/translations/zh-CN/content/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-the-codeql-workflow.md @@ -60,7 +60,11 @@ For more information, see the workflow extract in "[Automatic build for a compil 1. Your {% data variables.product.prodname_code_scanning %} workflow is analyzing a compiled language (C, C++, C#, or Java), but the code was not compiled. By default, the {% data variables.product.prodname_codeql %} analysis workflow contains an `autobuild` step, however, this step represents a best effort process, and may not succeed in building your code, depending on your specific build environment. Compilation may also fail if you have removed the `autobuild` step and did not include build steps manually. For more information about specifying build steps, see "[Configuring the {% data variables.product.prodname_codeql %} workflow for compiled languages](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language)." 1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but portions of your build are cached to improve performance (most likely to occur with build systems like Gradle or Bazel). Since {% data variables.product.prodname_codeql %} observes the activity of the compiler to understand the data flows in a repository, {% data variables.product.prodname_codeql %} requires a complete build to take place in order to perform analysis. 1. Your workflow is analyzing a compiled language (C, C++, C#, or Java), but compilation does not occur between the `init` and `analyze` steps in the workflow. {% data variables.product.prodname_codeql %} requires that your build happens in between these two steps in order to observe the activity of the compiler and perform analysis. -1. Your compiled code (in C, C++, C#, or Java) was compiled successfully, but {% data variables.product.prodname_codeql %} was unable to detect the compiler invocations. The most common causes are certain configuration options like running your build process in a container, if you're building using a distributed build system external to {% data variables.product.prodname_actions %} using a daemon process, or if {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. +1. Your compiled code (in C, C++, C#, or Java) was compiled successfully, but {% data variables.product.prodname_codeql %} was unable to detect the compiler invocations. The most common causes are: + + * Running your build process in a separate container to {% data variables.product.prodname_codeql %}. For more information, see "[Running CodeQL code scanning in a container](/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container)." + * Building using a distributed build system external to GitHub Actions, using a daemon process. + * {% data variables.product.prodname_codeql %} isn't aware of the specific compiler you are using. For C# projects using either `dotnet build` or `msbuild` which target .NET Core 2, you should specify `/p:UseSharedCompilation=false` in your workflow's `run` step, when you build your code. The `UseSharedCompilation` flag isn't necessary for .NET Core 3.0 and later. @@ -122,4 +126,4 @@ If you are analyzing code written in Python, you may see different results depen On GitHub-hosted runners that use Linux, the {% data variables.product.prodname_codeql_workflow %} tries to install and analyze Python dependencies, which could lead to more results. To disable the auto-install, add `setup-python-dependencies: false` to the "Initialize CodeQL" step of the workflow. For more information about configuring the analysis of Python dependencies, see "[Analyzing Python dependencies](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#analyzing-python-dependencies)." -{% endif %} \ No newline at end of file +{% endif %} diff --git a/translations/zh-CN/content/github/getting-started-with-github/githubs-products.md b/translations/zh-CN/content/github/getting-started-with-github/githubs-products.md index b37bec5434..5709935b2d 100644 --- a/translations/zh-CN/content/github/getting-started-with-github/githubs-products.md +++ b/translations/zh-CN/content/github/getting-started-with-github/githubs-products.md @@ -96,7 +96,7 @@ versions: - {% data variables.contact.github_support %} {% data variables.product.premium_plus_support_plan %} - {% data variables.product.prodname_insights %} -- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} +- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} - [组织的 {% data variables.product.prodname_learning %}](https://lab.github.com/organizations) 有关注册 {% data variables.product.prodname_ghe_one %} 的更多信息，请联系 [{% data variables.product.product_name %} 的销售团队](https://enterprise.github.com/contact)。 diff --git a/translations/zh-CN/content/github/getting-started-with-github/supported-browsers.md b/translations/zh-CN/content/github/getting-started-with-github/supported-browsers.md index f056e39ddb..af92934da3 100644 --- a/translations/zh-CN/content/github/getting-started-with-github/supported-browsers.md +++ b/translations/zh-CN/content/github/getting-started-with-github/supported-browsers.md @@ -4,7 +4,7 @@ redirect_from: - /articles/why-doesn-t-graphs-work-with-ie-8/ - /articles/why-don-t-graphs-work-with-ie8/ - /articles/supported-browsers -intro: '我们将 {% data variables.product.product_name %} 设计为支持最新的 Web 浏览器。 We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.16" %}Internet Explorer 11, {% endif %}and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' +intro: '我们将 {% data variables.product.product_name %} 设计为支持最新的 Web 浏览器。 We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).' versions: free-pro-team: '*' enterprise-server: '*' diff --git a/translations/zh-CN/content/github/importing-your-projects-to-github/about-github-importer.md b/translations/zh-CN/content/github/importing-your-projects-to-github/about-github-importer.md index 6f78625ff3..87880ab234 100644 --- a/translations/zh-CN/content/github/importing-your-projects-to-github/about-github-importer.md +++ b/translations/zh-CN/content/github/importing-your-projects-to-github/about-github-importer.md @@ -13,12 +13,12 @@ GitHub 导入工具是一种可快速将源代码仓库（包括提交和修订 在导入过程中，根据导入来源的版本控制系统，您可以向远程仓库进行身份验证，更新提交作者属性，以及导入包含大文件的仓库（如果不想使用 Git Large File Storage，也可删除大文件）。 -| 导入操作 | 子版本，Subversion | Mercurial | Team Foundation Server | Git | -|:----------------------------------------------------------------------------- |:--------------:|:---------:|:----------------------:|:-----:| -| 向远程仓库进行身份验证 | **X** | **X** | **X** | **X** | -| [更新提交作者属性](/articles/updating-commit-author-attribution-with-github-importer) | **X** | **X** | **X** | | -| 将大文件移至 [Git Large 文件存储](/articles/about-git-large-file-storage) | **X** | **X** | **X** | | -| 从仓库删除大文件 | **X** | **X** | **X** | | +| 导入操作 | 子版本 | Mercurial | Team Foundation Server | Git | +|:----------------------------------------------------------------------------- |:-----:|:---------:|:----------------------:|:-----:| +| 向远程仓库进行身份验证 | **X** | **X** | **X** | **X** | +| [更新提交作者属性](/articles/updating-commit-author-attribution-with-github-importer) | **X** | **X** | **X** | | +| 将大文件移至 [Git Large 文件存储](/articles/about-git-large-file-storage) | **X** | **X** | **X** | | +| 从仓库删除大文件 | **X** | **X** | **X** | | ### 延伸阅读 diff --git a/translations/zh-CN/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md b/translations/zh-CN/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md index dc060e337f..dfdacdbc70 100644 --- a/translations/zh-CN/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md +++ b/translations/zh-CN/content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md @@ -29,7 +29,7 @@ versions: 3. 将当前工作目录更改为您的本地仓库。 4. 将本地目录初始化为 Git 仓库。 ```shell - $ git init + $ git init -b main ``` 5. 在新的本地仓库中添加文件。 这会暂存它们用于第一次提交。 ```shell @@ -67,7 +67,7 @@ versions: 3. 将当前工作目录更改为您的本地仓库。 4. 将本地目录初始化为 Git 仓库。 ```shell - $ git init + $ git init -b main ``` 5. 在新的本地仓库中添加文件。 这会暂存它们用于第一次提交。 ```shell @@ -105,7 +105,7 @@ versions: 3. 将当前工作目录更改为您的本地仓库。 4. 将本地目录初始化为 Git 仓库。 ```shell - $ git init + $ git init -b main ``` 5. 在新的本地仓库中添加文件。 这会暂存它们用于第一次提交。 ```shell diff --git a/translations/zh-CN/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md b/translations/zh-CN/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md index 744cee11cb..f8dcec2831 100644 --- a/translations/zh-CN/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md +++ b/translations/zh-CN/content/github/managing-files-in-a-repository/adding-a-file-to-a-repository.md @@ -19,7 +19,7 @@ versions: {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. 在仓库名称下，单击 **Upload files（上传文件）**。 ![上传文件按钮](/assets/images/help/repository/upload-files-button.png) {% else %} 2. 在文件列表上方，使用 **Add file（添加文件）**下拉菜单，单击 **Upload files（上传文件）**。 !["Add file（添加文件）"下拉菜单中的"Upload files（上传文件）"](/assets/images/help/repository/upload-files-button.png) diff --git a/translations/zh-CN/content/github/managing-files-in-a-repository/navigating-code-on-github.md b/translations/zh-CN/content/github/managing-files-in-a-repository/navigating-code-on-github.md index 153f661e94..cbcfa0a747 100644 --- a/translations/zh-CN/content/github/managing-files-in-a-repository/navigating-code-on-github.md +++ b/translations/zh-CN/content/github/managing-files-in-a-repository/navigating-code-on-github.md @@ -10,6 +10,7 @@ versions: ### 关于在 {% data variables.product.prodname_dotcom %} 上导航代码 导航代码功能使用开源库 [`semantic`](https://github.com/github/semantic)。 支持以下语言： +- C# - CodeQL - Go - Java diff --git a/translations/zh-CN/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md b/translations/zh-CN/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md index 23ccc7f997..ba0e7367b1 100644 --- a/translations/zh-CN/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md +++ b/translations/zh-CN/content/github/managing-files-in-a-repository/working-with-jupyter-notebook-files-on-github.md @@ -9,9 +9,9 @@ versions: --- -笔记本的交互式功能（例如自定义的 JavaScript 图）在 {% data variables.product.product_location %} 上的仓库中不起作用。 有关示例，请参阅 [*Linking and Interactions.ipynb*](https://github.com/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb)。 +笔记本的交互式功能（例如自定义的 JavaScript 图）在 {% data variables.product.product_location %} 上的仓库中不起作用。 For an example, see [*Linking and Interactions.ipynb*](https://github.com/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb). -要查看呈现 JavaScript 内容的 Jupyter notebook 或与其他人共享您的笔记本文件，您可以使用 [nbviewer](https://nbviewer.jupyter.org/)。 有关示例，请参阅在 nbviewer 上呈现的 [*Linking and Interactions.ipynb*](https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb)。 +要查看呈现 JavaScript 内容的 Jupyter notebook 或与其他人共享您的笔记本文件，您可以使用 [nbviewer](https://nbviewer.jupyter.org/)。 For an example, see [*Linking and Interactions.ipynb*](https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb) rendered on nbviewer. 要查看 Jupyter Notebook 的完全交互式版本，您可以在本地设置笔记本服务器。 更多信息请参阅“[Jupyter 的正式文档](http://jupyter.readthedocs.io/en/latest/index.html)”。 diff --git a/translations/zh-CN/content/github/managing-large-files/about-git-large-file-storage.md b/translations/zh-CN/content/github/managing-large-files/about-git-large-file-storage.md index ded2a0bcf1..f974935ad1 100644 --- a/translations/zh-CN/content/github/managing-large-files/about-git-large-file-storage.md +++ b/translations/zh-CN/content/github/managing-large-files/about-git-large-file-storage.md @@ -41,11 +41,13 @@ size 84977953 它会跟踪所用 {% data variables.large_files.product_name_short %} 的 `version`，后接文件的唯一标识符 (`oid`)。 它还会存储最终文件的 `size`。 -{% tip %} +{% note %} -**提示**：{% data variables.large_files.product_name_short %} 不能用于 {% data variables.product.prodname_pages %} 站点。 +**注意**： +- {% data variables.large_files.product_name_short %} cannot be used with {% data variables.product.prodname_pages %} sites. +- {% data variables.large_files.product_name_short %} cannot be used with template repositories. -{% endtip %} +{% endnote %} ### 延伸阅读 diff --git a/translations/zh-CN/content/github/managing-large-files/conditions-for-large-files.md b/translations/zh-CN/content/github/managing-large-files/conditions-for-large-files.md index c15a457a34..f7e0369417 100644 --- a/translations/zh-CN/content/github/managing-large-files/conditions-for-large-files.md +++ b/translations/zh-CN/content/github/managing-large-files/conditions-for-large-files.md @@ -16,4 +16,4 @@ versions: ### 阻止大文件的推送 -{% if currentVersion != "free-pro-team@latest" %}By default, {% endif %}{% data variables.product.product_name %} blocks pushes that exceed {% data variables.large_files.max_github_size %}. {% if currentVersion != "free-pro-team@latest" %}However, a site administrator can configure a different limit for your {% data variables.product.prodname_ghe_server %} instance. 更多信息请参阅“[设置 Git 推送限制](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits)”。{% endif %} +{% if enterpriseServerVersions contains currentVersion %}默认情况下， {% endif %}{% data variables.product.product_name %} 阻止超过 {% data variables.large_files.max_github_size %} 的推送。 {% if enterpriseServerVersions contains currentVersion %}但站点管理员可为您的 {% data variables.product.prodname_ghe_server %} 实例配置不同的限制。 更多信息请参阅“[设置 Git 推送限制](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-git-push-limits)”。{% endif %} diff --git a/translations/zh-CN/content/github/managing-large-files/configuring-git-large-file-storage.md b/translations/zh-CN/content/github/managing-large-files/configuring-git-large-file-storage.md index eb040a0229..b12a577dd8 100644 --- a/translations/zh-CN/content/github/managing-large-files/configuring-git-large-file-storage.md +++ b/translations/zh-CN/content/github/managing-large-files/configuring-git-large-file-storage.md @@ -13,7 +13,7 @@ versions: {% data reusables.large_files.resolving-upload-failures %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} diff --git a/translations/zh-CN/content/github/managing-large-files/removing-files-from-git-large-file-storage.md b/translations/zh-CN/content/github/managing-large-files/removing-files-from-git-large-file-storage.md index 9290d04394..024d3303ca 100644 --- a/translations/zh-CN/content/github/managing-large-files/removing-files-from-git-large-file-storage.md +++ b/translations/zh-CN/content/github/managing-large-files/removing-files-from-git-large-file-storage.md @@ -1,6 +1,6 @@ --- -title: Removing files from Git Large File Storage -intro: 'If you''ve set up {% data variables.large_files.product_name_short %} for your repository, you can remove all files or a subset of files from {% data variables.large_files.product_name_short %}.' +title: 从 Git Large File Storage 中删除文件 +intro: '如果您已设置仓库的 {% data variables.large_files.product_name_short %}，则可以从 {% data variables.large_files.product_name_short %} 中删除所有文件或文件的子集。' redirect_from: - /articles/removing-files-from-git-large-file-storage versions: @@ -8,45 +8,45 @@ versions: enterprise-server: '*' --- -### Removing a single file +### 删除单个文件 -1. Remove the file from the repository's Git history using either the `filter-branch` command or BFG Repo-Cleaner. For detailed information on using these, see "[Removing sensitive data from a repository](/articles/removing-sensitive-data-from-a-repository)." -2. Navigate to your *.gitattributes* file. +1. 使用 `filter-branch` 命令或 BFG Repo-Cleaner 从仓库的 Git 历史记录中删除文件。 有关使用这些命令或工具的详细信息，请参阅“[从仓库中删除敏感数据](/articles/removing-sensitive-data-from-a-repository)”。 +2. 导航到 *.gitattributes* 文件。 {% note %} - **Note:** Your *.gitattributes* file is generally saved within your local repository. In some cases, you may have created a global *.gitattributes* file that contains all of your {% data variables.large_files.product_name_short %} associations. + **注：**您的 *.gitattributes* 文件通常保存在本地仓库中。 在某些情况下，您可能已创建包含所有 {% data variables.large_files.product_name_short %} 关联的全局 *.gitattributes* 文件。 {% endnote %} -3. Find and remove the associated {% data variables.large_files.product_name_short %} tracking rule within the *.gitattributes* file. -4. Save and exit the *.gitattributes* file. +3. 找到并删除 *.gitattributes* 文件内关联的 {% data variables.large_files.product_name_short %} 跟踪规则。 +4. 保存并退出 *.gitattributes* 文件。 -### Removing all files within a {% data variables.large_files.product_name_short %} repository +### 删除 {% data variables.large_files.product_name_short %} 仓库内的所有文件 -1. Remove the files from the repository's Git history using either the `filter-branch` command or BFG Repo-Cleaner. For detailed information on using these, see "[Removing sensitive data from a repository](/articles/removing-sensitive-data-from-a-repository)." -2. Optionally, to uninstall {% data variables.large_files.product_name_short %} in the repository, run: +1. 使用 `filter-branch` 命令或 BFG Repo-Cleaner 从仓库的 Git 历史记录中删除文件。 有关使用这些命令或工具的详细信息，请参阅“[从仓库中删除敏感数据](/articles/removing-sensitive-data-from-a-repository)”。 +2. （可选）要卸载仓库中的 {% data variables.large_files.product_name_short %}，请运行： ```shell $ git lfs uninstall ``` - For {% data variables.large_files.product_name_short %} versions below 1.1.0, run: + 对于 1.1.0 以下的 {% data variables.large_files.product_name_short %} 版本，运行： ```shell $ git lfs uninit ``` -### {% data variables.large_files.product_name_short %} objects in your repository +### 仓库中的 {% data variables.large_files.product_name_short %} 对象 After you remove files from {% data variables.large_files.product_name_short %}, the {% data variables.large_files.product_name_short %} objects still exist on the remote storage{% if currentVersion == "free-pro-team@latest" %} and will continue to count toward your {% data variables.large_files.product_name_short %} storage quota{% endif %}. -To remove {% data variables.large_files.product_name_short %} objects from a repository, {% if currentVersion == "free-pro-team@latest" %}delete and recreate the repository. When you delete a repository, any associated issues, stars, and forks are also deleted. For more information, see "[Deleting a repository](/github/administering-a-repository/deleting-a-repository)."{% else %}contact your {% data variables.product.prodname_enterprise %} administrator to archive the objects. Archived objects are purged after three months.{% endif %} +To remove {% data variables.large_files.product_name_short %} objects from a repository, {% if currentVersion == "free-pro-team@latest" %}delete and recreate the repository. 删除仓库时，所有关联的议题、星标和复刻也会被删除。 更多信息请参阅“[删除仓库](/github/administering-a-repository/deleting-a-repository)”。{% else %}请联系 {% data variables.product.prodname_enterprise %} 管理员以存档对象。 存档的对象将在三个月后清除。{% endif %} {% note %} -**Note:** If you removed a single file and have other {% data variables.large_files.product_name_short %} objects that you'd like to keep in your repository, after deleting and recreating your repository, reconfigure your {% data variables.large_files.product_name_short %}-associated files. For more information, see "[Removing a single file](#removing-a-single-file)" and "[Configuring {% data variables.large_files.product_name_long %}](/github/managing-large-files/configuring-git-large-file-storage)." +**注：**如果删除了单个文件并有想要留在仓库中的其他 {% data variables.large_files.product_name_short %} 对象，则删除并重新创建仓库后，重新配置您的 {% data variables.large_files.product_name_short %} 关联文件。 更多信息请参阅“[删除单个文件](#removing-a-single-file)”和“[配置 {% data variables.large_files.product_name_long %}](/github/managing-large-files/configuring-git-large-file-storage)”。 {% endnote %} -### Further reading +### 延伸阅读 -- "[About {% data variables.large_files.product_name_long %}](/articles/about-git-large-file-storage)" -- "[Collaboration with {% data variables.large_files.product_name_long %}](/articles/collaboration-with-git-large-file-storage/)" -- "[Installing {% data variables.large_files.product_name_long %}](/articles/installing-git-large-file-storage)" +- "[关于 {% data variables.large_files.product_name_long %}](/articles/about-git-large-file-storage)" +- “[使用 {% data variables.large_files.product_name_long %} 进行协作](/articles/collaboration-with-git-large-file-storage/)” +- "[安装 {% data variables.large_files.product_name_long %}](/articles/installing-git-large-file-storage)" diff --git a/translations/zh-CN/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/translations/zh-CN/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index 0ce617f2fd..b6e48cbaec 100644 --- a/translations/zh-CN/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/translations/zh-CN/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -49,10 +49,10 @@ You can also enable or disable {% data variables.product.prodname_dependabot %} {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert also contains a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."{% endif %} +When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert will also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a security alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% endif %} @@ -70,42 +70,15 @@ You can see all of the alerts that affect a particular project{% if currentVersi We send {% data variables.product.prodname_dependabot_short %} alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository.{% if currentVersion == "free-pro-team@latest" %} You can also enable {% data variables.product.prodname_dependabot_short %} alerts for additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."{% endif %} {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} We send security alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. {% endif %} -### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} - -{% if currentVersion == "free-pro-team@latest" %} -By default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive {% data variables.product.prodname_dependabot_alerts %} by email. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#security-alert-notification-options)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} -By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Choosing the delivery method for your notifications -](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)." -{% endif %} - -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.20" % %} - -{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} - -{% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} For more information, see "[Choosing the delivery method for your notifications](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)."{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."{% endif %} {% if currentVersion == "free-pro-team@latest" %} ### Further reading -- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" +- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" - "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Understanding how {% data variables.product.product_name %} uses and protects your data](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %} diff --git a/translations/zh-CN/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md b/translations/zh-CN/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md new file mode 100644 index 0000000000..8fdd78e33b --- /dev/null +++ b/translations/zh-CN/content/github/managing-security-vulnerabilities/about-github-dependabot-security-updates.md @@ -0,0 +1,33 @@ +--- +title: About GitHub Dependabot security updates +intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.' +shortTitle: About Dependabot security updates +versions: + free-pro-team: '*' +--- + +### 关于 {% data variables.product.prodname_dependabot_security_updates %} + +{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot_short %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot_short %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)." + +{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot_short %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." + +{% note %} + +**注** + +The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. You will see a {% data variables.product.prodname_dependabot_short %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot_short %} is unable to update an indirect or transitive dependency that is not explicitly defined. 更多信息请参阅“[关于依赖关系图](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)”。 + +{% endnote %} + +### About pull requests for security updates + +Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. 这包括漏洞的相关信息，如发行说明、变更日志条目和提交详细信息。 无法访问仓库的 {% data variables.product.prodname_dependabot_short %} 警报的任何人都看不到拉取请求所解决的漏洞详细信息。 + +When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot_short %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot_short %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)." + +{% data reusables.dependabot.automated-tests-note %} + +### 关于兼容性分数 + +{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency. diff --git a/translations/zh-CN/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md b/translations/zh-CN/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md index 23912381cc..cddb25cdc1 100644 --- a/translations/zh-CN/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md +++ b/translations/zh-CN/content/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database.md @@ -1,6 +1,7 @@ --- title: 浏览 GitHub Advisory Database 中的安全漏洞 intro: '{% data variables.product.prodname_advisory_database %} 允许您浏览或搜索影响 {% data variables.product.company_short %} 上开源项目的漏洞。' +shortTitle: Browsing the Advisory Database versions: free-pro-team: '*' --- diff --git a/translations/zh-CN/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md b/translations/zh-CN/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md index 17d581a532..7cba006d64 100644 --- a/translations/zh-CN/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md +++ b/translations/zh-CN/content/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates.md @@ -5,30 +5,16 @@ redirect_from: - /articles/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-fixes - /github/managing-security-vulnerabilities/configuring-automated-security-updates +shortTitle: Configuring Dependabot security updates versions: free-pro-team: '*' --- -### 关于 {% data variables.product.prodname_dependabot_security_updates %} +### About configuring {% data variables.product.prodname_dependabot_security_updates %} -{% data variables.product.prodname_dependabot_short %} 监控安全通告，如 {% data variables.product.prodname_advisory_database %} 和 [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database)，并在仓库的依赖关系图中检测到新的有漏洞依赖项时自动触发拉取请求。 有关 {% data variables.product.prodname_advisory_database %} 的更多信息，请参阅“[关于 {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database#about-the-github-advisory-database)”。 +您可以为任何使用 {% data variables.product.prodname_dependabot_short %} 警报和依赖关系图的仓库启用 {% data variables.product.prodname_dependabot_security_updates %}。 更多信息请参阅“[关于 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)”。 -{% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} - -{% data variables.product.prodname_dependabot_short %} 在有漏洞依赖项的警报中包含拉取请求的链接。 更多信息请参阅“[关于易受攻击的依赖项的警报](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)”和“[关于依赖关系图](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)”。 - -每个安全更新都包含快速、安全地查看提议的修复程序并将其合并到项目中所需的全部内容。 这包括漏洞的相关信息，如发行说明、变更日志条目和提交详细信息。 无法访问仓库的 {% data variables.product.prodname_dependabot_short %} 警报的任何人都看不到拉取请求所解决的漏洞详细信息。 - -当您合并包含安全更新的拉取请求时，仓库的相应警报将被标记为已解决。 - -{% note %} - -**注** -{% data variables.product.prodname_dependabot_security_updates %} only resolve security vulnerabilities in the dependencies tracked by your dependency graph. 安全更新创建的目标不是解决托管在私有仓库中的私有注册表或包中的漏洞。 但是，如果间接或过渡的依赖项已在锁定文件或类似文件中明确定义，则会包含在内。 更多信息请参阅“[关于依赖关系图](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)”。 此外，对于被检测出漏洞的依赖项，必须强调 {% data variables.product.prodname_dependabot_security_updates %} 自动使用建议用于锁定文件的修复程序创建拉取请求。 - -{% endnote %} - -您可以为任何使用 {% data variables.product.prodname_dependabot_short %} 警报和依赖关系图的仓库启用 {% data variables.product.prodname_dependabot_security_updates %}。 您可以对个别仓库或所有由您的用户帐户或组织拥有的仓库禁用 {% data variables.product.prodname_dependabot_security_updates %}。 更多信息请参阅下面的“[管理仓库的 {% data variables.product.prodname_dependabot_security_updates %}](#managing-github-dependabot-security-updates-for-your-repositories)”。 +您可以对个别仓库或所有由您的用户帐户或组织拥有的仓库禁用 {% data variables.product.prodname_dependabot_security_updates %}。 更多信息请参阅下面的“[管理仓库的 {% data variables.product.prodname_dependabot_security_updates %}](#managing-github-dependabot-security-updates-for-your-repositories)”。 {% data reusables.dependabot.dependabot-tos %} @@ -53,10 +39,6 @@ versions: 如果未为存储库启用安全更新，并且您不知道原因么，请先尝试使用以下程序部分的说明启用它们。 如果安全更新还是不工作，您可以[联系支持](https://support.github.com/contact)。 -### 关于兼容性分数 - -{% data variables.product.prodname_dependabot_security_updates %} 还包括兼容性分数，以便您了解更新漏洞是否可能导致对项目的重大更改。 我们从已生成特定安全更新的公共仓库中查看此前通过的 CI 测试，以了解更新是否会导致测试失败。 更新的兼容性分数是在依赖项的相关版本之间进行更新时，CI 运行被视为通过的百分比。 - ### 管理仓库的 {% data variables.product.prodname_dependabot_security_updates %} 您可以对单个仓库启用或禁用 {% data variables.product.prodname_dependabot_security_updates %}。 diff --git a/translations/zh-CN/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/translations/zh-CN/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md new file mode 100644 index 0000000000..4581566a00 --- /dev/null +++ b/translations/zh-CN/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md @@ -0,0 +1,58 @@ +--- +title: Configuring notifications for vulnerable dependencies +shortTitle: 配置通知 +intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts.' +versions: + free-pro-team: '*' + enterprise-server: '>=2.21' +--- + +### About notifications for vulnerable dependencies + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we send you {% data variables.product.prodname_dependabot_short %} alerts.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. +{% endif %} + +{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)." +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %} +Your site administrator needs to enable security alerts for vulnerable dependencies for +{% data variables.product.product_location_enterprise %} before you can use the feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.20" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive +{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} by email.{% endif %} + +{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} + +### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} + +You can configure notification settings for yourself or your organization from the Manage notifications drop-down {% octicon "bell" aria-label="The notifications bell" %} shown at the top of each page. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#choosing-your-notification-settings)." + +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} + ![{% data variables.product.prodname_dependabot_short %} 警报选项](/assets/images/help/notifications-v2/dependabot-alerts-options.png) +{% else %} + ![安全警报选项](/assets/images/help/notifications-v2/security-alerts-options.png) +{% endif %} + +{% note %} + +**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)." + +{% endnote %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" % %}{% data reusables.repositories.security-alerts-x-github-severity %} For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#filtering-email-notifications){% else %}"[About email notifications](/github/receiving-notifications-about-activity-on-github/about-email-notifications){% endif %}."{% endif %} + +### How to reduce the noise from notifications for vulnerable dependencies + +If you are concerned about receiving too many notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, we recommend you opt into the weekly email digest, or turn off notifications while keeping {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} enabled. You can still navigate to see your {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} in your repository's Security tab.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %} + +### 延伸阅读 + +- "[配置通知](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications)" +- "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-is-queries)" diff --git a/translations/zh-CN/content/github/managing-security-vulnerabilities/index.md b/translations/zh-CN/content/github/managing-security-vulnerabilities/index.md index a91e113ee8..7c9a135270 100644 --- a/translations/zh-CN/content/github/managing-security-vulnerabilities/index.md +++ b/translations/zh-CN/content/github/managing-security-vulnerabilities/index.md @@ -28,8 +28,11 @@ versions: {% link_in_list /browsing-security-vulnerabilities-in-the-github-advisory-database %} {% link_in_list /about-alerts-for-vulnerable-dependencies %} + {% link_in_list /configuring-notifications-for-vulnerable-dependencies %} + {% link_in_list /about-github-dependabot-security-updates %} {% link_in_list /configuring-github-dependabot-security-updates %} {% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %} {% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %} + {% link_in_list /troubleshooting-github-dependabot-errors %} diff --git a/translations/zh-CN/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md b/translations/zh-CN/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md new file mode 100644 index 0000000000..c5c71d9337 --- /dev/null +++ b/translations/zh-CN/content/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors.md @@ -0,0 +1,82 @@ +--- +title: Troubleshooting GitHub Dependabot errors +intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot_short %}.' +shortTitle: 排查错误 +versions: + free-pro-team: '*' +--- + +{% data reusables.dependabot.beta-note %} + +### About {% data variables.product.prodname_dependabot %} errors + +{% data reusables.dependabot.pull-request-introduction %} + +If anything prevents {% data variables.product.prodname_dependabot_short %} from raising a pull request, this is reported as an error. + +### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot_short %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_short %} alerts view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_short %} alerts** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request. + +![{% data variables.product.prodname_dependabot_short %} alerts view showing a pull request link](/assets/images/help/dependabot/dependabot-alert-pr-link.png) + +There are three reasons why an alert may have no pull request link: + +1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository. +1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file. +1. An error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request. + +If an error blocked {% data variables.product.prodname_dependabot_short %} from creating a pull request, you can display details of the error by clicking the alert. + +![{% data variables.product.prodname_dependabot_short %} alert showing the error that blocked the creation of a pull request](/assets/images/help/dependabot/dependabot-security-update-error.png) + +### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %} + +When {% data variables.product.prodname_dependabot_short %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot_short %} are listed on the {% data variables.product.prodname_dependabot_short %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot_short %}** tab. + +![{% data variables.product.prodname_dependabot_short %} view showing an error](/assets/images/help/dependabot/dependabot-tab-view-error-beta.png) + +To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed. + +![{% data variables.product.prodname_dependabot_short %} version update error and log ](/assets/images/help/dependabot/dependabot-version-update-error-beta.png) + +### Understanding {% data variables.product.prodname_dependabot_short %} errors + +Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot_short %} configuration files. Consequently, some errors are specific to one type of update. + +#### {% data variables.product.prodname_dependabot_short %} cannot update DEPENDENCY to a non-vulnerable version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository. + +Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem. + +The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. 更多信息请参阅“[启用和禁用版本更新](/github/administering-a-repository/enabling-and-disabling-version-updates)”。 + +#### {% data variables.product.prodname_dependabot_short %} cannot update to the required version as there is already an open pull request for the latest version + +**Security updates only.** {% data variables.product.prodname_dependabot_short %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version. + +There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +#### {% data variables.product.prodname_dependabot_short %} timed out during its update + +{% data variables.product.prodname_dependabot_short %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out. + +This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot_short %} to review the version update and generate the pull request in the time available. + +If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. 更多信息请参阅“[启用和禁用版本更新](/github/administering-a-repository/enabling-and-disabling-version-updates)”。 + +#### {% data variables.product.prodname_dependabot_short %} cannot open any more pull requests + +There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot_short %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests. + +There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. 更多信息请参阅“[依赖项更新的配置选项](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit)。” + +The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually](#triggering-a-dependabot-pull-request-manually)." + +### Triggering a {% data variables.product.prodname_dependabot_short %} pull request manually + +If you unblock {% data variables.product.prodname_dependabot_short %}, you can manually trigger a fresh attempt to create a pull request. + +- **Security updates**—display the {% data variables.product.prodname_dependabot_short %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot_short %} security update**. +- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**. diff --git a/translations/zh-CN/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/translations/zh-CN/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md index e9425cb934..4b943a9b44 100644 --- a/translations/zh-CN/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md +++ b/translations/zh-CN/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md @@ -1,6 +1,7 @@ --- title: 漏洞依赖项检测疑难解答 intro: '如果 {% data variables.product.product_name %} 报告的依赖项信息不符合您的预期，则需要考虑许多因素，您可以检查各种问题。' +shortTitle: Troubleshooting detection versions: free-pro-team: '*' --- @@ -14,9 +15,9 @@ versions: * {% data variables.product.prodname_advisory_database %} 是 {% data variables.product.prodname_dotcom %} 用来识别漏洞依赖项的数据源之一。 它是一款免费的、具有整理功能的数据库，用于检测 {% data variables.product.prodname_dotcom %} 上常见软件包生态系统的漏洞信息。 它包括从 {% data variables.product.prodname_security_advisories %} 直接报告给 {% data variables.product.prodname_dotcom %} 的数据，以及官方馈送和社区来源。 这些数据由 {% data variables.product.prodname_dotcom %} 审查和整理，以确保不会与开发社区分享虚假或不可行的信息。 更多信息请参阅“[浏览 {% data variables.product.prodname_advisory_database %} 中的安全漏洞](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)”和“[关于 {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)”。 * 依赖项图解析用户仓库中所有已知的包清单文件。 例如，对于 npm，它将解析 _package-lock.json_ 文件。 它构造所有仓库依赖项和公共依赖项的图表。 当启用依赖关系图时，当任何人推送到默认分支时，都会发生这种情况，其中包括对支持的清单格式进行更改的提交。 更多信息请参阅“[关于依赖关系图](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)”。 * {% data variables.product.prodname_dependabot_short %} 扫描对包含清单文件的默认分支的任何推送。 添加新的漏洞记录时，它会扫描所有现有仓库，并为每个存在漏洞的仓库生成警报。 {% data variables.product.prodname_dependabot_short %} 警报在仓库级别汇总，而不是针对每个漏洞创建一个警报。 更多信息请参阅“[关于易受攻击的依赖项的警报](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)”。 -* {% data variables.product.prodname_dependabot_security_updates %} 在您收到关于仓库中漏洞依赖项的安全警报时触发。 {% data variables.product.prodname_dotcom %} 会自动在您的仓库中创建拉取请求，以将漏洞依赖项升级到避免漏洞所需的最低安全版本。 更多信息请参阅“[配置 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)。” +* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)." - {% data variables.product.prodname_dependabot_short %} 不会按计划扫描仓库，而是在发生某些变更时扫描仓库。 例如，当新的依赖项被添加到 {% data variables.product.prodname_dotcom %} 时（对于每次推送都会进行此项检查），或者当新的漏洞被发现并添加到通告数据库时，就会触发扫描。 + {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. 例如，当新的依赖项被添加到 {% data variables.product.prodname_dotcom %} 时（对于每次推送都会进行此项检查），或者当新的漏洞被发现并添加到通告数据库时，就会触发扫描。 ### 为什么我没有收到某些生态系统的漏洞警报？ @@ -97,3 +98,4 @@ versions: - “[关于有易受攻击依赖项的警报](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)” - "[查看和更新仓库中的漏洞依赖项](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[管理仓库的安全和分析设置](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/zh-CN/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/zh-CN/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index 7dcdb610cc..bc9bd62f54 100644 --- a/translations/zh-CN/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/translations/zh-CN/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -4,17 +4,18 @@ intro: '如果 {% data variables.product.product_name %} 发现项目中存在 redirect_from: - /articles/viewing-and-updating-vulnerable-dependencies-in-your-repository permissions: 仓库管理员和组织所有者可以查看和更新依赖项。 +shortTitle: 查看和更新有漏洞的依赖项 versions: free-pro-team: '*' --- 仓库的 {% data variables.product.prodname_dependabot %} 警报选项卡列出所有打开和关闭的 {% data variables.product.prodname_dependabot_alerts %} 以及对应的 {% data variables.product.prodname_dependabot_security_updates %}。 您可以使用下拉菜单对警报列表进行排序，并且可以单击特定警报以获取更多详细信息。 更多信息请参阅“[关于易受攻击的依赖项的警报](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)”。 -您可以为使用 {% data variables.product.prodname_dependabot_alerts %} 和依赖关系图的任何仓库启用自动安全更新。 更多信息请参阅“[配置 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)。” +您可以为使用 {% data variables.product.prodname_dependabot_alerts %} 和依赖关系图的任何仓库启用自动安全更新。 更多信息请参阅“[关于 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)”。 ### 关于仓库中有漏洞的依赖项的更新 -当我们检测到影响到您的仓库的漏洞时，{% data variables.product.product_name %} 会发出 {% data variables.product.prodname_dependabot_alerts %}。 对于启用了 {% data variables.product.prodname_dependabot_security_updates %} 的仓库，当 {% data variables.product.product_name %} 检测到有漏洞的依赖项时，{% data variables.product.prodname_dependabot_short %} 会创建拉取请求来修复它。 {% data reusables.dependabot.upgrade-dependency-to-minimum-secure-version %} +当我们检测到影响到您的仓库的漏洞时，{% data variables.product.product_name %} 会发出 {% data variables.product.prodname_dependabot_alerts %}。 对于启用了 {% data variables.product.prodname_dependabot_security_updates %} 的仓库，当 {% data variables.product.product_name %} 检测到有漏洞的依赖项时，{% data variables.product.prodname_dependabot_short %} 会创建拉取请求来修复它。 拉取请求会将依赖项升级到避免漏洞所需的最低安全版本。 ### 查看和更新有漏洞的依赖项 @@ -33,3 +34,4 @@ versions: - "[配置 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" - "[管理仓库的安全和分析设置](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" - "[漏洞依赖项检测疑难解答](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)" +- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)" diff --git a/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md index 6045f27f3e..762429bbc5 100644 --- a/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md +++ b/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md @@ -163,25 +163,10 @@ If you are a member of more than one organization, you can configure each one to ### Security alert notification options {% endif %} -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}Choose how you want to receive {% data variables.product.prodname_dependabot_alerts %} for repositories that you are watching. 您可以在收件箱中接收 {% if page.version == 'dotcom' %} {% data variables.product.prodname_dependabot_alerts %} {% else %} 安全警报 {% endif %}、作为 {% data variables.product.product_name %} 的横幅、在命令行上接收、通过电子邮件接收，或使用这些选项的一些组合。 +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %} +{% data reusables.notifications.vulnerable-dependency-notification-options %} -如果您想通过电子邮件接收 {% data variables.product.prodname_dependabot_alerts %} ，请选择您是想每周接收最多 10 个仓库的漏洞电子邮件摘要，还是在每次检测到漏洞时接收一封新的电子邮件。 更多信息请参阅“[关于易受攻击的依赖项的警报](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)”。 {% endif %} - -{% if currentVersion == "enterprise-server@2.21" %}Choose how you want to receive security alerts for repositories that you are watching. 您可以在收件箱中接收安全警报、作为 {% data variables.product.product_name %} 的横幅、在命令行上接收、通过电子邮件接收，或使用这些选项的一些组合。 - -如果您想通过电子邮件接收安全警报 ，请选择您是想每周接收最多 10 个仓库的漏洞电子邮件摘要，还是在每次检测到漏洞时接收一封新的电子邮件。 更多信息请参阅“[关于易受攻击的依赖项的警报](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)”。 {% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} - ![{% data variables.product.prodname_dependabot_short %} 警报选项](/assets/images/help/notifications-v2/dependabot-alerts-options.png) -{% else %} - ![安全警报选项](/assets/images/help/notifications-v2/security-alerts-options.png) -{% endif %} - -{% note %} - -**Note:** You can filter your {% data variables.product.company_short %} inbox notifications by {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. 更多信息请参阅“[从收件箱管理通知](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)”。 - -{% endnote %} +For more information about the notification delivery methods available to you, and advice on optimizing your notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} diff --git a/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md index 51e8628e69..4ccacde083 100644 --- a/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md +++ b/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md @@ -124,6 +124,8 @@ versions: - `is:repository-advisory` - `is:team-discussion` +For information about reducing noise from notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." + 您还可以使用 `is:` 查询来描述如何对通知进行分类。 - `is:saved` diff --git a/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md b/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md index 334747df4d..15dafbc66c 100644 --- a/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md +++ b/translations/zh-CN/content/github/managing-subscriptions-and-notifications-on-github/managing-your-subscriptions.md @@ -38,7 +38,7 @@ versions: {% data reusables.notifications.access_notifications %} 1. 从通知收件箱中选择您想要取消订阅的通知。 -2. 使用 **selected（已选择）** {% octicon "triangle-down" aria-label="The down triangle icon" %} 下拉列表单击 **Unsubscribe（取消订阅）**。 ![主收件箱中的取消订阅选项](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) +2. Use the **selected** {% octicon "triangle-down" aria-label="The down triangle icon" %} drop-down to click **Unsubscribe.** ![主收件箱中的取消订阅选项](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png) ### 从订阅页面取消订阅通知 diff --git a/translations/zh-CN/content/github/managing-your-work-on-github/about-automation-for-project-boards.md b/translations/zh-CN/content/github/managing-your-work-on-github/about-automation-for-project-boards.md index e3248abc78..9d2c7f34e4 100644 --- a/translations/zh-CN/content/github/managing-your-work-on-github/about-automation-for-project-boards.md +++ b/translations/zh-CN/content/github/managing-your-work-on-github/about-automation-for-project-boards.md @@ -29,7 +29,10 @@ versions: | 已完成 |
    • 将所有关闭的议题移到此处
    • 将所有合并的拉取请求移到此处
    • 将所有已关闭、已取消合并的拉取请求移到此处
    | ### 项目进度跟踪 -项目板自动化默认启用进度跟踪。 "To do"（待处理）、"In progress"（进行中）或 "Done"（完成）列中的卡会预置总体目标进度值。 {% data reusables.project-management.project-progress-locations %} + +You can track the progress on your project board. Cards in the "To do", "In progress", or "Done" columns count toward the overall project progress. {% data reusables.project-management.project-progress-locations %} + +For more information, see "[Tracking progress on your project board](/github/managing-your-work-on-github/tracking-progress-on-your-project-board)." ### 延伸阅读 - "[Configuring automation for project boards](/articles/configuring-automation-for-project-boards)"{% if currentVersion == "free-pro-team@latest" %} diff --git a/translations/zh-CN/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md b/translations/zh-CN/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md index 53a67879b0..50134a5596 100644 --- a/translations/zh-CN/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md +++ b/translations/zh-CN/content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md @@ -1,6 +1,6 @@ --- -title: File attachments on issues and pull requests -intro: 'When you open issue or update a pull request, you can use issue attachments to upload images of proposed features or screenshots of bugs.' +title: 议题和拉取请求中的文件附件 +intro: '在打开议题或更新拉取请求时，您可以使用议题附件上传提议功能的图像或漏洞的屏幕截图。' redirect_from: - /articles/issue-attachments/ - /articles/file-attachments-on-issues-and-pull-requests @@ -8,33 +8,34 @@ versions: free-pro-team: '*' enterprise-server: '*' --- + {% warning %} -**Warning:** If you add an image to a pull request or issue comment, anyone can view the anonymized image URL without authentication, even if the pull request is in a private repository{% if currentVersion != "free-pro-team@latest" %}, or if private mode is enabled{% endif %}. To keep sensitive images private, serve them from a private network or server that requires authentication. {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} +**警告：**如果您在拉取请求或议题评论中添加了图像，则任何人都可以查看匿名图像 URL，无需身份验证，即使该拉取请求位于私有仓库中{% if enterpriseServerVersions contains currentVersion %}或者启用了私有模式{% endif %}。 要对敏感图像保密，请从需要身份验证的私有网络或服务器提供它们。 {% if currentVersion == "free-pro-team@latest" %}For more information on anonymized URLs see "[About anonymized image URLs](/articles/about-anonymized-image-urls)".{% endif %} {% endwarning %} -To attach a file to an issue or pull request conversation, drag and drop it into the comment box. Alternatively, you can click the bar at the bottom of the comment box to browse, select, and add a file from your computer. +要将文件附加到议题或拉取请求对话，请将它拖放到评论框中。 或者，您也可以单击评论框底部的栏来浏览、选择和添加计算机中的文件。 -![Select attachments from computer](/assets/images/help/pull_requests/select-bar.png) +![从计算机选择附件](/assets/images/help/pull_requests/select-bar.png) {% tip %} -**Tip:** If you're using Chrome, you can also copy-and-paste images directly into the box. +**Tip:** In many browsers, you can copy-and-paste images directly into the box. {% endtip %} -The maximum size for files is 25MB and the maximum size for images is 10MB. +文件大小不得超过 25MB，图像大小不得超过 10MB。 -We support these files: +我们支持这些文件： * PNG (*.png*) * GIF (*.gif*) * JPEG (*.jpg*) -* Log files (*.log*) -* Microsoft Word (*.docx*), Powerpoint (*.pptx*), and Excel (*.xlsx*) documents -* Text files (*.txt*) -* PDFs (*.pdf*) -* ZIP (*.zip*, *.gz*) +* 日志文件 (*.log*) +* Microsoft Word (*.docx*)、Powerpoint (*.pptx*) 和 Excel (*.xlsx*) 文档 +* 文本文件 (*.txt*) +* PDF (*.pdf*) +* ZIP (*.zip*、*.gz*) -![Attachments animated GIF](/assets/images/help/pull_requests/dragging_images.gif) +![附件动画 GIF](/assets/images/help/pull_requests/dragging_images.gif) diff --git a/translations/zh-CN/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md b/translations/zh-CN/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md index 6065e1d738..dc3112aea5 100644 --- a/translations/zh-CN/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md +++ b/translations/zh-CN/content/github/managing-your-work-on-github/linking-a-repository-to-a-project-board.md @@ -8,6 +8,12 @@ versions: enterprise-server: '*' --- +{% note %} + +**Note:** In order to link a repository to your organization or user owned project board the repository needs to have issues enabled. For information on how to see if issues are disabled for a repository, see "[Disabling issues](/github/managing-your-work-on-github/disabling-issues) ." + +{% endnote %} + 对项目板具有写入权限的任何人都可以将该组织或用户帐户拥有的仓库链接到项目板。 更多信息请参阅“[组织的项目板权限](/articles/project-board-permissions-for-an-organization/)”或“[用户拥有的项目板的权限级别](/articles/permission-levels-for-user-owned-project-boards/)”。 {% data reusables.project-management.link-repos-to-project-board %} 您可以在卡中输入议题或拉取请求 URL，从任何未链接的仓库添加议题和拉取请求。 更多信息请参阅“[添加议题和拉取请求到项目板](/articles/adding-issues-and-pull-requests-to-a-project-board)”。 diff --git a/translations/zh-CN/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md b/translations/zh-CN/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md index 5231fe8927..da3dd2ccdd 100644 --- a/translations/zh-CN/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md +++ b/translations/zh-CN/content/github/managing-your-work-on-github/tracking-progress-on-your-project-board.md @@ -1,6 +1,6 @@ --- title: 跟踪项目板上的进度 -intro: '默认情况下，当您在项目板上启用自动化后，将在进度栏中跟踪项目的总体进度。' +intro: 'You can see the overall progress of your project in a progress bar.' redirect_from: - /articles/tracking-progress-on-your-project-board versions: @@ -10,7 +10,7 @@ versions: {% data reusables.project-management.project-progress-locations %} -1. 导航到您想在其中禁用项目进度跟踪的项目板。 +1. Navigate to the project board where you want to enable or disable project progress tracking. {% data reusables.project-management.click-menu %} -{% data reusables.project-management.access-collaboration-settings %} -4. 取消选择 **Track project progress（跟踪项目进度）**。 +{% data reusables.project-management.click-edit-sidebar-menu-project-board %} +4. Select or deselect **Track project progress**. diff --git a/translations/zh-CN/content/github/searching-for-information-on-github/finding-files-on-github.md b/translations/zh-CN/content/github/searching-for-information-on-github/finding-files-on-github.md index 217c715233..dc0dae1989 100644 --- a/translations/zh-CN/content/github/searching-for-information-on-github/finding-files-on-github.md +++ b/translations/zh-CN/content/github/searching-for-information-on-github/finding-files-on-github.md @@ -18,7 +18,7 @@ versions: {% endtip %} {% data reusables.repositories.navigate-to-repo %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 2. 在仓库名称下，单击 **Find file（查找文件）**。 ![查找文件按钮](/assets/images/help/search/find-file-button.png) {% else %} 2. 在文件列表上方，单击 **Go to file（转到文件）**。 ![查找文件按钮](/assets/images/help/search/find-file-button.png) diff --git a/translations/zh-CN/content/github/searching-for-information-on-github/searching-for-packages.md b/translations/zh-CN/content/github/searching-for-information-on-github/searching-for-packages.md index 40c60730ab..f4ea5a774e 100644 --- a/translations/zh-CN/content/github/searching-for-information-on-github/searching-for-packages.md +++ b/translations/zh-CN/content/github/searching-for-information-on-github/searching-for-packages.md @@ -14,7 +14,7 @@ versions: 您可以在所有 {% data variables.product.product_name %} 中全局搜索包，也可以在特定组织内搜索包。 更多信息请参阅“[关于在 {% data variables.product.prodname_dotcom %} 上搜索](/articles/about-searching-on-github)”。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} You can only search for packages on {% data variables.product.product_location_enterprise %}, not {% data variables.product.prodname_dotcom_the_website %}, even if {% data variables.product.prodname_github_connect %} is enabled. {% endif %} diff --git a/translations/zh-CN/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md b/translations/zh-CN/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md index 525dd2af8f..7287da2490 100644 --- a/translations/zh-CN/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md +++ b/translations/zh-CN/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md @@ -13,7 +13,7 @@ versions: {% tip %} -**Tips:**{% if currentVersion != "free-pro-team@latest" %} +**Tips:**{% if enterpriseServerVersions contains currentVersion %} - 本文章包含在 {% data variables.product.prodname_dotcom %}.com 网站上的示例搜索，但您可以在 {% data variables.product.product_location_enterprise %} 上使用相同的搜索过滤器。{% endif %} - 有关可以添加到任何搜索限定符以进一步改善结果的搜索语法列表，请参阅“[了解搜索语法](/articles/understanding-the-search-syntax)”。 - 对多个字词的搜索词使用引号。 例如，如果要搜索具有标签 "In progress" 的议题，可搜索 `label:"in progress"`。 搜索不区分大小写。 diff --git a/translations/zh-CN/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md b/translations/zh-CN/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md index 3356c3b42d..9f205d0951 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions.md @@ -51,7 +51,7 @@ versions: 在月末，{% data variables.product.prodname_dotcom %} 会计算您使用的超过帐户自带限额的分钟数和存储空间费用。 例如，如果您的组织使用 {% data variables.product.prodname_team %} 并允许无限制支出，则使用 15,000 分钟可能会产生 56 美元的总存储空间和分钟数超额费用，具体取决于用于运行作业的操作系统。 - 5,000（3,000 Linux 加 2,000 Windows）分钟 = $56 ($24 + $32)。 - - 3,000 Linux 分钟（每分钟 $0.008）= $24。 + - 3,000 Linux minutes at $0.008 per minute = $24. - 2,000 Windows 分钟（每分钟 $0.016）= $32。 到月底，{% data variables.product.prodname_dotcom %} 会将您的数据传输舍入到最接近的 GB。 diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md index 287c2997e2..2f1a3de174 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md @@ -19,7 +19,7 @@ versions: ![团队提及图像](/assets/images/help/teams/team-mention.png) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} 您也可以使用 LDAP 同步根据建立的 LDAP 组同步 {% data variables.product.product_location_enterprise %} 团队成员和团队角色。 这可让您从 LDAP 服务器为用户建立基于角色的访问控制，而无需在 {% data variables.product.product_location_enterprise %} 中手动创建。 更多信息请参阅“[启用 LDAP 同步](/enterprise/{{ page.version }}/admin/guides/user-management/using-ldap#enabling-ldap-sync)”。 @@ -55,7 +55,7 @@ versions: 在创建团队时您可以选择父团队，或者以后在组织的层次结构中移动团队。 更多信息请参阅“[在组织的层次结构中移动团队](/articles/moving-a-team-in-your-organization-s-hierarchy)”。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% data reusables.enterprise_user_management.ldap-sync-nested-teams %} diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md index 4f758335e8..a4c23bdd71 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md @@ -28,7 +28,7 @@ versions: 在消息馈送的“All activity（所有活动）”部分，您可以查看来自组织中其他团队和仓库的更新。 -“All activity（所有活动）”部分显示组织中所有最近的活动，包括您未订阅的仓库中以及您未关注的人员的活动。 For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." +“All activity（所有活动）”部分显示组织中所有最近的活动，包括您未订阅的仓库中以及您未关注的人员的活动。 For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}" and "[Following people](/articles/following-people)." 例如，当组织中有人执行以下操作时，组织消息馈送会显示更新： - 创建新分支。 diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md index 6b112565b6..d6ed8e707c 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md @@ -1,6 +1,6 @@ --- -title: Adding organization members to a team -intro: 'People with owner or team maintainer permissions can add organization members to teams. People with owner permissions can also {% if currentVersion == "free-pro-team@latest" %}invite non-members to join{% else %}add non-members to{% endif %} a team and the organization.' +title: 添加组织成员到团队 +intro: '拥有所有者或团队维护员权限的人员可以添加成员到团队。 People with owner permissions can also {% if currentVersion == "free-pro-team@latest" %}invite non-members to join{% else %}add non-members to{% endif %} a team and the organization.' redirect_from: - /articles/adding-organization-members-to-a-team-early-access-program/ - /articles/adding-organization-members-to-a-team @@ -15,14 +15,13 @@ versions: {% data reusables.profile.access_org %} {% data reusables.organizations.specific_team %} {% data reusables.organizations.team_members_tab %} -6. Above the list of team members, click **Add a member**. -![Add member button](/assets/images/help/teams/add-member-button.png) +6. 在团队成员列表上方，单击 **Add a member（添加成员）**。 ![添加成员按钮](/assets/images/help/teams/add-member-button.png) {% data reusables.organizations.invite_to_team %} {% data reusables.organizations.review-team-repository-access %} {% if currentVersion == "free-pro-team@latest" %}{% data reusables.organizations.cancel_org_invite %}{% endif %} -### Further reading +### 延伸阅读 -- "[About teams](/articles/about-teams)" -- "[Managing team access to an organization repository](/articles/managing-team-access-to-an-organization-repository)" +- "[关于团队](/articles/about-teams)" +- "[管理团队对组织仓库的访问](/articles/managing-team-access-to-an-organization-repository)" diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md index be985f9279..15b4084008 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md @@ -1,5 +1,5 @@ --- -title: Converting an outside collaborator to an organization member +title: 将外部协作者转换为组织成员 intro: 'If you would like to give an outside collaborator on your organization''s repositories broader permissions within your organization, you can {% if currentVersion == "free-pro-team@latest" %}invite them to become a member of{% else %}make them a member of{% endif %} the organization.' redirect_from: - /articles/converting-an-outside-collaborator-to-an-organization-member @@ -10,9 +10,9 @@ versions: {% tip %} -**Tips**: +**提示**： - Only organization owners can {% if currentVersion == "free-pro-team@latest" %}invite users to join{% else %}add users to{% endif %} an organization. For more information, see "[Permission levels for an organization](/articles/permission-levels-for-an-organization)."{% if currentVersion == "free-pro-team@latest" %} -- If your organization is on a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %}{% endif %} +- 如果您的组织采用付费的每用户订阅，则必须有未使用的许可才可邀请新成员加入组织或恢复前组织成员。 更多信息请参阅“[关于每用户定价](/articles/about-per-user-pricing)”。 {% data reusables.organizations.org-invite-expiration %}{% endif %} - If your organization [requires members to use two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization), users {% if currentVersion == "free-pro-team@latest" %}you invite must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before they can accept the invitation.{% else %}must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before you can add them to the organization.{% endif %} {% endtip %} @@ -22,9 +22,10 @@ versions: {% data reusables.organizations.people %} {% data reusables.organizations.people_tab_outside_collaborators %} {% if currentVersion == "free-pro-team@latest" %} -5. To the right of the name of the outside collaborator you want to become a member, use the {% octicon "gear" aria-label="The gear icon" %} drop-down menu and click **Invite to organization**.![Invite outside collaborators to organization](/assets/images/help/organizations/invite_outside_collaborator_to_organization.png) +5. 在要成为成员的外部协作者名称的右侧，使用 +{% octicon "gear" aria-label="The gear icon" %} 下拉菜单，然后单击 **Invite to organization（邀请加入组织）**。![邀请外部协作者加入组织](/assets/images/help/organizations/invite_outside_collaborator_to_organization.png) {% else %} -5. To the right of the name of the outside collaborator you want to become a member, click **Invite to organization**.![Invite outside collaborators to organization](/assets/images/enterprise/orgs-and-teams/invite_outside_collabs_to_org.png) +5. 在您希望其成为成员的外部协作者姓名右侧，单击 **Invite to organization（邀请加入组织）**。![邀请外部协作者加入组织](/assets/images/enterprise/orgs-and-teams/invite_outside_collabs_to_org.png) {% endif %} {% data reusables.organizations.choose-to-restore-privileges %} {% data reusables.organizations.choose-user-role-send-invitation %} @@ -32,6 +33,6 @@ versions: {% data reusables.organizations.user_must_accept_invite_email %} {% data reusables.organizations.cancel_org_invite %} {% endif %} -### Further reading +### 延伸阅读 -- "[Converting an organization member to an outside collaborator](/articles/converting-an-organization-member-to-an-outside-collaborator)" +- "[将组织成员转换为外部协作者](/articles/converting-an-organization-member-to-an-outside-collaborator)" diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md index b2800bd160..5809b47303 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md @@ -17,7 +17,7 @@ versions: 此外，您可以对组织中的所有仓库启用 {% data variables.product.prodname_actions %}，但限制工作流程可以运行的操作。 {% data reusables.github-actions.enabled-local-github-actions %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %} ### 管理组织的 {% data variables.product.prodname_actions %} 权限 diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md index f3231626ad..d13a82342d 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization.md @@ -1,28 +1,26 @@ --- -title: Disabling publication of GitHub Pages sites for your organization -intro: 'You can prevent members of your organization from publishing {% data variables.product.prodname_pages %} sites from repositories in the organization.' -permissions: 'Organization owners can disable publication of {% data variables.product.prodname_pages %} sites from repositories in the organization.' +title: 为组织禁止发布 GitHub Pages 站点 +intro: '您可以禁止组织成员从组织的仓库中发布 {% data variables.product.prodname_pages %} 站点。' +permissions: '组织所有者可禁止从组织中的仓库发布 {% data variables.product.prodname_pages %} 站点。' product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' enterprise-server: '>2.22' --- -### About restrictions on publication of {% data variables.product.prodname_pages %} sites +### 关于限制发布 {% data variables.product.prodname_pages %} 站点 -You can control whether members of your organization can publish websites from repositories in your organization using {% data variables.product.prodname_pages %}. For more information about {% data variables.product.prodname_pages %}, see "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages)." +您可以控制组织成员是否可以使用 {% data variables.product.prodname_pages %} 从组织中的仓库发布网站。 有关 {% data variables.product.prodname_pages %} 的更多信息，请参阅“[关于 {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages)”。 -{% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." +{% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. 更多信息请参阅{% if enterpriseServerVersions contains currentVersion %} “[在设备上配置 {% data variables.product.prodname_pages %}](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)”和{% endif %}“[关于仓库可见性](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)”。 -### Disabling publication of {% data variables.product.prodname_pages %} sites +### 禁止发布 {% data variables.product.prodname_pages %} 站点 -After you disable publication of {% data variables.product.prodname_pages %} sites, any published site will remain published. You can manually unpublish the site. For more information, see "[Unpublishing a {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/unpublishing-a-github-pages-site)." +禁止发布 {% data variables.product.prodname_pages %} 站点后，任何已发布的站点仍将保持已发布状态。 您可以手动取消发布站点。 更多信息请参阅“[取消发布 {% data variables.product.prodname_pages %} 站点](/github/working-with-github-pages/unpublishing-a-github-pages-site)”。 {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.member-privileges %} -1. Under "Pages creation", unselect **Allow members to publish sites**. - ![Unselected checkbox for "Allow members to publish sites" option](/assets/images/help/organizations/org-settings-pages-disable-publication-checkbox.png) -1. Click **Save**. - !["Save" button for "Allow members to publish sites" option](/assets/images/help/organizations/org-settings-pages-disable-publication-save-button.png) +1. 在“Pages creation（页面创建）”下，取消选中 **Allow members to publish sites（允许成员发布站点）**。 ![取消选中的"允许成员发布站点"选项复选框](/assets/images/help/organizations/org-settings-pages-disable-publication-checkbox.png) +1. 单击 **Save（保存）**。 !["允许成员发布站点"选项的"保存"按钮](/assets/images/help/organizations/org-settings-pages-disable-publication-save-button.png) diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/index.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/index.md index 5402ee7639..66efec9824 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/index.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/index.md @@ -127,7 +127,7 @@ versions: {% link_in_list /disabling-publication-of-github-pages-sites-for-your-organization %} {% link_in_list /deleting-an-organization-account %} {% link_in_list /converting-an-organization-into-a-user %} - + {% link_in_list /integrating-jira-with-your-organization-project-board %} diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md index ae4469f41a..2da7232e26 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md @@ -63,7 +63,7 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | 购买、安装、管理其帐单以及取消 {% data variables.product.prodname_marketplace %} 应用程序 | **X** | | | | 列出 {% data variables.product.prodname_marketplace %} 中的应用程序 | **X** | | | | 接收所有组织仓库[关于易受攻击的依赖项的 {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) | **X** | | | -| 管理 {% data variables.product.prodname_dependabot_security_updates %}（请参阅“[配置 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)”） | **X** | | | +| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | | | [管理复刻策略](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | | | [限制组织中公共仓库的活动](/articles/limiting-interactions-in-your-organization) | **X** | | | | 拉取（读取）、推送（写入）和克隆（复制）组织中的*所有仓库* | **X** | | | diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md index 90f63f350b..991132ba4b 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md @@ -1,6 +1,6 @@ --- -title: Reinstating a former outside collaborator's access to your organization -intro: 'If you required two-factor authentication in your organization and an outside collaborator was removed from the organization for not having 2FA enabled, you can reinstate a former outside collaborator''s access permissions for organization repositories, forks, and settings.' +title: 恢复前外部协作者对组织的访问权限 +intro: '如果您的组织中需要双因素身份验证，并且已从组织中删除了未启用 2FA 的外部协作者，则可以恢复前外部协作者对组织仓库、复刻和设置的访问权限。' redirect_from: - /articles/reinstating-a-former-outside-collaborator-s-access-to-your-organization - /articles/reinstating-a-former-outside-collaborators-access-to-your-organization @@ -9,25 +9,25 @@ versions: enterprise-server: '*' --- -If an outside collaborator's access to your organization's private repositories is removed because you've [required members and outside collaborators to enable two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization), the user's access privileges and settings are saved for three months. You can restore the user's privileges if you {% if currentVersion == "free-pro-team@latest" %}invite{% else %}add{% endif %} them back to the organization within that time frame. +如果由于您[要求成员和外部协作者启用双因素身份验证](/articles/requiring-two-factor-authentication-in-your-organization)而删除了外部协作者对您组织私有仓库的访问权限，则用户的访问权限和设置将保存三个月。 You can restore the user's privileges if you {% if currentVersion == "free-pro-team@latest" %}invite{% else %}add{% endif %} them back to the organization within that time frame. {% data reusables.two_fa.send-invite-to-reinstate-user-before-2fa-is-enabled %} -When you reinstate a former outside collaborator, you can restore: - - The user's former access to organization repositories - - Any private forks of repositories owned by the organization - - Membership in the organization's teams - - Previous access and permissions for the organization's repositories - - Stars for organization repositories - - Issue assignments in the organization - - Repository subscriptions (notification settings for watching, not watching, or ignoring a repository's activity) +恢复前外部协作者时，您可以恢复以下各项： + - 用户对组织仓库以前的访问权限 + - 组织拥有的仓库的任何私有复刻 + - 组织团队的成员身份 + - 组织仓库以前的访问权限和权限 + - 组织仓库的星标 + - 组织中的议题分配 + - 仓库订阅（关注、不关注或忽略仓库活动的通知设置） {% tip %} -**Tips**: - - Only organization owners can reinstate outside collaborators' access to an organization. For more information, see "[Permission levels for an organization](/articles/permission-levels-for-an-organization)." +**提示**： + - 只有组织所有者才能恢复外部协作者对组织的访问权限。 更多信息请参阅“[组织的权限级别](/articles/permission-levels-for-an-organization)”。 - The reinstating a member flow on {% data variables.product.product_location %} may use the term "member" to describe reinstating an outside collaborator but if you reinstate this person and keep their previous privileges, they will only have their previous [outside collaborator permissions](/articles/permission-levels-for-an-organization/#outside-collaborators).{% if currentVersion == "free-pro-team@latest" %} - - If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)."{% endif %} + - 如果您的组织采用付费的每用户订阅，则必须有未使用的许可才可邀请新成员加入组织或恢复前组织成员。 更多信息请参阅“[关于每用户定价](/articles/about-per-user-pricing)”。{% endif %} {% endtip %} @@ -37,37 +37,35 @@ When you reinstate a former outside collaborator, you can restore: {% data reusables.organizations.invite_member_from_people_tab %} {% data reusables.organizations.reinstate-user-type-username %} {% if currentVersion == "free-pro-team@latest" %} -6. Choose to restore the outside collaborator's previous privileges in the organization by clicking **Invite and reinstate** or choose to clear their previous privileges and set new access permissions by clicking **Invite and start fresh**. +6. 通过单击 **Invite and reinstate（邀请并恢复）**选择恢复外部协作者在组织中以前的权限，或通过单击 **Invite and start fresh（邀请并重新开始）**选择清除其以前的权限并设置新的访问权限。 {% warning %} - **Warning:** If you want to upgrade the outside collaborator to a member of your organization, then choose **Invite and start fresh** and choose a new role for this person. Note, however, that this person's private forks of your organization's repositories will be lost if you choose to start fresh. To make the former outside collaborator a member of your organization *and* keep their private forks, choose **Invite and reinstate** instead. Once this person accepts the invitation, you can convert them to an organization member by [inviting them to join the organization as a member](/articles/converting-an-outside-collaborator-to-an-organization-member). + **警告：**如果想要将外部协作者升级为组织成员，则选择 **Invite and start fresh（邀请并重新开始）**，然后为此人员选择新角色。 但是，请注意，如果您选择重新开始，则此人员组织仓库的私人复刻将会丢失。 要使前外部协作者成为您组织的成员*并*保留其私有复刻，请选择 **Invite and reinstate（邀请并恢复）**。 此人员接受邀请后，您可以通过[邀请他们作为成员加入组织](/articles/converting-an-outside-collaborator-to-an-organization-member)，将其转换为组织成员。 {% endwarning %} - ![Choose to restore settings or not](/assets/images/help/organizations/choose_whether_to_restore_org_member_info.png) + ![选择是否恢复设置](/assets/images/help/organizations/choose_whether_to_restore_org_member_info.png) {% else %} -6. Choose to restore the outside collaborator's previous privileges in the organization by clicking **Add and reinstate** or choose to clear their previous privileges and set new access permissions by clicking **Add and start fresh**. +6. 通过单击 **Add and reinstate（添加并恢复）**选择恢复外部协作者在组织中以前的权限，或通过单击 **Add and start fresh（添加并重新开始）**选择清除其以前的权限并设置新的访问权限。 {% warning %} - **Warning:** If you want to upgrade the outside collaborator to a member of your organization, then choose **Add and start fresh** and choose a new role for this person. Note, however, that this person's private forks of your organization's repositories will be lost if you choose to start fresh. To make the former outside collaborator a member of your organization *and* keep their private forks, choose **Add and reinstate** instead. Then, you can convert them to an organization member by [adding them to the organization as a member](/articles/converting-an-outside-collaborator-to-an-organization-member). + **警告：**如果想要将外部协作者升级为组织成员，则选择 **Add and start fresh（添加并重新开始）**，然后为此人员选择新角色。 但是，请注意，如果您选择重新开始，则此人员组织仓库的私人复刻将会丢失。 要使前外部协作者成为您组织的成员*并*保留其私有复刻，请选择 **Add and reinstate（添加并恢复）**。 然后，您可以通过[将他们作为成员添加到组织](/articles/converting-an-outside-collaborator-to-an-organization-member)，将其转换为组织成员。 {% endwarning %} - ![Choose to restore settings or not](/assets/images/help/organizations/choose_whether_to_restore_org_member_info_ghe.png) + ![选择是否恢复设置](/assets/images/help/organizations/choose_whether_to_restore_org_member_info_ghe.png) {% endif %} {% if currentVersion == "free-pro-team@latest" %} -7. If you cleared the previous privileges for a former outside collaborator, choose a role for the user and optionally add them to some teams, then click **Send invitation**. - ![Role and team options and send invitation button](/assets/images/help/organizations/add-role-send-invitation.png) +7. 如果已清除前外部协作者以前的权限，请为该用户选择一个角色，并（可选）将其添加到某些团队，然后单击 **Send invitation（发送邀请）**。 ![角色和团队选项及发送邀请按钮](/assets/images/help/organizations/add-role-send-invitation.png) {% else %} -7. If you cleared the previous privileges for a former outside collaborator, choose a role for the user and optionally add them to some teams, then click **Add member**. - ![Role and team options and add member button](/assets/images/help/organizations/add-role-add-member.png) +7. 如果已清除前外部协作者以前的权限，请为该用户选择一个角色，并（可选）将其添加到某些团队，然后单击 **Add member（添加成员）**。 ![角色和团队选项及添加成员按钮](/assets/images/help/organizations/add-role-add-member.png) {% endif %} {% if currentVersion == "free-pro-team@latest" %} -8. The invited person will receive an email inviting them to the organization. They will need to accept the invitation before becoming an outside collaborator in the organization. {% data reusables.organizations.cancel_org_invite %} +8. 被邀请的人员将收到邀请其加入组织的电子邮件。 它们需要接受邀请，然后才能成为组织中的外部协作者。 {% data reusables.organizations.cancel_org_invite %} {% endif %} -### Further Reading +### 延伸阅读 -- "[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)" +- "[组织的仓库权限级别](/articles/repository-permission-levels-for-an-organization)" diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md index b0029b8eea..66375ea090 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md @@ -47,7 +47,7 @@ To search for specific events, use the `action` qualifier in your query. Actions | `repository_content_analysis` | Contains all activities related to [enabling or disabling data use for a private repository](/articles/about-github-s-use-of-your-data). | `repository_dependency_graph` | Contains all activities related to [enabling or disabling the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository).{% endif %} | `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% if currentVersion == "free-pro-team@latest" %} -| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if currentVersion != "free-pro-team@latest" %} +| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion %} | `team` | Contains all activities related to teams in your organization.{% endif %} | `team_discussions` | Contains activities related to managing team discussions for an organization. @@ -85,7 +85,7 @@ This list describes the available categories and associated events: - [The `repository_content_analysis` category](#the-repository_content_analysis-category) - [The `repository_dependency_graph` category](#the-repository_dependency_graph-category){% endif %} - [The `repository_vulnerability_alert` category](#the-repository_vulnerability_alert-category){% if currentVersion == "free-pro-team@latest" %} -- [The `sponsors` category](#the-sponsors-category){% endif %}{% if currentVersion != "free-pro-team@latest" %} +- [The `sponsors` category](#the-sponsors-category){% endif %}{% if enterpriseServerVersions contains currentVersion %} - [The `team` category](#the-team-category){% endif %} - [The `team_discussions` category](#the-team_discussions-category) @@ -184,7 +184,8 @@ For more information, see "[Restricting publication of {% data variables.product |------------------|-------------------{% if currentVersion == "free-pro-team@latest"%} | `audit_log_export` | Triggered when an organization admin [creates an export of the organization audit log](#exporting-the-audit-log). If the export included a query, the log will list the query used and the number of audit log entries matching that query. | `block_user` | Triggered when an organization owner [blocks a user from accessing the organization's repositories](/articles/blocking-a-user-from-your-organization). -| `cancel_invitation` | Triggered when an organization invitation has been revoked. +| `cancel_invitation` | Triggered when an organization invitation has been revoked. {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a organization admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization).{% endif %} {% if currentVersion == "free-pro-team@latest"%} | `disable_oauth_app_restrictions` | Triggered when an owner [disables {% data variables.product.prodname_oauth_app %} access restrictions](/articles/disabling-oauth-app-access-restrictions-for-your-organization) for your organization. | `disable_saml` | Triggered when an organization admin disables SAML single sign-on for an organization.{% endif %} | `disable_member_team_creation_permission` | Triggered when an organization owner limits team creation to owners. For more information, see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)." | @@ -196,13 +197,22 @@ For more information, see "[Restricting publication of {% data variables.product | `invite_member` | Triggered when [a new user was invited to join your organization](/articles/adding-organization-members-to-a-team).{% if currentVersion == "free-pro-team@latest" %} | `oauth_app_access_approved` | Triggered when an owner [grants organization access to an {% data variables.product.prodname_oauth_app %}](/articles/approving-oauth-apps-for-your-organization/). | `oauth_app_access_denied` | Triggered when an owner [disables a previously approved {% data variables.product.prodname_oauth_app %}'s access](/articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization) to your organization. -| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| `oauth_app_access_requested` | Triggered when an organization member requests that an owner grant an {% data variables.product.prodname_oauth_app %} access to your organization.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when an organization owner [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization). +| `remove_actions_secret` | Triggered when a organization admin removes a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest"%} | `remove_billing_manager` | Triggered when an [owner removes a billing manager from an organization](/articles/removing-a-billing-manager-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and a billing manager doesn't use 2FA or disables 2FA. |{% endif %} | `remove_member` | Triggered when an [owner removes a member from an organization](/articles/removing-a-member-from-your-organization/) or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an organization member doesn't use 2FA or disables 2FA. Also triggered when an [organization member removes themselves](/articles/removing-yourself-from-an-organization/) from an organization.| -| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" %} +| `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA. |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_self_hosted_runner` | Triggered when an organization owner [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). {% endif %}{% if currentVersion == "free-pro-team@latest" %} | `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." -| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." -| `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/articles/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `runner_group_created` | Triggered when an organization admin [creates a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization). +| `runner_group_removed` | Triggered when an organization admin removes a self-hosted runner group. +| `runner_group_renamed` | Triggered when an organization admin renames a self-hosted runner group. +| `runner_group_runners_added` | Triggered when an organization admin [adds a self-hosted runner to a group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group). +| `runner_group_runners_removed` | Triggered when an organization admin removes a self-hosted runner from a group. {% endif %}{% if currentVersion == "free-pro-team@latest"%} +| `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/articles/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a organization admin updates a {% data variables.product.prodname_actions %} secret.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} | `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} | `update_default_repository_permission` | Triggered when an owner changes the default repository permission level for organization members. | `update_member` | Triggered when an owner changes a person's role from owner to member or member to owner. @@ -300,21 +310,26 @@ For more information, see "[Restricting publication of {% data variables.product | `access` | Triggered when a repository owned by an organization is [switched from "private" to "public"](/articles/making-a-private-repository-public) (or vice versa). | `add_member` | Triggered when a user accepts an [invitation to have collaboration access to a repository](/articles/inviting-collaborators-to-a-personal-repository). | `add_topic` | Triggered when a repository admin [adds a topic](/articles/classifying-your-repository-with-topics) to a repository. -| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if currentVersion != "free-pro-team@latest" %} +| `archived` | Triggered when a repository admin [archives a repository](/articles/about-archiving-repositories).{% if enterpriseServerVersions contains currentVersion %} | `config.disable_anonymous_git_access` | Triggered when [anonymous Git read access is disabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | `config.enable_anonymous_git_access` | Triggered when [anonymous Git read access is enabled](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository) in a public repository. | `config.lock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is locked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access). | `config.unlock_anonymous_git_access` | Triggered when a repository's [anonymous Git read access setting is unlocked](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access).{% endif %} -| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository). +| `create` | Triggered when [a new repository is created](/articles/creating-a-new-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `create_actions_secret` | Triggered when a repository admin [creates a {% data variables.product.prodname_actions %} secret](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository).{% endif %} | `destroy` | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} | `disable` | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %} -| `enable` | Triggered when a repository is reenabled. -| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository). +| `enable` | Triggered when a repository is reenabled.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `remove_actions_secret` | Triggered when a repository admin removes a {% data variables.product.prodname_actions %} secret.{% endif %} +| `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `register_self_hosted_runner` | Triggered when a repository admin [registers a new self-hosted runner](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository). +| `remove_self_hosted_runner` | Triggered when a repository admin [removes a self-hosted runner](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository). {% endif %} | `remove_topic` | Triggered when a repository admin removes a topic from a repository. | `rename` | Triggered when [a repository is renamed](/articles/renaming-a-repository). | `transfer` | Triggered when [a repository is transferred](/articles/how-to-transfer-a-repository). | `transfer_start` | Triggered when a repository transfer is about to occur. -| `unarchived` | Triggered when a repository admin unarchives a repository. +| `unarchived` | Triggered when a repository admin unarchives a repository.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `update_actions_secret` | Triggered when a repository admin updates a {% data variables.product.prodname_actions %} secret.{% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -351,7 +366,7 @@ For more information, see "[Restricting publication of {% data variables.product | repo_funding_links_file_action | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ##### The `team` category | Action | Description diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md index 83bcbe3dd4..b15cd54ace 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md @@ -1,6 +1,6 @@ --- -title: Reviewing your organization's installed integrations -intro: You can review the permission levels for your organization's installed integrations and configure each integration's access to organization repositories. +title: 审查组织安装的集成 +intro: 您可以审查组织安装的集成的权限级别，并配置每个集成对组织仓库的访问权限。 redirect_from: - /articles/reviewing-your-organization-s-installed-integrations - /articles/reviewing-your-organizations-installed-integrations @@ -12,12 +12,9 @@ versions: {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} -4. In the left sidebar, click **Installed {% data variables.product.prodname_github_app %}s**. - ![Installed {% data variables.product.prodname_github_app %}s tab in the organization settings sidebar](/assets/images/help/organizations/org-settings-installed-github-apps.png) -5. Next to the {% data variables.product.prodname_github_app %} you'd like to review, click **Configure**. - ![Configure button](/assets/images/help/organizations/configure-installed-integration-button.png) -6. Review the {% data variables.product.prodname_github_app %}'s permissions and repository access. - ![Option to give the {% data variables.product.prodname_github_app %} access to all repositories or specific repositories](/assets/images/help/organizations/toggle-integration-repo-access.png) - - To give the {% data variables.product.prodname_github_app %} access to all of your organization's repositories, select **All repositories**. - - To choose specific repositories to give the application access to, select **Only select repositories**, then type a repository name. -7. Click **Save**. +4. 在左侧边栏中，单击 **Installed {% data variables.product.prodname_github_app %}s（安装的 GitHub 应用程序）**。 ![组织设置边栏中安装的 {% data variables.product.prodname_github_app %}选项卡](/assets/images/help/organizations/org-settings-installed-github-apps.png) +5. 在您要审查的 {% data variables.product.prodname_github_app %} 旁边，单击 **Configure（配置）**。 ![配置按钮](/assets/images/help/organizations/configure-installed-integration-button.png) +6. 审查 {% data variables.product.prodname_github_app %} 的权限和仓库访问权限。 ![授予 {% data variables.product.prodname_github_app %}所有仓库或特定仓库访问权限的选项](/assets/images/help/organizations/toggle-integration-repo-access.png) + - 要授予 {% data variables.product.prodname_github_app %}所有组织仓库的访问权限，请选择 **All repositories（所有仓库）**。 + - 要选择特定仓库授予应用程序的访问权限，请选择 **Only select repositories（仅选择仓库）**，然后输入仓库名称。 +7. 单击 **Save（保存）**。 diff --git a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md index 9f038f84ec..8e2ee380e9 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md @@ -1,6 +1,6 @@ --- -title: Setting permissions for adding outside collaborators -intro: 'To protect your organization''s data and the number of paid licenses used in your organization, you can allow only owners to invite outside collaborators to organization repositories.' +title: 设置添加外部协作者的权限 +intro: '为了保护组织的数据和组织中使用的付费许可数，您可以只允许所有者邀请外部协作者加入组织仓库。' product: '{% data reusables.gated-features.restict-add-collaborator %}' redirect_from: - /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories/ @@ -10,7 +10,7 @@ versions: enterprise-server: '*' --- -Organization owners, and members with admin privileges for a repository, can invite outside collaborators to work on the repository. You can also restrict outside collaborator invite permissions to only organization owners. +组织所有者和具有仓库管理员权限的成员可以邀请外部协作者处理仓库。 您还可以将外部协作者邀请权限仅限于组织所有者。 {% data reusables.organizations.outside-collaborators-use-seats %} @@ -18,7 +18,6 @@ Organization owners, and members with admin privileges for a repository, can inv {% data reusables.profile.access_org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.member-privileges %} -5. Under "Repository invitations", select **Allow members to invite outside collaborators to repositories for this organization**.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} - ![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox-updated.png){% else %} - ![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox.png){% endif %} -6. Click **Save**. +5. Under "Repository invitations", select **Allow members to invite outside collaborators to repositories for this organization**.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} ![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox-updated.png){% else %} +![Checkbox to allow members to invite outside collaborators to organization repositories](/assets/images/help/organizations/repo-invitations-checkbox.png){% endif %} +6. 单击 **Save（保存）**。 diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md index 99a9751f8f..7c77cbe9b2 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md @@ -27,6 +27,8 @@ versions: 有关使用 GraphQL API 管理企业帐户的信息，请参阅“[企业帐户](/v4/guides/managing-enterprise-accounts)”。 +{% if currentVersion == "free-pro-team@latest" %} + ### 管理链接到企业帐户的组织 组织是共享帐户，供多个项目的人员同时协作之用。 所有者可通过复杂的安全和管理功能管理成员对组织的数据和项目的访问。 更多信息请参阅“[关于组织](/articles/about-organizations)”。 @@ -35,6 +37,8 @@ versions: 更多信息请参阅“[管理企业帐户中的组织](/articles/managing-organizations-in-your-enterprise-account)”和“[为企业帐户中的组织设置策略](/articles/setting-policies-for-organizations-in-your-enterprise-account)”。 +{% endif %} + ### 管理链接至企业帐户的 {% data variables.product.prodname_ghe_server %} 许可 {% data reusables.enterprise-accounts.admin-managing-licenses %} diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/index.md b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/index.md index 943dcc3fd8..d77a96a2b7 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/index.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/index.md @@ -6,6 +6,7 @@ redirect_from: - /categories/setting-up-and-managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md index 09ec38e3dd..eae00d112a 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/managing-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md index ae76e263fe..1a53327ae3 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md @@ -6,5 +6,6 @@ redirect_from: - /articles/managing-your-enterprise-account versions: free-pro-team: '*' + enterprise-server: '*' --- diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md index c42ee13ce3..10508deb63 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md @@ -6,6 +6,5 @@ redirect_from: - /articles/setting-policies-for-organizations-in-your-enterprise-account versions: free-pro-team: '*' - enterprise-server: '*' --- diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md index 0d30405969..1686f24dac 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md @@ -18,6 +18,9 @@ versions: {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.enterprise-licensing-tab %} -4. 在“User licenses（用户许可证）”下，查看许可证总数、已使用许可证数量和订阅到期日期。 ![企业计费设置中的许可证和订阅信息](/assets/images/help/business-accounts/billing-license-info.png) -5. 要查看当前使用的用户许可的详细信息，请单击 **View details（查看详细信息）**。 +{% data reusables.enterprise-accounts.license-tab %} +4. Under "User +{% if currentVersion == "free-pro-team@latest" %}Licenses{% else %}licenses{% endif %}", view your total licenses, number of consumed licenses, and your subscription expiration date. + {% if currentVersion == "free-pro-team@latest" %}![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png){% else %} + ![企业计费设置中的许可证和订阅信息](/assets/images/enterprise/enterprises/enterprise-server-billing-license-info.png){% endif %} +5. To view details of the user licenses currently in use, click **View {% if currentVersion == "free-pro-team@latest" %}details{% else %}users{% endif %}**. diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md b/translations/zh-CN/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md index 6821a119a5..1780ea922a 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md @@ -25,7 +25,7 @@ versions: - 提交到仓库的默认分支或 `gh-pages` 分支 - 打开议题 - 提议拉取请求 -- Submitting a pull request review{% if currentVersion != "free-pro-team@latest" %} +- 提交拉取请求审查{% if enterpriseServerVersions contains currentVersion %} - 合作创作仓库默认分支或 `gh-pages` 分支中的提交{% endif %} {% data reusables.pull_requests.pull_request_merges_and_contributions %} diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md b/translations/zh-CN/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md index 04ba72a83c..2255f08627 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md @@ -29,10 +29,10 @@ versions: - 您已复刻该仓库。 - 您已打开仓库中的拉取请求或议题。 - 您已为仓库加星标。 -{% if currentVersion != "free-pro-team@latest" %} + ### 贡献未计算的常见原因 -{% data reusables.pull_requests.pull_request_merges_and_contributions %}{% endif %} +{% data reusables.pull_requests.pull_request_merges_and_contributions %} #### 24 小时内进行的提交 diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md b/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md index 8140f49101..158ae686cb 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/changing-your-github-username.md @@ -1,6 +1,6 @@ --- -title: Changing your GitHub username -intro: 'You can change your {% data variables.product.product_name %} username at any time.' +title: 更改 GitHub 用户名 +intro: '您可以随时更改自己的 {% data variables.product.product_name %} 用户名。' redirect_from: - /articles/how-to-change-your-username/ - /articles/changing-your-github-user-name/ @@ -12,50 +12,46 @@ versions: enterprise-server: '*' --- -### About username changes +### 关于用户名更改 You can change your username to another username that is not currently in use.{% if currentVersion == "free-pro-team@latest" %} If the username you want is not available, you'll see information about whether you can request the username to be released when you type in the desired username. -If the username is not eligible for release and you don't hold a trademark for the username, you can choose another username or keep your current username. {% data variables.contact.github_support %} cannot release the unavailable username for you. For more information, see "[Changing your username](#changing-your-username)."{% endif %} +如果该用户名不符合释放条件，并且您不持有该用户名的商标，则可选择其他用户名或保留您当前的用户名。 {% data variables.contact.github_support %} 无法为您释放不可用的用户名。 更多信息请参阅“[更改用户名](#changing-your-username)”。{% endif %} -After changing your username, your old username becomes available for anyone else to claim. Most references to your repositories under the old username automatically change to the new username. However, some links to your profile won't automatically redirect. +更改用户名后，您的旧用户名即可供其他人申请使用。 对旧用户名下仓库的大多数引用会自动更改为新用户名。 不过，指向您个人资料的某些链接不会自动重定向。 -{% data variables.product.product_name %} cannot set up redirects for: -- [@mentions](/articles/basic-writing-and-formatting-syntax/#mentioning-people-and-teams) using your old username -- Links to [gists](/articles/creating-gists) that include your old username +{% data variables.product.product_name %} 无法为以下各项设置重定向： +- 使用旧用户名的[@提及](/articles/basic-writing-and-formatting-syntax/#mentioning-people-and-teams) +- 包含旧用户名的 [gists](/articles/creating-gists) 链接 -### Repository references +### 仓库引用 -After you change your username, {% data variables.product.product_name %} will automatically redirect references to your repositories. -- Web links to your existing repositories will continue to work. This can take a few minutes to complete after you make the change. -- Command line pushes from your local repository clones to the old remote tracking URLs will continue to work. +您更改用户名后，{% data variables.product.product_name %} 自动将引用重定向到您的仓库。 +- 指向现有仓库的 Web 链接仍然有效。 进行更改后，可能需要几分钟时间才能完成。 +- 从本地仓库克隆推送到旧的远程跟踪 URL 的命令行仍然有效。 -If the new owner of your old username creates a repository with the same name as your repository, that will override the redirect entry and your redirect will stop working. Because of this possibility, we recommend you update all existing remote repository URLs after changing your username. For more information, see "[Changing a remote's URL](/articles/changing-a-remote-s-url)." +如果旧用户名的新所有者创建与您的仓库同名的仓库，则会覆盖重定向条目，并且您的重定向将停止工作。 由于这种可能性，我们建议您在更改用户名后更新所有现有的远程仓库 URL。 更多信息请参阅“[更改远程的 URL](/articles/changing-a-remote-s-url)”。 -### Links to your previous profile page +### 指向以前的个人资料页面的链接 -After changing your username, links to your previous profile page, such as `https://{% data variables.command_line.backticks %}/previoususername`, will return a 404 error. We recommend updating any links to your {% data variables.product.product_name %} account from elsewhere{% if currentVersion == "free-pro-team@latest" %}, such as your LinkedIn or Twitter profile{% endif %}. +更改用户名后，指向以前的个人资料页面的链接（例如 `https://{% data variables.command_line.backticks %}/previoususername`）将返回 404 错误。 We recommend updating any links to your {% data variables.product.product_name %} account from elsewhere{% if currentVersion == "free-pro-team@latest" %}, such as your LinkedIn or Twitter profile{% endif %}. -### Your Git commits +### 您的 Git 提交 -{% if currentVersion == "free-pro-team@latest"%}Git commits that were associated with your {% data variables.product.product_name %}-provided `noreply` email address won't be attributed to your new username and won't appear in your contributions graph.{% endif %} If your Git commits are associated with another email address you've [added to your GitHub account](/articles/adding-an-email-address-to-your-github-account), {% if currentVersion == "free-pro-team@latest"%}including the ID-based {% data variables.product.product_name %}-provided `noreply` email address, {% endif %}they'll continue to be attributed to you and appear in your contributions graph after you've changed your username. For more information on setting your email address, see "[Setting your commit email address](/articles/setting-your-commit-email-address)." +{% if currentVersion == "free-pro-team@latest"%}Git commits that were associated with your {% data variables.product.product_name %}-provided `noreply` email address won't be attributed to your new username and won't appear in your contributions graph.{% endif %} If your Git commits are associated with another email address you've [added to your GitHub account](/articles/adding-an-email-address-to-your-github-account), {% if currentVersion == "free-pro-team@latest"%}including the ID-based {% data variables.product.product_name %}-provided `noreply` email address, {% endif %}they'll continue to be attributed to you and appear in your contributions graph after you've changed your username. 有关设置电子邮件地址的更多详细信息，请参阅“[设置您的提交电子邮件地址](/articles/setting-your-commit-email-address)”。 -### Changing your username +### 更改用户名 {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.account_settings %} -3. In the "Change username" section, click **Change username**. - ![Change Username button](/assets/images/help/settings/settings-change-username.png){% if currentVersion == "free-pro-team@latest" %} -4. Read the warnings about changing your username. If you still want to change your username, click **I understand, let's change my username**. - ![Change Username warning button](/assets/images/help/settings/settings-change-username-warning-button.png) -5. Type a new username. - ![New username field](/assets/images/help/settings/settings-change-username-enter-new-username.png) -6. If the username you've chosen is available, click **Change my username**. If the username you've chosen is unavailable, you can try a different username or one of the suggestions you see. - ![Change Username warning button](/assets/images/help/settings/settings-change-my-username-button.png) +3. 在“Change username（更改用户名）”部分，单击 **Change username（更改用户名）**。 ![Change Username button](/assets/images/help/settings/settings-change-username.png){% if currentVersion == "free-pro-team@latest" %} +4. 阅读有关更改用户名的警告。 如果您仍要更改用户名，请单击 **I understand, let's change my username（我了解，让我们更改用户名）**。 ![更改用户名警告按钮](/assets/images/help/settings/settings-change-username-warning-button.png) +5. 键入新的用户名。 ![新用户名字段](/assets/images/help/settings/settings-change-username-enter-new-username.png) +6. 如果您选择的用户名可用，请单击 **Change my username（更改我的用户名）**。 如果您选择的用户名不可用，可以尝试其他用户名或您看到的建议之一。 ![更改用户名警告按钮](/assets/images/help/settings/settings-change-my-username-button.png) {% endif %} -### Further reading +### 延伸阅读 -- "[Changing a remote's URL](/articles/changing-a-remote-s-url)" +- “[更改远程的 URL](/articles/changing-a-remote-s-url)” - "[Why are my commits linked to the wrong user?](/articles/why-are-my-commits-linked-to-the-wrong-user)"{% if currentVersion == "free-pro-team@latest" %} -- "[{% data variables.product.prodname_dotcom %} Username Policy](/articles/github-username-policy)"{% endif %} +- "[{% data variables.product.prodname_dotcom %} 用户名策略](/articles/github-username-policy)"{% endif %} diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/index.md b/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/index.md index 752e154ff7..d1243cce46 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/index.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/index.md @@ -24,7 +24,7 @@ versions: {% link_in_list /managing-the-default-branch-name-for-your-repositories %} {% link_in_list /managing-security-and-analysis-settings-for-your-user-account %} {% link_in_list /managing-access-to-your-user-accounts-project-boards %} - + {% link_in_list /integrating-jira-with-your-personal-projects %} diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md b/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md index 030edb1b55..e2e96b65b1 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md @@ -1,6 +1,6 @@ --- title: 管理仓库的默认分支名称 -intro: 'You can set a default branch name for all new repositories that you create.' +intro: 'You can set the default branch name new repositories that you create on {% data variables.product.product_location %}.' versions: free-pro-team: '*' enterprise-server: '>=2.23' @@ -22,4 +22,4 @@ When you create a new repository on {% data variables.product.product_location % ### 延伸阅读 -- /github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization +- "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)" diff --git a/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md b/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md index c6ebc8a604..f1771b72f2 100644 --- a/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md +++ b/translations/zh-CN/content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md @@ -1,6 +1,6 @@ --- -title: Permission levels for a user account repository -intro: 'A repository owned by a user account has two permission levels: the *repository owner* and *collaborators*.' +title: 用户帐户仓库的权限级别 +intro: '用户帐户拥有的仓库有两种权限级别：*仓库所有者*和*协作者*。' redirect_from: - /articles/permission-levels-for-a-user-account-repository versions: @@ -10,64 +10,64 @@ versions: {% tip %} -**Tip:** If you require more granular read/write access to a repository owned by your user account, consider transferring the repository to an organization. For more information, see "[Transferring a repository](/articles/transferring-a-repository)." +**提示：**如果需要对用户帐户拥有的仓库实施更细致的读/写权限，请考虑将仓库转让给组织。 更多信息请参阅“[转让仓库](/articles/transferring-a-repository)”。 {% endtip %} -#### Owner access on a repository owned by a user account +#### 所有者对用户帐户拥有的仓库的访问权限 -The repository owner has full control of the repository. In addition to all the permissions allowed by repository collaborators, the repository owner can: +仓库所有者对仓库具有完全控制权。 除了仓库协作者的所有权限之外，仓库所有者还可以： - {% if currentVersion == "free-pro-team@latest" %}[Invite collaborators](/articles/inviting-collaborators-to-a-personal-repository){% else %}[Add collaborators](/articles/inviting-collaborators-to-a-personal-repository){% endif %} - Change the visibility of the repository (from [public to private](/articles/making-a-public-repository-private), or from [private to public](/articles/making-a-private-repository-public)){% if currentVersion == "free-pro-team@latest" %} -- [Limit interactions with a repository](/articles/limiting-interactions-with-your-repository){% endif %} -- Merge a pull request on a protected branch, even if there are no approving reviews -- [Delete the repository](/articles/deleting-a-repository) +- [限制与仓库的交互](/articles/limiting-interactions-with-your-repository){% endif %} +- 合并受保护分支上的拉取请求（即使没有批准审查） +- [删除仓库](/articles/deleting-a-repository) - [Manage a repository's topics](/articles/classifying-your-repository-with-topics){% if currentVersion == "free-pro-team@latest" %} -- Manage security and analysis settings. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)."{% endif %}{% if currentVersion == "free-pro-team@latest" %} +- 管理安全和分析设置。 For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)."{% endif %}{% if currentVersion == "free-pro-team@latest" %} - [Enable the dependency graph](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository) for a private repository{% endif %}{% if currentVersion == "free-pro-team@latest" %} -- Delete packages. For more information, see "[Deleting a package](/github/managing-packages-with-github-packages/deleting-a-package)."{% endif %} -- Create and edit repository social cards. For more information, see "[Customizing your repository's social media preview](/articles/customizing-your-repositorys-social-media-preview)." -- Make the repository a template. For more information, see "[Creating a template repository](/articles/creating-a-template-repository)." +- 删除包。 更多信息请参阅“[删除包](/github/managing-packages-with-github-packages/deleting-a-package)”。{% endif %} +- 创建和编辑仓库社交卡。 更多信息请参阅“[自定义仓库的社交媒体审查](/articles/customizing-your-repositorys-social-media-preview)”。 +- 将仓库设为模板。 更多信息请参阅“[创建模板仓库](/articles/creating-a-template-repository)”。 - Receive [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a repository.{% if currentVersion == "free-pro-team@latest" %} -- Dismiss {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)." -- [Manage data usage for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository){% endif %} -- [Define code owners for the repository](/articles/about-code-owners) +- 忽略仓库中的 {% data variables.product.prodname_dependabot_alerts %}。 更多信息请参阅“[查看和更新仓库中的漏洞依赖项](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)”。 +- [管理私有仓库的数据使用](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository){% endif %} +- [定义仓库的代码所有者](/articles/about-code-owners) - [Archive repositories](/articles/about-archiving-repositories){% if currentVersion == "free-pro-team@latest" %} -- Create security advisories. For more information, see "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)." -- Display a sponsor button. For more information, see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)."{% endif %} +- 创建安全通告。 更多信息请参阅“[关于 {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)”。 +- 显示赞助按钮。 更多信息请参阅“[在仓库中显示赞助按钮](/articles/displaying-a-sponsor-button-in-your-repository)”。{% endif %} -There is only **one owner** of a repository owned by a user account; this permission cannot be shared with another user account. To transfer ownership of a repository to another user, see "[How to transfer a repository](/articles/how-to-transfer-a-repository)." +用户帐户拥有的仓库只有**一个所有者**，此权限无法与其他用户帐户共享。 要将仓库的所有权转让给其他用户，请参阅“[如何转让仓库](/articles/how-to-transfer-a-repository)”。 -#### Collaborator access on a repository owned by a user account +#### 协作者对用户帐户拥有的仓库的访问权限 {% note %} -**Note:** In a private repository, repository owners can only grant write access to collaborators. Collaborators can't have read-only access to repositories owned by a user account. +**注：**在私有仓库中，仓库所有者只能为协作者授予写入权限。 协作者不能对用户帐户拥有的仓库具有只读权限。 {% endnote %} -Collaborators on a personal repository can: +个人仓库的协作者可以： -- Push to (write), pull from (read), and fork (copy) the repository -- Create, apply, and delete labels and milestones -- Open, close, re-open, and assign issues -- Edit and delete comments on commits, pull requests, and issues -- Mark an issue or pull request as a duplicate. For more information, see "[About duplicate issues and pull requests](/articles/about-duplicate-issues-and-pull-requests)." -- Open, merge and close pull requests -- Apply suggested changes to pull requests. For more information, see "[Incorporating feedback in your pull request](/articles/incorporating-feedback-in-your-pull-request)." +- 推送（写入）、拉取（读取）和复刻（复制）仓库 +- 创建、应用和删除标签及里程碑 +- 打开、关闭、重新打开和分配议题 +- 编辑和删除对提交、拉取请求和议题的评论 +- 将议题或拉取请求标记为重复。 更多信息请参阅“[关于重复的议题和拉取请求](/articles/about-duplicate-issues-and-pull-requests)”。 +- 打开、合并和关闭拉取请求 +- 对拉取请求应用提议的更改。 更多信息请参阅“[合并拉取请求中的反馈](/articles/incorporating-feedback-in-your-pull-request)”。 - Send pull requests from forks of the repository{% if currentVersion == "free-pro-team@latest" %} -- Publish, view, and install packages. For more information, see "[Publishing and managing packages](/github/managing-packages-with-github-packages/publishing-and-managing-packages)."{% endif %} -- Create and edit Wikis -- Create and edit releases. For more information, see "[Managing releases in a repository](/github/administering-a-repository/managing-releases-in-a-repository). -- Remove themselves as collaborators on the repository -- Submit a review on a pull request that will affect its mergeability -- Act as a designated code owner for the repository. For more information, see "[About code owners](/articles/about-code-owners)." -- Lock a conversation. For more information, see "[Locking conversations](/articles/locking-conversations)."{% if currentVersion == "free-pro-team@latest" %} -- Report abusive content to {% data variables.contact.contact_support %}. For more information, see "[Reporting abuse or spam](/articles/reporting-abuse-or-spam)."{% endif %} -- Transfer an issue to a different repository. For more information, see "[Transferring an issue to another repository](/articles/transferring-an-issue-to-another-repository)." +- 发布、查看和安装包。 更多信息请参阅“[发布和管理包](/github/managing-packages-with-github-packages/publishing-and-managing-packages)”。{% endif %} +- 创建和编辑 Wiki +- 创建和编辑发行版. 更多信息请参阅“[管理仓库中的发行版](/github/administering-a-repository/managing-releases-in-a-repository)”。 +- 作为仓库协作者删除自己 +- 提交会影响其合并性的拉取请求审查 +- 作为仓库的指定代码所有者。 更多信息请参阅“[关于代码所有者](/articles/about-code-owners)”。 +- 锁定对话。 For more information, see "[Locking conversations](/articles/locking-conversations)."{% if currentVersion == "free-pro-team@latest" %} +- 向 {% data variables.contact.contact_support %} 报告滥用的内容。 更多信息请参阅“[报告滥用或垃圾邮件](/articles/reporting-abuse-or-spam)”。{% endif %} +- 将议题转让给不同的仓库 更多信息请参阅“[将议题传输到其他仓库](/articles/transferring-an-issue-to-another-repository)”。 -### Further reading +### 延伸阅读 -- "[Inviting collaborators to a personal repository](/articles/inviting-collaborators-to-a-personal-repository)" -- "[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)" +- "[邀请个人仓库的协作者](/articles/inviting-collaborators-to-a-personal-repository)" +- "[组织的仓库权限级别](/articles/repository-permission-levels-for-an-organization)" diff --git a/translations/zh-CN/content/github/site-policy/github-enterprise-subscription-agreement.md b/translations/zh-CN/content/github/site-policy/github-enterprise-subscription-agreement.md index 051bc9437a..8b3757cc8e 100644 --- a/translations/zh-CN/content/github/site-policy/github-enterprise-subscription-agreement.md +++ b/translations/zh-CN/content/github/site-policy/github-enterprise-subscription-agreement.md @@ -330,7 +330,7 @@ GitHub 只能在以下情况下访问客户的私有仓库 (i) 经客户同意 #### 3.5.2 版权侵权和 DMCA 政策。 -如果客户是版权所有者，并且认为服务上的内容侵犯了其版权，则客户可根据 GitHub 的[数字千禧年版权法政策](https://github.com/contact/dmca)联系 GitHub - 通过其 [DMCA 表](https://github.com/contact/dmca-notice)联系 GitHub 或发电子邮件到 copyright@github.com。 +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 3.5.3 GitHub 商标和徽标。 diff --git a/translations/zh-CN/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/translations/zh-CN/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md index c079aa0894..56a072b050 100644 --- a/translations/zh-CN/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md +++ b/translations/zh-CN/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md @@ -1,6 +1,6 @@ --- -title: GitHub Insights and data protection for your organization -intro: '{% data variables.product.prodname_insights %} analyzes your {% data variables.product.prodname_ghe_server %} data. This data could include personal data of individuals in your organization who may have the right to understand how such personal data is being used.' +title: 组织的 GitHub Insights 和数据保护 +intro: '{% data variables.product.prodname_insights %} 会分析您的 {% data variables.product.prodname_ghe_server %} 数据。 这些数据可能包括贵组织中有权了解如何使用个人数据之人的个人数据。' product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization @@ -9,38 +9,38 @@ versions: enterprise-server: '*' --- -For more information about the terms that govern {% data variables.product.prodname_insights %}, see your {% data variables.product.prodname_ghe_one %} subscription agreement. +有关 {% data variables.product.prodname_insights %} 管制条款的更多信息，请参阅您的 {% data variables.product.prodname_ghe_one %} 订阅协议。 -For the avoidance of doubt, none of the foregoing information should be considered legal advice provided by {% data variables.product.prodname_dotcom %}. You are responsible for securing your own legal analysis of the information provided herein and for your compliance with privacy and data protection laws. It is up to you whether to use {% data variables.product.prodname_insights %} to process your employees’ and users’ data, and if you do so, you are solely responsible for conducting such processing in compliance with applicable law. +为了避免产生疑问，上述任何信息都不应被视为 {% data variables.product.prodname_dotcom %} 提供的法律建议。 您有责任对这里提供的信息进行法律分析，并遵守隐私和数据保护法律。 是否使用 {% data variables.product.prodname_insights %} 来处理您的员工和用户的数据，完全由您决定，如果您选择处理，则要自行负责按照适用的法律进行处理。 -### The organization’s roles and responsibilities +### 组织的角色和责任 -When using {% data variables.product.prodname_insights %}, your organization is the data controller because your organization determines whether, how, and why {% data variables.product.prodname_insights %} will process any individual’s personal data. Your organization is solely responsible for ensuring that you are complying with all applicable laws in processing data with {% data variables.product.prodname_insights %}. +使用 {% data variables.product.prodname_insights %} 时，您的组织是数据控制方，因为您的组织决定是否、如何以及为什么 {% data variables.product.prodname_insights %} 会处理任何个人的个人数据。 您的组织完全负责确保您在使用 {% data variables.product.prodname_insights %} 处理数据时遵守所有适用的法律。 -### Data privacy recommendations +### 数据隐私建议 -You have full control over which metrics, reports, repositories, and contributors to include before beginning use of {% data variables.product.prodname_insights %}. The data you process with {% data variables.product.prodname_insights %} can only be pulled from your installation of {% data variables.product.prodname_ghe_server %}. Consider balancing the risks versus the benefits of analyzing personal data. +在开始使用 {% data variables.product.prodname_insights %} 之前，您可以完全控制要包含哪些指标、报告、仓库和贡献者。 您通过 {% data variables.product.prodname_insights %} 处理的数据只能从您安装的 {% data variables.product.prodname_ghe_server %} 中拉取。 考虑平衡分析个人数据的风险与优点。 -- **Develop a clear analysis plan**: You must understand clearly what you want to analyze and why, and then consider how {% data variables.product.prodname_insights %} may help you find those answers. +- **制定一个清晰的分析计划**：您必须清楚地了解您想要分析的内容和分析的原因，然后考虑 {% data variables.product.prodname_insights %} 如何帮助您找到这些答案。 -- **Consider a data protection impact assessment**: If your proposed use of {% data variables.product.prodname_insights %} involves processing personal data, consider completing a data protection impact assessment or otherwise completing formal legal analysis of your planned use. +- **考虑数据保护影响评估**：如果您对 {% data variables.product.prodname_insights %} 的使用涉及处理个人数据，请考虑完成数据保护影响评估，或以其他方式完成对预期使用方式的正式法律分析。 -### Decide what data to use +### 决定要使用的数据 -- **Decide which repositories to include**: Before you start an analysis in {% data variables.product.prodname_insights %}, consider which repositories to include. Administrators can include repositories when adding organizations and can enable and disable repositories at any time. For more information on adding organizations to {% data variables.product.prodname_insights %}, see "[Managing organizations](/insights/installing-and-configuring-github-insights/managing-organizations)." For more information on enabling and disabling repositories, see "[Managing repositories](/insights/installing-and-configuring-github-insights/managing-repositories)." +- **决定要包含的仓库**：在开始分析 {% data variables.product.prodname_insights %} 之前，请考虑要包含哪些仓库。 管理员可以在添加组织时包含仓库，并且可以随时启用和禁用仓库。 有关将组织添加到 {% data variables.product.prodname_insights %} 的更多信息，请参阅“[管理组织](/insights/installing-and-configuring-github-insights/managing-organizations)。 有关启用和禁用仓库的更多信息，请参阅“[管理仓库](/insights/installing-and-configuring-github-insights/managing-repositories)”。 -- **Decide which metrics and reports to include**: Administrators can enable and disable metrics and reports available for all users at any time. Administrators control the {% data variables.product.prodname_insights %} data that users have access to in your installation of {% data variables.product.prodname_ghe_server %}. For more information, see "[Managing available metrics and reports](/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports)." +- **决定要包含的指标和报告**：管理员可以随时对所有用户启用和禁用指标和报告。 管理员控制用户可在您的 {% data variables.product.prodname_ghe_server %} 安装中访问的 {% data variables.product.prodname_insights %} 数据。 更多信息请参阅“[管理可用的指标和报告](/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports)”。 -- **Decide which contributors to include**: Administrators can disable a specific contributor’s data from being processed in the metrics and reports. For more information on managing contributor data, see "[Managing contributors and teams](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)." +- **决定要包含的贡献者**：管理员可以禁止在指标和报告中处理特定贡献者的数据。 有关管理贡献者数据的更多信息，请参阅“[管理贡献者和团队](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)”。 -### User rights +### 用户权限 -Under various data protection regulations, such as the General Data Protection Regulation (GDPR), users may have the right to request exclusion from processing, access, and correction, or to request deletion of their personal data. As the data controller, your organization should evaluate whether a particular user request is valid and, if appropriate, take action to fulfill the request. +根据各种数据保护条例，例如通用数据保护条例 (GDPR)， 用户可能有权要求被排除在处理、访问和更正之外，或要求删除其个人数据。 作为数据控制方，您的组织应该评估特定用户请求是否有效，并在适当时采取行动满足该请求。 -- **Exclusion of processing**: Users may have the right to have their personal data excluded from being processed. Administrators have the ability to remove a contributor’s data from being processed in {% data variables.product.prodname_insights %}, and the resulting reports and metrics will exclude the contributor’s data accordingly. For more information, see "[Managing contributors and teams](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)." +- **排除处理**：用户可能有权将其个人数据排除在处理之外。 管理员可以删除贡献者的数据而不在 {% data variables.product.prodname_insights %} 中处理，由此产生的报告和指标也会相应地排除该贡献者的数据。 更多信息请参阅“[管理贡献者和团队](/insights/installing-and-configuring-github-insights/managing-contributors-and-teams)”。 -- **Access**: Users may have the right to demand to see what personal data is being processed. Each metric and report has a detailed description of what personal data is being processed. For more information, see "[Metrics available with {% data variables.product.prodname_insights %}](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)." Raw data is available through the {% data variables.product.prodname_enterprise %} API. Your organization is responsible for any decisions to process personal data and for fulfilling any such requests. +- **访问**：用户可能有权要求查看处理的个人数据。 每个指标和报告都详细说明了所处理的个人数据。 更多信息请参阅“[可用于 {% data variables.product.prodname_insights %} 的指标](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)”。 原始数据通过 {% data variables.product.prodname_enterprise %} API 提供。 您的组织负责作出处理个人数据的任何决定以及执行此类任何请求。 -- **Correction and deletion**: Users may have the right to rectify or delete their personal data. The data used in {% data variables.product.prodname_insights %} is derived from the existing data you add to or generate from your {% data variables.product.prodname_ghe_server %} installation. Correction and deletion should follow your organization's existing process to correct and delete data from {% data variables.product.prodname_ghe_server %}. +- **更正和删除**：用户可能有权更正或删除他们的个人数据。 {% data variables.product.prodname_insights %} 中使用的数据来自您在 {% data variables.product.prodname_ghe_server %} 安装中添加或生成的现有数据。 在更正和删除时，应遵循您的组织的现有流程更正和删除来自 {% data variables.product.prodname_ghe_server %} 的数据。 -- **Transparency regarding processing**: Each metric and report has a detailed description of what personal data is being processed. For more information, see "[Metrics available with {% data variables.product.prodname_insights %}](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)." +- **处理的透明度**：每个指标和报告都详细描述了所处理的个人数据。 更多信息请参阅“[可用于 {% data variables.product.prodname_insights %} 的指标](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)”。 diff --git a/translations/zh-CN/content/github/site-policy/github-sensitive-data-removal-policy.md b/translations/zh-CN/content/github/site-policy/github-sensitive-data-removal-policy.md index 882b6a244a..aaa3ca9a59 100644 --- a/translations/zh-CN/content/github/site-policy/github-sensitive-data-removal-policy.md +++ b/translations/zh-CN/content/github/site-policy/github-sensitive-data-removal-policy.md @@ -76,7 +76,7 @@ GitHub 在禁用父仓库时不会自动禁用复刻。 这是因为复刻属于 ### 如果提交请求 -您可以通过我们的[联系表格](https://support.github.com/contact)提交删除敏感数据的申请。 请在邮件正文中包含请求的纯文本版本。 以附件形式发送请求可能导致处理延迟。 +您可以通过我们的[联系表格](https://support.github.com/contact?tags=docs-sensitive-data)提交删除敏感数据的申请。 请在邮件正文中包含请求的纯文本版本。 以附件形式发送请求可能导致处理延迟。 ### 异议 diff --git a/translations/zh-CN/content/github/site-policy/github-subprocessors-and-cookies.md b/translations/zh-CN/content/github/site-policy/github-subprocessors-and-cookies.md index 18e7b27974..51b4e729a7 100644 --- a/translations/zh-CN/content/github/site-policy/github-subprocessors-and-cookies.md +++ b/translations/zh-CN/content/github/site-policy/github-subprocessors-and-cookies.md @@ -10,7 +10,7 @@ versions: free-pro-team: '*' --- -生效日期：**2020 年 12 月 8 日** +Effective date: **October 2, 2020** GitHub 在如何使用您的数据、如何收集您的数据以及与谁分享您的数据方面提供很大的透明度。 为此，我们制作了本页面，详细介绍[我们的子处理商](#github-subprocessors)、我们如何使用 [cookie](#cookies-on-github)、在何处进行跟踪以及如何[在 GitHub 上执行跟踪](#tracking-on-github)。 @@ -18,80 +18,80 @@ GitHub 在如何使用您的数据、如何收集您的数据以及与谁分享 我们与第三方子处理商（例如我们的供应商和服务提供商）分享您的信息时，我们仍对您的信息负责。 我们在引入新供应商时，会竭尽所能保持您的信任，并且要求所有供应商与我们签订数据保护协议，以约束他们对用户个人信息（定义见[隐私声明](/articles/github-privacy-statement/)）的处理。 -| 子处理商名称 | 处理说明 | 处理地点 | 公司地点 | -|:------------------ |:-------------------- |:---- |:---- | -| Automattic | 博客服务 | 美国 | 美国 | -| AWS Amazon | 数据托管 | 美国 | 美国 | -| Braintree (PayPal) | 订阅费用信用卡支付处理商 | 美国 | 美国 | -| Clearbit | 营销数据充实服务 | 美国 | 美国 | -| Discourse | 社区论坛软件提供商 | 美国 | 美国 | -| DiscoverOrg | 营销数据充实服务 | 美国 | 美国 | -| Eloqua | 营销活动自动化 | 美国 | 美国 | -| Google Apps | 公司内部基础设施 | 美国 | 美国 | -| Google Analytics | 网站分析和性能 | 美国 | 美国 | -| LinkedIn Navigator | 营销数据充实服务 | 美国 | 美国 | -| Magic Robot | 活动报告（Salesforce 加载项） | 美国 | 美国 | -| MailChimp | 客户事件单邮件服务提供商 | 美国 | 美国 | -| Mailgun | 交易邮件服务提供商 | 美国 | 美国 | -| Microsoft | Microsoft 服务 | 美国 | 美国 | -| Monday.com | 团队协作和项目管理平台 | 美国 | 以色列 | -| Nexmo | 短信通知提供商 | 美国 | 美国 | -| Oracle | 公司财务系统 | 美国 | 美国 | -| Salesforce.com | 客户关系管理 | 美国 | 美国 | -| Sendgrid | 交易邮件服务提供商 | 美国 | 美国 | -| Sentry.io | 应用程序监控提供商 | 美国 | 美国 | -| Stripe | 支付服务提供商 | 美国 | 美国 | -| Twilio | 短信通知提供商 | 美国 | 美国 | -| Zendesk | 客户支持事件单系统 | 美国 | 美国 | -| Zuora | 公司计费系统 | 美国 | 美国 | +| 子处理商名称 | 处理说明 | 处理地点 | 公司地点 | +|:------------------ |:------------------------- |:---- |:---- | +| Automattic | 博客服务 | 美国 | 美国 | +| AWS Amazon | 数据托管 | 美国 | 美国 | +| Braintree (PayPal) | 订阅费用信用卡支付处理商 | 美国 | 美国 | +| Clearbit | 营销数据充实服务 | 美国 | 美国 | +| Discourse | 社区论坛软件提供商 | 美国 | 美国 | +| DiscoverOrg | 营销数据充实服务 | 美国 | 美国 | +| Eloqua | 营销活动自动化 | 美国 | 美国 | +| Google Apps | 公司内部基础设施 | 美国 | 美国 | +| Google Analytics | Analytics and performance | 美国 | 美国 | +| LinkedIn Navigator | 营销数据充实服务 | 美国 | 美国 | +| Magic Robot | 活动报告（Salesforce 加载项） | 美国 | 美国 | +| MailChimp | 客户事件单邮件服务提供商 | 美国 | 美国 | +| Mailgun | 交易邮件服务提供商 | 美国 | 美国 | +| Microsoft | Microsoft 服务 | 美国 | 美国 | +| Monday.com | 团队协作和项目管理平台 | 美国 | 以色列 | +| Nexmo | 短信通知提供商 | 美国 | 美国 | +| Oracle | 公司财务系统 | 美国 | 美国 | +| Salesforce.com | 客户关系管理 | 美国 | 美国 | +| Sendgrid | 交易邮件服务提供商 | 美国 | 美国 | +| Sentry.io | 应用程序监控提供商 | 美国 | 美国 | +| Stripe | 支付服务提供商 | 美国 | 美国 | +| Twilio | 短信通知提供商 | 美国 | 美国 | +| Zendesk | 客户支持事件单系统 | 美国 | 美国 | +| Zuora | 公司计费系统 | 美国 | 美国 | 在我们引入新的子处理商来处理用户个人信息、删除子处理商或更改使用子处理商的方式时，我们将更新本页面。 如果您对新的子处理商有疑问或疑虑，我们乐意提供帮助。 请通过 {% data variables.contact.contact_privacy %} 联系我们。 ### GitHub 上的 Cookie -GitHub 在如何使用您的数据、如何收集您的数据以及与谁分享您的数据方面提供很大的透明度。 为此，我们制作了本页面，详细介绍[我们的子处理商](#github-subprocessors)、我们如何使用 [cookie](#cookies-on-github)、在何处进行跟踪以及如何[在 GitHub 上执行跟踪](#tracking-on-github)。 +GitHub uses cookies and similar technologies (collectively, “cookies”) to provide and secure our websites, as well as to analyze the usage of our websites, in order to offer you a great user experience. Please take a look at our [Privacy Statement](/github/site-policy/github-privacy-statement#our-use-of-cookies-and-tracking) if you’d like more information about cookies, and on how and why we use them. Since the number and names of cookies may change,the table below may be updated from time to time. -| Cookie 名称 | 原因 | 描述 | Expiration* | -|:----------------------------- |:------------------------------------ |:------------------------------------------------------------------------------------------------------------------------------------------ |:------------------------------------------------------------- | -| GitHub | `app_manifest_token` | 此 cookie 用于表明页面之间的临时应用程序和框架状态，例如用户在多步骤表单中处于哪一步。 | five minutes | -| GitHub | `cookie-preferences` | 此 cookie 用于向我们表明用户已登录。 | one year | -| GitHub | `_device_id` | 此 cookie 用于向我们表明用户已登录。 | one year | -| GitHub | `dotcom_user` | 此 cookie 用于向我们表明用户已登录。 | one year | -| GitHub | `_gh_ent` | This cookie is used for temporary application and framework state between pages like what step the customer is on in a multiple step form. | two weeks | -| GitHub | `_gh_sess` | 此 cookie 用于表明页面之间的临时应用程序和框架状态，例如用户在多步骤表单中处于哪一步。 | 会话 | -| GitHub | `gist_oauth_csrf` | 此 cookie 由 Gist 设置，以确保启动 oauth 流的用户与完成它的用户是同一个用户。 | deleted when oauth state is validated | -| GitHub | `gist_user_session` | 此 cookie 由 Gist 在单独主机上运行时使用。 | two weeks | -| GitHub | `has_recent_activity` | This cookie is used to prevent showing the security interstitial to users that have visited the app recently. | one hour | -| GitHub | `__Host-gist_user_session_same_site` | 此 cookie 设置为确保支持 SameSite cookie 的浏览器可以检查请求是否来自 GitHub。 | two weeks | -| GitHub | `__Host-user_session_same_site` | 此 cookie 设置为确保支持 SameSite cookie 的浏览器可以检查请求是否来自 GitHub。 | two weeks | -| GitHub | `logged_in` | 此 cookie 用于向我们表明用户已登录。 | one year | -| GitHub | `marketplace_repository_ids` | 此 cookie 用于您的登录。 | one hour | -| GitHub | `marketplace_suggested_target_id` | 此 cookie 用于您的登录。 | one hour | -| GitHub | `_octo` | 此 cookie 被我们的内部分析服务 Octolytics 用来区分独特的用户和客户端。 | one year | -| GitHub | `org_transform_notice` | This cookie is used to provide notice during organization transforms. | one hour | -| GitHub | `github.com/personal` | 此 cookie 用于 Google Analytics。 | two weeks | -| GitHub | `saml_csrf_token` | 此 cookie 由 SAML 身份验证路径方法设置，以将令牌与客户端相关联。 | until user closes browser or completes authentication request | -| GitHub | `saml_csrf_token_legacy` | 此 cookie 由 SAML 身份验证路径方法设置，以将令牌与客户端相关联。 | until user closes browser or completes authentication request | -| GitHub | `saml_return_to` | 此 cookie 由 SAML 身份验证路径方法设置，以在 SAML 身份验证循环期间维持状态。 | until user closes browser or completes authentication request | -| GitHub | `saml_return_to_legacy` | 此 cookie 由 SAML 身份验证路径方法设置，以在 SAML 身份验证循环期间维持状态。 | until user closes browser or completes authentication request | -| GitHub | `tz` | 此 cookie 允许您的浏览器告诉我们您所在的时区。 | 会话 | -| GitHub | `user_session` | 此 cookie 用于您的登录。 | two weeks | -| 此 cookie 用于 Google Analytics。 | `_ga` | 此 cookie 用于 Google Analytics。 | two years | -| 此 cookie 用于 Google Analytics。 | `_gat` | 此 cookie 用于 Google Analytics。 | one minute | -| 此 cookie 用于 Google Analytics。 | `_gid` | 此 cookie 用于 Google Analytics。 | one day | +| Service Provider | Cookie Name | 描述 | Expiration* | +|:------------------ |:------------------------------------ |:------------------------------------------------------------------------------------------------------------------------------------------ |:------------------------------------------------------------- | +| GitHub | `app_manifest_token` | This cookie is used during the App Manifest flow to maintain the state of the flow during the redirect to fetch a user session. | five minutes | +| GitHub | `cookie-preferences` | This cookie is used to track user cookie preferences. | one year | +| GitHub | `_device_id` | This cookie is used to track recognized devices. | one year | +| GitHub | `dotcom_user` | This cookie is used to signal to us that the user is already logged in. | one year | +| GitHub | `_gh_ent` | This cookie is used for temporary application and framework state between pages like what step the customer is on in a multiple step form. | two weeks | +| GitHub | `_gh_sess` | This cookie is used for temporary application and framework state between pages like what step the user is on in a multiple step form. | 会话 | +| GitHub | `gist_oauth_csrf` | This cookie is set by Gist to ensure the user that started the oauth flow is the same user that completes it. | deleted when oauth state is validated | +| GitHub | `gist_user_session` | This cookie is used by Gist when running on a separate host. | two weeks | +| GitHub | `has_recent_activity` | This cookie is used to prevent showing the security interstitial to users that have visited the app recently. | one hour | +| GitHub | `__Host-gist_user_session_same_site` | This cookie is set to ensure that browsers that support SameSite cookies can check to see if a request originates from GitHub. | two weeks | +| GitHub | `__Host-user_session_same_site` | This cookie is set to ensure that browsers that support SameSite cookies can check to see if a request originates from GitHub. | two weeks | +| GitHub | `logged_in` | This cookie is used to signal to us that the user is already logged in. | one year | +| GitHub | `marketplace_repository_ids` | This cookie is used for the marketplace installation flow. | one hour | +| GitHub | `marketplace_suggested_target_id` | This cookie is used for the marketplace installation flow. | one hour | +| GitHub | `_octo` | This cookie is used by our internal analytics service to distinguish unique users and clients. | one year | +| GitHub | `org_transform_notice` | This cookie is used to provide notice during organization transforms. | one hour | +| GitHub | `private_mode_user_session` | This cookie is used for Enterprise authentication requests. | two weeks | +| GitHub | `saml_csrf_token` | This cookie is set by SAML auth path method to associate a token with the client. | until user closes browser or completes authentication request | +| GitHub | `saml_csrf_token_legacy` | This cookie is set by SAML auth path method to associate a token with the client. | until user closes browser or completes authentication request | +| GitHub | `saml_return_to` | This cookie is set by the SAML auth path method to maintain state during the SAML authentication loop. | until user closes browser or completes authentication request | +| GitHub | `saml_return_to_legacy` | This cookie is set by the SAML auth path method to maintain state during the SAML authentication loop. | until user closes browser or completes authentication request | +| GitHub | `tz` | This cookie allows your browser to tell us what time zone you're in. | 会话 | +| GitHub | `user_session` | This cookie is used to log you in. | two weeks | +| Google Analytics** | `_ga` | This cookie is used by Google Analytics. | two years | +| Google Analytics** | `_gat` | This cookie is used by Google Analytics. | one minute | +| Google Analytics** | `_gid` | This cookie is used by Google Analytics. | one day | -_*_ GitHub 出于以下原因在用户设备上放置以下 cookie： +_*_ The **expiration** dates for the cookies listed below generally apply on a rolling basis. -_我们使用 Google Analytics 收集有关我们网站性能以及用户在总体上如何浏览和使用 GitHub 的信息。 这有助于我们评估用户对 GitHub 的使用情况；汇编关于活动的统计报告；以及改善我们的内容和网站性能。 +_**_ We use **Google Analytics** as a third party analytics service to collect information about how our website performs and how our users, in general, navigate through and use GitHub. This helps us evaluate our users' use of GitHub, compile statistical reports on activity, and improve our content and website performance. -You can control your Google Analytics cookie preferences through our cookie preference link located at the footer of our website. Google 提供有关其隐私实践的更多信息，并且[提供一个浏览器加载项，以供选择退出 Google Analytics 跟踪](https://tools.google.com/dlpage/gaoptout)。 +You can control your Google Analytics cookie preferences through our cookie preference link located at the footer of our website. In addition, Google provides further information about its own privacy practices and [offers a browser add-on to opt out of Google Analytics tracking](https://tools.google.com/dlpage/gaoptout). -我们网站上的某些页面可能会放置其他第三方的 cookie。 例如，我们可能会嵌入来自其他网站的内容（例如视频），而该网站可能放置 cookie。 虽然我们尽可能减少这些第三方 cookie，但我们无法始终控制这些第三方内容放置哪些 cookie。 +(!) Please note certain pages on our website may set other third party cookies. For example, we may embed content, such as videos, from another site that sets a cookie. While we try to minimize these third party cookies, we can’t always control what cookies this third party content sets. ### 在 GitHub 上跟踪 -“[别跟踪](https://www.eff.org/issues/do-not-track)”(DNT) 是有一种隐私首选项，如果您不希望在线服务（特别是广告网络）通过第三方跟踪服务收集和分享有关您在线活动的某类信息，您可以在浏览器中设置该选项。 GitHub 响应浏览器的 DNT 信号，并遵循[关于响应 DNT 信号的 W3C 标准](https://www.w3.org/TR/tracking-dnt/)。 如果您要设置浏览器以传达不希望被跟踪的信号，请查看浏览器的文档以了解如何启用该信号。 还有一些很适合阻止在线跟踪的应用程序，例如 [Privacy Badger](https://www.eff.org/privacybadger)。 +"[Do Not Track](https://www.eff.org/issues/do-not-track)" (DNT) is a privacy preference you can set in your browser if you do not want online services to collect and share certain kinds of information about your online activity from third party tracking services. GitHub 响应浏览器的 DNT 信号，并遵循[关于响应 DNT 信号的 W3C 标准](https://www.w3.org/TR/tracking-dnt/)。 If you would like to set your browser to signal that you would not like to be tracked, please check your browser's documentation for how to enable that signal. There are also good applications that block online tracking, such as [Privacy Badger](https://www.eff.org/privacybadger). -如果您没有在支持 DNT 的浏览器上启用 DNT，则我们网站某些部分的 cookie 会长期跟踪您在其他在线服务上的在线浏览活动，不过，我们不允许我们分析和服务提供商以外的第三方长期跟踪 GitHub 用户在 GitHub 上的活动。 我们还与某些供应商签订了协议，例如分析供应商，他们帮助我们在网站的某些页面上跟踪访客的活动。 只有代表我们收集个人信息的供应商，才能在我们的页面上收集数据，并且我们与每个此类供应商都签订了数据保护协议。 我们利用从这些供应商处获得的数据，更好地了解访客的兴趣、网站的性能并改善我们的内容。 任何分析供应商都将列入上文的子处理商列表中，您还可以在下文查看收集此类数据的所有页面列表。 +If you have not enabled DNT on a browser that supports it, cookies on some parts of our website will track your online browsing activity on other online services over time, though we do not permit third parties other than our analytics and service providers to track GitHub users' activity over time on GitHub. We have agreements with certain vendors, such as analytics providers, who help us track visitors' movements on certain pages on our website. Only our vendors, who are collecting personal information on our behalf, may collect data on our pages, and we have signed data protection agreements with every vendor who collects this data on our behalf. We use the data we receive from these vendors to better understand our visitors' interests, to understand our website's performance, and to improve our content. Any analytics vendor will be listed in our [subprocessor list](#github-subprocessors), and you may see a list of every page where we collect this kind of data below. diff --git a/translations/zh-CN/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md b/translations/zh-CN/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md index 2f20e2acfe..a0b08b029b 100644 --- a/translations/zh-CN/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md +++ b/translations/zh-CN/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md @@ -175,7 +175,7 @@ GitHub 只能在以下情况下访问客户的私有仓库 (i) 经客户同意 #### 2.5.2 版权侵权和 DMCA 政策。 -如果客户是版权所有者，并且认为服务上的内容侵犯了其版权，则客户可根据 GitHub 的[数字千禧年版权法政策](https://github.com/contact/dmca)联系 GitHub - 通过其 [DMCA 表](https://github.com/contact/dmca-notice)联系 GitHub 或发电子邮件到 copyright@github.com。 +If Customer is a copyright owner and believes that Content on the Service violates Customer’s copyright, Customer may contact GitHub in accordance with GitHub's [Digital Millennium Copyright Act Policy](https://github.com/contact/dmca) by notifying GitHub via its [DMCA Form](https://github.com/contact/dmca-notice) or by emailing copyright@github.com. #### 2.5.3 GitHub 商标和徽标。 diff --git a/translations/zh-CN/content/github/site-policy/github-trademark-policy.md b/translations/zh-CN/content/github/site-policy/github-trademark-policy.md index 7f0d9a7da5..5a7a7e7a65 100644 --- a/translations/zh-CN/content/github/site-policy/github-trademark-policy.md +++ b/translations/zh-CN/content/github/site-policy/github-trademark-policy.md @@ -23,7 +23,7 @@ versions: ### 如何举报违反商标政策的行为？ -注册商标持有者可通过[联系表](https://support.github.com/contact)向 GitHub 举报可能违反商标政策的行为。 请使用您的公司电子邮件地址提交与商标相关的请求，并提供下面要求的所有信息，这有助于加快我们的响应。 另外，请务必向我们清楚地说明，为什么该帐户可能导致您的商标混淆问题，或者该帐户如何影响或损害您的商标。 +注册商标持有者可通过[联系表](https://support.github.com/contact?tags=docs-trademark)向 GitHub 举报可能违反商标政策的行为。 请使用您的公司电子邮件地址提交与商标相关的请求，并提供下面要求的所有信息，这有助于加快我们的响应。 另外，请务必向我们清楚地说明，为什么该帐户可能导致您的商标混淆问题，或者该帐户如何影响或损害您的商标。 ### 举报违反商标政策的行为时需要提供哪些信息？ diff --git a/translations/zh-CN/content/github/using-git/changing-a-remotes-url.md b/translations/zh-CN/content/github/using-git/changing-a-remotes-url.md index 07297e1dae..1979de0d0c 100644 --- a/translations/zh-CN/content/github/using-git/changing-a-remotes-url.md +++ b/translations/zh-CN/content/github/using-git/changing-a-remotes-url.md @@ -50,7 +50,7 @@ git@{% data variables.command_line.codeblock %}:USERNAME/REPOSITORY > origin https://{% data variables.command_line.codeblock %}/USERNAME/REPOSITORY.git (push) ``` -下次对远程仓库执行 `git fetch`、`git pull` 或 `git push` 操作时，您需要提供 GitHub 用户名和密码。 +下次对远程仓库执行 `git fetch`、`git pull` 或 `git push` 操作时，您需要提供 GitHub 用户名和密码。 {% data reusables.user_settings.password-authentication-deprecation %} - 如果您启用了[双重身份验证](/articles/securing-your-account-with-two-factor-authentication-2fa)，则必须[创建个人访问令牌](/github/authenticating-to-github/creating-a-personal-access-token)来代替 GitHub 密码。 - 您可以[使用凭据小助手](/github/using-git/caching-your-github-credentials-in-git)让 Git 在每次与 GitHub 会话时记住您的 GitHub 用户名和密码。 diff --git a/translations/zh-CN/content/github/using-git/pushing-commits-to-a-remote-repository.md b/translations/zh-CN/content/github/using-git/pushing-commits-to-a-remote-repository.md index 51399b9ea9..c90c3999cc 100644 --- a/translations/zh-CN/content/github/using-git/pushing-commits-to-a-remote-repository.md +++ b/translations/zh-CN/content/github/using-git/pushing-commits-to-a-remote-repository.md @@ -97,3 +97,4 @@ git fetch upstream - [`git remote` 手册页](https://git-scm.com/docs/git-remote.html) - "[Git 小抄](/articles/git-cheatsheet)" - "[Git 工作流程](/articles/git-workflows)" +- "[Git Handbook](https://guides.github.com/introduction/git-handbook/)" diff --git a/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md index 069c3b38ed..e674add356 100644 --- a/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md +++ b/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md @@ -47,9 +47,9 @@ You can use the dependency graph to: {% if currentVersion == "free-pro-team@latest" %}To generate a dependency graph, {% data variables.product.product_name %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private repositories. For information about enabling or disabling it for private repositories, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md index 1781bd264b..881bbb3808 100644 --- a/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md +++ b/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md @@ -35,7 +35,7 @@ The dependency graph shows the dependencies{% if currentVersion == "free-pro-tea {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} 在仓库的清单或锁定文件中指定的任何直接或间接依赖项按生态系统分组列出。 If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to {% data variables.product.prodname_dependabot_short %} 警报. @@ -55,7 +55,7 @@ The dependency graph shows the dependencies{% if currentVersion == "free-pro-tea {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 在仓库的清单或锁定文件中指定的任何直接或间接依赖项按生态系统分组列出。 如果在仓库中检测到漏洞，这些漏洞将显示在视图顶部，供有权访问安全警报的用户查看。 {% note %} diff --git a/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md b/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md index b2dd888e2b..e36fbf9314 100644 --- a/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md +++ b/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/viewing-a-projects-contributors.md @@ -13,7 +13,7 @@ versions: ### 关于贡献者 -You can view the top 100 contributors to a repository{% if currentVersion != "free-pro-team@latest" %}, including commit co-authors,{% endif %} in the contributors graph. 合并提交和空提交不会计为此图的贡献。 +您可以在贡献者图中查看仓库的前 100 名贡献者{% if enterpriseServerVersions contains currentVersion %}，包括提交合作作者{% endif %}。 合并提交和空提交不会计为此图的贡献。 {% if currentVersion == "free-pro-team@latest" %} 您还可以看到为项目的 Python 依赖项做出贡献的人员列表。 要访问此社区贡献者列表，请访问 `https://github.com/REPO-OWNER/REPO-NAME/community_contributors`。 diff --git a/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md b/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md index 5597ba9682..eba985831a 100644 --- a/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md +++ b/translations/zh-CN/content/github/visualizing-repository-data-with-graphs/viewing-traffic-to-a-repository.md @@ -1,6 +1,6 @@ --- -title: Viewing traffic to a repository -intro: 'Anyone with push access to a repository can view its traffic, including full clones (not fetches), visitors from the past 14 days, referring sites, and popular content in the traffic graph.' +title: 查看仓库的流量 +intro: '具有仓库推送权限的任何人都可以查看其流量，包括完整克隆（不是提取）、过去 14 天的访问者、推荐站点以及流量图中的热门内容。' product: '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 %}, and {% data variables.product.prodname_ghe_cloud %}.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[About repository graphs](/articles/about-repository-graphs)" and "[{% data variables.product.prodname_dotcom %}''s products](/articles/github-s-products)."{% endif %}' redirect_from: - /articles/viewing-traffic-to-a-repository @@ -8,21 +8,20 @@ versions: free-pro-team: '*' --- -You can navigate to referring sites, excluding search engines and {% data variables.product.product_name %} itself, from the links the specific paths were referred from. The popular content links to the specific content that generated traffic. +您可以从推荐特定路径的链接导航到推荐站点，不包括搜索引擎和 {% data variables.product.product_name %} 本身。 热门内容会链接到生成流量的特定内容。 -Referring sites and popular content are ordered by views and unique visitors. Full clones and visitor information update hourly, while referring sites and popular content sections update daily. All data in the traffic graph uses the UTC+0 timezone, regardless of your location. +推荐站点和热门内容按视图和唯一的访问者排序。 完整克隆和访问者信息每小时更新一次，而推荐站点和热门内容部分每天更新。 无论您的位置如何，流量图中的所有数据均使用 UTC+0 时区。 {% tip %} -**Tip:** You can hover over a specific day in the traffic graph to view the exact data for that day. +**提示：**您可以将鼠标悬停在流量图中的特定日期，以查看该日期的确切数据。 {% endtip %} -![Repository traffic graphs with tooltip](/assets/images/help/graphs/repo_traffic_graphs_tooltip_dotcom.png) +![带工具提示的仓库流量图](/assets/images/help/graphs/repo_traffic_graphs_tooltip_dotcom.png) -### Accessing the traffic graph +### 访问流量图 {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.accessing-repository-graphs %} -3. In the left sidebar, click **Traffic**. -![Traffic tab](/assets/images/help/graphs/traffic_tab.png) +3. 在左侧边栏中，单击 **Traffic（流量）**。 ![流量选项卡](/assets/images/help/graphs/traffic_tab.png) diff --git a/translations/zh-CN/content/github/working-with-github-pages/about-github-pages-and-jekyll.md b/translations/zh-CN/content/github/working-with-github-pages/about-github-pages-and-jekyll.md index 11e43db8a5..ba0bce2570 100644 --- a/translations/zh-CN/content/github/working-with-github-pages/about-github-pages-and-jekyll.md +++ b/translations/zh-CN/content/github/working-with-github-pages/about-github-pages-and-jekyll.md @@ -27,7 +27,7 @@ versions: Jekyll 是一个静态站点生成器，内置 {% data variables.product.prodname_pages %} 支持和简化的构建过程。 Jekyll 使用 Markdown 和 HTML 文件，并根据您选择的布局创建完整静态网站。 Jekyll 支持 Markdown 和 Lick，这是一种可在网站上加载动态内容的模板语言。 更多信息请参阅 [Jekyll](https://jekyllrb.com/)。 -Windows 并未正式支持 Jekyll。 更多信息请参阅 Jekyll 文档中的“[Windows 上的 Jekyll](http://jekyllrb.com/docs/windows/#installation)”。 +Windows 并未正式支持 Jekyll。 For more information, see "[Jekyll on Windows](http://jekyllrb.com/docs/windows/#installation)" in the Jekyll documentation. 我们建议将 Jekyll 用于 {% data variables.product.prodname_pages %}。 如果您喜欢，可以使用其他静态站点生成器或者在本地或其他服务器上自定义构建过程。 更多信息请参阅“[关于 {% data variables.product.prodname_pages %}](/articles/about-github-pages#static-site-generators)”。 diff --git a/translations/zh-CN/content/github/working-with-github-pages/about-github-pages.md b/translations/zh-CN/content/github/working-with-github-pages/about-github-pages.md index d32685ad4d..2af77badc6 100644 --- a/translations/zh-CN/content/github/working-with-github-pages/about-github-pages.md +++ b/translations/zh-CN/content/github/working-with-github-pages/about-github-pages.md @@ -45,7 +45,7 @@ To publish a user site, you must create a repository owned by your user account 您只能为每个 {% data variables.product.product_name %} 账户创建一个用户或组织站点。 项目站点（无论是组织还是用户帐户拥有）没有限制。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} The URL where your site is available depends on whether subdomain isolation is enabled for {% data variables.product.product_location %}. diff --git a/translations/zh-CN/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md b/translations/zh-CN/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md index 86907ab801..279f8f63f6 100644 --- a/translations/zh-CN/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md +++ b/translations/zh-CN/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md @@ -1,24 +1,24 @@ --- -title: Creating a GitHub Pages site with Jekyll -intro: 'You can use Jekyll to create a {% data variables.product.prodname_pages %} site in a new or existing repository.' +title: 使用 Jekyll 创建 GitHub Pages 站点 +intro: '您可以使用 Jekyll 在新仓库或现有仓库中创建 {% data variables.product.prodname_pages %} 站点。' product: '{% data reusables.gated-features.pages %}' redirect_from: - /articles/creating-a-github-pages-site-with-jekyll -permissions: 'People with admin permissions for a repository can create a {% data variables.product.prodname_pages %} site with Jekyll.' +permissions: '拥有仓库管理员权限的人员可以使用 Jekyll 创建 {% data variables.product.prodname_pages %} 站点。' versions: free-pro-team: '*' enterprise-server: '*' --- -### Prerequisites +### 基本要求 -Before you can use Jekyll to create a {% data variables.product.prodname_pages %} site, you must install Jekyll and Git. For more information, see [Installation](https://jekyllrb.com/docs/installation/) in the Jekyll documentation and "[Set up Git](/articles/set-up-git)." +必须安装 Jekyll 和 Git 后才可使用 Jekyll 创建 {% data variables.product.prodname_pages %} 站点。 更多信息请参阅 Jekyll 文档中的[安装](https://jekyllrb.com/docs/installation/)和“[设置 Git](/articles/set-up-git)”。 {% data reusables.pages.recommend-bundler %} {% data reusables.pages.jekyll-install-troubleshooting %} -### Creating a repository for your site +### 为站点创建仓库 {% data reusables.pages.new-or-existing-repo %} @@ -29,59 +29,58 @@ Before you can use Jekyll to create a {% data variables.product.prodname_pages % {% data reusables.pages.create-repo-name %} {% data reusables.repositories.choose-repo-visibility %} -### Creating your site +### 创建站点 {% data reusables.pages.must-have-repo-first %} {% data reusables.command_line.open_the_multi_os_terminal %} -2. If you don't already have a local copy of your repository, navigate to the location where you want to store your site's source files, replacing _PARENT-FOLDER_ with the folder you want to contain the folder for your repository. +2. 如果您还没有本地版仓库，请导航到您想要存储站点源文件的位置，将 _PARENT-FOLDER_ 替换为要包含仓库文件夹的文件夹。 ```shell $ cd PARENT-FOLDER ``` -3. If you haven't already, initialize a local Git repository, replacing _REPOSITORY-NAME_ with the name of your repository. +3. 如果尚未初始化本地 Git 仓库，请将 _REPOSITORY-NAME_ 替换为仓库名称。 ```shell $ git init REPOSITORY-NAME > Initialized empty Git repository in /Users/octocat/my-site/.git/ # Creates a new folder on your computer, initialized as a Git repository - ``` - 4. Change directories to the repository. + ``` + 4. 将目录更改为仓库。 ```shell $ cd REPOSITORY-NAME # Changes the working directory ``` {% data reusables.pages.decide-publishing-source %} {% data reusables.pages.navigate-publishing-source %} - For example, if you chose to publish your site from the `docs` folder on the default branch, create and change directories to the `docs` folder. + 例如，如果选择从默认分支上的 `docs` 文件夹发布站点，则创建并切换目录到 `docs` 文件夹。 ```shell $ mkdir docs # Creates a new folder called docs $ cd docs ``` - If you chose to publish your site from the `gh-pages` branch, create and checkout the `gh-pages` branch. + 如果选择从 `gh-pages` 分支发布站点，则创建并检出 `gh-pages` 分支。 ```shell $ git checkout --orphan gh-pages # Creates a new branch, with no history or contents, called gh-pages and switches to the gh-pages branch ``` - 7. To create a new Jekyll site, use the `jekyll new` command, replacing _VERSION_ with the current dependency version for Jekyll. For more information, see "[Dependency versions](https://pages.github.com/versions/)" on the {% data variables.product.prodname_pages %} site. - - If you installed Bundler: + 7. 要创建新的 Jekyll 站点，请使用 `jekyll new` 命令，将 _VERSION_ 替换为当前的 Jekyll 依赖项版本。 更多信息请参阅 {% data variables.product.prodname_pages %} 网站上的“[依赖项版本](https://pages.github.com/versions/)”。 + - 如已安装 Bundler： ```shell $ bundle exec jekyll VERSION new . # Creates a Jekyll site in the current directory ``` - - If you don't have Bundler installed: + - 如果尚未安装 Bundler： ```shell $ jekyll VERSION new . # Creates a Jekyll site in the current directory ``` -8. Open the Gemfile that was created and follow the instructions in the Gemfile's comments to use {% data variables.product.prodname_pages %}. - ![Instructions for updating Gemfile](/assets/images/help/pages/gemfile-instructions.png) -9. Update the `gem "github-pages"` line so that the line looks like this, replacing _VERSION_ with the current dependency version for `github-pages`. For more information, see "[Dependency versions](https://pages.github.com/versions/)" on the {% data variables.product.prodname_pages %} site. +8. 打开已创建的 Gemfile，并按照 Gemfile 注释中的说明使用 {% data variables.product.prodname_pages %}。 ![更新 Gemfile 的说明](/assets/images/help/pages/gemfile-instructions.png) +9. 更新 `gem "github-pages"` 行，使该行类似如下，将 _VERSION_ 替换为 `github-pages` 的当前依赖项版本。 更多信息请参阅 {% data variables.product.prodname_pages %} 网站上的“[依赖项版本](https://pages.github.com/versions/)”。 ```shell gem "github-pages", "~> VERSION", group: :jekyll_plugins ``` -10. Save and close the Gemfile. -11. Optionally, test your site locally. For more information, see "[Testing your {% data variables.product.prodname_pages %} site locally with Jekyll](/articles/testing-your-github-pages-site-locally-with-jekyll)." -12. Add your {% data variables.product.product_name %} repository as a remote, replacing {% if currentVersion != "free-pro-team@latest" %}_HOSTNAME_ with your appliance's hostname,{% endif %} _USER_ with the account that owns the repository{% if currentVersion != "free-pro-team@latest" %},{% endif %} and _REPOSITORY_ with the name of the repository. +10. 保存并关闭 Gemfile。 +11. （可选）在本地测试您的站点。 更多信息请参阅“[使用 Jekyll 在本地测试 {% data variables.product.prodname_pages %} 站点](/articles/testing-your-github-pages-site-locally-with-jekyll)”。 +12. 将您的 {% data variables.product.product_name %} 仓库添加为远程，使用您的设备的主机名替换 {% if enterpriseServerVersions contains currentVersion %}_HOSTNAME_，{% endif %} _USER_ 替换为拥有该仓库的帐户{% if enterpriseServerVersions contains currentVersion %}，{% endif %}并且 _REPOSITORY_ 替换为仓库名称。 ```shell {% if currentVersion == "free-pro-team@latest" %} $ git remote add origin https://github.com/USER/REPOSITORY.git @@ -89,7 +88,7 @@ $ git remote add origin https://github.com/USER/REPOSITORY.git $ git remote add origin https://HOSTNAME/USER/REPOSITORY.git {% endif %} ``` -13. Push the repository to {% data variables.product.product_name %}, replacing _BRANCH_ with the name of the branch you're working on. +13. 将仓库推送到 {% data variables.product.product_name %}，_BRANCH_ 替换为您所操作的分支的名称。 ```shell $ git push -u origin BRANCH ``` @@ -100,8 +99,8 @@ $ git remote add origin https://HOSTNAME/USER/REPOSITORY ``` -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation disabled: +{% if enterpriseServerVersions contains currentVersion %} +例如，*OctodogApp* 和 *OctocatApp* 项目将发布到同一个仓库： ``` ` element of the *pom.xml* file. {% data variables.product.prodname_dotcom %} will match the repository based on that field. Since the repository name is also part of the `distributionManagement` element, there are no additional steps to publish multiple packages to the same repository. +如果要将多个包发布到同一个仓库，您可以在 `pom.xml` 文件的 `` 元素中包含该仓库的 URL。 {% data variables.product.prodname_dotcom %} 将根据该字段匹配仓库。 由于仓库名称也是 `distributionManagement` 元素的一部分，因此将多个包发布到同一个仓库无需额外步骤、 -For more information on creating a package, see the [maven.apache.org documentation](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html). +有关创建包的更多信息，请参阅 [maven.apache.org 文档](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)。 -1. Edit the `distributionManagement` element of the *pom.xml* file located in your package directory, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}`OWNER` with the name of the user or organization account that owns the repository and `REPOSITORY` with the name of the repository containing your project. - {% if currentVersion != "free-pro-team@latest" %} - If your instance has subdomain isolation enabled: +1. 编辑包目录中 *pom.xml* 文件的 `distributionManagement` 元素，将 `OWNER` 替换为拥有该仓库的用户或组织帐户的名称，将 `REPOSITORY` 替换为包含项目的仓库的名称。 + +{% if enterpriseServerVersions contains currentVersion %}将 *HOSTNAME* 替换为您的 {% data variables.product.prodname_ghe_server %} 实例的主机名称， {% endif %}将 `OWNER` 替换为拥有仓库的用户或组织帐户的名称，并将 `REPOSITORY` 替换为包含您项目的仓库的名称。 + {% if enterpriseServerVersions contains currentVersion %} + 有关创建包的更多信息，请参阅 [maven.apache.org 文档](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)。 {% endif %} ``` @@ -144,8 +146,8 @@ For more information on creating a package, see the [maven.apache.org documentat ``` - {% if currentVersion != "free-pro-team@latest" %} - If your instance has subdomain isolation disabled: + {% if enterpriseServerVersions contains currentVersion %} + 例如，*OctodogApp* 和 *OctocatApp* 项目将发布到同一个仓库： ``` @@ -156,7 +158,7 @@ For more information on creating a package, see the [maven.apache.org documentat ``` {% endif %} -2. Publish the package. +2. 发布包。 ```shell $ mvn deploy @@ -164,12 +166,12 @@ For more information on creating a package, see the [maven.apache.org documentat {% data reusables.package_registry.viewing-packages %} -### Installing a package +### 安装包 -To install an Apache Maven package from {% data variables.product.prodname_registry %}, edit the *pom.xml* file to include the package as a dependency. If you want to install packages from more than one repository, add a `repository` tag for each. For more information on using a *pom.xml* file in your project, see "[Introduction to the POM](https://maven.apache.org/guides/introduction/introduction-to-the-pom.html)" in the Apache Maven documentation. +要从 {% data variables.product.prodname_registry %} 安装 Apache Maven 包，请编辑 *pom.xml* 文件以包含该包作为依赖项。 如果要从多个仓库安装包，请为每个仓库添加 `repository` 标记。 有关在项目中使用 *pom.xml* 文件的更多信息，请参阅 Apache Maven 文档中的“[POM 简介](https://maven.apache.org/guides/introduction/introduction-to-the-pom.html)”。 {% data reusables.package_registry.authenticate-step %} -2. Add the package dependencies to the `dependencies` element of your project *pom.xml* file, replacing `com.example:test` with your package. +2. 将包依赖项添加到项目 *pom.xml* 文件的 `dependencies` 元素，将 `com.example:test` 替换为您的包。 ``` @@ -180,13 +182,13 @@ To install an Apache Maven package from {% data variables.product.prodname_regis ``` -3. Install the package. +3. 安装包。 ```shell $ mvn install ``` -### Further reading +### 延伸阅读 -- "[Configuring Gradle for use with {% data variables.product.prodname_registry %}](/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages)" -- "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" +- "[配置 Gradle 用于 {% data variables.product.prodname_registry %}](/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages)" +- “[删除包](/packages/publishing-and-managing-packages/deleting-a-package/)” diff --git a/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md b/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md index 59c0d2c8b8..ce11b4da6f 100644 --- a/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md +++ b/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md @@ -1,6 +1,6 @@ --- -title: Configuring Docker for use with GitHub Packages -intro: 'You can configure the Docker client to use {% data variables.product.prodname_registry %} to publish and retrieve docker images.' +title: 配置 Docker 用于 GitHub 包 +intro: '您可以配置 Docker 客户端以使用 {% data variables.product.prodname_registry %} 发布和检索 docker 镜像。' product: '{% data reusables.gated-features.packages %}' redirect_from: - /articles/configuring-docker-for-use-with-github-package-registry @@ -13,33 +13,33 @@ versions: {% data reusables.package_registry.packages-ghes-release-stage %} -{% data reusables.package_registry.admins-can-configure-package-types %} +**注：**安装或发布 Docker 映像时，{% data variables.product.prodname_registry %} 当前不支持外部图层，如 Windows 映像。 -### About Docker and {% data variables.product.prodname_registry %} +### 向 {% data variables.product.prodname_registry %} 验证 {% data reusables.package_registry.docker_registry_deprecation_status %} -When installing or publishing a docker image, {% data variables.product.prodname_registry %} does not currently support foreign layers, such as Windows images. +您可以使用 `docker` 登录命令，通过 Docker 向 {% data variables.product.prodname_registry %} 验证。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} -Before you can use the Docker registry on {% data variables.product.prodname_registry %}, the site administrator for {% data variables.product.product_location_enterprise %} must enable Docker support and subdomain isolation for your instance. For more information, see "[Managing GitHub Packages for your enterprise](/enterprise/admin/packages)." +必须在 {% data variables.product.product_location_enterprise %} 的网站管理员为您的实例启用 Docker 支持和子域隔离后，您才可在 {% data variables.product.prodname_registry %} 上使用 Docker 注册表。 更多信息请参阅“[为企业管理 GitHub Packages](/enterprise/admin/packages)”。 {% endif %} -### Authenticating to {% data variables.product.prodname_registry %} +### 向 {% data variables.product.prodname_registry %} 验证 {% data reusables.package_registry.docker_registry_deprecation_status %} {% data reusables.package_registry.authenticate-packages %} -#### Authenticating with a personal access token +#### 使用个人访问令牌进行身份验证 {% data reusables.package_registry.required-scopes %} -You can authenticate to {% data variables.product.prodname_registry %} with Docker using the `docker` login command. +您可以使用 `docker` 登录命令，通过 Docker 向 {% data variables.product.prodname_registry %} 验证。 -To keep your credentials secure, we recommend you save your personal access token in a local file on your computer and use Docker's `--password-stdin` flag, which reads your token from a local file. +为确保凭据安全，我们建议您将个人访问令牌保存在您计算机上的本地文件中，然后使用 Docker 的 `--password-stdin` 标志从本地文件读取您的令牌。 {% if currentVersion == "free-pro-team@latest" %} {% raw %} @@ -49,7 +49,7 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% raw %} ```shell $ cat ~/TOKEN.txt | docker login docker.HOSTNAME -u USERNAME --password-stdin @@ -57,42 +57,44 @@ To keep your credentials secure, we recommend you save your personal access toke {% endraw %} {% endif %} -To use this example login command, replace `USERNAME` with your {% data variables.product.product_name %} username{% if currentVersion != "free-pro-team@latest" %}, `HOSTNAME` with the URL for {% data variables.product.product_location_enterprise %},{% endif %} and `~/TOKEN.txt` with the file path to your personal access token for {% data variables.product.product_name %}. +要使用此示例登录命令，请将 `USERNAME` 替换为您的 {% data variables.product.product_name %} 用户名{% if enterpriseServerVersions contains currentVersion %}，将 `HOSTNAME` 替换为 {% data variables.product.product_location_enterprise %},{% endif %} 的 URL，并将 `~/TOKEN.txt` 替换为您用于 {% data variables.product.product_name %} 的个人访问令牌的文件路径。 -For more information, see "[Docker login](https://docs.docker.com/engine/reference/commandline/login/#provide-a-password-using-stdin)." +更多信息请参阅“[Docker 登录](https://docs.docker.com/engine/reference/commandline/login/#provide-a-password-using-stdin)”。 -#### Authenticating with the `GITHUB_TOKEN` +#### 使用 `GITHUB_TOKEN` 进行身份验证 {% data reusables.package_registry.package-registry-with-github-tokens %} -### Publishing a package +### 发布包 {% data reusables.package_registry.docker_registry_deprecation_status %} -{% data variables.product.prodname_registry %} supports multiple top-level Docker images per repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation. +{% data variables.product.prodname_registry %} 支持每个仓库的多个顶层 Docker 镜像。 仓库可以拥有任意数量的映像标记。 在发布或安装大于 10GB 的 Docker 映像（每个图层上限为 5GB）时，可能会遇到服务降级的情况。 更多信息请参阅 Docker 文档中的“[Docker 标记](https://docs.docker.com/engine/reference/commandline/tag/)”。 {% data reusables.package_registry.lowercase-name-field %} {% data reusables.package_registry.viewing-packages %} -1. Determine the image name and ID for your docker image using `docker images`. +1. 使用 `docker images` 确定 docker 映像的名称和 ID。 ```shell $ docker images > < > > REPOSITORY TAG IMAGE ID CREATED SIZE > IMAGE_NAME VERSION IMAGE_ID 4 weeks ago 1.11MB ``` -2. Using the Docker image ID, tag the docker image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *VERSION* with package version at build time. +2. 使用 Docker 映像 ID 标记 docker 映像，将 *OWNER* 替换为拥有仓库的用户或组织帐户的名称，将 *REPOSITORY* 替换为包含项目的仓库的名称，将 *IMAGE_NAME* 替换为包或映像的名称，将 *VERSION* 替换为构建时的包版本。 +{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* 使用 {% data variables.product.product_location_enterprise %} 的主机名，{% endif %}而 *VERSION* 使用构建时的软件包版本。 {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker tag IMAGE_ID docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION ``` {% else %} ```shell - $ docker tag IMAGE_ID docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION + 如果尚未为包构建 docker 映像，请构建映像，将 OWNER 替换为拥有仓库的用户或组织帐户的名称，将 REPOSITORY 替换为包含项目的仓库的名称，将 IMAGE_NAME 替换为包或映像的名称，将 VERSION 替换为构建时的包版本，将 PATH 替换为映像路径（如果映像未在当前工作目录中）。 ``` {% endif %} -3. If you haven't already built a docker image for the package, build the image, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image, *VERSION* with package version at build time,{% if currentVersion != "free-pro-team@latest" %} *HOSTNAME* with the hostname of {% data variables.product.product_location_enterprise %},{% endif %} and *PATH* to the image if it isn't in the current working directory.s +3. 您可能首次发布新的 Docker 映像并将其命名为 `monalisa`。 +{% if enterpriseServerVersions contains currentVersion %} *HOSTNAME* 使用 {% data variables.product.product_location_enterprise %} 的主机名，{% endif %}以及映像的 *PATH*（如果不在当前工作目录中）。 {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker build -t docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH @@ -102,7 +104,8 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen $ docker build -t docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH ``` {% endif %} -4. Publish the image to {% data variables.product.prodname_registry %}. +4. 将映像发布到 +{% data variables.product.prodname_registry %}. {% if currentVersion == "free-pro-team@latest" %} ```shell $ docker push docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION @@ -114,15 +117,15 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen {% endif %} {% note %} - **Note:** You must push your image using `IMAGE_NAME:VERSION` and not using `IMAGE_NAME:SHA`. + **注：**必须使用 `IMAGE_NAME:VERSION` 推送映像，而不能使用 `IMAGE_NAME:SHA`。 {% endnote %} -#### Example publishing a Docker image +#### 发布 Docker 映像的示例 {% data reusables.package_registry.docker_registry_deprecation_status %} -You can publish version 1.0 of the `monalisa` image to the `octocat/octo-app` repository using an image ID. +您可以使用映像 ID 将 `monalisa` 映像的 1.0 版本发布到 `octocat/octo-app` 仓库。 {% if currentVersion == "free-pro-team@latest" %} ```shell @@ -155,7 +158,7 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0 {% endif %} -You can publish a new Docker image for the first time and name it `monalisa`. +您可能首次发布新的 Docker 映像并将其命名为 `monalisa`。 {% if currentVersion == "free-pro-team@latest" %} ```shell @@ -178,11 +181,11 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0 ``` {% endif %} -### Installing a package +### 安装包 {% data reusables.package_registry.docker_registry_deprecation_status %} -You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %} +您可以使用 `docker pull` 命令从 {% data variables.product.prodname_registry %} 安装 Docker 映像，将 *OWNER* 替换为拥有仓库的用户或组织帐户的名称，将 *REPOSITORY* 替换为包含项目的仓库的名称，将 *IMAGE_NAME* 替换为包或映像的名称，{% if enterpriseServerVersions contains currentVersion %}将 *HOSTNAME* 替换为您 {% data variables.product.prodname_ghe_server %} 实例的主机名称，{% endif %}并将 *TAG_NAME* 替换为要安装的映像的标记。 {% data reusables.package_registry.lowercase-name-field %} {% if currentVersion == "free-pro-team@latest" %} ```shell @@ -196,10 +199,10 @@ $ docker pull docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:TAG_NAME {% note %} -**Note:** You must pull the image using `IMAGE_NAME:VERSION` and not using `IMAGE_NAME:SHA`. +**注：**必须使用 `IMAGE_NAME:VERSION` 推送映像，而不能使用 `IMAGE_NAME:SHA`。 {% endnote %} -### Further reading +### 延伸阅读 -- "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" +- “[删除包](/packages/publishing-and-managing-packages/deleting-a-package/)” diff --git a/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md b/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md index 1738b9e9ec..934489fbc4 100644 --- a/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md +++ b/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md @@ -29,7 +29,7 @@ versions: 必须： - 将 `USERNAME` 替换为您在 {% data variables.product.prodname_dotcom %} 上的用户帐户的名称。 - 将 `TOKEN` 替换为您的个人访问令牌。 -- 将 `OWNER` 替换为拥有项目所在仓库的用户或组织帐户的名称。{% if currentVersion != "free-pro-team@latest" %} +- 将 `OWNER` 替换为拥有项目所在仓库的用户或组织帐户的名称。{% if enterpriseServerVersions contains currentVersion %} - 拥有 {% data variables.product.prodname_ghe_server %} 实例主机名称的 `HOSTNAME`。 有关创建包的更多信息，请参阅 [maven.apache.org 文档](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)。 @@ -51,7 +51,7 @@ versions: ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} 例如，*OctodogApp* 和 *OctocatApp* 项目将发布到同一个仓库： ```xml @@ -90,7 +90,7 @@ versions: 3. 将项目的特定信息添加到以 *.csproj* 结尾的项目文件中。 必须： - 将 `OWNER` 替换为拥有项目所在仓库的用户或组织帐户的名称。 - 将 `REPOSITORY` 替换为要发布的包所在仓库的名称。 - - 将 `1.0.0` 替换为包的版本号。{% if currentVersion != "free-pro-team@latest" %} + - 将 `1.0.0` 替换为包的版本号。{% if enterpriseServerVersions contains currentVersion %} - 拥有 {% data variables.product.prodname_ghe_server %} 实例主机名称的 `HOSTNAME`。{% endif %} ``` xml diff --git a/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md b/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md index e8042a94bc..3ad04c3d0a 100644 --- a/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md +++ b/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md @@ -25,7 +25,7 @@ versions: 您可以使用 Gradle Groovy 或 Kotlin DSL，通过 Gradle 向 {% data variables.product.prodname_registry %} 验证，方法是编辑 *build.gradle* 文件 (Gradle Groovy) 或 *build.gradle.kts* 文件 (Kotlin DSL) 以包含您的个人访问令牌。 您还可以配置 Gradle Groovy 和 Kotlin DSL 以识别仓库中的一个或多个包。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} 将 *REGISTRY-URL* 替换为您实例的 Maven 注册表的 URL。 如果您的实例启用了子域隔离，请使用 `maven.HOSTNAME`。 如果您的实例禁用了子域隔离，请使用 `HOSTNAME/_registry/maven`。 无论是哪种情况，都要将 *HOSTNAME* 替换为 {% data variables.product.prodname_ghe_server %} 实例的主机名。 {% endif %} @@ -174,7 +174,7 @@ subprojects { {% data reusables.package_registry.authenticate-step %} 2. 将包依赖项添加到您的 *build.gradle* 文件 (Gradle Groovy) 或 *build.gradle.kts* 文件 (Kotlin DSL)。 - Example using Gradle Groovy: + 使用 Gradle Groovy 的示例： ```shell dependencies { implementation 'com.example:package' @@ -189,7 +189,7 @@ subprojects { 3. 将 maven 插件添加到您的 *build.gradle* 文件 (Gradle Groovy) 或 *build.gradle.kts* 文件 (Kotlin DSL)。 - Example using Gradle Groovy: + 使用 Gradle Groovy 的示例： ```shell plugins { id 'maven' diff --git a/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md b/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md index efc0e2d450..2e8cdf78de 100644 --- a/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md +++ b/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md @@ -1,6 +1,6 @@ --- -title: Configuring npm for use with GitHub Packages -intro: 'You can configure npm to publish packages to {% data variables.product.prodname_registry %} and to use packages stored on {% data variables.product.prodname_registry %} as dependencies in an npm project.' +title: 配置 npm 用于 GitHub 包 +intro: '您可以配置 npm 以将包发布到 {% data variables.product.prodname_registry %} 并将存储在 {% data variables.product.prodname_registry %} 上的包用作 npm 项目中的依赖项。' product: '{% data reusables.gated-features.packages %}' redirect_from: - /articles/configuring-npm-for-use-with-github-package-registry @@ -13,40 +13,43 @@ versions: {% data reusables.package_registry.packages-ghes-release-stage %} -{% data reusables.package_registry.admins-can-configure-package-types %} +**注：**安装或发布 Docker 映像时，{% data variables.product.prodname_registry %} 当前不支持外部图层，如 Windows 映像。 -### Authenticating to {% data variables.product.prodname_registry %} +### 向 {% data variables.product.prodname_registry %} 验证 {% data reusables.package_registry.authenticate-packages %} -#### Authenticating with a personal access token +#### 使用个人访问令牌进行身份验证 {% data reusables.package_registry.required-scopes %} -You can authenticate to {% data variables.product.prodname_registry %} with npm by either editing your per-user *~/.npmrc* file to include your personal access token or by logging in to npm on the command line using your username and personal access token. +通过编辑您的每用户 *~/.npmrc* 文件以包含个人访问令牌，或者在命令行上使用用户名和个人访问令牌登录 npm，您可以使用 npm 向 {% data variables.product.prodname_registry %} 验证。 -To authenticate by adding your personal access token to your *~/.npmrc* file, edit the *~/.npmrc* file for your project to include the following line, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*TOKEN* with your personal access token. Create a new *~/.npmrc* file if one doesn't exist. +要通过将个人访问令牌添加到 *~/.npmrc* 文件进行身份验证，请编辑项目的 *~/.npmrc* 文件以包含以下行，将{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* 替换为 {% data variables.product.prodname_ghe_server %} 实例的主机名，并{% endif %}将 *TOKEN* 替换为您的个人访问令牌。 如果 *~/.npmrc* 文件不存在，请新建该文件。 -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation enabled: +{% if enterpriseServerVersions contains currentVersion %} +有关创建包的更多信息，请参阅 [maven.apache.org 文档](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)。 {% endif %} ```shell //{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}/:_authToken=TOKEN ``` -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation disabled: +{% if enterpriseServerVersions contains currentVersion %} +例如，*OctodogApp* 和 *OctocatApp* 项目将发布到同一个仓库： ```shell -//HOSTNAME/_registry/npm/:_authToken=TOKEN +$ npm login --registry=https://npm.pkg.github.com +> Username: USERNAME +> Password: TOKEN +> Email: PUBLIC-EMAIL-ADDRESS ``` {% endif %} -To authenticate by logging in to npm, use the `npm login` command, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *PUBLIC-EMAIL-ADDRESS* with your email address. +要通过登录到 npm 进行身份验证，请使用 `npm login` 命令，将 *USERNAME* 替换为您的 {% data variables.product.prodname_dotcom %} 用户名，将 *TOKEN* 替换为您的个人访问令牌，将 *PUBLIC-EMAIL-ADDRESS* 替换为您的电子邮件地址。 -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation enabled: +{% if enterpriseServerVersions contains currentVersion %} +有关创建包的更多信息，请参阅 [maven.apache.org 文档](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)。 {% endif %} ```shell @@ -56,57 +59,57 @@ $ npm login --registry=https://{% if currentVersion == "free-pro-team@latest" %} > Email: PUBLIC-EMAIL-ADDRESS ``` -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation disabled: +{% if enterpriseServerVersions contains currentVersion %} +例如，*OctodogApp* 和 *OctocatApp* 项目将发布到同一个仓库： ```shell -$ npm login --registry=https://HOSTNAME/_registry/npm/ -> Username: USERNAME -> Password: TOKEN -> Email: PUBLIC-EMAIL-ADDRESS +registry=https://npm.pkg.github.com/OWNER +@OWNER:registry=https://npm.pkg.github.com +@OWNER:registry=https://npm.pkg.github.com ``` {% endif %} -#### Authenticating with the `GITHUB_TOKEN` +#### 使用 `GITHUB_TOKEN` 进行身份验证 {% data reusables.package_registry.package-registry-with-github-tokens %} -### Publishing a package +### 发布包 -By default, {% data variables.product.prodname_registry %} publishes a package in the {% data variables.product.prodname_dotcom %} repository you specify in the name field of the *package.json* file. For example, you would publish a package named `@my-org/test` to the `my-org/test` {% data variables.product.prodname_dotcom %} repository. You can add a summary for the package listing page by including a *README.md* file in your package directory. For more information, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" and "[How to create Node.js Modules](https://docs.npmjs.com/getting-started/creating-node-modules)" in the npm documentation. +默认情况下，{% data variables.product.prodname_registry %} 将包发布到您在 *package.json* 文件的名称字段中指定的 {% data variables.product.prodname_dotcom %} 仓库。 例如，您要发布一个名为 `@my-org/test` 的包到 `my-org/test` {% data variables.product.prodname_dotcom %} 仓库。 通过在包目录中包含 *README.md* 文件，您可以添加包列表页面的摘要。 更多信息请参阅 npm 文档中的“[使用 package.json](https://docs.npmjs.com/getting-started/using-a-package.json)”和“[如何创建 Node.js 模块](https://docs.npmjs.com/getting-started/creating-node-modules)”。 -You can publish multiple packages to the same {% data variables.product.prodname_dotcom %} repository by including a `URL` field in the *package.json* file. For more information, see "[Publishing multiple packages to the same repository](#publishing-multiple-packages-to-the-same-repository)." +通过在 *package.json* 文件中包含 `URL` 字段，您可以将多个包发布到同一个 {% data variables.product.prodname_dotcom %} 仓库。 更多信息请参阅“[将多个包发布到同一个仓库](#publishing-multiple-packages-to-the-same-repository)”。 -You can set up the scope mapping for your project using either a local *.npmrc* file in the project or using the `publishConfig` option in the *package.json*. {% data variables.product.prodname_registry %} only supports scoped npm packages. Scoped packages have names with the format of `@owner/name`. Scoped packages always begin with an `@` symbol. You may need to update the name in your *package.json* to use the scoped name. For example, `"name": "@codertocat/hello-world-npm"`. +您可以使用项目中的本地 *.npmrc* 文件或使用 *package.json* 中的 `publishConfig` 选项来设置项目的作用域映射。 {% data variables.product.prodname_registry %} 只支持作用域内的 npm 包。 作用域内的包具有名称格式 `@owner/name`。 作用域内的包总是以 `@` 符号开头。 您可能需要更新 *package.json* 中的名称以使用作用域内的名称。 例如，`"name": "@codertocat/hello-world-npm"`。 {% data reusables.package_registry.viewing-packages %} -#### Publishing a package using a local *.npmrc* file +#### 使用本地 *.npmrc* 文件发布包 -You can use an *.npmrc* file to configure the scope mapping for your project. In the *.npmrc* file, use the {% data variables.product.prodname_registry %} URL and account owner so {% data variables.product.prodname_registry %} knows where to route package requests. Using an *.npmrc* file prevents other developers from accidentally publishing the package to npmjs.org instead of {% data variables.product.prodname_registry %}. {% data reusables.package_registry.lowercase-name-field %} +您可以使用 *.npmrc* 文件来配置项目的作用域映射。 在 *.npmrc* 文件中，使用 {% data variables.product.prodname_registry %} URL 和帐户所有者，使 account owner so {% data variables.product.prodname_registry %} 知道将包请求路由到何处。 使用 *.npmrc* 文件防止其他开发者意外地将包发布到 npmjs.org 而不是 {% data variables.product.prodname_registry %}。 {% data reusables.package_registry.lowercase-name-field %} {% data reusables.package_registry.authenticate-step %} {% data reusables.package_registry.create-npmrc-owner-step %} {% data reusables.package_registry.add-npmrc-to-repo-step %} -4. Verify the name of your package in your project's *package.json*. The `name` field must contain the scope and the name of the package. For example, if your package is called "test", and you are publishing to the "My-org" {% data variables.product.prodname_dotcom %} organization, the `name` field in your *package.json* should be `@my-org/test`. +4. 验证项目的 *package.json* 中包的名称。 `name` 字段必须包含包的作用域和名称。 例如，如果您的包名称为“test”，要发布到“My-org” +{% data variables.product.prodname_dotcom %} 组织，则 *package.json* 中的 `name` 字段应为 `@my-org/test`。 {% data reusables.package_registry.verify_repository_field %} {% data reusables.package_registry.publish_package %} -#### Publishing a package using `publishConfig` in the *package.json* file +#### 使用 *package.json* 文件中的 `publishConfig` 发布包 -You can use `publishConfig` element in the *package.json* file to specify the registry where you want the package published. For more information, see "[publishConfig](https://docs.npmjs.com/files/package.json#publishconfig)" in the npm documentation. +您可以使用 *package.json* 文件中的 `publishConfig` 元素来指定要发布包的注册表。 更多信息请参阅 npm 文档中的“[publishConfig](https://docs.npmjs.com/files/package.json#publishconfig)”。 -1. Edit the *package.json* file for your package and include a `publishConfig` entry. - {% if currentVersion != "free-pro-team@latest" %} - If your instance has subdomain isolation enabled: +1. 编辑包的 *package.json* 文件并包含 `publishConfig` 条目。 + {% if enterpriseServerVersions contains currentVersion %} + 有关创建包的更多信息，请参阅 [maven.apache.org 文档](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)。 {% endif %} ```shell "publishConfig": { "registry":"https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}" }, ``` - {% if currentVersion != "free-pro-team@latest" %} - If your instance has subdomain isolation disabled: + {% if enterpriseServerVersions contains currentVersion %} + 例如，*OctodogApp* 和 *OctocatApp* 项目将发布到同一个仓库： ```shell "publishConfig": { "registry":"https://HOSTNAME/_registry/npm/" @@ -116,13 +119,13 @@ You can use `publishConfig` element in the *package.json* file to specify the re {% data reusables.package_registry.verify_repository_field %} {% data reusables.package_registry.publish_package %} -### Publishing multiple packages to the same repository +### 将多个包发布到同一个仓库 -To publish multiple packages to the same repository, you can include the URL of the {% data variables.product.prodname_dotcom %} repository in the `repository` field of the *package.json* file for each package. +要将多个包发布到同一个仓库，您可以在每个包的 *package.json* 文件的 `repository` 字段中包含 {% data variables.product.prodname_dotcom %} 仓库的 URL。 -To ensure the repository's URL is correct, replace REPOSITORY with the name of the repository containing the package you want to publish, and OWNER with the name of the user or organization account on {% data variables.product.prodname_dotcom %} that owns the repository. +为确保仓库的 URL 正确，请将 REPOSITORY 替换为要发布的包所在仓库的名称，将 OWNER 替换为拥有该仓库的 {% data variables.product.prodname_dotcom %} 用户或组织帐户的名称。 -{% data variables.product.prodname_registry %} will match the repository based on the URL, instead of based on the package name. If you store the *package.json* file outside the root directory of your repository, you can use the `directory` field to specify the location where {% data variables.product.prodname_registry %} can find the *package.json* files. +{% data variables.product.prodname_registry %} 将根据该 URL 匹配仓库，而不是根据包名称。 如果您在仓库根目录的外部存储 *package.json* 文件，您可以使用 `directory` 字段指定 {% data variables.product.prodname_registry %} 可找到 *package.json* 文件的位置。 ```shell "repository" : { @@ -132,18 +135,18 @@ To ensure the repository's URL is correct, replace REPOSITORY with the name of t }, ``` -### Installing a package +### 安装包 -You can install packages from {% data variables.product.prodname_registry %} by adding the packages as dependencies in the *package.json* file for your project. For more information on using a *package.json* in your project, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" in the npm documentation. +通过在项目的 *package.json* 文件中将包添加为依赖项，您可以从 {% data variables.product.prodname_registry %} 安装包。 有关在项目中使用 *package.json* 的更多信息，请参阅 npm 文档中的“[使用 package.json](https://docs.npmjs.com/getting-started/using-a-package.json)”。 -By default, you can add packages from one organization. For more information, see "[Installing packages from other organizations](#installing-packages-from-other-organizations)." +默认情况下，您可以从一个组织添加包。 更多信息请参阅“[从其他组织安装包](#installing-packages-from-other-organizations)”。 -You also need to add the *.npmrc* file to your project so all requests to install packages will go through {% data variables.product.prodname_registry %}. When you route all package requests through {% data variables.product.prodname_registry %}, you can use both scoped and unscoped packages from *npmjs.com*. For more information, see "[npm-scope](https://docs.npmjs.com/misc/scope)" in the npm documentation. +还需要将 *.npmrc* 文件添加到项目，使所有安装包的请求都会通过 {% data variables.product.prodname_registry %}。 通过 {% data variables.product.prodname_registry %} 路由所有包请求时，您可以使用 *npmjs.com* 作用域内和作用域外的包。 更多信息请参阅 npm 文档中的“[npm 作用域](https://docs.npmjs.com/misc/scope)”。 {% data reusables.package_registry.authenticate-step %} {% data reusables.package_registry.create-npmrc-owner-step %} {% data reusables.package_registry.add-npmrc-to-repo-step %} -4. Configure *package.json* in your project to use the package you are installing. To add your package dependencies to the *package.json* file for {% data variables.product.prodname_registry %}, specify the full-scoped package name, such as `@my-org/server`. For packages from *npmjs.com*, specify the full name, such as `@babel/core` or `@lodash`. For example, this following *package.json* uses the `@octo-org/octo-app` package as a dependency. +4. 配置项目中的 *package.json* 使用要安装的包。 要将包依赖项添加到 {% data variables.product.prodname_registry %} 的 *package.json* 文件，请指定完整的作用域内包名称，例如 `@my-org/server`。 对于来自 *npmjs.com* 的包，请指定全名，例如 `@babel/core` 或 `@lodash`。 例如，以下 *package.json* 将 `@octo-org/octo-app` 包用作依赖项。 ``` { @@ -158,18 +161,18 @@ You also need to add the *.npmrc* file to your project so all requests to instal } } ``` -5. Install the package. +5. 安装包。 ```shell $ npm install ``` -#### Installing packages from other organizations +#### 从其他组织安装包 -By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %} +默认情况下，您只能使用来自一个组织的 {% data variables.product.prodname_registry %} 包。 如果想将包请求传送到多个组织和用户，您可以添加额外行到 *.npmrc* 文件，将 {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* 替换为您的 {% data variables.product.prodname_ghe_server %} 实例的主机名，并{% endif %}将 *OWNER* 替换为拥有项目所在仓库的用户或组织帐户的名称。 {% data reusables.package_registry.lowercase-name-field %} -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation enabled: +{% if enterpriseServerVersions contains currentVersion %} +有关创建包的更多信息，请参阅 [maven.apache.org 文档](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)。 {% endif %} ```shell @@ -178,8 +181,8 @@ registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github @OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %} ``` -{% if currentVersion != "free-pro-team@latest" %} -If your instance has subdomain isolation disabled: +{% if enterpriseServerVersions contains currentVersion %} +例如，*OctodogApp* 和 *OctocatApp* 项目将发布到同一个仓库： ```shell registry=https://HOSTNAME/_registry/npm/OWNER @@ -188,6 +191,6 @@ registry=https://HOSTNAME/_registry/npm/OWNER ``` {% endif %} -### Further reading +### 延伸阅读 -- "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package/)" +- “[删除包](/packages/publishing-and-managing-packages/deleting-a-package/)” diff --git a/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md b/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md index 35f32a1ae3..da25231521 100644 --- a/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md +++ b/translations/zh-CN/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md @@ -56,7 +56,7 @@ For example, you would create or edit a *~/.gem/credentials* to include the foll To install gems, you need to authenticate to {% data variables.product.prodname_registry %} by editing the *~/.gemrc* file for your project to include `https://USERNAME:TOKEN@{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER/`. You must replace: - `USERNAME` with your {% data variables.product.prodname_dotcom %} username. - `TOKEN` with your personal access token. - - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} + - `OWNER` with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} - `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance. {% endif %} @@ -74,7 +74,7 @@ If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this exa ``` -To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} {% data reusables.package_registry.lowercase-name-field %} @@ -97,7 +97,7 @@ $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygem ```shell gem build OCTO-GEM.gemspec ``` -3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +3. Publish a package to {% data variables.product.prodname_registry %}, replacing `OWNER` with the name of the user or organization account that owns the repository containing your project and `OCTO-GEM` with the name of your gem package.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ```shell $ gem push --key github \ @@ -107,7 +107,7 @@ $ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygem ### Publishing multiple packages to the same repository -To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if currentVersion != "free-pro-team@latest" %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% if enterpriseServerVersions contains currentVersion %} Replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` gem.metadata = { "github_repo" => "ssh://{% if currentVersion == "free-pro-team@latest" %}github.com{% else %}HOSTNAME{% endif %}/OWNER/REPOSITORY" } @@ -118,7 +118,7 @@ gem.metadata = { "github_repo" => "ssh://{% if currentVersion == "free-pro-team@ You can use gems from {% data variables.product.prodname_registry %} much like you use gems from *rubygems.org*. You need to authenticate to {% data variables.product.prodname_registry %} by adding your {% data variables.product.prodname_dotcom %} user or organization as a source in the *~/.gemrc* file or by using Bundler and editing you *Gemfile*. {% data reusables.package_registry.authenticate-step %} -2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if currentVersion != "free-pro-team@latest" %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} +2. For Bundler, add your {% data variables.product.prodname_dotcom %} user or organization as a source in your *Gemfile* to fetch gems from this new source. For example, you can add a new `source` block to your *Gemfile* that uses {% data variables.product.prodname_registry %} only for the packages you specify, replacing *GEM NAME* with the package you want to install from {% data variables.product.prodname_registry %} and *OWNER* with the user or organization that owns the repository containing the gem you want to install.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.{% endif %} ``` source "https://rubygems.org" diff --git a/translations/zh-CN/content/rest/guides/basics-of-authentication.md b/translations/zh-CN/content/rest/guides/basics-of-authentication.md index 7ddee525e5..ef3cc7fed7 100644 --- a/translations/zh-CN/content/rest/guides/basics-of-authentication.md +++ b/translations/zh-CN/content/rest/guides/basics-of-authentication.md @@ -106,7 +106,7 @@ end #### 检查授予的作用域 -Users can edit the scopes you requested by directly changing the URL. This can grant your application less access than you originally asked for. 因此，在使用令牌发出任何请求之前，您应该检查用户为令牌授予的作用域。 For more information about requested and granted scopes, see "[Scopes for OAuth Apps](/developers/apps/scopes-for-oauth-apps#requested-scopes-and-granted-scopes)." +用户可以通过直接更改 URL 来编辑您请求的范围。 这可以授予您的应用程序比您最初请求的更少的访问权限。 因此，在使用令牌发出任何请求之前，您应该检查用户为令牌授予的作用域。 有关请求和授予的范围的更多信息，请参阅“[OAuth 应用程序的范围](/developers/apps/scopes-for-oauth-apps#requested-scopes-and-granted-scopes)”。 授予的作用域在交换令牌的响应中返回。 diff --git a/translations/zh-CN/content/rest/guides/getting-started-with-the-git-database-api.md b/translations/zh-CN/content/rest/guides/getting-started-with-the-git-database-api.md index 389e845197..6c13844b39 100644 --- a/translations/zh-CN/content/rest/guides/getting-started-with-the-git-database-api.md +++ b/translations/zh-CN/content/rest/guides/getting-started-with-the-git-database-api.md @@ -38,7 +38,7 @@ versions: 消费 API 需要明确请求拉取请求来创建一个_测试_合并提交。 当您在 UI 中查看拉取请求并且“ Merge（合并）”按钮显示时，或者当您使用 REST API 来[获取](/v3/pulls/#get-a-pull-request)、[创建](/v3/pulls/#create-a-pull-request)或[编辑](/v3/pulls/#update-a-pull-request)拉取请求时，将创建一个_测试_合并提交。 如果没有此请求，`merge` Git 引用将过时，直到下次有人查看拉取请求。 -If you are currently using polling methods that produce outdated `merge` Git refs, then GitHub recommends using the following steps to get the latest changes from the default branch: +如果您当前正在使用会生成过时 `merge` Git 引用的轮询方法，GitHub 建议使用以下步骤从默认分支获取最新更改： 1. 接收拉取请求 web 挂钩。 2. 调用 [`GET /repos/{owner}/{repo}/pulls/{pull_number}`](/v3/pulls/#get-a-pull-request) 以启动创建合并提交候选项的后台作业。 diff --git a/translations/zh-CN/content/rest/overview/api-previews.md b/translations/zh-CN/content/rest/overview/api-previews.md index 37c5d5493d..b521250d25 100644 --- a/translations/zh-CN/content/rest/overview/api-previews.md +++ b/translations/zh-CN/content/rest/overview/api-previews.md @@ -42,7 +42,7 @@ API 预览允许您试用新的 API 以及对现有 API 方法的更改（在它 **自定义媒体类型：** `mockingbird-preview` **公布日期：** [2016-05-23](https://developer.github.com/changes/2016-05-23-timeline-preview-api/) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 预接收环境 创建、列出、更新和删除预接收挂钩的环境。 @@ -50,7 +50,7 @@ API 预览允许您试用新的 API 以及对现有 API 方法的更改（在它 **自定义媒体类型：** `eye-scream-preview` **公布日期：** [2015-07-29](/rest/reference/enterprise-admin#pre-receive-environments) {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### 集成 通过 API 管理[集成](/early-access/integrations/)。 @@ -98,7 +98,7 @@ API 预览允许您试用新的 API 以及对现有 API 方法的更改（在它 **自定义媒体类型：** `scarlet-witch-preview` -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### 嵌套团队 在[团队](/v3/teams/)有效负载中包含嵌套团队内容。 @@ -107,7 +107,7 @@ API 预览允许您试用新的 API 以及对现有 API 方法的更改（在它 {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 全局 web 挂钩 @@ -117,7 +117,7 @@ API 预览允许您试用新的 API 以及对现有 API 方法的更改（在它 {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} ### 仓库转让 将[仓库](/v3/repos/)转让给组织或用户。 @@ -125,7 +125,7 @@ API 预览允许您试用新的 API 以及对现有 API 方法的更改（在它 **自定义媒体类型：** `nightshade-preview` **公布日期：** [2017-11-09](https://developer.github.com/changes/2017-11-09-repository-transfer-api-preview) {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} ### 添加锁定原因 现在，您可以在[锁定议题](/v3/issues/#lock-an-issue)时添加原因。 @@ -145,7 +145,7 @@ API 预览允许您试用新的 API 以及对现有 API 方法的更改（在它 **自定义媒体类型：** `luke-cage-preview` **公布日期：** [2018-03-16](https://developer.github.com/changes/2018-03-16-protected-branches-required-approving-reviews) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.19" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.19" %} ### 检索悬停卡信息 从[某人的悬停卡](/v3/users/#get-contextual-information-for-a-user)检索信息。 @@ -162,7 +162,7 @@ API 预览允许您试用新的 API 以及对现有 API 方法的更改（在它 **自定义媒体类型：** `antiope-preview` **公布日期：** [2018-05-07](https://developer.github.com/changes/2018-05-07-new-checks-api-public-beta/) {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 对仓库的匿名 Git 访问 @@ -216,7 +216,7 @@ GitHub 应用程序清单允许用户创建预配置的 GitHub 应用程序。 {% endif %} -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### 草稿拉取请求 您可以使用草稿拉取请求 API 及其[拉取请求](/v3/pulls/)端点来查看拉取请求是否处于草稿状态。 要了解有关草稿拉取请求的更多信息，请参阅“[关于拉取请求](/articles/about-pull-requests/)”。 @@ -237,7 +237,7 @@ GitHub 应用程序清单允许用户创建预配置的 GitHub 应用程序。 **自定义媒体类型：** `groot-preview` **公布日期：** [2019-04-11](https://developer.github.com/changes/2019-04-11-pulls-branches-for-commit/) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} ### 卸载 GitHub 应用程序 GitHub 应用程序的所有者现在可以使用[应用程序 API](/v3/apps/#delete-an-installation-for-the-authenticated-app) 卸载其应用程序。 diff --git a/translations/zh-CN/content/rest/overview/resources-in-the-rest-api.md b/translations/zh-CN/content/rest/overview/resources-in-the-rest-api.md index b4f29ab80b..3565c19388 100644 --- a/translations/zh-CN/content/rest/overview/resources-in-the-rest-api.md +++ b/translations/zh-CN/content/rest/overview/resources-in-the-rest-api.md @@ -40,7 +40,7 @@ $ curl -i {% data variables.product.api_url_pre %}/users/octocat/orgs > X-GitHub-Media-Type: github.v3 > X-RateLimit-Limit: 5000 > X-RateLimit-Remaining: 4987 -> X-RateLimit-Reset: 1350085394{% if currentVersion != "free-pro-team@latest" %} +> X-RateLimit-Reset: 1350085394{% if enterpriseServerVersions contains currentVersion %} > X-GitHub-Enterprise-Version: {{ currentVersion }}.0{% endif %} > Content-Length: 5 > Cache-Control: max-age=0, private, must-revalidate @@ -107,7 +107,7 @@ curl -u my_client_id:my_client_secret '{% data variables.product.api_url_pre %}/ 使用 `client_id` 和 `client_secret`_不会_验证为用户，只会识别您的 OAuth 应用程序以提高速率限制。 权限仅授予用户，而不授予应用程序，因此只会返回未经验证用户可以看到的数据。 因此，您应该仅在服务器到服务器的场景中使用 OAuth2 键/密钥。 不要将 OAuth 应用程序的客户端密钥泄露给用户。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} 在私有模式下无法使用 OAuth2 键和密钥进行身份验证，尝试验证时会返回 `401 Unauthorized`。 更多信息请参阅“[启用私有模式](/enterprise/admin/installation/enabling-private-mode)”。 {% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -163,10 +163,10 @@ $ curl -i -u username -d '{"scopes":["public_repo"]}' {% data variables.product. 您可以向根端点发出 `GET` 请求，以获取 REST API 支持的所有端点类别： ```shell -$ curl {% if currentVersion != "free-pro-team@latest" %}-u username:password {% endif %}{% data variables.product.api_url_pre %} +$ curl {% if enterpriseServerVersions contains currentVersion %}-u username:password {% endif %}{% data variables.product.api_url_pre %} ``` -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/zh-CN/content/rest/reference/actions.md b/translations/zh-CN/content/rest/reference/actions.md index 7e093c8f3f..4ac749c15b 100644 --- a/translations/zh-CN/content/rest/reference/actions.md +++ b/translations/zh-CN/content/rest/reference/actions.md @@ -26,9 +26,9 @@ versions: ## 权限 -The Permissions API allows you to set permissions for what organizations and repositories are allowed to run {% data variables.product.prodname_actions %}, and what actions are allowed to run. For more information, see "[Usage limits, billing, and administration](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)." +权限 API 允许您设置允许哪些组织和仓库运行 {% data variables.product.prodname_actions %}，以及允许运行哪些操作。 更多信息请参阅“[使用限制、计费和管理](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)”。 -You can also set permissions for an enterprise. 更多信息请参阅“[{% data variables.product.prodname_dotcom %} Enterprise 管理](/rest/reference/enterprise-admin#github-actions)”REST API。 +您还可以为企业设置权限。 更多信息请参阅“[{% data variables.product.prodname_dotcom %} Enterprise 管理](/rest/reference/enterprise-admin#github-actions)”REST API。 {% for operation in currentRestOperations %} {% if operation.subcategory == 'permissions' %}{% include rest_operation %}{% endif %} diff --git a/translations/zh-CN/content/rest/reference/apps.md b/translations/zh-CN/content/rest/reference/apps.md index 542721363c..69f615d3c3 100644 --- a/translations/zh-CN/content/rest/reference/apps.md +++ b/translations/zh-CN/content/rest/reference/apps.md @@ -61,3 +61,12 @@ GitHub 应用程序 API 使您能够获取有关 GitHub 应用程序的高层次 {% endfor %} {% endif %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +## Web 挂钩 + +{% for operation in currentRestOperations %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} +{% endfor %} + +{% endif %} \ No newline at end of file diff --git a/translations/zh-CN/content/rest/reference/enterprise-admin.md b/translations/zh-CN/content/rest/reference/enterprise-admin.md index 226906944b..a84427032f 100644 --- a/translations/zh-CN/content/rest/reference/enterprise-admin.md +++ b/translations/zh-CN/content/rest/reference/enterprise-admin.md @@ -21,7 +21,7 @@ You can use these {{ site.data.variables.product.prodname_ghe_cloud }} endpoints {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 端点 URL @@ -39,7 +39,7 @@ http(s)://hostname/ ### 身份验证 -{% data variables.product.product_name %} 安装设施的 API 端点接受与 GitHub.com [相同的身份验证方法](/rest/overview/resources-in-the-rest-api#authentication)。 您可以使用 **[OAuth 令牌](/apps/building-integrations/setting-up-and-registering-oauth-apps/)**（可使用[授权 API](/rest/reference/oauth-authorizations#create-a-new-authorization) 创建）或**[基本身份验证](/rest/overview/resources-in-the-rest-api#basic-authentication)**来验证自己。 {% if currentVersion != "free-pro-team@latest" %} OAuth 令牌用于企业特定的端点时必须具有 `site_admin` [OAuth 作用域](/developers/apps/scopes-for-oauth-apps#available-scopes)。{% endif %} +{% data variables.product.product_name %} 安装设施的 API 端点接受与 GitHub.com [相同的身份验证方法](/rest/overview/resources-in-the-rest-api#authentication)。 您可以使用 **[OAuth 令牌](/apps/building-integrations/setting-up-and-registering-oauth-apps/)**（可使用[授权 API](/rest/reference/oauth-authorizations#create-a-new-authorization) 创建）或**[基本身份验证](/rest/overview/resources-in-the-rest-api#basic-authentication)**来验证自己。 {% if enterpriseServerVersions contains currentVersion %} OAuth 令牌用于企业特定的端点时必须具有 `site_admin` [OAuth 作用域](/developers/apps/scopes-for-oauth-apps#available-scopes)。{% endif %} 企业管理 API 端点只有经过身份验证的 {% data variables.product.product_name %} 站点管理员可以访问，但[管理控制台](#management-console) API 例外，它需要[管理控制台密码](/enterprise/admin/articles/accessing-the-management-console/)。 @@ -135,7 +135,7 @@ GET /scim/v2/enterprises/{enterprise}/Users/{scim_user_id} {% endif %} -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ## 管理统计 diff --git a/translations/zh-CN/content/rest/reference/gists.md b/translations/zh-CN/content/rest/reference/gists.md index 20b89e17e0..695de85599 100644 --- a/translations/zh-CN/content/rest/reference/gists.md +++ b/translations/zh-CN/content/rest/reference/gists.md @@ -9,7 +9,7 @@ versions: ### 身份验证 -您可以匿名读取公开 Gist {% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "2.9" %}并为没有令牌的匿名用户创建它们。{% else %}，但是您必须登录到 GitHub 才能创建 Gist。{% endif %} 要代表用户读取或写入 Gist，您需要 Gist OAuth 作用域和令牌。 更多信息请参阅“[OAuth 应用程序的作用域](/developers/apps/scopes-for-oauth-apps)”。 +您可以匿名读取公开 Gist {% if enterpriseServerVersions contains currentVersion %}并为没有令牌的匿名用户创建它们。{% else %}，但是您必须登录到 GitHub 才能创建 Gist。{% endif %} 要代表用户读取或写入 Gist，您需要 Gist OAuth 作用域和令牌。 更多信息请参阅“[OAuth 应用程序的作用域](/developers/apps/scopes-for-oauth-apps)”。 diff --git a/translations/zh-CN/content/rest/reference/interactions.md b/translations/zh-CN/content/rest/reference/interactions.md index c57b33799d..e9ae08c8a7 100644 --- a/translations/zh-CN/content/rest/reference/interactions.md +++ b/translations/zh-CN/content/rest/reference/interactions.md @@ -28,9 +28,9 @@ versions: 仓库交互 API 允许具有所有者或管理员权限的用户临时限制哪些用户可以在公共存储库中发表评论、开设议题或创建拉取请求。 {% data reusables.interactions.interactions-detail %} 以下是有关 {% data variables.product.product_name %} 用户组的更多信息： -* {% data reusables.interactions.existing-user-limit-definition %} in the repository. -* {% data reusables.interactions.contributor-user-limit-definition %} in the repository. -* {% data reusables.interactions.collaborator-user-limit-definition %} in the repository. +* 仓库中的 {% data reusables.interactions.existing-user-limit-definition %}。 +* 仓库中的 {% data reusables.interactions.contributor-user-limit-definition %}。 +* 仓库中的 {% data reusables.interactions.collaborator-user-limit-definition %}。 {% for operation in currentRestOperations %} {% if operation.subcategory == 'repos' %}{% include rest_operation %}{% endif %} diff --git a/translations/zh-CN/content/rest/reference/orgs.md b/translations/zh-CN/content/rest/reference/orgs.md index 01966b8c0d..d2ef689204 100644 --- a/translations/zh-CN/content/rest/reference/orgs.md +++ b/translations/zh-CN/content/rest/reference/orgs.md @@ -56,5 +56,5 @@ versions: {% data variables.product.product_name %} 发送时将附带几个 HTTP 标头，以区分事件类型和有效负载标识符。 更多信息请参阅 [web 挂钩标头](/webhooks/event-payloads/#delivery-headers)。 {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} diff --git a/translations/zh-CN/content/rest/reference/permissions-required-for-github-apps.md b/translations/zh-CN/content/rest/reference/permissions-required-for-github-apps.md index 34fd07f8f0..9dbdbe99dd 100644 --- a/translations/zh-CN/content/rest/reference/permissions-required-for-github-apps.md +++ b/translations/zh-CN/content/rest/reference/permissions-required-for-github-apps.md @@ -577,7 +577,7 @@ _团队_ - [`GET /orgs/:org/teams`](/v3/teams/#list-teams) (:read) - [`POST /orgs/:org/teams`](/v3/teams/#create-a-team) (:write) - [`GET /orgs/:org/teams/:team_slug`](/v3/teams/#get-a-team-by-name) (:read) -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} - [`GET /teams/:team_id`](/v3/teams/#get-a-team) (:read) {% endif %} - [`PATCH /teams/:team_id`](/v3/teams/#update-a-team) (:write) @@ -619,7 +619,7 @@ _团队_ _团队_ - [`DELETE /teams/:team_id/projects/:project_id`](/v3/teams/#remove-a-project-from-a-team) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 有关“组织预接收挂钩”的权限 - [`GET /orgs/:org/pre-receive-hooks`](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-an-organization) (:read) @@ -766,7 +766,7 @@ _审查_ - [`POST /repos/:owner/:repo/hooks/:hook_id/pings`](/v3/repos/hooks/#ping-a-repository-webhook) (:read) - [`POST /repos/:owner/:repo/hooks/:hook_id/tests`](/v3/repos/hooks/#test-the-push-repository-webhook) (:read) -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 有关“仓库预接收挂钩”的权限 - [`GET /repos/:owner/:repo/pre-receive-hooks`](/enterprise/user/rest/reference/enterprise-admin#list-pre-receive-hooks-for-a-repository) (:read) diff --git a/translations/zh-CN/content/rest/reference/repos.md b/translations/zh-CN/content/rest/reference/repos.md index 5345c36af2..3b299ac556 100644 --- a/translations/zh-CN/content/rest/reference/repos.md +++ b/translations/zh-CN/content/rest/reference/repos.md @@ -189,7 +189,7 @@ versions: 在返回 GitHub Pages 站点信息的 {% data variables.product.prodname_pages %} API 端点中，JSON 响应包括以下字段： * `html_url`：所渲染的 Pages 站点的绝对 URL（包括模式）。 例如，`https://username.github.io`。 * `source`：包含所渲染 Pages 站点的源分支和目录的对象。 这包括： - - `branch`：用于发布[站点源文件](/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site)的仓库分支。 For example, _main_ or _gh-pages_. + - `branch`：用于发布[站点源文件](/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site)的仓库分支。 例如，_main_ 或 _gh-pages_。 - `path`：提供站点发布内容的仓库目录。 可能是 `/` 或 `/docs`。 {% for operation in currentRestOperations %} @@ -216,7 +216,7 @@ versions: 计算仓库统计信息是一项昂贵的操作，所以我们尽可能返回缓存的数据。 如果您查询仓库的统计信息时，数据尚未缓存，您将会收到 `202` 响应；同时触发后台作业以开始编译这些统计信息。 稍等片刻，待作业完成，然后再次提交请求。 如果作业已完成，该请求将返回 `200` 响应，响应正文中包含统计信息。 -Repository statistics are cached by the SHA of the repository's default branch; pushing to the default branch resets the statistics cache. +仓库统计信息由仓库默认分支的 SHA 缓存；推送到默认分支将重置统计信息缓存。 ### 统计排除某些类型的提交 @@ -263,7 +263,7 @@ API 公开的统计信息与[各种仓库图](/github/visualizing-repository-dat 如果您要设置一个 web 挂钩来接收来自组织所有仓库的事件，请参阅关于[组织 web 挂钩](/rest/reference/orgs#webhooks)的 API 文档。 {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} ### 接收 web 挂钩 @@ -292,14 +292,14 @@ GitHub 还可以作为所有仓库的 [PubSubHubbabub](https://github.com/pubsub #### 回调 URL 回调 URL 可以使用 `http://` 协议。 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %}您还可以 `github://` 回叫以指定 GitHub 服务。 +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %}您还可以 `github://` 回叫来指定 GitHub 服务。 {% data reusables.apps.deprecating_github_services_ghe %} {% endif %} # Send updates to postbin.org http://postbin.org/123 -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} # Send updates to Campfire github://campfire?subdomain=github&room=Commits&token=abc123 {% endif %} diff --git a/translations/zh-CN/data/glossaries/external.yml b/translations/zh-CN/data/glossaries/external.yml index 4fa2651fa9..d4c296ba41 100644 --- a/translations/zh-CN/data/glossaries/external.yml +++ b/translations/zh-CN/data/glossaries/external.yml @@ -157,7 +157,7 @@ description: >- GitHub 上的特定活动，将会：- 添加方块到用户的贡献图："[计为贡献的活动](https://help.github.com/articles/viewing-contributions-on-your-profile/#what-counts-as-a-contribution)" - 添加活动到用户个人资料上的时间表："[贡献活动](https://help.github.com/articles/viewing-contributions-on-your-profile/#contribution-activity)" - - term: 贡献者，参与者 + term: 贡献者 description: >- 贡献者是指对仓库没有协作者权限但参与过项目，并且他们打开的拉取请求已合并到仓库的人员。 - @@ -180,7 +180,7 @@ - term: 默认分支 description: >- - The base branch for new pull requests and code commits in a repository. Each repository has at least one branch, which Git creates when you initialize the repository. The first branch is usually called `main`, and is often the default branch. + 仓库中新拉取请求和代码提交的基本分支。每个仓库至少有一个分支，Git 会在您初始化仓库时创建该分支。第一个分支通常称为"main"，并且通常是默认分支。 - term: 从属者图 description: >- diff --git a/translations/zh-CN/data/reusables/actions/actions-not-verified.md b/translations/zh-CN/data/reusables/actions/actions-not-verified.md index dcfd5cdeef..2ab85ce6c1 100644 --- a/translations/zh-CN/data/reusables/actions/actions-not-verified.md +++ b/translations/zh-CN/data/reusables/actions/actions-not-verified.md @@ -1 +1 @@ -只要符合服务条款，任何人都可以在 {% data variables.product.prodname_marketplace %} 中发布操作。 与应用程序不同， 在 {% data variables.product.prodname_marketplace %} 中列出的 {% data variables.product.prodname_actions %} 不会经过 {% data variables.product.prodname_dotcom %} 验证。 +Anyone can publish an action in {% data variables.product.prodname_marketplace %}. {% data variables.product.prodname_dotcom %} verifies some partner organizations, but unlike verified apps, {% data variables.product.prodname_dotcom %} does not review or verify individual actions listed in {% data variables.product.prodname_marketplace %}. diff --git a/translations/zh-CN/data/reusables/actions/enterprise-beta.md b/translations/zh-CN/data/reusables/actions/enterprise-beta.md index 5f4014ad61..33a0ba2b51 100644 --- a/translations/zh-CN/data/reusables/actions/enterprise-beta.md +++ b/translations/zh-CN/data/reusables/actions/enterprise-beta.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion == "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.22" %} {% note %} **注：**{% data variables.product.prodname_ghe_server %} 2.22 上的 {% data variables.product.prodname_actions %} 支持是有限的公测版。 要查看外部存储要求并请求访问测试版，请参阅“[启用 {% data variables.product.prodname_actions %} 和配置存储](/enterprise/admin/github-actions/enabling-github-actions-and-configuring-storage)”。 diff --git a/translations/zh-CN/data/reusables/actions/enterprise-github-hosted-runners.md b/translations/zh-CN/data/reusables/actions/enterprise-github-hosted-runners.md index 6b261671df..a15cdb4984 100644 --- a/translations/zh-CN/data/reusables/actions/enterprise-github-hosted-runners.md +++ b/translations/zh-CN/data/reusables/actions/enterprise-github-hosted-runners.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} {% note %} **注：** {% data variables.product.prodname_dotcom %} 托管的运行器目前在 {% data variables.product.prodname_ghe_server %} 上不受支持。 您可以在 [{% data variables.product.prodname_roadmap %}](https://github.com/github/roadmap/issues/72) 上查看有关未来支持计划的更多信息。 diff --git a/translations/zh-CN/data/reusables/actions/enterprise-marketplace-actions.md b/translations/zh-CN/data/reusables/actions/enterprise-marketplace-actions.md index 2b069953f0..3ac2560a0f 100644 --- a/translations/zh-CN/data/reusables/actions/enterprise-marketplace-actions.md +++ b/translations/zh-CN/data/reusables/actions/enterprise-marketplace-actions.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} diff --git a/translations/zh-CN/data/reusables/actions/enterprise-setup-prereq.md b/translations/zh-CN/data/reusables/actions/enterprise-setup-prereq.md index c977eab7ce..9ac5106358 100644 --- a/translations/zh-CN/data/reusables/actions/enterprise-setup-prereq.md +++ b/translations/zh-CN/data/reusables/actions/enterprise-setup-prereq.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} #### 在 {% data variables.product.prodname_ghe_server %} 上使用自托管的运行器 diff --git a/translations/zh-CN/data/reusables/apps/deprecating_auth_with_query_parameters.md b/translations/zh-CN/data/reusables/apps/deprecating_auth_with_query_parameters.md index ae6581b669..a05cf5318c 100644 --- a/translations/zh-CN/data/reusables/apps/deprecating_auth_with_query_parameters.md +++ b/translations/zh-CN/data/reusables/apps/deprecating_auth_with_query_parameters.md @@ -3,7 +3,7 @@ **弃用通知：** {% data variables.product.prodname_dotcom %} 将停止使用查询参数向 API 验证。 Authenticating to the API should be done with [HTTP basic authentication](/v3/auth/#via-oauth-and-personal-access-tokens).{% if currentVersion == "free-pro-team@latest" %} Using query parameters to authenticate to the API will no longer work on May 5, 2021. {% endif %}有关详细信息，包括预定的限电，请参阅[博客文章](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/)。 -{% if currentVersion != "free-pro-team@latest" %} Authentication to the API using query parameters while available is no longer supported due to security concerns. 相反，我们建议集成商在标头中移动其访问令牌 `client_id` 或 `client_secret`。 {% data variables.product.prodname_dotcom %} 将宣布删除通过查询参数进行身份验证，并且会提前通知。 {% endif %} +{% if enterpriseServerVersions contains currentVersion %} 出于安全考虑，不再支持使用查询参数向 API 验证（如果可用）。 相反，我们建议集成商在标头中移动其访问令牌 `client_id` 或 `client_secret`。 {% data variables.product.prodname_dotcom %} 将宣布删除通过查询参数进行身份验证，并且会提前通知。 {% endif %} {% endwarning %} {% endif %} diff --git a/translations/zh-CN/data/reusables/apps/deprecating_github_services_ghe.md b/translations/zh-CN/data/reusables/apps/deprecating_github_services_ghe.md index da4c8ee639..a0c505915e 100644 --- a/translations/zh-CN/data/reusables/apps/deprecating_github_services_ghe.md +++ b/translations/zh-CN/data/reusables/apps/deprecating_github_services_ghe.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% note %} **注：**GitHub Enterprise 2.17 及更高版本不再允许管理员安装新的 GitHub 服务，并且现有服务将在 GitHub Enterprise 2.20 及更高版本中停用。 您可以使用[替换 GitHub 服务指南](/v3/guides/replacing-github-services)帮助您将服务更新到 web 挂钩。 diff --git a/translations/zh-CN/data/reusables/apps/deprecating_password_auth.md b/translations/zh-CN/data/reusables/apps/deprecating_password_auth.md index dddce4a714..e84b7a0047 100644 --- a/translations/zh-CN/data/reusables/apps/deprecating_password_auth.md +++ b/translations/zh-CN/data/reusables/apps/deprecating_password_auth.md @@ -3,7 +3,7 @@ **弃用通知：** {% data variables.product.prodname_dotcom %} 将停止使用密码向 API 验证。 You must now authenticate to the {% data variables.product.prodname_dotcom %} API with an API token, such as an OAuth access token, GitHub App installation access token, or personal access token, depending on what you need to do with the token.{% if currentVersion == "free-pro-team@latest" %} Password authentication to the API will be removed on November 13, 2020.{% endif %} For more information,{% if currentVersion == "free-pro-team@latest" %} including scheduled brownouts,{% endif %} see the [blog post](https://developer.github.com/changes/2020-02-14-deprecating-password-auth/). -{% if currentVersion != "free-pro-team@latest" %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %} 将宣布弃用，并在删除对此功能的支持之前提前通知。{% endif %} +{% if enterpriseServerVersions contains currentVersion %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_dotcom %} 将宣布弃用，并在删除对此功能的支持之前提前通知。{% endif %} {% endwarning %} {% endif %} diff --git a/translations/zh-CN/data/reusables/apps/deprecating_token_oauth_authorizations.md b/translations/zh-CN/data/reusables/apps/deprecating_token_oauth_authorizations.md index 73b13e7f42..5f5ecbdaf3 100644 --- a/translations/zh-CN/data/reusables/apps/deprecating_token_oauth_authorizations.md +++ b/translations/zh-CN/data/reusables/apps/deprecating_token_oauth_authorizations.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.20" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.20" %} {% warning %} **弃用通知：**`token` 属性在某些 OAuth 授权 API 响应中弃用： diff --git a/translations/zh-CN/data/reusables/code-scanning/about-code-scanning.md b/translations/zh-CN/data/reusables/code-scanning/about-code-scanning.md index 70df68d69b..faeb0c3c7d 100644 --- a/translations/zh-CN/data/reusables/code-scanning/about-code-scanning.md +++ b/translations/zh-CN/data/reusables/code-scanning/about-code-scanning.md @@ -1 +1 @@ -{% data variables.product.prodname_code_scanning_capc %} is a feature that you use to analyze the code in a {% data variables.product.prodname_dotcom %} repository to find security vulnerabilities and coding errors. Any problems identified by the analysis are shown in {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_ghe_server %}{% else %}{% data variables.product.prodname_dotcom %}{% endif %}. +{% data variables.product.prodname_code_scanning_capc %} 是一项功能，可用于分析 {% data variables.product.prodname_dotcom %} 仓库中的代码，以查找安全漏洞和编码错误。 Any problems identified by the analysis are shown in {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_ghe_server %}{% else %}{% data variables.product.prodname_dotcom %}{% endif %}. diff --git a/translations/zh-CN/data/reusables/code-scanning/choose-alert-dismissal-reason.md b/translations/zh-CN/data/reusables/code-scanning/choose-alert-dismissal-reason.md new file mode 100644 index 0000000000..e7abf5ece7 --- /dev/null +++ b/translations/zh-CN/data/reusables/code-scanning/choose-alert-dismissal-reason.md @@ -0,0 +1 @@ +It's important to choose the appropriate reason from the drop-down menu as this may affect whether a query continues to be included in future analysis. \ No newline at end of file diff --git a/translations/zh-CN/data/reusables/code-scanning/false-positive-fix-codeql.md b/translations/zh-CN/data/reusables/code-scanning/false-positive-fix-codeql.md index db3da9c9d5..011f129f12 100644 --- a/translations/zh-CN/data/reusables/code-scanning/false-positive-fix-codeql.md +++ b/translations/zh-CN/data/reusables/code-scanning/false-positive-fix-codeql.md @@ -1 +1 @@ -If you close a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." +If you {% if currentVersion == "enterprise-server@2.22" %}close{% else %}dismiss{% endif %} a {% data variables.product.prodname_codeql %} alert as a false positive result, for example because the code uses a sanitization library that isn't supported, consider contributing to the {% data variables.product.prodname_codeql %} repository and improving the analysis. For more information about {% data variables.product.prodname_codeql %}, see "[Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md)." diff --git a/translations/zh-CN/data/reusables/dependabot/automated-tests-note.md b/translations/zh-CN/data/reusables/dependabot/automated-tests-note.md new file mode 100644 index 0000000000..aba3ea792a --- /dev/null +++ b/translations/zh-CN/data/reusables/dependabot/automated-tests-note.md @@ -0,0 +1,5 @@ +{% note %} + +**注：**自动化测试和验收过程是一项好做法，这样可在合并拉取请求之前进行检查。 如果建议的升级版本包含额外的功能，或者更改会中断您的项目代码，这种做法尤其重要。 有关持续集成的更多信息，请参阅“[关于持续集成](/actions/building-and-testing-code-with-continuous-integration/about-continuous-integration)”。 + +{% endnote %} diff --git a/translations/zh-CN/data/reusables/dependabot/pull-request-introduction.md b/translations/zh-CN/data/reusables/dependabot/pull-request-introduction.md new file mode 100644 index 0000000000..c69a2724db --- /dev/null +++ b/translations/zh-CN/data/reusables/dependabot/pull-request-introduction.md @@ -0,0 +1 @@ +{% data variables.product.prodname_dependabot %} 提出拉取请求，以更新依赖项。 {% data variables.product.prodname_dependabot_short %} 可能会针对版本更新和/或安全更新提出拉取请求，具体取决于仓库的配置方式。 您可以按与任何其他拉取请求相同的方式管理这些拉取请求，但也有一些额外的可用命令。 有关启用 {% data variables.product.prodname_dependabot %} 依赖项更新的更多信息，请参阅“[配置 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)”和“[启用和禁用版本更新](/github/administering-a-repository/enabling-and-disabling-version-updates)”。 \ No newline at end of file diff --git a/translations/zh-CN/data/reusables/dependabot/supported-package-managers.md b/translations/zh-CN/data/reusables/dependabot/supported-package-managers.md index 59453a3648..4e94345748 100644 --- a/translations/zh-CN/data/reusables/dependabot/supported-package-managers.md +++ b/translations/zh-CN/data/reusables/dependabot/supported-package-managers.md @@ -7,7 +7,7 @@ | Elm: `elm` | | | Git 子模块：`gitsubmodule` | | | GitHub 操作：`github-actions` | | -| Go 模块：`gomod` | | +| Go 模块：`gomod` | **X** | | Gradle: `gradle` | | | Maven: `maven` | | | Mix: `mix` | | diff --git a/translations/zh-CN/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md b/translations/zh-CN/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md new file mode 100644 index 0000000000..10ed6b90df --- /dev/null +++ b/translations/zh-CN/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md @@ -0,0 +1,5 @@ +1. 导航至 {% data variables.product.prodname_dotcom_the_website %}。 + +1. In the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) + +1. In the list of enterprises, click the enterprise you want to view. ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png) diff --git a/translations/zh-CN/data/reusables/enterprise-accounts/access-enterprise.md b/translations/zh-CN/data/reusables/enterprise-accounts/access-enterprise.md index 2a7bee222c..66edf20433 100644 --- a/translations/zh-CN/data/reusables/enterprise-accounts/access-enterprise.md +++ b/translations/zh-CN/data/reusables/enterprise-accounts/access-enterprise.md @@ -1,3 +1,17 @@ -1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on GitHub](/assets/images/help/enterprises/your-enterprises.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**. !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png) 1. In the list of enterprises, click the enterprise you want to view. ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png) + +{% endif %} + +{% if currentVersion ver_lt "enterprise-server@2.22" %} + +1. Navigate to your enterprise account by visiting {% raw %}https://HOSTNAME/enterprises/ENTERPRISE-NAME{% endraw %}, replacing `HOSTNAME` with your instance's hostname and `ENTERPRISE-NAME` with your enterprise account's name. + +{% elsif enterpriseServerVersions contains currentVersion %} + +1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Enterprise settings**. !["Enterprise settings" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/enterprise/settings/enterprise-settings.png) + +{% endif %} diff --git a/translations/zh-CN/data/reusables/enterprise-accounts/license-tab.md b/translations/zh-CN/data/reusables/enterprise-accounts/license-tab.md index 411cb3132e..97d8d671f2 100644 --- a/translations/zh-CN/data/reusables/enterprise-accounts/license-tab.md +++ b/translations/zh-CN/data/reusables/enterprise-accounts/license-tab.md @@ -1 +1,9 @@ -1. 在左侧边栏中，单击 **License（许可）**。 ![企业服务器设置边栏中的许可选项卡](/assets/images/enterprise/business-accounts/license-tab.png) +{% if currentVersion == "free-pro-team@latest" %} + +1. 在左侧边栏中，单击 **Enterprise licensing（企业许可）**。 ![企业帐户设置侧边栏中的"Enterprise licensing（企业许可）"选项卡](/assets/images/help/enterprises/enterprise-licensing-tab.png) + +{% else %} + +1. 在左侧边栏中，单击 **License（许可）**。 !["License" tab in the enterprise account settings sidebar](/assets/images/enterprise/enterprises/license.png) + +{% endif %} diff --git a/translations/zh-CN/data/reusables/enterprise/rate_limit.md b/translations/zh-CN/data/reusables/enterprise/rate_limit.md index 3467807cea..01a7e39424 100644 --- a/translations/zh-CN/data/reusables/enterprise/rate_limit.md +++ b/translations/zh-CN/data/reusables/enterprise/rate_limit.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} Note that the limits mentioned above are the default rate limits for a {% data variables.product.prodname_ghe_server %} 实例的主机名。 请与站点管理员联系，确认是否启用了速率限制以及如何配置它们。 {% endif %} diff --git a/translations/zh-CN/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md b/translations/zh-CN/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md index b48d23012d..416987c57e 100644 --- a/translations/zh-CN/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md +++ b/translations/zh-CN/data/reusables/enterprise_enterprise_support/submit-support-ticket-first-section.md @@ -9,7 +9,7 @@ - Choose **{% data variables.product.support_ticket_priority_urgent %}** to report {% if currentVersion == "free-pro-team@latest" %}critical system failure{% else %}fatal system failures, outages impacting critical system operations, security incidents, and expired licenses{% endif %}. - Choose **{% data variables.product.support_ticket_priority_high %}** to report issues impacting business operations, including {% if currentVersion == "free-pro-team@latest" %}removing sensitive data (commits, issues, pull requests, uploaded attachments) from your own accounts and organization restorations{% else %}system performance issues{% endif %}, or to report critical bugs. - Choose **{% data variables.product.support_ticket_priority_normal %}** to {% if currentVersion == "free-pro-team@latest" %}request account recovery or spam unflagging, report user login issues{% else %}make technical requests like configuration changes and third-party integrations{% endif %}, and to report non-critical bugs. - - Choose **{% data variables.product.support_ticket_priority_low %}** to ask general questions and submit requests for new features, purchases, training, or health checks.{% if currentVersion != "free-pro-team@latest" %} + - 选择 **{% data variables.product.support_ticket_priority_low %}**，提出一般问题并提交关于新功能、购买、培训或状态检查的请求。{% if enterpriseServerVersions contains currentVersion %} 1. From the " {% data variables.product.prodname_enterprise %} Series" drop-down menu, select the version of {% data variables.product.prodname_ghe_server %} you're using. ![{% data variables.product.prodname_enterprise %} 系列下拉菜单](/assets/images/enterprise/support/support-ticket-ghes-series.png) diff --git a/translations/zh-CN/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md b/translations/zh-CN/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md index fc3af06a0f..d4bc769804 100644 --- a/translations/zh-CN/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md +++ b/translations/zh-CN/data/reusables/enterprise_enterprise_support/submit-support-ticket-second-section.md @@ -1,5 +1,5 @@ 1. 单击 **Submit（提交）**。 -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} If you chose not to include diagnostics with your support ticket, you can share diagnostic information with {% data variables.product.prodname_enterprise %} Support after submitting your support request. 更多信息请参阅“[向 {% data variables.product.prodname_dotcom %} Support 提供数据](/enterprise/admin/guides/enterprise-support/providing-data-to-github-support)”。{% endif %} diff --git a/translations/zh-CN/data/reusables/enterprise_installation/aws-recommended-instance-types.md b/translations/zh-CN/data/reusables/enterprise_installation/aws-recommended-instance-types.md index bbeeddd2fa..f1afb43aea 100644 --- a/translations/zh-CN/data/reusables/enterprise_installation/aws-recommended-instance-types.md +++ b/translations/zh-CN/data/reusables/enterprise_installation/aws-recommended-instance-types.md @@ -1,5 +1,5 @@ 根据您的用户许可数量，我们建议使用以下实例类型。 | -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} | 用户许可 | 建议类型 | |:----------------- | ----------:| | 试用版、演示版或 10 个轻度用户 | r4.large | diff --git a/translations/zh-CN/data/reusables/enterprise_installation/aws-supported-instance-types.md b/translations/zh-CN/data/reusables/enterprise_installation/aws-supported-instance-types.md index 20743d939f..c742114644 100644 --- a/translations/zh-CN/data/reusables/enterprise_installation/aws-supported-instance-types.md +++ b/translations/zh-CN/data/reusables/enterprise_installation/aws-supported-instance-types.md @@ -28,9 +28,9 @@ | -------- | --------------------------------------------------------------- | | R4 | r4.large、r4.xlarge、r4.2xlarge、r4.4xlarge、r4.8xlarge、r4.16xlarge | -| EC2 实例类型 | 模型 | -| -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} +| EC2 实例类型 | 模型 | +| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| R5 | r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.12xlarge, r5.24xlarge{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.19" %}, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.12xlarge, r5n.24xlarge, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.12xlarge, r5a.24xlarge{% endif %} | EC2 实例类型 | 模型 | | -------- | ----------------------- | diff --git a/translations/zh-CN/data/reusables/files/add-file.md b/translations/zh-CN/data/reusables/files/add-file.md index 2c5a070b2e..d2aa63603d 100644 --- a/translations/zh-CN/data/reusables/files/add-file.md +++ b/translations/zh-CN/data/reusables/files/add-file.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. 在文件列表上方，单击 **Create new file（创建新文件）**。 !["创建新文件"按钮](/assets/images/help/repository/create_new_file.png) {% else %} 1. 在文件列表上方，使用 **Add file（添加文件）**下拉菜单，单击 **Create new file（创建新文件）**。 !["添加文件"下拉菜单中的"创建新文件"按钮](/assets/images/help/repository/create_new_file.png) diff --git a/translations/zh-CN/data/reusables/gated-features/code-scanning.md b/translations/zh-CN/data/reusables/gated-features/code-scanning.md index a1aca3e675..2bcd80c1d4 100644 --- a/translations/zh-CN/data/reusables/gated-features/code-scanning.md +++ b/translations/zh-CN/data/reusables/gated-features/code-scanning.md @@ -1 +1 @@ -{% data variables.product.prodname_code_scanning_capc %} is available in public repositories, and in public and private repositories owned by organizations with a license for {% data variables.product.prodname_advanced_security %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +{% data variables.product.prodname_code_scanning_capc %} is available {% if currentVersion == "free-pro-team@latest" %}in public repositories, and in private repositories owned by organizations with {% else %}if you have {% endif %}an {% data variables.product.prodname_advanced_security %} license. {% data reusables.gated-features.more-info %} diff --git a/translations/zh-CN/data/reusables/gated-features/draft-prs.md b/translations/zh-CN/data/reusables/gated-features/draft-prs.md index 0379025602..f729b2a6ed 100644 --- a/translations/zh-CN/data/reusables/gated-features/draft-prs.md +++ b/translations/zh-CN/data/reusables/gated-features/draft-prs.md @@ -1 +1 @@ -Draft pull requests are 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 %}{% if currentVersion != "free-pro-team@latest" %}, {% data variables.product.prodname_ghe_server %} 2.17+,{% endif %} and {% data variables.product.prodname_ghe_cloud %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} +拉取请求草稿可用于具有组织的 {% data variables.product.prodname_free_team %} 和传统的按仓库结算方案的公共仓库，以及具有 {% data variables.product.prodname_team %}{% if enterpriseServerVersions contains currentVersion %}、{% data variables.product.prodname_ghe_server %} 2.17+、{% endif %} 和 {% data variables.product.prodname_ghe_cloud %} 的公共和私有仓库。 {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %} diff --git a/translations/zh-CN/data/reusables/gist/anonymous-gists-cannot-be-deleted.md b/translations/zh-CN/data/reusables/gist/anonymous-gists-cannot-be-deleted.md index b04f744606..def42bf9ee 100644 --- a/translations/zh-CN/data/reusables/gist/anonymous-gists-cannot-be-deleted.md +++ b/translations/zh-CN/data/reusables/gist/anonymous-gists-cannot-be-deleted.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% warning %} **警告：**匿名 gists 不能从Web 浏览器中删除。 若要删除匿名 Gist，请联系 {% data variables.contact.contact_support %}。 请提供您想要删除的 Gist 的 URL。 diff --git a/translations/zh-CN/data/reusables/github-actions/macos-runner-preview.md b/translations/zh-CN/data/reusables/github-actions/macos-runner-preview.md new file mode 100644 index 0000000000..88a2d482c4 --- /dev/null +++ b/translations/zh-CN/data/reusables/github-actions/macos-runner-preview.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** The MacOS 11.0 virtual environment is currently provided as a preview only. The `macos-latest` YAML workflow label still uses the MacOS 10.15 virtual environment. + +{% endnote %} diff --git a/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md b/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md index 1566894864..4a9770a936 100644 --- a/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md +++ b/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-management-permissions-required.md @@ -1,9 +1,9 @@ -A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. 要管理自托管运行器，您必须拥有以下权限，具体取决于添加自托管运行器的位置： +A self-hosted runner can be located in either your repository, organization, or {% if currentVersion == "free-pro-team@latest" %}enterprise account settings on {% data variables.product.prodname_dotcom %}{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} enterprise settings on {% data variables.product.product_location %}{% endif %}. 要管理自托管运行器，您必须拥有以下权限，具体取决于添加自托管运行器的位置： - **用户仓库**：您必须是仓库所有者。 - **组织**：您必须是组织所有者。 - **组织仓库**：您必须是组织所有者或者拥有该仓库的管理员权限。 {% if currentVersion == "free-pro-team@latest" %} - **企业账户**：您必须是企业所有者。 -{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %} +{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} - **企业**：您必须是 {% data variables.product.prodname_enterprise %} 站点管理员。 {% endif %} diff --git a/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md b/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md index c2a0770b29..a10c4a86f0 100644 --- a/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md +++ b/translations/zh-CN/data/reusables/github-actions/self-hosted-runner-navigate-to-repo-org-enterprise.md @@ -1,6 +1,6 @@ 1. 导航到自托管运行器注册的位置： * **在组织或仓库中**，导航到主页并单击 {% octicon "gear" aria-label="The Settings gear" %} **Settings（设置）**。 - * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**: navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**: 1. 在任何页面的右上角，单击 {% octicon "rocket" aria-label="The rocket ship" %}。 1. 在左边栏中，单击 **Enterprise overview（企业概览）**。 @@ -9,4 +9,4 @@ * **在组织或仓库中**：单击左边栏中的 **Actions（操作）**。 ![操作设置](/assets/images/help/settings/settings-sidebar-actions.png) - * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". + * {% if currentVersion == "free-pro-team@latest" %}**If using an enterprise account**{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}**If using an enterprise-level runner**{% endif %}: click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies". diff --git a/translations/zh-CN/data/reusables/github-actions/supported-github-runners.md b/translations/zh-CN/data/reusables/github-actions/supported-github-runners.md index 462f4a2425..1f787e8a8a 100644 --- a/translations/zh-CN/data/reusables/github-actions/supported-github-runners.md +++ b/translations/zh-CN/data/reusables/github-actions/supported-github-runners.md @@ -4,4 +4,5 @@ | Ubuntu 20.04 | `ubuntu-20.04` | | Ubuntu 18.04 | `ubuntu-latest` 或 `ubuntu-18.04` | | Ubuntu 16.04 | `ubuntu-16.04` | +| macOS Big Sur 11.0 | `macos-11.0` | | macOS Catalina 10.15 | `macos-latest` 或 `macos-10.15` | diff --git a/translations/zh-CN/data/reusables/github-actions/usage-matrix-limits.md b/translations/zh-CN/data/reusables/github-actions/usage-matrix-limits.md index a0391421ce..d424ca36ff 100644 --- a/translations/zh-CN/data/reusables/github-actions/usage-matrix-limits.md +++ b/translations/zh-CN/data/reusables/github-actions/usage-matrix-limits.md @@ -1 +1 @@ -- **Job matrix** - A job matrix can generate a maximum of 256 jobs per workflow run. 此限制也适用于自托管运行器。 +作业矩阵在每次工作流程运行时最多可生成 256 个作业。 此限制也适用于自托管运行器。 diff --git a/translations/zh-CN/data/reusables/notifications/outbound_email_tip.md b/translations/zh-CN/data/reusables/notifications/outbound_email_tip.md index e36e768411..d9312fd081 100644 --- a/translations/zh-CN/data/reusables/notifications/outbound_email_tip.md +++ b/translations/zh-CN/data/reusables/notifications/outbound_email_tip.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} 如果在 {% data variables.product.product_location_enterprise %} 上启用了出站电子邮件支持，您将只收到邮件通知。 更多信息请联系站点管理员。 diff --git a/translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md b/translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md new file mode 100644 index 0000000000..6b3de47d4c --- /dev/null +++ b/translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-delivery-method-customization.md @@ -0,0 +1,3 @@ +You can choose the delivery method for notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} on repositories that you are watching, as well as the frequency at which the notifications are sent to you. + + diff --git a/translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-options.md b/translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-options.md new file mode 100644 index 0000000000..29e67dd447 --- /dev/null +++ b/translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-options.md @@ -0,0 +1,33 @@ +{% if currentVersion == "free-pro-team@latest" %} +By default, you will receive +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive +{% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) +You can customize the way you are notified about + +{% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} + +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} +By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts: +- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) +- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) +- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) +- in your inbox, as web notifications (**Web** option) + +You can customize the way you are notified about security alerts. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. +{% endif %} diff --git a/translations/zh-CN/data/reusables/package_registry/admins-can-configure-package-types.md b/translations/zh-CN/data/reusables/package_registry/admins-can-configure-package-types.md index 122d4e9370..bffc17cbf1 100644 --- a/translations/zh-CN/data/reusables/package_registry/admins-can-configure-package-types.md +++ b/translations/zh-CN/data/reusables/package_registry/admins-can-configure-package-types.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **注：**这种包类型可能不适用于您的实例，因为站点管理员可以启用或禁用每种支持的包类型。 更多信息请参阅“[为企业配置软件包支持](/enterprise/admin/packages/configuring-packages-support-for-your-enterprise)”。 diff --git a/translations/zh-CN/data/reusables/package_registry/docker_registry_deprecation_status.md b/translations/zh-CN/data/reusables/package_registry/docker_registry_deprecation_status.md index 79e9650f34..2df9364c31 100644 --- a/translations/zh-CN/data/reusables/package_registry/docker_registry_deprecation_status.md +++ b/translations/zh-CN/data/reusables/package_registry/docker_registry_deprecation_status.md @@ -1,5 +1,5 @@ {% warning %} -**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if currentVersion != "free-pro-team@latest" %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} +**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if enterpriseServerVersions contains currentVersion %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %} {% endwarning %} diff --git a/translations/zh-CN/data/reusables/package_registry/packages-ghes-release-stage.md b/translations/zh-CN/data/reusables/package_registry/packages-ghes-release-stage.md index 11431946a1..38654cd2a5 100644 --- a/translations/zh-CN/data/reusables/package_registry/packages-ghes-release-stage.md +++ b/translations/zh-CN/data/reusables/package_registry/packages-ghes-release-stage.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% note %} **注：** {% data variables.product.prodname_registry %} 目前正在测试用于 {% data variables.product.prodname_ghe_server %} 2.22。 要加入您的实例的测试版，请使用[注册表单](https://resources.github.com/beta-signup/)。 diff --git a/translations/zh-CN/data/reusables/pages/build-failure-email-server.md b/translations/zh-CN/data/reusables/pages/build-failure-email-server.md index 261cb22531..4e058703b7 100644 --- a/translations/zh-CN/data/reusables/pages/build-failure-email-server.md +++ b/translations/zh-CN/data/reusables/pages/build-failure-email-server.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} {% tip %} 如果在 {% data variables.product.product_location_enterprise %} 上启用了出站电子邮件支持，您将只收到电子邮件。 更多信息请联系站点管理员。 diff --git a/translations/zh-CN/data/reusables/pages/private_pages_are_public_warning.md b/translations/zh-CN/data/reusables/pages/private_pages_are_public_warning.md index 2579c5d10f..9fab974289 100644 --- a/translations/zh-CN/data/reusables/pages/private_pages_are_public_warning.md +++ b/translations/zh-CN/data/reusables/pages/private_pages_are_public_warning.md @@ -1,5 +1,5 @@ {% warning %} - **Warning**: {% if currentVersion != "free-pro-team@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. If you have sensitive data in your site's repository, you may want to remove it before publishing. For more information, see{% if currentVersion != "free-pro-team@latest" %} "[Configuring {% data variables.product.prodname_pages %} on your appliance](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." + **Warning**: {% if enterpriseServerVersions contains currentVersion %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet, even if the repository for the site is private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %} or internal{% endif %}. 如果站点的仓库中有敏感数据，您可能想要在发布前删除它。 更多信息请参阅{% if enterpriseServerVersions contains currentVersion %} “[在设备上配置 {% data variables.product.prodname_pages %}](/enterprise/admin/installation/configuring-github-pages-on-your-appliance#making-github-pages-publicly-accessible)”和{% endif %}“[关于仓库可见性](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)”。 {% endwarning %} diff --git a/translations/zh-CN/data/reusables/pre-release-program/fury-pre-release.md b/translations/zh-CN/data/reusables/pre-release-program/fury-pre-release.md index 04ac15f9fe..9b8015a95d 100644 --- a/translations/zh-CN/data/reusables/pre-release-program/fury-pre-release.md +++ b/translations/zh-CN/data/reusables/pre-release-program/fury-pre-release.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.21" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} {% note %} **Note:** {% data variables.product.prodname_github_app %} Manifests are currently available for developers to preview. 要在预览期间访问此 API，必须在 `Accept` 标头中提供自定义[媒体类型](/v3/media)： diff --git a/translations/zh-CN/data/reusables/pre-release-program/machine-man-preview.md b/translations/zh-CN/data/reusables/pre-release-program/machine-man-preview.md index daf65ebc77..d9e6e56720 100644 --- a/translations/zh-CN/data/reusables/pre-release-program/machine-man-preview.md +++ b/translations/zh-CN/data/reusables/pre-release-program/machine-man-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **注：**要使用 GitHub 应用程序访问 API，您必须在请求的 `Accept` 标头中提供自定义[媒体类型](/v3/media)。 diff --git a/translations/zh-CN/data/reusables/pre-release-program/sailor-v-preview.md b/translations/zh-CN/data/reusables/pre-release-program/sailor-v-preview.md index 71ec207423..e80010badb 100644 --- a/translations/zh-CN/data/reusables/pre-release-program/sailor-v-preview.md +++ b/translations/zh-CN/data/reusables/pre-release-program/sailor-v-preview.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} {% note %} **注：**您现在可以使用 REST API 在锁定议题时添加原因，并且在包含议题或拉取请求的响应中会看到锁定原因。 在 `locked` 事件中也会看到锁定原因。 此功能目前可供开发者预览。 有关完整详情，请参阅[博客文章](https://developer.github.com/changes/2018-01-10-lock-reason-api-preview)。 要访问此功能，必须在 `Accept` 标头中提供自定义[媒体类型](/v3/media)： diff --git a/translations/zh-CN/data/reusables/profile/user_profile_page_block_or_report.md b/translations/zh-CN/data/reusables/profile/user_profile_page_block_or_report.md index bdd19342f6..df90533956 100644 --- a/translations/zh-CN/data/reusables/profile/user_profile_page_block_or_report.md +++ b/translations/zh-CN/data/reusables/profile/user_profile_page_block_or_report.md @@ -1 +1 @@ -1. 在左侧边栏中用户的个人资料图片下，单击 **Block or report user（阻止或举报用户）**。 ![阻止或举报用户链接](/assets/images/help/profile/profile-block-or-report-button.png) +1. In the left sidebar, under the user's profile picture, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Block or report user**. ![阻止或举报用户链接](/assets/images/help/profile/profile-block-or-report-button.png) diff --git a/translations/zh-CN/data/reusables/project-management/project-progress-locations.md b/translations/zh-CN/data/reusables/project-management/project-progress-locations.md index bdbaf3c5b8..9ac6c41be9 100644 --- a/translations/zh-CN/data/reusables/project-management/project-progress-locations.md +++ b/translations/zh-CN/data/reusables/project-management/project-progress-locations.md @@ -1 +1 @@ -启用项目板自动化后，进度条将出现在项目板上方、项目列表页面上、议题侧边栏中以及对其他项目板项目的引用中。 +If progress tracking is enabled, a progress bar appears above the project board, on the project listing page, in the issue sidebar, and in references to the project on other project boards. diff --git a/translations/zh-CN/data/reusables/pull_requests/pull_request_merges_and_contributions.md b/translations/zh-CN/data/reusables/pull_requests/pull_request_merges_and_contributions.md index 0d187edc7b..63e8c84954 100644 --- a/translations/zh-CN/data/reusables/pull_requests/pull_request_merges_and_contributions.md +++ b/translations/zh-CN/data/reusables/pull_requests/pull_request_merges_and_contributions.md @@ -1,6 +1,6 @@ {% note %} -**Notes:**{% if currentVersion != "free-pro-team@latest" %} +**注：**{% if enterpriseServerVersions contains currentVersion %} - 要显示在您的个人资料贡献图中，合作提交必须符合与只有一个作者的提交相同的条件。{% endif %} - 在变基提交时，提交的原作者和提交的变基者（无论是在命令行还是 {% data variables.product.product_location %} 上）都会获得贡献积分。 diff --git a/translations/zh-CN/data/reusables/repositories/about-internal-repos.md b/translations/zh-CN/data/reusables/repositories/about-internal-repos.md index d921cfd133..cfa9b36198 100644 --- a/translations/zh-CN/data/reusables/repositories/about-internal-repos.md +++ b/translations/zh-CN/data/reusables/repositories/about-internal-repos.md @@ -1 +1 @@ -You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if currentVersion != "free-pro-team@latest" %}, even with private mode disabled{% endif %}. +You can use internal repositories to practice "innersource" within your {% if currentVersion == "free-pro-team@latest" %}enterprise account{% else %}instance{% endif %}. Members of {% if currentVersion == "free-pro-team@latest" %}your enterprise account{% else %}any organization on your instance{% endif %} can collaborate using open source methodologies without sharing proprietary information publicly{% if enterpriseServerVersions contains currentVersion %}, even with private mode disabled{% endif %}. diff --git a/translations/zh-CN/data/reusables/repositories/copy-clone-url.md b/translations/zh-CN/data/reusables/repositories/copy-clone-url.md index c1c554f63b..d66423d4c7 100644 --- a/translations/zh-CN/data/reusables/repositories/copy-clone-url.md +++ b/translations/zh-CN/data/reusables/repositories/copy-clone-url.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. 在仓库名称下，单击 **Clone or download（克隆或下载）**。 ![克隆或下载按钮](/assets/images/help/repository/clone-repo-clone-url-button.png) 2. 要使用 HTTPS 克隆仓库，请在“Clone with HTTPS（使用 HTTPS 克隆）”下单击 {% octicon "clippy" aria-label="The clipboard icon" %}. diff --git a/translations/zh-CN/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md b/translations/zh-CN/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md index bad215d486..efe97e2e59 100644 --- a/translations/zh-CN/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md +++ b/translations/zh-CN/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md @@ -2,7 +2,7 @@ **警告：** -- 如果您删除某人访问私有仓库的权限，则其对该私有仓库的任何复刻也会被删除。 将保留私人仓库的本地克隆。 If a team's access to a private repository is revoked or a team with access to a private repository is deleted, and team members do not have access to the repository through another team, private forks of the repository will be deleted.{% if currentVersion != "free-pro-team@latest" %} +- 如果您删除某人访问私有仓库的权限，则其对该私有仓库的任何复刻也会被删除。 将保留私人仓库的本地克隆。 如果撤销团队对私有仓库的访问权限，或者删除对私有仓库具有访问权限的团队，并且团队成员无法通过另一个团队访问仓库，则该仓库的私有复刻将被删除。{% if enterpriseServerVersions contains currentVersion %} - 当 [LDAP 同步启用](/enterprise/{{ page.version }}/admin/guides/user-management/using-ldap/#enabling-ldap-sync)后，如果从仓库删除某用户，此用户将失去访问权，但其复刻不会被删除。 如果此用户在三个月内被加入具有原组织仓库访问权限的团队，则其对复刻的访问权限将在下次同步时自动恢复。{% endif %} - 您负责确保无法访问仓库的人员删除任何机密信息或知识产权。 diff --git a/translations/zh-CN/data/reusables/repositories/enable-security-alerts.md b/translations/zh-CN/data/reusables/repositories/enable-security-alerts.md index b3b7d90a4f..7269678448 100644 --- a/translations/zh-CN/data/reusables/repositories/enable-security-alerts.md +++ b/translations/zh-CN/data/reusables/repositories/enable-security-alerts.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} 您的站点管理员必须启用 {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location_enterprise %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)." {% endif %} diff --git a/translations/zh-CN/data/reusables/repositories/new-pull-request.md b/translations/zh-CN/data/reusables/repositories/new-pull-request.md index 4b809bd944..8d14fb9cac 100644 --- a/translations/zh-CN/data/reusables/repositories/new-pull-request.md +++ b/translations/zh-CN/data/reusables/repositories/new-pull-request.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. 对于 Branch（分支）菜单右侧，单击 **New pull request（新拉取请求）**。 ![文件列表上方的"拉取请求"链接](/assets/images/help/pull_requests/pull-request-start-review-button.png) {% else %} 1. 在文件列表上方，单击 diff --git a/translations/zh-CN/data/reusables/repositories/open-with-github-desktop.md b/translations/zh-CN/data/reusables/repositories/open-with-github-desktop.md index 168cd1e826..0d7188a0c6 100644 --- a/translations/zh-CN/data/reusables/repositories/open-with-github-desktop.md +++ b/translations/zh-CN/data/reusables/repositories/open-with-github-desktop.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. 在仓库名称下，单击 **Clone or download（克隆或下载）**。 ![克隆或下载按钮](/assets/images/help/repository/clone-repo-clone-url-button.png) 1. Click **Open in Desktop** to clone the repository and open it in {% data variables.product.prodname_desktop %}. diff --git a/translations/zh-CN/data/reusables/repositories/releases.md b/translations/zh-CN/data/reusables/repositories/releases.md index 9b80791131..a2adee7e46 100644 --- a/translations/zh-CN/data/reusables/repositories/releases.md +++ b/translations/zh-CN/data/reusables/repositories/releases.md @@ -1,4 +1,4 @@ -{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.22" %} +{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} 1. 在仓库名称下，单击 **Releases（发布）**。 ![发布选项卡](/assets/images/help/releases/release-link.png) diff --git a/translations/zh-CN/data/reusables/repositories/tracks-vulnerabilities.md b/translations/zh-CN/data/reusables/repositories/tracks-vulnerabilities.md index cd5f740324..c20b5addfb 100644 --- a/translations/zh-CN/data/reusables/repositories/tracks-vulnerabilities.md +++ b/translations/zh-CN/data/reusables/repositories/tracks-vulnerabilities.md @@ -3,4 +3,3 @@ We add vulnerabilities to the {% data variables.product.prodname_advisory_databa - 机器学习和人工审查结合检测 {% data variables.product.prodname_dotcom %} 上公共提交中的漏洞 - Security advisories reported on {% data variables.product.prodname_dotcom %} - [npm 安全通告](https://www.npmjs.com/advisories)数据库 -- [FriendsOfPHP](https://github.com/FriendsOfPHP/security-advisories) diff --git a/translations/zh-CN/data/reusables/repositories/you-can-fork.md b/translations/zh-CN/data/reusables/repositories/you-can-fork.md index 2d290ce6cd..0e1e8bcc1f 100644 --- a/translations/zh-CN/data/reusables/repositories/you-can-fork.md +++ b/translations/zh-CN/data/reusables/repositories/you-can-fork.md @@ -1,3 +1,3 @@ -You can fork any public repository to your user account or any organization where you have repository creation permissions. For more information, see "[Permission levels for an organization](/articles/permission-levels-for-an-organization)." +您可以将任何公共仓库复刻到您的用户帐户或任何您拥有仓库创建权限的组织。 更多信息请参阅“[组织的权限级别](/articles/permission-levels-for-an-organization)”。 -You can fork any private repository you can access to your user account and any organization on {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} where you have repository creation permissions. You cannot fork a private repository to an organization using {% data variables.product.prodname_free_team %}.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[GitHub's products](/articles/githubs-products)."{% endif %} +您可以将您具有访问权限的任何私有仓库复刻到您的用户帐户，以及 {% data variables.product.prodname_team %} 或 {% data variables.product.prodname_enterprise %} 上您拥有仓库创建权限的任何组织。 You cannot fork a private repository to an organization using {% data variables.product.prodname_free_team %}.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[GitHub's products](/articles/githubs-products)."{% endif %} diff --git a/translations/zh-CN/data/reusables/search/syntax_tips.md b/translations/zh-CN/data/reusables/search/syntax_tips.md index d3e0d51af9..2f61b874ad 100644 --- a/translations/zh-CN/data/reusables/search/syntax_tips.md +++ b/translations/zh-CN/data/reusables/search/syntax_tips.md @@ -1,6 +1,6 @@ {% tip %} -**Tips:**{% if currentVersion != "free-pro-team@latest" %} +**Tips:**{% if enterpriseServerVersions contains currentVersion %} - 本文章包含在 {% data variables.product.prodname_dotcom %}.com 网站上的示例搜索，但您可以在 {% data variables.product.product_location_enterprise %} 上使用相同的搜索过滤器。{% endif %} - 有关可以添加到任何搜索限定符以进一步改善结果的搜索语法列表，请参阅“[了解搜索语法](/articles/understanding-the-search-syntax)”。 - 对多个字词的搜索词使用引号。 例如，如果要搜索具有标签 "In progress" 的议题，可搜索 `label:"in progress"`。 搜索不区分大小写。 diff --git a/translations/zh-CN/data/reusables/two_fa/auth_methods_2fa.md b/translations/zh-CN/data/reusables/two_fa/auth_methods_2fa.md index eac14aac17..c73508d44f 100644 --- a/translations/zh-CN/data/reusables/two_fa/auth_methods_2fa.md +++ b/translations/zh-CN/data/reusables/two_fa/auth_methods_2fa.md @@ -1,10 +1,10 @@ -{% if currentVersion != "free-pro-team@latest" %} +{% if enterpriseServerVersions contains currentVersion %} ### 支持 2FA 的身份验证方法 -| 身份验证方法 | 描述 | 双重身份验证支持 | -| -------------- | ------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------- | -| 内置 | 根据存储在 {% data variables.product.prodname_ghe_server %} 设备上的用户帐户进行身份验证。 | 在 {% data variables.product.prodname_ghe_server %} 设备上支持和管理。 组织管理员可要求对组织的成员启用 2FA。 |{% if currentVersion != "free-pro-team@latest" %} +| 身份验证方法 | 描述 | 双重身份验证支持 | +| -------------- | ------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------- | +| 内置 | 根据存储在 {% data variables.product.prodname_ghe_server %} 设备上的用户帐户进行身份验证。 | 在 {% data variables.product.prodname_ghe_server %} 设备上支持和管理。 组织管理员可要求对组织的成员启用 2FA。 |{% if enterpriseServerVersions contains currentVersion %} | 内置向身份提供商进行身份验证 | 根据存储在身份提供程序中的用户帐户进行身份验证。 | 依赖身份提供程序。{% endif %} -| LDAP | 允许与您的公司目录服务集成以进行身份验证。 | 在 {% data variables.product.prodname_ghe_server %} 设备上支持和管理。 组织管理员可要求对组织的成员启用 2FA。 | +| LDAP | 允许与您的公司目录服务集成以进行身份验证。 | 在 {% data variables.product.prodname_ghe_server %} 设备上支持和管理。 组织管理员可要求对组织的成员启用 2FA。 | | SAML | 在外部身份提供商上进行身份验证。 | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %} | CAS | 单点登录服务由外部服务器提供。 | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %}{% endif %} diff --git a/translations/zh-CN/data/reusables/webhooks/webhooks-rest-api-links.md b/translations/zh-CN/data/reusables/webhooks/webhooks-rest-api-links.md new file mode 100644 index 0000000000..3882222b05 --- /dev/null +++ b/translations/zh-CN/data/reusables/webhooks/webhooks-rest-api-links.md @@ -0,0 +1,4 @@ +You can use the repository, organization, and app webhook REST APIs to create, update, delete, and ping webhooks. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}You can also use the REST API to change the configuration of the webhook. For example, you can modify the payload URL, content type, SSL verification, and secret. {% endif %}For more information, see: +- [Repository Webhooks REST API](/rest/reference/repos#webhooks) +- [Organization Webhooks REST API](/rest/reference/orgs#webhooks){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +- [GitHub App Webhooks REST API](/rest/reference/apps#webhooks){% endif %} diff --git a/translations/zh-CN/data/variables/contact.yml b/translations/zh-CN/data/variables/contact.yml index 9e3e339149..087513b91f 100644 --- a/translations/zh-CN/data/variables/contact.yml +++ b/translations/zh-CN/data/variables/contact.yml @@ -1,15 +1,15 @@ --- contact_ent_support: '[GitHub Enterprise 支持](https://enterprise.githubsupport.com/hc/en-us) 或 [GitHub 高级支持](https://premium.githubsupport.com)' contact_support: >- - {% if currentVersion == "free-pro-team@latest" %}[GitHub Support](https://support.github.com/contact) or [GitHub Premium Support](https://premium.githubsupport.com){% else %}your GitHub Enterprise site administrator{% endif %} + {% if currentVersion == "free-pro-team@latest" %}[GitHub 支持](https://support.github.com/contact) 或 [GitHub 高级支持](https://premium.githubsupport.com){% else %}您的 GitHub Enterprise 站点管理员{% endif %} report_abuse: >- - {% if currentVersion == "free-pro-team@latest" %}[Report abuse](https://github.com/contact/report-abuse){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[报告滥用](https://github.com/contact/report-abuse){% endif %} report_content: >- - {% if currentVersion == "free-pro-team@latest" %}[Report content](https://github.com/contact/report-content){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[报告内容](https://github.com/contact/report-content){% endif %} contact_dmca: >- - {% if currentVersion == "free-pro-team@latest" %}[Copyright claims form](https://github.com/contact/dmca){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[版权声明表](https://github.com/contact/dmca){% endif %} contact_privacy: >- - {% if currentVersion == "free-pro-team@latest" %}[Privacy contact form](https://github.com/contact/privacy){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[隐私联系表](https://github.com/contact/privacy){% endif %} contact_enterprise_sales: '[GitHub'' 销售团队](https://enterprise.github.com/contact)' contact_feedback_actions: '[GitHub 操作的反馈表](https://support.github.com/contact/feedback?contact[category]=actions)' #The team that provides Standard Support diff --git a/translations/zh-CN/data/variables/explore.yml b/translations/zh-CN/data/variables/explore.yml index e9d43c4230..b238c60dea 100644 --- a/translations/zh-CN/data/variables/explore.yml +++ b/translations/zh-CN/data/variables/explore.yml @@ -1,7 +1,7 @@ --- explore_github: >- - {% if currentVersion == "free-pro-team@latest" %}[Explore GitHub](https://github.com/explore){% else %}Explore GitHub (`https://[hostname]/explore`){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[探索 GitHub](https://github.com/explore){% else %}探索 GitHub (`https://[hostname]/explore`){% endif %} your_stars_page: >- - {% if currentVersion == "free-pro-team@latest" %}[stars page](https://github.com/stars){% else %}stars page (`https://[hostname]/stars`){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[标星页面](https://github.com/stars){% else %}标星页面 (`https://[hostname]/stars`){% endif %} trending_page: >- - {% if currentVersion == "free-pro-team@latest" %}[Trending page](https://github.com/trending){% else %}Trending page (`https://[hostname]/trending`){% endif %} + {% if currentVersion == "free-pro-team@latest" %}[趋势页面](https://github.com/trending){% else %}趋势页面 (`https://[hostname]/trending`){% endif %} diff --git a/translations/zh-CN/data/variables/gists.yml b/translations/zh-CN/data/variables/gists.yml index 9d1fea10ac..053461f3f8 100644 --- a/translations/zh-CN/data/variables/gists.yml +++ b/translations/zh-CN/data/variables/gists.yml @@ -1,7 +1,7 @@ --- gist_homepage: >- - {% if currentVersion == "free-pro-team@latest" %}[gist home page](https://gist.github.com/){% else %}gist home page, `http(s)://[hostname]/gist` or `http(s)://gist.[hostname]` if subdomains are enabled {% endif %} + {% if currentVersion == "free-pro-team@latest" %}[gist 主页](https://gist.github.com/){% else %}gist 主页，`http(s)://[hostname]/gist` 或 `http(s)://gist.[hostname]`，如果启用了子域 {% endif %} gist_search_url: >- - {% if currentVersion == "free-pro-team@latest" %}[Gist Search](https://gist.github.com/search){% else %}Gist Search, `http(s)://[hostname]/gist/search` or `http(s)://gist.[hostname]/search` if subdomains are enabled{% endif %} + {% if currentVersion == "free-pro-team@latest" %}[Gist 搜索](https://gist.github.com/search){% else %}Gist 搜索，`http(s)://[hostname]/gist/search` 或 `http(s)://gist.[hostname]/search`，如果启用了子域{% endif %} discover_url: >- {% if currentVersion == "free-pro-team@latest" %}[Discover](https://gist.github.com/discover){% else %}Discover, `http(s)://[hostname]/gist/discover` or `http(s)://gist.[hostname]/discover` if subdomains are enabled{% endif %} From 7286ac179213e5a9c14e31e265850db9017949ed Mon Sep 17 00:00:00 2001 From: Martin Lopes <54248166+martin389@users.noreply.github.com> Date: Wed, 28 Oct 2020 08:59:22 +1000 Subject: [PATCH 30/40] [ASAP] GitHub Apps permission for up to 10 files (#16081) * Added entry for single_file_paths * Added versioning for 2.23 * Added updates from tech review * Added update from peer review * Apply suggestions from code review Co-authored-by: Lucas Costi Co-authored-by: Lucas Costi Co-authored-by: Rachael Sewell --- .../apps/creating-a-github-app-using-url-parameters.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/developers/apps/creating-a-github-app-using-url-parameters.md b/content/developers/apps/creating-a-github-app-using-url-parameters.md index d718d3f89b..203a9f3a34 100644 --- a/content/developers/apps/creating-a-github-app-using-url-parameters.md +++ b/content/developers/apps/creating-a-github-app-using-url-parameters.md @@ -41,7 +41,8 @@ The complete list of available query parameters, permissions, and events is list `webhook_secret` | `string` | You can specify a secret to secure your webhooks. See "[Securing your webhooks](/webhooks/securing/)" for more details. `events` | `array of strings` | Webhook events. Some webhook events require `read` or `write` permissions for a resource before you can select the event when registering a new {% data variables.product.prodname_github_app %}. See the "[{% data variables.product.prodname_github_app %} webhook events](#github-app-webhook-events)" section for available events and their required permissions. You can select multiple events in a query string. For example, `events[]=public&events[]=label`. `domain` | `string` | The URL of a content reference. -`single_file_name` | `string` | When you grant `read` or `write` access to the `single_file` permission, this field provides the path to the single file your {% data variables.product.prodname_github_app %} will manage. +`single_file_name` | `string` | This is a narrowly-scoped permission that allows the app to access a single file in any repository. When you set the `single_file` permission to `read` or `write`, this field provides the path to the single file your {% data variables.product.prodname_github_app %} will manage. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} If you need to manage multiple files, see `single_file_paths` below. {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +`single_file_paths` | `array of strings` | This allows the app to access up ten specified files in a repository. When you set the `single_file` permission to `read` or `write`, this array can store the paths for up to ten files that your {% data variables.product.prodname_github_app %} will manage. These files all receive the same permission set by `single_file`, and do not have separate individual permissions. When two or more files are configured, the API returns `multiple_single_files=true`, otherwise it returns `multiple_single_files=false`.{% endif %} ### {% data variables.product.prodname_github_app %} permissions From bee289d95d115ebe2822f4ea482108fdfbb32c3e Mon Sep 17 00:00:00 2001 From: Chiedo John <2156688+chiedo@users.noreply.github.com> Date: Tue, 27 Oct 2020 19:04:11 -0400 Subject: [PATCH 31/40] Add manual running of algolia (#16251) Co-authored-by: Chiedo --- .github/workflows/sync-algolia-search-indices.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sync-algolia-search-indices.yml b/.github/workflows/sync-algolia-search-indices.yml index 04677d17d0..9df5a5a4fe 100644 --- a/.github/workflows/sync-algolia-search-indices.yml +++ b/.github/workflows/sync-algolia-search-indices.yml @@ -1,6 +1,7 @@ name: Algolia on: + workflow_dispatch: push: branches: - main From b1beb63b3abc1e507ba8ee72b86e19067ed2a8ae Mon Sep 17 00:00:00 2001 From: Chiedo John <2156688+chiedo@users.noreply.github.com> Date: Tue, 27 Oct 2020 19:18:30 -0400 Subject: [PATCH 32/40] Remove broken translated file (#16252) Co-authored-by: Chiedo --- .../workflow-syntax-for-github-actions.md | 718 +++++++++--------- 1 file changed, 359 insertions(+), 359 deletions(-) diff --git a/translations/pt-BR/content/actions/reference/workflow-syntax-for-github-actions.md b/translations/pt-BR/content/actions/reference/workflow-syntax-for-github-actions.md index 8992fecfde..2d4d9a44df 100644 --- a/translations/pt-BR/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/translations/pt-BR/content/actions/reference/workflow-syntax-for-github-actions.md @@ -1,7 +1,7 @@ --- -title: Sintaxe de fluxo de trabalho para o GitHub Actions -shortTitle: Sintaxe de fluxo de trabalho -intro: Um fluxo de trabalho é um processo automatizado configurável constituído de um ou mais trabalhos. Você deve criar um arquivo YAML para definir a configuração do seu fluxo de trabalho. +title: Workflow syntax for GitHub Actions +shortTitle: Workflow syntax +intro: A workflow is a configurable automated process made up of one or more jobs. You must create a YAML file to define your workflow configuration. product: '{% data reusables.gated-features.actions %}' redirect_from: - /articles/workflow-syntax-for-github-actions @@ -15,45 +15,45 @@ versions: {% data reusables.actions.enterprise-beta %} {% data reusables.actions.enterprise-github-hosted-runners %} -### Sobre sintaxe YAML para fluxos de trabalho +### About YAML syntax for workflows -Arquivos de fluxo de trabalho usam sintaxe YAML e devem ter uma extensão de arquivo `.yml` ou `.yaml`. Se você não souber o que é YAMLe quiser saber mais, consulte "[Aprender a usar YAML em cinco minutos](https://www.codeproject.com/Articles/1214409/Learn-YAML-in-five-minutes)". +Workflow files use YAML syntax, and must have either a `.yml` or `.yaml` file extension. If you're new to YAML and want to learn more, see "[Learn YAML in five minutes](https://www.codeproject.com/Articles/1214409/Learn-YAML-in-five-minutes)." -Você deve armazenar os arquivos de fluxo de trabalho no diretório `.github/workflows` do seu repositório. +You must store workflow files in the `.github/workflows` directory of your repository. ### **`name`** -Nome do fluxo de trabalho. O {% data variables.product.prodname_dotcom %} exibe os nomes dos fluxos de trabalho na página de ações do repositório. Se você omitir o `nome`, o {% data variables.product.prodname_dotcom %} irá defini-lo como o caminho do arquivo do fluxo de trabalho relativo à raiz do repositório. +The name of your workflow. {% data variables.product.prodname_dotcom %} displays the names of your workflows on your repository's actions page. If you omit `name`, {% data variables.product.prodname_dotcom %} sets it to the workflow file path relative to the root of the repository. ### **`on`** -**Obrigatório** Nome do evento do {% data variables.product.prodname_dotcom %} que aciona o fluxo de trabalho. Você pode fornecer uma única `string` de evento, um `array` de eventos, um `array` de `types` (tipos) de eventos ou um `map` (mapa) de configuração de eventos que programe um fluxo de trabalho ou restrinja a execução do fluxo de trabalho a alterações em determinados arquivos, tags ou branches. Para obter uma lista de eventos disponíveis, consulte "[Eventos que acionam fluxos de trabalho](/articles/events-that-trigger-workflows)". +**Required** The name of the {% data variables.product.prodname_dotcom %} event that triggers the workflow. You can provide a single event `string`, `array` of events, `array` of event `types`, or an event configuration `map` that schedules a workflow or restricts the execution of a workflow to specific files, tags, or branch changes. For a list of available events, see "[Events that trigger workflows](/articles/events-that-trigger-workflows)." {% data reusables.github-actions.actions-on-examples %} ### **`on..types`** -Seleciona os tipos de atividades que acionarão a execução de um fluxo de trabalho. A maioria dos eventos GitHub são acionados por mais de um tipo de atividade. Por exemplo, o evento para o recurso release (versão) é acionado quando uma versão é `published` (publicada), `unpublished` (a publicação é cancelada), `created` (criada), `edited` (editada), `deleted` (excluída) ou `prereleased` (versão prévia). A palavra-chave `types` (tipos) permite que você limite a atividade que faz com que o fluxo de trabalho seja executado. Quando somente um tipo de atividade aciona um evento de webhook, a palavra-chave `types` (tipos) é desnecessária. +Selects the types of activity that will trigger a workflow run. Most GitHub events are triggered by more than one type of activity. For example, the event for the release resource is triggered when a release is `published`, `unpublished`, `created`, `edited`, `deleted`, or `prereleased`. The `types` keyword enables you to narrow down activity that causes the workflow to run. When only one activity type triggers a webhook event, the `types` keyword is unnecessary. -É possível usar um array de `types` (tipos) de evento. Para obter mais informações sobre cada evento e seus tipos de atividades, consulte "[Eventos que acionam fluxos de trabalho](/articles/events-that-trigger-workflows#webhook-events)". +You can use an array of event `types`. For more information about each event and their activity types, see "[Events that trigger workflows](/articles/events-that-trigger-workflows#webhook-events)." ```yaml -# Aciona o fluxo de trabalho na atividade de pull request +# Trigger the workflow on pull request activity on: release: - # Usa apenas a palavra-chave types (tipos) para limitar os tipos de atividades que acionam o fluxo de trabalho. + # Only use the types keyword to narrow down the activity types that will trigger your workflow. types: [published, created, edited] ``` ### **`on..`** -Ao usar os eventos `push` e `pull_request`, é possível configurar um fluxo de trabalho para ser executado em branches ou tags específicos. Para um evento de `pull_request`, são avaliados apenas os branches e tags na base. Se você definir apenas `tags` ou `branches`, o fluxo de trabalho não será executado para eventos que afetam o Git ref indefinido. +When using the `push` and `pull_request` events, you can configure a workflow to run on specific branches or tags. For a `pull_request` event, only branches and tags on the base are evaluated. If you define only `tags` or only `branches`, the workflow won't run for events affecting the undefined Git ref. -As palavras-chave `branches`, `branches-ignore`, `tags` e `tags-ignore` aceitam padrões glob que usam os caracteres curinga `*` e `**` para coincidir com mais de um nome de branch ou tag. Para obter mais informações, consulte a "[Folha de consulta de filtro padrão](#filter-pattern-cheat-sheet)". +The `branches`, `branches-ignore`, `tags`, and `tags-ignore` keywords accept glob patterns that use the `*` and `**` wildcard characters to match more than one branch or tag name. For more information, see the "[Filter pattern cheat sheet](#filter-pattern-cheat-sheet)." -#### Exemplo com branches e tags +#### Example including branches and tags -Os padrões definidos nos `branches` e `tags` são avaliados relativamente ao nome do Git ref. Por exemplo, definir o padrão `mona/octocat` nos `branches` corresponde ao Git ref `refs/heads/mona/octocat`. O padrão `releases/**` corresponderá ao Git ref `refs/heads/releases/10`. +The patterns defined in `branches` and `tags` are evaluated against the Git ref's name. For example, defining the pattern `mona/octocat` in `branches` will match the `refs/heads/mona/octocat` Git ref. The pattern `releases/**` will match the `refs/heads/releases/10` Git ref. ```yaml on: @@ -72,37 +72,37 @@ on: - v1.* # Push events to v1.0, v1.1, and v1.9 tags ``` -#### Exemplo desconsiderando branches e tags +#### Example ignoring branches and tags -Sempre que um padrão corresponde ao padrão `branches-ignore` ou `tags-ignore`, o fluxo de trabalho não será executado. Os padrões definidos em `branches-ignore` e `tags-ignore` são avaliados relativamente ao nome do Git ref. Por exemplo, definir o padrão `mona/octocat` nos `branches` corresponde ao Git ref `refs/heads/mona/octocat`. O padrão `releases/**-alpha` em `branches` corresponderá ao Git ref `refs/releases/beta/3-alpha`. +Anytime a pattern matches the `branches-ignore` or `tags-ignore` pattern, the workflow will not run. The patterns defined in `branches-ignore` and `tags-ignore` are evaluated against the Git ref's name. For example, defining the pattern `mona/octocat` in `branches` will match the `refs/heads/mona/octocat` Git ref. The pattern `releases/**-alpha` in `branches` will match the `refs/releases/beta/3-alpha` Git ref. ```yaml -em: +on: push: - # Sequência de padrões que correspondem a refs/heads + # Sequence of patterns matched against refs/heads branches-ignore: - # Push de eventos para branches que correspondem a refs/heads/mona/octocat + # Push events to branches matching refs/heads/mona/octocat - 'mona/octocat' - # Push de eventos para branches que correspondem a refs/heads/releases/beta/3-alpha + # Push events to branches matching refs/heads/releases/beta/3-alpha - 'releases/**-alpha' - # Sequência de padrões que correspondem a refs/tags + # Sequence of patterns matched against refs/tags tags-ignore: - v1.* # Push events to tags v1.0, v1.1, and v1.9 ``` -#### Excluir branches e tags +#### Excluding branches and tags -Você pode usar dois tipos de filtros para impedir a execução de um fluxo de trabalho em pushes e pull requests para tags e branches. -- `branches` ou `branches-ignore` - não é possível usar os dois filtros `branches` e `branches-ignore` para o mesmo evento em um fluxo de trabalho. Use o filtro `branches` quando você precisa filtrar branches para correspondências positivas e excluir branches. Use o filtro `branches-ignore` quando você só precisa excluir nomes de branches. -- `tags` ou `tags-ignore` - não é possível usar os dois filtros `tags` e `tags-ignore` para o mesmo evento em um fluxo de trabalho. Use o filtro `tags` quando você precisa filtrar tags para correspondências positivas e excluir tags. Use o filtro `tags-ignore` quando você só precisa excluir nomes de tags. +You can use two types of filters to prevent a workflow from running on pushes and pull requests to tags and branches. +- `branches` or `branches-ignore` - You cannot use both the `branches` and `branches-ignore` filters for the same event in a workflow. Use the `branches` filter when you need to filter branches for positive matches and exclude branches. Use the `branches-ignore` filter when you only need to exclude branch names. +- `tags` or `tags-ignore` - You cannot use both the `tags` and `tags-ignore` filters for the same event in a workflow. Use the `tags` filter when you need to filter tags for positive matches and exclude tags. Use the `tags-ignore` filter when you only need to exclude tag names. -#### Exemplo com padrões positivos e negativos +#### Example using positive and negative patterns -Você pode excluir `tags` e `branches` usando o caractere `!`. A ordem de definição dos padrões é importante. - - Um padrão negativo (precedido por `!`) depois de uma correspondência positiva excluirá o Git ref. - - Um padrão positivo correspondente após uma correspondência negativa incluirá a Git ref novamente. +You can exclude `tags` and `branches` using the `!` character. The order that you define patterns matters. + - A matching negative pattern (prefixed with `!`) after a positive match will exclude the Git ref. + - A matching positive pattern after a negative match will include the Git ref again. -O fluxo de trabalho a seguir será executado em pushes para `releases/10` ou `releases/beta/mona`, mas não em `releases/10-alpha` ou `releases/beta/3-alpha`, pois o padrão negativo `!releases/**-alpha` está na sequência do padrão positivo. +The following workflow will run on pushes to `releases/10` or `releases/beta/mona`, but not on `releases/10-alpha` or `releases/beta/3-alpha` because the negative pattern `!releases/**-alpha` follows the positive pattern. ```yaml on: @@ -114,13 +114,13 @@ on: ### **`on..paths`** -Ao usar os eventos `push` e `pull_request`, é possível configurar um fluxo de trabalho para ser executado quando pelo menos um arquivo não corresponde a `paths-ignore` ou pelo menos um arquivo modificado corresponde ao `paths` configurado. Flitros de caminho não são avaliados em pushes para tags. +When using the `push` and `pull_request` events, you can configure a workflow to run when at least one file does not match `paths-ignore` or at least one modified file matches the configured `paths`. Path filters are not evaluated for pushes to tags. -As palavras-chave `paths-ignore` e `paths` aceitam padrões glob que usam os caracteres curinga `*` e `**` para coincidir com mais de um nome de caminho. Para obter mais informações, consulte a "[Folha de consulta de filtro padrão](#filter-pattern-cheat-sheet)". +The `paths-ignore` and `paths` keywords accept glob patterns that use the `*` and `**` wildcard characters to match more than one path name. For more information, see the "[Filter pattern cheat sheet](#filter-pattern-cheat-sheet)." -#### Exemplo desconsiderando caminhos +#### Example ignoring paths -Sempre que um nome de caminho corresponder a um padrão em `paths-ignore`, o fluxo de trabalho não será executado. O {% data variables.product.prodname_dotcom %} avalia os padrões definidos em `paths-ignore` com relação ao nome do caminho. Um fluxo de trabalho com o seguinte filtro de caminho só será executado em eventos `push` que tiverem pelo menos um arquivo fora do diretório `docs` na raiz do repositório. +Anytime a path name matches a pattern in `paths-ignore`, the workflow will not run. {% data variables.product.prodname_dotcom %} evaluates patterns defined in `paths-ignore` against the path name. A workflow with the following path filter will only run on `push` events that include at least one file outside the `docs` directory at the root of the repository. ```yaml on: @@ -129,9 +129,9 @@ on: - 'docs/**' ``` -#### Exemplo incluindo caminhos +#### Example including paths -Se pelo menos um caminho corresponder a um padrão no filtro `paths`, o fluxo de trabalho será executado. Para acionar uma compilação sempre que você fizer push de um arquivo JavaScript, você pode usar um padrão curinga. +If at least one path matches a pattern in the `paths` filter, the workflow runs. To trigger a build anytime you push a JavaScript file, you can use a wildcard pattern. ```yaml on: @@ -140,19 +140,19 @@ on: - '**.js' ``` -#### Excluir caminhos +#### Excluding paths -Você pode excluir caminhos com dois tipos de filtros. Não é possível usar ambos os filtros para o mesmo evento em um fluxo de trabalho. -- `paths-ignore` - use o filtro `paths-ignore` quando você precisa somente excluir nomes de caminhos. -- `paths` - use o filtro `paths` quando você precisa filtrar caminhos para correspondências positivas e excluir caminhos. +You can exclude paths using two types of filters. You cannot use both of these filters for the same event in a workflow. +- `paths-ignore` - Use the `paths-ignore` filter when you only need to exclude path names. +- `paths` - Use the `paths` filter when you need to filter paths for positive matches and exclude paths. -#### Exemplo com padrões positivos e negativos +#### Example using positive and negative patterns -Você pode excluir `paths` usando o caractere `!`. A ordem de definição dos padrões é importante: - - Um padrão negativo (precedido por `!`) depois de uma correspondência positiva excluirá o caminho. - - Um padrão positivo correspondente após uma correspondência negativa incluirá o caminho novamente. +You can exclude `paths` using the `!` character. The order that you define patterns matters: + - A matching negative pattern (prefixed with `!`) after a positive match will exclude the path. + - A matching positive pattern after a negative match will include the path again. -Este exemplo é executado sempre que o evento `push` inclui um arquivo no diretório `sub-project` ou seus subdiretórios, a menos que o arquivo esteja no diretório `sub-project/docs`. Por exemplo, um push que alterou `sub-project/index.js` ou `sub-project/src/index.js` acionará uma execução de fluxo de trabalho, mas um push que altere somente`sub-project/docs/readme.md` não acionará. +This example runs anytime the `push` event includes a file in the `sub-project` directory or its subdirectories, unless the file is in the `sub-project/docs` directory. For example, a push that changed `sub-project/index.js` or `sub-project/src/index.js` will trigger a workflow run, but a push changing only `sub-project/docs/readme.md` will not. ```yaml on: @@ -162,58 +162,58 @@ on: - '!sub-project/docs/**' ``` -#### Comparações Git diff +#### Git diff comparisons {% note %} -**Observação:** se você fizer push de mais de 1.000 commits ou se o {% data variables.product.prodname_dotcom %} não gera o diff devido a um tempo limite esgotado (diffs muito grandes), o fluxo de trabalho sempre será executado. +**Note:** If you push more than 1,000 commits, or if {% data variables.product.prodname_dotcom %} does not generate the diff due to a timeout (diffs that are too large diffs), the workflow will always run. {% endnote %} -O filtro determina se um fluxo de trabalho deve ser executado avaliando os arquivos alterados e comparando-os à lista de `paths-ignore` ou `paths`. Se não houver arquivos alterados, o fluxo de trabalho não será executado. +The filter determines if a workflow should run by evaluating the changed files and running them against the `paths-ignore` or `paths` list. If there are no files changed, the workflow will not run. -O {% data variables.product.prodname_dotcom %} gera a lista de arquivos alterados usando diffs de dois pontos para pushes e diffs de três pontos para pull requests: -- **Pull requests:** diffs de três pontos são uma comparação entre a versão mais recente do branch de tópico e o commit onde o branch de tópico foi sincronizado pela última vez com o branch de base. -- **Pushes para branches existentes:** um diff de dois pontos compara os SHAs head e base, um com o outro. -- **Pushes para novos branches:** um diff de dois pontos compara o principal do ancestral do commit mais extenso que foi feito push. +{% data variables.product.prodname_dotcom %} generates the list of changed files using two-dot diffs for pushes and three-dot diffs for pull requests: +- **Pull requests:** Three-dot diffs are a comparison between the most recent version of the topic branch and the commit where the topic branch was last synced with the base branch. +- **Pushes to existing branches:** A two-dot diff compares the head and base SHAs directly with each other. +- **Pushes to new branches:** A two-dot diff against the parent of the ancestor of the deepest commit pushed. -Para obter mais informações, consulte "[Sobre comparação de branches em pull requests](/articles/about-comparing-branches-in-pull-requests)". +For more information, see "[About comparing branches in pull requests](/articles/about-comparing-branches-in-pull-requests)." ### **`on.schedule`** {% data reusables.repositories.actions-scheduled-workflow-example %} -Para obter mais informações sobre a sintaxe cron, consulte "[Eventos que acionam fluxos de trabalho](/actions/automating-your-workflow-with-github-actions/events-that-trigger-workflows#scheduled-events)". +For more information about cron syntax, see "[Events that trigger workflows](/actions/automating-your-workflow-with-github-actions/events-that-trigger-workflows#scheduled-events)." ### **`env`** -Um `map` (mapa) das variáveis de ambiente que estão disponíveis para todos os trabalhos e etapas do fluxo de trabalho. Também é possível configurar variáveis de ambiente que estão disponíveis apenas para um trabalho ou etapa. Para obter mais informações, consulte [`jobs..env`](#jobsjob_idenv) e [`jobs..steps.env`](#jobsjob_idstepsenv). +A `map` of environment variables that are available to all jobs and steps in the workflow. You can also set environment variables that are only available to a job or step. For more information, see [`jobs..env`](#jobsjob_idenv) and [`jobs..steps.env`](#jobsjob_idstepsenv). {% data reusables.repositories.actions-env-var-note %} -#### Exemplo +#### Example ```yaml env: SERVER: production ``` -### **`padrões`** +### **`defaults`** -Um `mapa` das configurações-padrão que serão aplicadas a todos os trabalhos do fluxo de trabalho. Você também pode definir as configurações-padrão disponíveis para um trabalho. Para obter mais informações, consulte [`jobs..defaults`](#jobsjob_iddefaults). +A `map` of default settings that will apply to all jobs in the workflow. You can also set default settings that are only available to a job. For more information, see [`jobs..defaults`](#jobsjob_iddefaults). {% data reusables.github-actions.defaults-override %} ### **`defaults.run`** -Você pode fornecer opções-padrão de `shell` e `working-directory` para todas as etapas de [`executar`](#jobsjob_idstepsrun) em um fluxo de trabalho. Você também pode definir as configurações-padrão para `execução` apenas disponíveis para um trabalho. Para obter mais informações, consulte [`jobs..defaults.run`](#jobsjob_iddefaultsrun). Você não pode usar contextos ou expressões nesta palavra-chave. +You can provide default `shell` and `working-directory` options for all [`run`](#jobsjob_idstepsrun) steps in a workflow. You can also set default settings for `run` that are only available to a job. For more information, see [`jobs..defaults.run`](#jobsjob_iddefaultsrun). You cannot use contexts or expressions in this keyword. {% data reusables.github-actions.defaults-override %} -#### Exemplo +#### Example ```yaml -padrões: +defaults: run: shell: bash working-directory: scripts @@ -221,37 +221,37 @@ padrões: ### **`jobs`** -A execução de um fluxo de trabalho consiste em um ou mais trabalhos. Por padrão, os trabalhos são executados paralelamente. Para executar trabalhos sequencialmente, você pode definir dependências em outros trabalhos usando a palavra-chave `jobs..needs`. +A workflow run is made up of one or more jobs. Jobs run in parallel by default. To run jobs sequentially, you can define dependencies on other jobs using the `jobs..needs` keyword. -Cada trabalho é executado em um ambiente especificado por `runs-on`. +Each job runs in an environment specified by `runs-on`. -Você pode executar quantos trabalhos desejar, desde que esteja dentro dos limites de uso do fluxo de trabalho. Para obter mais informações, consulte "[Limites de uso e cobrança](/actions/reference/usage-limits-billing-and-administration)" para executores hospedados em {% data variables.product.prodname_dotcom %} e "[Sobre executores auto-hospedados](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)" para limites de uso de executores auto-hospedados. +You can run an unlimited number of jobs as long as you are within the workflow usage limits. For more information, see "[Usage limits and billing](/actions/reference/usage-limits-billing-and-administration)" for {% data variables.product.prodname_dotcom %}-hosted runners and "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)" for self-hosted runner usage limits. -Se você precisar encontrar o identificador exclusivo de um trabalho e execução em um fluxo de trabalho, você poderá usar a API {% data variables.product.prodname_dotcom %}. Para obter mais informações, consulte "[Trabalhos do fluxo de trabalho](/v3/actions/workflow-jobs)". +If you need to find the unique identifier of a job running in a workflow run, you can use the {% data variables.product.prodname_dotcom %} API. For more information, see "[Workflow Jobs](/v3/actions/workflow-jobs)." ### **`jobs.`** -Cada trabalho deve ter um id associado. A chave `job_id` é uma string, e seu valor é um mapa dos dados de configuração do trabalho. Você deve substituir `` por uma string exclusiva para o objeto `jobs`. `` deve começar por uma letra ou `_`, além de conter somente caracteres alfanuméricos, `-` ou `_`. +Each job must have an id to associate with the job. The key `job_id` is a string and its value is a map of the job's configuration data. You must replace `` with a string that is unique to the `jobs` object. The `` must start with a letter or `_` and contain only alphanumeric characters, `-`, or `_`. -#### Exemplo +#### Example ```yaml jobs: - meu_primeiro_trabalho: - name: meu primeiro trabalho - meu_segundo_trabalho: - name: meu segundo trabalho + my_first_job: + name: My first job + my_second_job: + name: My second job ``` ### **`jobs..name`** -Nome do trabalho no {% data variables.product.prodname_dotcom %}. +The name of the job displayed on {% data variables.product.prodname_dotcom %}. ### **`jobs..needs`** -Identifica todos os trabalhos a serem concluídos com êxito antes da execução deste trabalho. Esse código pode ser uma string ou array de strings. Se houver falha em um trabalho, todos os trabalhos que dependem dele serão ignorados, a menos que os trabalhos usem uma instrução condicional que faça o trabalho continuar. +Identifies any jobs that must complete successfully before this job will run. It can be a string or array of strings. If a job fails, all jobs that need it are skipped unless the jobs use a conditional statement that causes the job to continue. -#### Exemplo +#### Example ```yaml jobs: @@ -262,9 +262,9 @@ jobs: needs: [job1, job2] ``` -Neste exemplo, `job1` deve ser concluído com êxito antes do início de `job2`, e `job3` aguarda a conclusão de `job1` e `job2`. +In this example, `job1` must complete successfully before `job2` begins, and `job3` waits for both `job1` and `job2` to complete. -Os trabalhos neste exemplo são executados sequencialmente: +The jobs in this example run sequentially: 1. `job1` 2. `job2` @@ -272,60 +272,60 @@ Os trabalhos neste exemplo são executados sequencialmente: ### **`jobs..runs-on`** -**Obrigatório** O tipo de máquina para executar o trabalho. A máquina pode ser ou um executor hospedado em {% data variables.product.prodname_dotcom %} ou um executor auto-hospedado. +**Required** The type of machine to run the job on. The machine can be either a {% data variables.product.prodname_dotcom %}-hosted runner or a self-hosted runner. {% data reusables.actions.enterprise-github-hosted-runners %} -#### Runners hospedados no {% data variables.product.prodname_dotcom %} +#### {% data variables.product.prodname_dotcom %}-hosted runners -Se você usar um executor hospedado no {% data variables.product.prodname_dotcom %}, cada trabalho será executado em uma nova instância de um ambiente virtual especificado por `runs-on`. +If you use a {% data variables.product.prodname_dotcom %}-hosted runner, each job runs in a fresh instance of a virtual environment specified by `runs-on`. -Os tipos de executor disponíveis para {% data variables.product.prodname_dotcom %} são: +Available {% data variables.product.prodname_dotcom %}-hosted runner types are: {% data reusables.github-actions.supported-github-runners %} {% data reusables.github-actions.ubuntu-runner-preview %} -##### **Exemplo** +##### **Example** ```yaml runs-on: ubuntu-latest ``` -Para obter mais informações, consulte "[Ambientes virtuais para executores hospedados em {% data variables.product.prodname_dotcom %}](/github/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners)". +For more information, see "[Virtual environments for {% data variables.product.prodname_dotcom %}-hosted runners](/github/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners)." -#### Executores auto-hospedados +#### Self-hosted runners {% data reusables.github-actions.self-hosted-runner-labels-runs-on %} -##### **Exemplo** +##### **Example** ```yaml runs-on: [self-hosted, linux] ``` -Para obter mais informações, consulte "[Sobre executores auto-hospedados](/github/automating-your-workflow-with-github-actions/about-self-hosted-runners)" e "[Usar executores auto-hospedados em um fluxo de trabalho](/github/automating-your-workflow-with-github-actions/using-self-hosted-runners-in-a-workflow)." +For more information, see "[About self-hosted runners](/github/automating-your-workflow-with-github-actions/about-self-hosted-runners)" and "[Using self-hosted runners in a workflow](/github/automating-your-workflow-with-github-actions/using-self-hosted-runners-in-a-workflow)." ### **`jobs..outputs`** -Um `mapa` de saídas para um trabalho. As saídas de trabalho estão disponíveis para todos os trabalhos downstream que dependem deste trabalho. Para obter mais informações sobre a definição de dependências de trabalhos, consulte [`jobs..needs`](#jobsjob_idneeds). +A `map` of outputs for a job. Job outputs are available to all downstream jobs that depend on this job. For more information on defining job dependencies, see [`jobs..needs`](#jobsjob_idneeds). -As saídas de trabalho são strings e saídas de trabalho que contêm expressões são avaliadas no executor ao final de cada trabalho. As saídas que contêm segredos são eliminadas no executor e não são enviadas para {% data variables.product.prodname_actions %}. +Job outputs are strings, and job outputs containing expressions are evaluated on the runner at the end of each job. Outputs containing secrets are redacted on the runner and not sent to {% data variables.product.prodname_actions %}. -Para usar as saídas de trabalho em um trabalho dependente, você poderá usar o contexto `needs`. Para obter mais informações, consulte "[Contexto e sintaxe de expressão para {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions#needs-context)". +To use job outputs in a dependent job, you can use the `needs` context. For more information, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions#needs-context)." -#### **Exemplo** +#### **Example** {% raw %} ```yaml -trabalhos: +jobs: job1: runs-on: ubuntu-latest - # Mapeia a saída de uma etapa com a saída de um trabalho - saídas: + # Map a step output to a job output + outputs: output1: ${{ steps.step1.outputs.test }} output2: ${{ steps.step2.outputs.test }} - etapas: + steps: - id: step1 run: echo "::set-output name=test::hello" - id: step2 @@ -333,18 +333,18 @@ trabalhos: job2: runs-on: ubuntu-latest needs: job1 - etapas: + steps: - run: echo ${{needs.job1.outputs.output1}} ${{needs.job1.outputs.output2}} ``` {% endraw %} ### **`jobs..env`** -Um `map` (mapa) das variáveis de ambiente que estão disponíveis para todos as etapas do trabalho. Também é possível definir variáveis de ambiente para todo o fluxo de trabalho ou uma etapa individual. Para obter mais informações, consulte [`env`](#env) e [`jobs..steps.env`](#jobsjob_idstepsenv). +A `map` of environment variables that are available to all steps in the job. You can also set environment variables for the entire workflow or an individual step. For more information, see [`env`](#env) and [`jobs..steps.env`](#jobsjob_idstepsenv). {% data reusables.repositories.actions-env-var-note %} -#### **Exemplo** +#### **Example** ```yaml jobs: @@ -355,43 +355,43 @@ jobs: ### **`jobs..defaults`** -Um `mapa` com as configurações- padrão que serão aplicadas a todas as etapas do trabalho. Você também pode definir as configurações-padrão para todo o fluxo de trabalho. Para obter mais informações, consulte [`padrão`](#defaults). +A `map` of default settings that will apply to all steps in the job. You can also set default settings for the entire workflow. For more information, see [`defaults`](#defaults). {% data reusables.github-actions.defaults-override %} ### **`jobs..defaults.run`** -Forneça o `shell` e `working-directory` para todas as etapas do trabalho `executar`. Não são permitidos contexto e expressão nesta seção. +Provide default `shell` and `working-directory` to all `run` steps in the job. Context and expression are not allowed in this section. -Você pode fornecer as opções-padrão de `shell` e `working-directory` para todas as etapas de [`execução`](#jobsjob_idstepsrun) de um trabalho. Você também pode definir as configurações-padrão para `execução` para todo o fluxo de trabalho. Para obter mais informações, consulte [`jobs.defaults.run`](#defaultsrun). Você não pode usar contextos ou expressões nesta palavra-chave. +You can provide default `shell` and `working-directory` options for all [`run`](#jobsjob_idstepsrun) steps in a job. You can also set default settings for `run` for the entire workflow. For more information, see [`jobs.defaults.run`](#defaultsrun). You cannot use contexts or expressions in this keyword. {% data reusables.github-actions.defaults-override %} -#### Exemplo +#### Example ```yaml -trabalhos: +jobs: job1: runs-on: ubuntu-latest - padrões: - executar: + defaults: + run: shell: bash working-directory: scripts ``` ### **`jobs..if`** -Você pode usar a condicional `if` (se) para evitar que um trabalho seja executado a não ser que determinada condição seja atendida. Você pode usar qualquer contexto e expressão compatível para criar uma condicional. +You can use the `if` conditional to prevent a job from running unless a condition is met. You can use any supported context and expression to create a conditional. -{% data reusables.github-actions.expression-syntax-if %} Para obter mais informações, consulte "[Contexto e sintaxe de expressão para {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)". +{% data reusables.github-actions.expression-syntax-if %} For more information, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)." ### **`jobs..steps`** -Trabalhos contêm sequências de tarefas chamadas `steps`. As etapas podem executar comandos, executar trabalhos de configuração ou executar ações no seu repositório, em repositórios públicos, ou ações publicadas em registros do Docker. Nem todas as etapas executam ações, mas todas as ações são executadas como etapas. Cada etapa é executada em seu próprio processo no ambiente do executor, tendo acesso ao espaço de trabalho e ao sistema de arquivos. Como as etapas são executadas em seus próprios processos, as alterações nas variáveis de ambiente não são preservadas entre as etapas. O {% data variables.product.prodname_dotcom %} fornece etapas integradas para configurar e concluir trabalhos. +A job contains a sequence of tasks called `steps`. Steps can run commands, run setup tasks, or run an action in your repository, a public repository, or an action published in a Docker registry. Not all steps run actions, but all actions run as a step. Each step runs in its own process in the runner environment and has access to the workspace and filesystem. Because steps run in their own process, changes to environment variables are not preserved between steps. {% data variables.product.prodname_dotcom %} provides built-in steps to set up and complete a job. -Você pode executar quantas etapas quiser, desde que esteja dentro dos limites de uso do fluxo de trabalho. Para obter mais informações, consulte "[Limites de uso e cobrança](/actions/reference/usage-limits-billing-and-administration)" para executores hospedados em {% data variables.product.prodname_dotcom %} e "[Sobre executores auto-hospedados](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)" para limites de uso de executores auto-hospedados. +You can run an unlimited number of steps as long as you are within the workflow usage limits. For more information, see "[Usage limits and billing](/actions/reference/usage-limits-billing-and-administration)" for {% data variables.product.prodname_dotcom %}-hosted runners and "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners/#usage-limits)" for self-hosted runner usage limits. -#### Exemplo +#### Example {% raw %} ```yaml @@ -417,28 +417,28 @@ jobs: #### **`jobs..steps.id`** -Identificador exclusivo da etapa. Você pode usar `id` para fazer referência à etapa em contextos. Para obter mais informações, consulte "[Contexto e sintaxe de expressão para {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)". +A unique identifier for the step. You can use the `id` to reference the step in contexts. For more information, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)." #### **`jobs..steps.if`** -Você pode usar a condicional `if` (se) para evitar que uma etapa trabalho seja executada a não ser que determinada condição seja atendida. Você pode usar qualquer contexto e expressão compatível para criar uma condicional. +You can use the `if` conditional to prevent a step from running unless a condition is met. You can use any supported context and expression to create a conditional. -{% data reusables.github-actions.expression-syntax-if %} Para obter mais informações, consulte "[Contexto e sintaxe de expressão para {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)". +{% data reusables.github-actions.expression-syntax-if %} For more information, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)." -##### Exemplo usando contextos +##### Example using contexts - Essa etapa somente é executada quando o tipo de evento é uma `pull_request` e a ação do evento é `unassigned` (não atribuída). + This step only runs when the event type is a `pull_request` and the event action is `unassigned`. ```yaml -etapas: - - nome: Minha primeira etapa - se: {% raw %}${{ github.event_name == 'pull_request' && github.event.action == 'unassigned' }}{% endraw %} - executar: echo Este evento é um pull request cujo responsável foi removido. +steps: + - name: My first step + if: {% raw %}${{ github.event_name == 'pull_request' && github.event.action == 'unassigned' }}{% endraw %} + run: echo This event is a pull request that had an assignee removed. ``` -##### Exemplo usando funções de verificação de status +##### Example using status check functions -A função `my backup step` (minha etapa de backup) somente é executada quando houver falha em uma etapa anterior do trabalho. Para obter mais informações, consulte "[Contexto e sintaxe de expressão para {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions#job-status-check-functions)". +The `my backup step` only runs when the previous step of a job fails. For more information, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions#job-status-check-functions)." ```yaml steps: @@ -451,22 +451,22 @@ steps: #### **`jobs..steps.name`** -Nome da etapa no {% data variables.product.prodname_dotcom %}. +A name for your step to display on {% data variables.product.prodname_dotcom %}. #### **`jobs..steps.uses`** -Seleciona uma ação para executar como parte de uma etapa no trabalho. A ação é uma unidade reutilizável de código. Você pode usar uma ação definida no mesmo repositório que o fluxo de trabalho, um repositório público ou em uma [imagem publicada de contêiner Docker](https://hub.docker.com/). +Selects an action to run as part of a step in your job. An action is a reusable unit of code. You can use an action defined in the same repository as the workflow, a public repository, or in a [published Docker container image](https://hub.docker.com/). -É altamente recomendável incluir a versão da ação que você está usando ao especificar um número de tag Docker, SHA ou ref do Git. Se você não especificar uma versão, ela poderá interromper seus fluxos de trabalho ou causar um comportamento inesperado quando o proprietário da ação publicar uma atualização. -- Usar o commit SHA de uma versão de ação lançada é a maneira mais garantida de obter estabilidade e segurança. -- Usar a versão principal da ação permite receber correções importantes e patches de segurança sem perder a compatibilidade. Fazer isso também garante o funcionamento contínuo do fluxo de trabalho. -- Usar o branch-padrão de uma ação pode ser conveniente, mas se alguém lançar uma nova versão principal com uma mudança significativa, seu fluxo de trabalho poderá ter problemas. +We strongly recommend that you include the version of the action you are using by specifying a Git ref, SHA, or Docker tag number. If you don't specify a version, it could break your workflows or cause unexpected behavior when the action owner publishes an update. +- Using the commit SHA of a released action version is the safest for stability and security. +- Using the specific major action version allows you to receive critical fixes and security patches while still maintaining compatibility. It also assures that your workflow should still work. +- Using the default branch of an action may be convenient, but if someone releases a new major version with a breaking change, your workflow could break. -Algumas ações requerem entradas que devem ser definidas com a palavra-chave [`with`](#jobsjob_idstepswith) (com). Revise o arquivo README da ação para determinar as entradas obrigatórias. +Some actions require inputs that you must set using the [`with`](#jobsjob_idstepswith) keyword. Review the action's README file to determine the inputs required. -Ações são arquivos JavaScript ou contêineres Docker. Se a ação em uso for um contêiner do Docker, você deverá executar o trabalho em um ambiente do Linux. Para obter mais detalhes, consulte [`runs-on`](#jobsjob_idruns-on). +Actions are either JavaScript files or Docker containers. If the action you're using is a Docker container you must run the job in a Linux environment. For more details, see [`runs-on`](#jobsjob_idruns-on). -##### Exemplo usando ações com versão +##### Example using versioned actions ```yaml steps: @@ -480,11 +480,11 @@ steps: - uses: actions/setup-node@main ``` -##### Exemplo usando uma ação pública +##### Example using a public action `{owner}/{repo}@{ref}` -Você pode especificar um branch, ref ou SHA em um repositório público {% data variables.product.prodname_dotcom %}. +You can specific branch, ref, or SHA in a public {% data variables.product.prodname_dotcom %} repository. ```yaml jobs: @@ -498,11 +498,11 @@ jobs: uses: actions/aws@v2.0.1 ``` -##### Exemplo usando uma ação pública em um subdiretório +##### Example using a public action in a subdirectory `{owner}/{repo}/{path}@{ref}` -Subdiretório em um repositório público do {% data variables.product.prodname_dotcom %} em um branch, ref ou SHA específico. +A subdirectory in a public {% data variables.product.prodname_dotcom %} repository at a specific branch, ref, or SHA. ```yaml jobs: @@ -512,66 +512,66 @@ jobs: uses: actions/aws/ec2@main ``` -##### Exemplo usando a ação no mesmo repositório que o fluxo de trabalho +##### Example using action in the same repository as the workflow `./path/to/dir` -Caminho para o diretório que contém a ação no repositório do seu fluxo de trabalho. Você deve reservar seu repositório antes de usar a ação. - -```yaml -trabalhos: - my_first_job: - etapas: - - Nome: Verificar repositório - usa: actions/checkout@v2 - - nome: Use local my-action - usa: ./.github/actions/my-action -``` - -##### Exemplo usando uma ação do Docker Hub - -`docker://{image}:{tag}` - -Imagem Docker publicada no [Docker Hub](https://hub.docker.com/). - -```yaml -empregos: - my_first_job: - passos: - - nome: Meu primeiro passo - usa: docker://alpine:3.8 -``` - -##### Exemplo usando uma ação do registro público do Docker Hub - -`docker://{host}/{image}:{tag}` - -Imagem Docker em um registro público. +The path to the directory that contains the action in your workflow's repository. You must check out your repository before using the action. ```yaml jobs: - meu_primeiro_trabalho: + my_first_job: steps: - - name: minha primeira etapa + - name: Check out repository + uses: actions/checkout@v2 + - name: Use local my-action + uses: ./.github/actions/my-action +``` + +##### Example using a Docker Hub action + +`docker://{image}:{tag}` + +A Docker image published on [Docker Hub](https://hub.docker.com/). + +```yaml +jobs: + my_first_job: + steps: + - name: My first step + uses: docker://alpine:3.8 +``` + +##### Example using a Docker public registry action + +`docker://{host}/{image}:{tag}` + +A Docker image in a public registry. + +```yaml +jobs: + my_first_job: + steps: + - name: My first step uses: docker://gcr.io/cloud-builders/gradle ``` #### **`jobs..steps.run`** -Executa programas de linha de comando usando o shell do sistema operacional. Se você não informar um `name`, o nome da etapa será configurado por padrão como o texto indicado no comando `run`. +Runs command-line programs using the operating system's shell. If you do not provide a `name`, the step name will default to the text specified in the `run` command. -Por padrão, os comandos run usam shells de não login. Você pode escolher um shell diferente e personalizar o shell usado para executar comandos. Para obter mais informações, consulte "[Usar um shell específico](#using-a-specific-shell)". +Commands run using non-login shells by default. You can choose a different shell and customize the shell used to run commands. For more information, see "[Using a specific shell](#using-a-specific-shell)." -Cada palavra-chave `run` representa um novo processo e shell no ambiente do executor. Quando você fornece comandos de várias linhas, cada linha será executada no mesmo shell. Por exemplo: +Each `run` keyword represents a new process and shell in the runner environment. When you provide multi-line commands, each line runs in the same shell. For example: -* Um comando de linha única: +* A single-line command: ```yaml - name: Install Dependencies run: npm install ``` -* Um comando de várias linhas: +* A multi-line command: ```yaml - name: Clean install dependencies and build @@ -580,7 +580,7 @@ Cada palavra-chave `run` representa um novo processo e shell no ambiente do exec npm run build ``` -Com a palavra-chave `working-directory` (diretório de trabalho), é possível especificar o diretório de trabalho de onde o comando será executado. +Using the `working-directory` keyword, you can specify the working directory of where to run the command. ```yaml - name: Clean temp directory @@ -588,20 +588,20 @@ Com a palavra-chave `working-directory` (diretório de trabalho), é possível e working-directory: ./temp ``` -##### Usar um shell específico +##### Using a specific shell -Você pode anular as configurações padrão de shell no sistema operacional do executor usando a palavra-chave `shell`. É possível usar palavras-chave integradas a `shell` ou definir um conjunto personalizado de opções de shell. +You can override the default shell settings in the runner's operating system using the `shell` keyword. You can use built-in `shell` keywords, or you can define a custom set of shell options. -| Plataforma compatível | Parâmetro `shell` | Descrição | Comando executado internamente | -| --------------------- | ----------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | -| Todas | `bash` | O shell padrão em plataformas que não sejam Windows como uma alternativa para `sh`. Ao especificar um shell bash no Windows, é utilizado o shell bash incluído no Git para Windows. | `bash --noprofile --norc -eo pipefail {0}` | -| Todas | `pwsh` | Powershell Core. O {% data variables.product.prodname_dotcom %} anexa a extensão `.ps1` ao nome do script. | `pwsh -command ". '{0}'"` | -| Todas | `python` | Executa o comando python. | `python {0}` | -| Linux / macOS | `sh` | Comportamento alternativo para plataformas que não sejam Windows se nenhum shell for fornecido e o `bash` não for encontrado no caminho. | `sh -e {0}` | -| Windows | `cmd` | O {% data variables.product.prodname_dotcom %} anexa a extensão `.cmd` ao nome do script e a substitui por `{0}`. | `%ComSpec% /D /E:ON /V:OFF /S /C "CALL "{0}""`. | -| Windows | `powershell` | Essa é a shell padrão usada no Windows. PowerShell Desktop. O {% data variables.product.prodname_dotcom %} anexa a extensão `.ps1` ao nome do script. | `powershell -command ". '{0}'"`. | +| Supported platform | `shell` parameter | Description | Command run internally | +|--------------------|-------------------|-------------|------------------------| +| All | `bash` | The default shell on non-Windows platforms with a fallback to `sh`. When specifying a bash shell on Windows, the bash shell included with Git for Windows is used. | `bash --noprofile --norc -eo pipefail {0}` | +| All | `pwsh` | The PowerShell Core. {% data variables.product.prodname_dotcom %} appends the extension `.ps1` to your script name. | `pwsh -command ". '{0}'"` | +| All | `python` | Executes the python command. | `python {0}` | +| Linux / macOS | `sh` | The fallback behavior for non-Windows platforms if no shell is provided and `bash` is not found in the path. | `sh -e {0}` | +| Windows | `cmd` | {% data variables.product.prodname_dotcom %} appends the extension `.cmd` to your script name and substitutes for `{0}`. | `%ComSpec% /D /E:ON /V:OFF /S /C "CALL "{0}""`. | +| Windows | `powershell` | This is the default shell used on Windows. The Desktop PowerShell. {% data variables.product.prodname_dotcom %} appends the extension `.ps1` to your script name. | `powershell -command ". '{0}'"`. | -##### Exemplo de execução de um script usando bash: +##### Example running a script using bash ```yaml steps: @@ -610,7 +610,7 @@ steps: shell: bash ``` -##### Exemplo de execução de um script usando Windows `cmd` +##### Example running a script using Windows `cmd` ```yaml steps: @@ -619,7 +619,7 @@ steps: shell: cmd ``` -##### Exemplo de execução de um script usando PowerShell Core +##### Example running a script using PowerShell Core ```yaml steps: @@ -628,7 +628,7 @@ steps: shell: pwsh ``` -##### Exemplo de execução de um script python +##### Example running a python script ```yaml steps: @@ -639,35 +639,35 @@ steps: shell: python ``` -##### Shell personalizado +##### Custom shell -Você pode usar o valor `shell` em um string modelo usando `command […options] {0} [..more_options]`. O {% data variables.product.prodname_dotcom %} interpreta a primeira palavra da string delimitada por um espaço em branco como o comando e insere o nome do arquivo para o script temporário em `{0}`. +You can set the `shell` value to a template string using `command […options] {0} [..more_options]`. {% data variables.product.prodname_dotcom %} interprets the first whitespace-delimited word of the string as the command, and inserts the file name for the temporary script at `{0}`. -##### Preferências de ação de erro e códigos de saída +##### Exit codes and error action preference -Para palavras-chave de shell integradas, fornecemos os seguintes padrões usados por executores hospedados no {% data variables.product.prodname_dotcom %}. Você deve seguir estas diretrizes quando executar scripts shell. +For built-in shell keywords, we provide the following defaults that are executed by {% data variables.product.prodname_dotcom %}-hosted runners. You should use these guidelines when running shell scripts. - `bash`/`sh`: - - Comportamento fail-fast usando `set -e o pipefail`: padrão para `bash` e `shell` integrado. Também é o padrão quando você não der opção em plataformas que não sejam Windows. - - Você pode cancelar o fail-fast e assumir o controle fornecendo uma string de modelo para as opções do shell. Por exemplo, `bash {0}`. - - Shells do tipo sh saem com o código de saída do último comando executado em um script, que também é o comportamento padrão das ações. O executor relatará o status da etapa como falha/êxito com base nesse código de saída. + - Fail-fast behavior using `set -e o pipefail`: Default for `bash` and built-in `shell`. It is also the default when you don't provide an option on non-Windows platforms. + - You can opt out of fail-fast and take full control by providing a template string to the shell options. For example, `bash {0}`. + - sh-like shells exit with the exit code of the last command executed in a script, which is also the default behavior for actions. The runner will report the status of the step as fail/succeed based on this exit code. - `powershell`/`pwsh` - - Comportamento fail-fast quando possível. Para shell integrado `pwsh` e `powershell`, precederemos `$ErrorActionPreference = 'stop'` para conteúdos de script. - - Vincularemos `if ((Test-Path -LiteralPath variable:\LASTEXITCODE)) { exit $LASTEXITCODE }` a scripts powershell para que os status da ação reflitam o código de saída mais recente do script. - - Os usuários podem sempre optar por não usar o shell integrado e fornecer uma opção personalizada, como: `pwsh -File {0}` ou `powershell -Command "& '{0}'"`, dependendo da situação. + - Fail-fast behavior when possible. For `pwsh` and `powershell` built-in shell, we will prepend `$ErrorActionPreference = 'stop'` to script contents. + - We append `if ((Test-Path -LiteralPath variable:\LASTEXITCODE)) { exit $LASTEXITCODE }` to powershell scripts so action statuses reflect the script's last exit code. + - Users can always opt out by not using the built-in shell, and providing a custom shell option like: `pwsh -File {0}`, or `powershell -Command "& '{0}'"`, depending on need. - `cmd` - - Parece não haver uma forma de optar totalmente por um comportamento fail-fast que não seja gravar seu script para verificar cada código de erro e reagir de acordo. Como não podemos fornecer esse comportamento por padrão, você precisa gravá-lo em seu script. - - `cmd.exe` sairá com o error level do último programa que executou e retornará o código de erro para o executor. Este comportamento é internamente consistente o padrão de comportamento anterior `sh` e `pwsh`, e é o padrão `cmd.exe`; portanto, ele fica intacto. + - There doesn't seem to be a way to fully opt into fail-fast behavior other than writing your script to check each error code and respond accordingly. Because we can't actually provide that behavior by default, you need to write this behavior into your script. + - `cmd.exe` will exit with the error level of the last program it executed, and it will and return the error code to the runner. This behavior is internally consistent with the previous `sh` and `pwsh` default behavior and is the `cmd.exe` default, so this behavior remains intact. #### **`jobs..steps.with`** -Um `map` (mapa) dos parâmetros de entrada definidos pela ação. Cada parâmetro de entrada é um par chave/valor. Parâmetros de entrada são definidos como variáveis de ambiente. A variável é precedida por `INPUT_` e convertida em letras maiúsculas. +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. -##### Exemplo +##### Example -Define os três parâmetros de entrada (`first_name`, `middle_name` e `last_name`) definidos pela ação `hello_world`. Essas variáveis de entrada estarão acessíveis para a ação `hello-world` como variáveis de ambiente `INPUT_FIRST_NAME`, `INPUT_MIDDLE_NAME` e `INPUT_LAST_NAME`. +Defines the three input parameters (`first_name`, `middle_name`, and `last_name`) defined by the `hello_world` action. These input variables will be accessible to the `hello-world` action as `INPUT_FIRST_NAME`, `INPUT_MIDDLE_NAME`, and `INPUT_LAST_NAME` environment variables. ```yaml jobs: @@ -683,9 +683,9 @@ jobs: #### **`jobs..steps.with.args`** -Uma `string` que define as entradas para um contêiner Docker. O {% data variables.product.prodname_dotcom %} entrega os `args` ao `ENTRYPOINT` do contêiner quando o contêiner inicia. Um `array de strings` não é compatível com esse parâmetro. +A `string` that defines the inputs for a Docker container. {% data variables.product.prodname_dotcom %} passes the `args` to the container's `ENTRYPOINT` when the container starts up. An `array of strings` is not supported by this parameter. -##### Exemplo +##### Example {% raw %} ```yaml @@ -698,17 +698,17 @@ steps: ``` {% endraw %} -`args` são usados em substituição à instrução `CMD` em um `Dockerfile`. Se você usar `CMD` no `Dockerfile`, use as diretrizes ordenadas por preferência: +The `args` are used in place of the `CMD` instruction in a `Dockerfile`. If you use `CMD` in your `Dockerfile`, use the guidelines ordered by preference: -1. Documente os argumentos necessários no LEIAME das ações e omita-os da instrução `CMD`. -1. Use padrões que permitam o uso da ação sem especificação de `args`. -1. Se a ação expõe um sinalizador `--help` ou similar, use isso como padrão para que a ação se documente automaticamente. +1. Document required arguments in the action's README and omit them from the `CMD` instruction. +1. Use defaults that allow using the action without specifying any `args`. +1. If the action exposes a `--help` flag, or something similar, use that as the default to make your action self-documenting. #### **`jobs..steps.with.entrypoint`** -Anula o `ENTRYPOINT` Docker no `Dockerfile` ou define-o caso ainda não tenha sido especificado. Diferentemente da instrução Docker `ENTRYPOINT` que tem um formulário shell e exec, a palavra-chave `entrypoint` aceita apena uma única string que define o executável. +Overrides the Docker `ENTRYPOINT` in the `Dockerfile`, or sets it if one wasn't already specified. Unlike the Docker `ENTRYPOINT` instruction which has a shell and exec form, `entrypoint` keyword accepts only a single string defining the executable to be run. -##### Exemplo +##### Example ```yaml steps: @@ -718,83 +718,83 @@ steps: entrypoint: /a/different/executable ``` -A palavra-chave `entrypoint` é para ser usada com ações de contêiner Docker, mas você também pode usá-la com ações JavaScript que não definem nenhuma entrada. +The `entrypoint` keyword is meant to use with Docker container actions, but you can also use it with JavaScript actions that don't define any inputs. #### **`jobs..steps.env`** -Define variáveis de ambiente para etapas a serem usadas no ambiente do executor. Também é possível definir variáveis de ambiente para todo o fluxo de trabalho ou para um trabalho. Para obter mais informações, consulte [`env`](#env) e [`jobs..env`](#jobsjob_idenv). +Sets environment variables for steps to use in the runner environment. You can also set environment variables for the entire workflow or a job. For more information, see [`env`](#env) and [`jobs..env`](#jobsjob_idenv). {% data reusables.repositories.actions-env-var-note %} -Ações públicas podem especificar variáveis de ambiente esperadas no arquivo LEIAME. Se você está configurando um segredo em uma variável de ambiente, use o contexto `secrets`. Para obter mais informações, consulte "[Usar variáveis de ambiente](/actions/automating-your-workflow-with-github-actions/using-environment-variables)e "[Sintaxe de contexto e expressão para {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)". +Public actions may specify expected environment variables in the README file. If you are setting a secret in an environment variable, you must set secrets using the `secrets` context. For more information, see "[Using environment variables](/actions/automating-your-workflow-with-github-actions/using-environment-variables)" and "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)." -##### Exemplo +##### Example {% raw %} ```yaml steps: - - name: minha primeira ação - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - FIRST_NAME: Mona - LAST_NAME: Octocat + - name: My first action + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + FIRST_NAME: Mona + LAST_NAME: Octocat ``` {% endraw %} #### **`jobs..steps.continue-on-error`** -Impede a falha de um trabalho se uma etapa não funcionar. Defina `true` (verdadeiro) para permitir que um trabalho aconteça quando essa etapa falhar. +Prevents a job from failing when a step fails. Set to `true` to allow a job to pass when this step fails. #### **`jobs..steps.timeout-minutes`** -Número máximo de minutos para executar a etapa antes de interromper o processo. +The maximum number of minutes to run the step before killing the process. ### **`jobs..timeout-minutes`** -Número máximo de minutos para permitir a execução de um trabalho o antes que o {% data variables.product.prodname_dotcom %} o cancele automaticamente. Padrão: 360 +The maximum number of minutes to let a job run before {% data variables.product.prodname_dotcom %} automatically cancels it. Default: 360 ### **`jobs..strategy`** -Estratégias criam matrizes de compilação para os trabalhos. Você pode definir variações diferentes dos ambientes em que vai executar os trabalhos. +A strategy creates a build matrix for your jobs. You can define different variations of an environment to run each job in. #### **`jobs..strategy.matrix`** -Você pode definir uma matriz de diferentes configurações de trabalho. Uma matriz permite que você crie vários trabalhos que realizam a substituição de variável em uma definição de trabalho único. Por exemplo, você pode usar uma matriz para criar trabalhos para mais de uma versão compatível de uma linguagem de programação, sistema operacional ou ferramenta. Uma matriz reutiliza a configuração do trabalho e cria trabalho para cada matriz que você configurar. +You can define a matrix of different job configurations. A matrix allows you to create multiple jobs by performing variable substitution in a single job definition. For example, you can use a matrix to create jobs for more than one supported version of a programming language, operating system, or tool. A matrix reuses the job's configuration and creates a job for each matrix you configure. {% data reusables.github-actions.usage-matrix-limits %} -Cada opção que você define na `matriz` tem uma chave e um valor. As chaves que você define tornam-se propriedades no contexto da `matriz` e você pode fazer referência à propriedade em outras áreas do seu arquivo de fluxo de trabalho. Por exemplo, se você definir a chave `os` que contém um array de sistemas operacionais, você poderá usar a propriedade `matrix.os` como o valor da palavra-chave `runs-on` para criar um trabalho para cada sistema operacional. Para obter mais informações, consulte "[Contexto e sintaxe de expressão para {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)". +Each option you define in the `matrix` has a key and value. The keys you define become properties in the `matrix` context and you can reference the property in other areas of your workflow file. For example, if you define the key `os` that contains an array of operating systems, you can use the `matrix.os` property as the value of the `runs-on` keyword to create a job for each operating system. For more information, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)." -A ordem que você define uma `matriz` importa. A primeira opção que você definir será a primeira que será executada no seu fluxo de trabalho. +The order that you define a `matrix` matters. The first option you define will be the first job that runs in your workflow. -##### Exemplo de execução com mais de uma versão do Node.js +##### Example running with more than one version of Node.js -Você pode especificar uma matriz ao fornecer um array para as opções de configuração. Por exemplo, se o executor for compatível com as versões 6, 8 e 10 do Node.js versões, você poderá especificar um array dessas versões na `matriz`. +You can specify a matrix by supplying an array for the configuration options. For example, if the runner supports Node.js versions 6, 8, and 10, you could specify an array of those versions in the `matrix`. -Este exemplo cria uma matriz de três trabalhos, definindo a chave `nó` para um array de três versões do Node.js. Para usar a matriz, o exemplo define a propriedade do contexto `matrix.node` como o valor do parâmetro `setup-node` de entrada da ação `node-version`. Como resultado, três trabalhos serão executados, cada uma usando uma versão diferente do Node.js. +This example creates a matrix of three jobs by setting the `node` key to an array of three Node.js versions. To use the matrix, the example sets the `matrix.node` context property as the value of the `setup-node` action's input parameter `node-version`. As a result, three jobs will run, each using a different Node.js version. {% raw %} ```yaml -estratégia: - matriz: - nó: [6, 8, 10] -etapas: - # Configura a versão do nó usada nos executores hospedados no GitHub - - usa: actions/setup-node@v1 - com: - # A versão do Node.js a ser configurada +strategy: + matrix: + node: [6, 8, 10] +steps: + # Configures the node version used on GitHub-hosted runners + - uses: actions/setup-node@v1 + with: + # The Node.js version to configure node-version: ${{ matrix.node }} ``` {% endraw %} -A ação setup-node `` é a forma recomendada de configurar uma versão do Node.js ao usar executores hospedados em {% data variables.product.prodname_dotcom %}. Para obter mais informações, consulte a ação [`setup-node`](https://github.com/actions/setup-node). +The `setup-node` action is the recommended way to configure a Node.js version when using {% data variables.product.prodname_dotcom %}-hosted runners. For more information, see the [`setup-node`](https://github.com/actions/setup-node) action. -##### Exemplo de execução com mais de um sistema operacional +##### Example running with more than one operating system -Você pode criar uma matriz para executar fluxos de trabalho em mais de um sistema operacional do executor. Você também pode especificar mais de uma configuração da matriz. Este exemplo cria uma matriz de 6 trabalhos: +You can create a matrix to run workflows on more than one runner operating system. You can also specify more than one matrix configuration. This example creates a matrix of 6 jobs: -- 2 sistemas operacionais especificados na array `os` -- 3 versões do Node.js especificadas na array do `nó` +- 2 operating systems specified in the `os` array +- 3 Node.js versions specified in the `node` array {% data reusables.repositories.actions-matrix-builds-os %} @@ -812,59 +812,59 @@ steps: ``` {% endraw %} -Para encontrar opções de configuração compatíveis com os executores hospedados em {% data variables.product.prodname_dotcom %}, consulte "[Ambientes virtuais para executores hospedados em {% data variables.product.prodname_dotcom %}](/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners)." +To find supported configuration options for {% data variables.product.prodname_dotcom %}-hosted runners, see "[Virtual environments for {% data variables.product.prodname_dotcom %}-hosted runners](/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners)." -##### Exemplo de inclusão valores adicionais em combinações +##### Example including additional values into combinations -Você pode adicionar opções de configurações para um trabalho de matriz de compilação existente. Por exemplo, se você quer usar uma versão específica do `npm` quando o trabalho que usa o `windows-latest` e a versão 4 do `nó` é executado, você pode usar `incluir` para especificar a opção adicional. +You can add additional configuration options to a build matrix job that already exists. For example, if you want to use a specific version of `npm` when the job that uses `windows-latest` and version 4 of `node` runs, you can use `include` to specify that additional option. {% raw %} ```yaml runs-on: ${{ matrix.os }} -estratégia: - matriz: +strategy: + matrix: os: [macos-latest, windows-latest, ubuntu-18.04] - nó: [4, 6, 8, 10] - inclui: - # incluo uma variável nova do npm com um valor de 2 - # para o leg da matriz que corresponde ao os e à versão + node: [4, 6, 8, 10] + include: + # includes a new variable of npm with a value of 2 + # for the matrix leg matching the os and version - os: windows-latest - nó: 4 + node: 4 npm: 2 ``` {% endraw %} -##### Exemplo de inclusão novas combinações +##### Example including new combinations -Você pode usar `incluir` para adicionar novos trabalhos a uma matriz de criação. Qualquer configuração sem correspondência de incluir será adicionadas à matriz. Por exemplo, se você quiser usar a versão 12 do `nó` para compilar em vários sistemas operacionais, mas quiser uma tarefa experimental extra usando o node 13 no Ubuntu, você poderá usar `incluir` para especificar essa tarefa adicional. +You can use `include` to add new jobs to a build matrix. Any unmatched include configurations are added to the matrix. For example, if you want to use `node` version 12 to build on multiple operating systems, but wanted one extra experimental job using node version 13 on Ubuntu, you can use `include` to specify that additional job. {% raw %} ```yaml runs-on: ${{ matrix.os }} -estratégia: - matriz: - nó: [12] +strategy: + matrix: + node: [12] os: [macos-latest, windows-latest, ubuntu-18.04] - inclui: - - nó: 13 + include: + - node: 13 os: ubuntu-18.04 - experimental: verdadeiro + experimental: true ``` {% endraw %} -##### Exemplo excluindo configurações de uma matriz +##### Example excluding configurations from a matrix -Você pode remover uma configuração específica definida na matriz de compilação usando a opção `exclude` (excluir). `exclude` remove um trabalho definido pela matriz de compilação. O número de trabalhos é o produto cruzado do número de sistemas operacionais (`os`) incluídos nos arrays fornecidos por você, menos quaisquer subtrações (`exclude`). +You can remove a specific configurations defined in the build matrix using the `exclude` option. Using `exclude` removes a job defined by the build matrix. The number of jobs is the cross product of the number of operating systems (`os`) included in the arrays you provide, minus any subtractions (`exclude`). {% raw %} ```yaml runs-on: ${{ matrix.os }} -estratégia: - matriz: +strategy: + matrix: os: [macos-latest, windows-latest, ubuntu-18.04] - nó: [4, 6, 8, 10] - excluir: - # exclui o nó 4 no macOS + node: [4, 6, 8, 10] + exclude: + # excludes node 4 on macOS - os: macos-latest node: 4 ``` @@ -872,17 +872,17 @@ estratégia: {% note %} -**Observação:** Todas as combinações de `incluir` são processadas depois de `excluir`. Isso permite que você use `incluir` para voltar a adicionar combinações que foram excluídas anteriormente. +**Note:** All `include` combinations are processed after `exclude`. This allows you to use `include` to add back combinations that were previously excluded. {% endnote %} ### **`jobs..strategy.fail-fast`** -Quando definido como `true`, o {% data variables.product.prodname_dotcom %} cancela todos os trabalhos em andamento em caso de falha de algum trabalho de `matrix`. Padrão: `true` +When set to `true`, {% data variables.product.prodname_dotcom %} cancels all in-progress jobs if any `matrix` job fails. Default: `true` ### **`jobs..strategy.max-parallel`** -Número máximo de trabalhos que podem ser executados simultaneamente ao usar uma estratégia de trabalho de `matrix`. Por padrão, o {% data variables.product.prodname_dotcom %} maximizará o número de trabalhos executados em paralelo dependendo dos executores disponíveis nas máquinas virtuais hospedadas no {% data variables.product.prodname_dotcom %}. +The maximum number of jobs that can run simultaneously when using a `matrix` job strategy. By default, {% data variables.product.prodname_dotcom %} will maximize the number of jobs run in parallel depending on the available runners on {% data variables.product.prodname_dotcom %}-hosted virtual machines. ```yaml strategy: @@ -891,36 +891,36 @@ strategy: ### **`jobs..continue-on-error`** -Impede que ocorra falha na execução de um fluxo de trabalho quando ocorrer uma falha em um trabalho. Defina como `verdadeiro` para permitir que uma execução de um fluxo de trabalho passe quando este trabalho falhar. +Prevents a workflow run from failing when a job fails. Set to `true` to allow a workflow run to pass when this job fails. -#### Exemplo do impedimento de uma matriz falha específica de gerar uma falha na execução do fluxo de trabalho +#### Example preventing a specific failing matrix job from failing a workflow run -Você pode permitir que as tarefas específicas em uma matriz de tarefas falhem sem que ocorra falha na execução do fluxo de trabalho. Por exemplo, se você deseja permitir apenas um trabalho experimental com o `nó` definido como `13` sem falhar a execução do fluxo de trabalho. +You can allow specific jobs in a job matrix to fail without failing the workflow run. For example, if you wanted to only allow an experimental job with `node` set to `13` to fail without failing the workflow run. {% raw %} ```yaml runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.experimental }} -estratégia: - fail-fast: falso - matriz: - nó: [11, 12] +strategy: + fail-fast: false + matrix: + node: [11, 12] os: [macos-latest, ubuntu-18.04] experimental: [false] - incluir: - - nó: 13 + include: + - node: 13 os: ubuntu-18.04 - experimental: verdadeiro + experimental: true ``` {% endraw %} ### **`jobs..container`** -Contêiner para executar qualquer etapa em um trabalho que ainda não tenha especificado um contêiner. Se você tiver etapas que usam ações de script e de contêiner, as ações de contêiner serão executadas como contêineres irmãos na mesma rede e com as mesmas montagens de volume. +A container to run any steps in a job that don't already specify a container. If you have steps that use both script and container actions, the container actions will run as sibling containers on the same network with the same volume mounts. -Se você não definir um `container`, todas as etapas serão executadas diretamente no host especificado por `runs-on`, a menos que uma etapa se refira a uma ação configurada para execução em um contêiner. +If you do not set a `container`, all steps will run directly on the host specified by `runs-on` unless a step refers to an action configured to run in a container. -#### Exemplo +#### Example ```yaml jobs: @@ -936,7 +936,7 @@ jobs: options: --cpus 1 ``` -Ao especificar somente uma imagem de contêiner, você pode omitir a palavra-chave `image`. +When you only specify a container image, you can omit the `image` keyword. ```yaml jobs: @@ -946,14 +946,14 @@ jobs: #### **`jobs..container.image`** -Imagem Docker a ser usada como contêiner para executar a ação. O valor pode ser o nome da imagem do Docker Hub ou um {% if enterpriseServerVersions contém currentVersion e currentVersion ver_lt "enterprise-server@2.23" %}nome de registro{% endif %} público. +The Docker image to use as the container to run the action. The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..container.credentials`** {% data reusables.actions.registry-credentials %} -##### Exemplo +##### Example {% raw %} ```yaml @@ -968,23 +968,23 @@ container: #### **`jobs..container.env`** -Define um `mapa` das variáveis de ambiente no contêiner. +Sets a `map` of environment variables in the container. #### **`jobs..container.ports`** -Define um `array` de portas para expor no contêiner. +Sets an `array` of ports to expose on the container. #### **`jobs..container.volumes`** -Define um `array` de volumes para uso do contêiner. É possível usar volumes para compartilhar dados entre serviços ou outras etapas em um trabalho. Você pode especificar volumes de nome Docker, volumes Docker anônimos ou vincular montagens no host. +Sets an `array` of volumes for the container to use. You can use volumes to share data between services or other steps in a job. You can specify named Docker volumes, anonymous Docker volumes, or bind mounts on the host. -Para especificar um volume, especifique o caminho de origem e destino: +To specify a volume, you specify the source and destination path: `:`. -`` é um nome de volume ou caminho absoluto na máquina host, e `` é um caminho absoluto no contêiner. +The `` is a volume name or an absolute path on the host machine, and `` is an absolute path in the container. -##### Exemplo +##### Example ```yaml volumes: @@ -995,48 +995,48 @@ volumes: #### **`jobs..container.options`** -Opções adicionais de recursos do contêiner Docker. Para obter uma lista de opções, consulte "[opções `docker create`](https://docs.docker.com/engine/reference/commandline/create/#options)". +Additional Docker container resource options. For a list of options, see "[`docker create` options](https://docs.docker.com/engine/reference/commandline/create/#options)." ### **`jobs..services`** {% data reusables.github-actions.docker-container-os-support %} -Usado para hospedar contêineres de serviço para um trabalho em um fluxo de trabalho. Contêineres de serviço são úteis para a criação de bancos de dados ou serviços armazenamento em cache como o Redis. O executor cria automaticamente uma rede do Docker e gerencia o ciclo de vida dos contêineres do serviço. +Used to host service containers for a job in a workflow. Service containers are useful for creating databases or cache services like Redis. The runner automatically creates a Docker network and manages the life cycle of the service containers. -Se você configurar seu trabalho para ser executado em um contêiner, ou a sua etapa usar ações ao contêiner, você não precisará mapear as portas para acessar o serviço ou a ação. O Docker expõe automaticamente todas as portas entre os contêineres da mesma rede de ponte definida pelo usuário. Você pode fazer referência ao contêiner de serviço diretamente pelo seu nome de host. O nome do host é mapeado automaticamente com o nome da etiqueta que você configurar para o serviço no fluxo de trabalho. +If you configure your job to run in a container, or your step uses container actions, you don't need to map ports to access the service or action. Docker automatically exposes all ports between containers on the same Docker user-defined bridge network. You can directly reference the service container by its hostname. The hostname is automatically mapped to the label name you configure for the service in the workflow. -Se você configurar a tarefa para executar diretamente na máquina do executor e sua etapa não usar uma ação de contêiner, você deverá mapear todas as portas de contêiner de serviço do Docker necessárias para o host do Docker (a máquina do executor). Você pode acessar o contêiner de serviço usando host local e a porta mapeada. +If you configure the job to run directly on the runner machine and your step doesn't use a container action, you must map any required Docker service container ports to the Docker host (the runner machine). You can access the service container using localhost and the mapped port. -Para obter mais informações sobre as diferenças entre os contêineres de serviço de rede, consulte "[Sobre contêineres de serviço](/actions/automating-your-workflow-with-github-actions/about-service-containers)". +For more information about the differences between networking service containers, see "[About service containers](/actions/automating-your-workflow-with-github-actions/about-service-containers)." -#### Exemplo de uso de host local +#### Example using localhost -Este exemplo cria dois serviços: nginx e redis. Ao especificar a porta do host do Docker mas não a porta do contêiner, a porta do contêiner será atribuída aleatoriamente a uma porta livre. O {% data variables.product.prodname_dotcom %} define a porta de contêiner atribuída no contexto {% raw %}`${{job.services..ports}}`{% endraw %}. Neste exemplo, você pode acessar as portas do contêiner de serviço usando os contextos {% raw %}`${{ job.services.nginx.ports['8080'] }}`{% endraw %} e {% raw %}`${{ job.services.redis.ports['6379'] }}`{% endraw %}. +This example creates two services: nginx and redis. When you specify the Docker host port but not the container port, the container port is randomly assigned to a free port. {% data variables.product.prodname_dotcom %} sets the assigned container port in the {% raw %}`${{job.services..ports}}`{% endraw %} context. In this example, you can access the service container ports using the {% raw %}`${{ job.services.nginx.ports['8080'] }}`{% endraw %} and {% raw %}`${{ job.services.redis.ports['6379'] }}`{% endraw %} contexts. ```yaml -serviços: +services: nginx: - imagem: nginx - # Mapeia a porta 8080 no host do Docker com a porta 80 no contêiner nginx - portas: + image: nginx + # Map port 8080 on the Docker host to port 80 on the nginx container + ports: - 8080:80 redis: - imagem: redis - # Mapeia a porta port 6379 TCP no host do Docker com uma porta livre aleatória no contêiner Redis - portas: + image: redis + # Map TCP port 6379 on Docker host to a random free port on the Redis container + ports: - 6379/tcp ``` #### **`jobs..services..image`** -Imagem Docker a ser usada como contêiner de serviço para executar a ação. O valor pode ser o nome da imagem do Docker Hub ou um {% if enterpriseServerVersions contém currentVersion e currentVersion ver_lt "enterprise-server@2.23" %}nome de registro{% endif %} público. +The Docker image to use as the service container to run the action. The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} #### **`jobs..services..credentials`** {% data reusables.actions.registry-credentials %} -##### Exemplo +##### Example {% raw %} ```yaml @@ -1057,23 +1057,23 @@ services: #### **`jobs..services..env`** -Define um `maá` das variáveis de ambiente no contêiner do serviço. +Sets a `map` of environment variables in the service container. #### **`jobs..services..ports`** -Define um `array` de portas para expor no contêiner de serviço. +Sets an `array` of ports to expose on the service container. #### **`jobs..services..volumes`** -Define um `array` de volumes para uso do contêiner de serviço. É possível usar volumes para compartilhar dados entre serviços ou outras etapas em um trabalho. Você pode especificar volumes de nome Docker, volumes Docker anônimos ou vincular montagens no host. +Sets an `array` of volumes for the service container to use. You can use volumes to share data between services or other steps in a job. You can specify named Docker volumes, anonymous Docker volumes, or bind mounts on the host. -Para especificar um volume, especifique o caminho de origem e destino: +To specify a volume, you specify the source and destination path: `:`. -`` é um nome de volume ou caminho absoluto na máquina host, e `` é um caminho absoluto no contêiner. +The `` is a volume name or an absolute path on the host machine, and `` is an absolute path in the container. -##### Exemplo +##### Example ```yaml volumes: @@ -1084,63 +1084,63 @@ volumes: #### **`jobs..services..options`** -Opções adicionais de recursos do contêiner Docker. Para obter uma lista de opções, consulte "[opções `docker create`](https://docs.docker.com/engine/reference/commandline/create/#options)". +Additional Docker container resource options. For a list of options, see "[`docker create` options](https://docs.docker.com/engine/reference/commandline/create/#options)." -### Folha de consulta de filtro padrão +### Filter pattern cheat sheet -Você pode usar caracteres especiais nos filtros de caminhos, branches e tags. +You can use special characters in path, branch, and tag filters. -- `*`: Corresponde a zero ou mais caracteres, mas não Corresponde ao caractere `/`. Por exemplo, `Octo*` corresponde a `Octocat`. -- `**`: Corresponde a zero ou mais de qualquer caractere. -- `?`: Corresponde a zero ou a um único caractere. Por exemplo, `Octoc?t` corresponde a `Octocat`. -- `+`: Corresponde a um ou mais dos caracteres anteriores. -- `[]` Corresponde a um caractere listado entre colchetes ou incluído nos intervalos. Os intervalos só podem incluir valores de `a-z`, `A-Z`, e `0-9`. Por exemplo, o intervalo`[0-9a-f]` corresponde a qualquer letra maiúscula ou minúscula. Por exemplo, `[CB]at` corresponde a `Cat` ou `Bat` e `[1-2]00` corresponde a `100` e `200`. -- `!` No início de um padrão faz com que ele anule padrões positivos anteriores. Não tem nenhum significado especial caso não seja o primeiro caractere. +- `*`: Matches zero or more characters, but does not match the `/` character. For example, `Octo*` matches `Octocat`. +- `**`: Matches zero or more of any character. +- `?`: Matches zero or one single character. For example, `Octoc?t` matches `Octocat`. +- `+`: Matches one or more of the preceding character. +- `[]` 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-f]` matches any digits 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. -Os caracteres `*`, `[` e `!` são caracteres especiais em YAML. Se você iniciar um padrão com `*`, `[` ou `!`, você deverá colocá-lo entre aspas. +The characters `*`, `[`, and `!` are special characters in YAML. If you start a pattern with `*`, `[`, or `!`, you must enclose the pattern in quotes. ```yaml -# Válido +# Valid - '**/README.md' -# Inválido - Cria um erro de análise que -# impede que o seu fluxo de trabalho seja executado. +# Invalid - creates a parse error that +# prevents your workflow from running. - **/README.md ``` -Para obter mais informações sobre a sintaxe de filtros de branches, tags e caminhos, consulte "[`on..`](#onpushpull_requestbranchestags)" e "[`on..paths`](#onpushpull_requestpaths)". +For more information about branch, tag, and path filter syntax, see "[`on..`](#onpushpull_requestbranchestags)" and "[`on..paths`](#onpushpull_requestpaths)." -#### Padrões para corresponder branches e tags +#### Patterns to match branches and tags -| Padrão | Descrição | Exemplos de correspondências | -| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------- | -| `feature/*` | O caractere curinga `*` corresponde a qualquer caractere, mas não à barra (`/`). | -`feature/my-branch`
    -`feature/your-branch` | -| `feature/**` | `**` correspondem a qualquer caractere, incluindo a barra (`/`) em nomes de branches e tags. | -`feature/beta-a/my-branch`
    -`feature/your-branch`
    -`feature/mona/the/octocat` | -| -`main`
    -`releases/mona-the-octcat` | Corresponde ao nome exato de um branch ou tag. | -`main`
    -`releases/mona-the-octocat` | -| `'*'` | Corresponde a todos os nomes de branches e tags que não contêm uma barra (`/`). O caractere `*` é um caractere especial em YAML. Ao inciar um padrão com `*`, você deve usar aspas. | -`main`
    -`releases` | -| `'**'` | Corresponde a todos os nomes de branches e tags. Esse é o comportamento padrão quando você não usa um filtro de `branches` ou `tags`. | -`all/the/branches`
    -`every/tag` | -| `'*feature'` | O caractere `*` é um caractere especial em YAML. Ao inciar um padrão com `*`, você deve usar aspas. | -`mona-feature`
    -`feature`
    -`ver-10-feature` | -| `v2*` | Corresponde aos nomes de branches e tags que iniciam com `v2`. | -`v2`
    -`v2.0`
    -`v2.9` | -| `v[12].[0-9]+.[0-9]+` | Corresponde a todas as tags de versão semântica com a versão principal 1 ou 2 | -`v1.10.1`
    -`v2.0.0` | +| Pattern | Description | Example matches | +|---------|------------------------|---------| +| `feature/*` | The `*` wildcard matches any character, but does not match slash (`/`). | -`feature/my-branch`
    -`feature/your-branch` | +| `feature/**` | The `**` wildcard matches any character including slash (`/`) in branch and tag names. | -`feature/beta-a/my-branch`
    -`feature/your-branch`
    -`feature/mona/the/octocat` | +| -`main`
    -`releases/mona-the-octcat` | Matches the exact name of a branch or tag name. | -`main`
    -`releases/mona-the-octocat` | +| `'*'` | Matches all branch and tag names that don't contain a slash (`/`). The `*` character is a special character in YAML. When you start a pattern with `*`, you must use quotes. | -`main`
    -`releases` | +| `'**'` | Matches all branch and tag names. This is the default behavior when you don't use a `branches` or `tags` filter. | -`all/the/branches`
    -`every/tag` | +| `'*feature'` | The `*` character is a special character in YAML. When you start a pattern with `*`, you must use quotes. | -`mona-feature`
    -`feature`
    -`ver-10-feature` | +| `v2*` | Matches branch and tag names that start with `v2`. | -`v2`
    -`v2.0`
    -`v2.9` | +| `v[12].[0-9]+.[0-9]+` | Matches all semantic versioning tags with major version 1 or 2 | -`v1.10.1`
    -`v2.0.0` | -#### Padrões para corresponder a caminhos de arquivos +#### Patterns to match file paths -Padrões de caminhos devem corresponder ao caminho completo e iniciar a partir da raiz do repositório. +Path patterns must match the whole path, and start from the repository's root. -| Padrão | Descrição das correspondências | Exemplos de correspondências | -| ---------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- | -| `'*'` | O caractere curinga `*` corresponde a qualquer caractere, mas não à barra (`/`). O caractere `*` é um caractere especial em YAML. Ao inciar um padrão com `*`, você deve usar aspas. | -`LEIAME.md`
    -`server.rb` | -| `'*.jsx?'` | O caractere `?` corresponde a zero ou a um dos caracteres anteriores. | -`page.js`
    -`page.jsx` | -| `'**'` | `**` corresponde a qualquer caractere incluindo a barra (`/`). Esse é o comportamento padrão quando você não usa um filtro de `path`. | -`all/the/files.md` | -| `'*.js'` | O caractere curinga `*` corresponde a qualquer caractere, mas não à barra (`/`). Corresponde a todos os arquivos `.js` na raiz do repositório. | -`app.js`
    -`index.js` | -| `'**.js'` | Corresponde a todos os arquivos `.js` no repositório. | -`index.js`
    -`js/index.js`
    -`src/js/app.js` | -| `docs/*` | Todos os arquivos dentro da raiz do diretório `docs`, na raiz do repositório. | -`docs/LEIAME.md`
    -`docs/file.txt` | -| `docs/**` | Qualquer arquivo no diretório `docs`, na raiz do repositório. | -`docs/LEIAME.md`
    -`docs/mona/octocat.txt` | -| `docs/**/*.md` | Um arquivo com um sufixo `.md` em qualquer local do diretório `docs`. | -`docs/LEIAME.md`
    -`docs/mona/hello-world.md`
    -`docs/a/markdown/file.md` | -| `'**/docs/**'` | Qualquer arquivo no diretório `docs`, em qualquer local do repositório. | -`/docs/hello.md`
    -`dir/docs/my-file.txt`
    -`space/docs/plan/space.doc` | -| `'**/README.md'` | Um arquivo LEIAME.md em qualquer local do repositório. | -`LEIAME.md`
    -`js/LEIAME.md` | -| `'**/*src/**'` | Qualquer arquivo em uma pasta com o sufixo `src` em qualquer local do repositório. | -`a/src/app.js`
    -`my-src/code/js/app.js` | -| `'**/*-post.md'` | Um arquivo com o sufixo `-post.md` em qualquer local do repositório. | -`my-post.md`
    -`path/their-post.md` | -| `'**/migrate-*.sql'` | Um arquivo com o prefixo `migrate-` e sufixo `.sql` em qualquer local do repositório. | -`migrate-10909.sql`
    -`db/migrate-v1.0.sql`
    -`db/sept/migrate-v1.sql` | -| -`*.md`
    -`!LEIAME.md` | Usar um sinal de exclamação (`!`) na frente de um padrão o anula. Quando um arquivo corresponde a um padrão e também corresponde a um padrão negativo definido posteriormente no arquivo, o arquivo não será incluído. | -`hello.md`
    _Does not match_
    -`LEIAME.md`
    -`docs/hello.md` | -| -`*.md`
    -`!LEIAME.md`
    -`LEIAME*` | Os padrões são verificados sequencialmente. Um padrão que anula um padrão anterior irá incluir caminhos de arquivos novamente. | -`hello.md`
    -`LEIAME.md`
    -`LEIAME.doc` | +| Pattern | Description of matches | Example matches | +|---------|------------------------|-----------------| +| `'*'` | The `*` wildcard matches any character, but does not match slash (`/`). The `*` character is a special character in YAML. When you start a pattern with `*`, you must use quotes. | -`README.md`
    -`server.rb` | +| `'*.jsx?'` | The `?` character matches zero or one of the preceding character. | -`page.js`
    -`page.jsx` | +| `'**'` | The `**` wildcard matches any character including slash (`/`). This is the default behavior when you don't use a `path` filter. | -`all/the/files.md` | +| `'*.js'` | The `*` wildcard matches any character, but does not match slash (`/`). Matches all `.js` files at the root of the repository. | -`app.js`
    -`index.js` +| `'**.js'` | Matches all `.js` files in the repository. | -`index.js`
    -`js/index.js`
    -`src/js/app.js` | +| `docs/*` | All files within the root of the `docs` directory, at the root of the repository. | -`docs/README.md`
    -`docs/file.txt` | +| `docs/**` | Any files in the `/docs` directory at the root of the repository. | -`docs/README.md`
    -`docs/mona/octocat.txt` | +| `docs/**/*.md` | A file with a `.md` suffix anywhere in the `docs` directory. | -`docs/README.md`
    -`docs/mona/hello-world.md`
    -`docs/a/markdown/file.md` +| `'**/docs/**'` | Any files in a `docs` directory anywhere in the repository. | -`/docs/hello.md`
    -`dir/docs/my-file.txt`
    -`space/docs/plan/space.doc` +| `'**/README.md'` | A README.md file anywhere in the repository. | -`README.md`
    -`js/README.md` +| `'**/*src/**'` | Any file in a folder with a `src` suffix anywhere in the repository. | -`a/src/app.js`
    -`my-src/code/js/app.js` +| `'**/*-post.md'` | A file with the suffix `-post.md` anywhere in the repository. | -`my-post.md`
    -`path/their-post.md` | +| `'**/migrate-*.sql'` | A file with the prefix `migrate-` and suffix `.sql` anywhere in the repository. | -`migrate-10909.sql`
    -`db/migrate-v1.0.sql`
    -`db/sept/migrate-v1.sql` | +| -`*.md`
    -`!README.md` | Using an exclamation mark (`!`) in front of a pattern negates it. When a file matches a pattern and also matches a negative pattern defined later in the file, the file will not be included. | -`hello.md`
    _Does not match_
    -`README.md`
    -`docs/hello.md` | +| -`*.md`
    -`!README.md`
    -`README*` | Patterns are checked sequentially. A pattern that negates a previous pattern will re-include file paths. | -`hello.md`
    -`README.md`
    -`README.doc`| From afdba963b9b29ceba5d970084669f227386d53cb Mon Sep 17 00:00:00 2001 From: Chiedo John <2156688+chiedo@users.noreply.github.com> Date: Tue, 27 Oct 2020 19:25:15 -0400 Subject: [PATCH 33/40] Remove broken translations (#16253) * Remove broken translated file * Fix another broken file Co-authored-by: Chiedo --- .../githubs-products.md | 112 +++++++++--------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/translations/pt-BR/content/github/getting-started-with-github/githubs-products.md b/translations/pt-BR/content/github/getting-started-with-github/githubs-products.md index 3e0d2602b0..22f2395c57 100644 --- a/translations/pt-BR/content/github/getting-started-with-github/githubs-products.md +++ b/translations/pt-BR/content/github/getting-started-with-github/githubs-products.md @@ -1,5 +1,5 @@ --- -title: Produtos do GitHub +title: GitHub's products redirect_from: - /articles/github-s-products - /articles/githubs-products @@ -8,95 +8,95 @@ versions: enterprise-server: '*' --- -O {% data variables.product.prodname_dotcom %} oferece produtos grátis e pagos. Você pode ver o preço e uma lista completa dos recursos de cada produto em <{% data variables.product.pricing_url %}>. {% data reusables.products.product-roadmap %} +{% data variables.product.prodname_dotcom %} offers free and paid products. You can see pricing and a full list of features for each product at <{% data variables.product.pricing_url %}>. {% data reusables.products.product-roadmap %} -### {% data variables.product.prodname_free_user %} para contas de usuário +### {% data variables.product.prodname_free_user %} for user accounts -Com o {% data variables.product.prodname_free_team %} para contas de usuário, você pode trabalhar com colaboradores ilimitados em repositórios públicos ilimitados com um conjunto completo de recursos e em repositórios privados ilimitados com um conjunto de recursos limitado. +With {% data variables.product.prodname_free_team %} for user accounts, you can work with unlimited collaborators on unlimited public repositories with a full feature set, and on unlimited private repositories with a limited feature set. -Com o {% data variables.product.prodname_free_user %}, sua conta de usuário inclui: +With {% data variables.product.prodname_free_user %}, your user account includes: - {% data variables.product.prodname_gcf %} - {% data variables.product.prodname_dependabot_alerts %} -- Implementação de autenticação de dois fatores -- 2.000 {% data variables.product.prodname_actions %} minutos -- 500MB {% data variables.product.prodname_registry %} de armazenamento +- Two-factor authentication enforcement +- 2,000 {% data variables.product.prodname_actions %} minutes +- 500MB {% data variables.product.prodname_registry %} storage ### {% data variables.product.prodname_pro %} -Além dos recursos disponíveis no {% data variables.product.prodname_free_user %} para contas de usuário, o {% data variables.product.prodname_pro %} inclui: -- {% data variables.contact.github_support %} via e-mail -- 3.000 {% data variables.product.prodname_actions %} minutos -- 2GB {% data variables.product.prodname_registry %} de armazenamento -- Ferramentas avançadas e insights em repositórios privados: - - Revisores de pull request necessários - - Múltiplos revisores de pull request - - Referências autovinculadas +In addition to the features available with {% data variables.product.prodname_free_user %} for user accounts, {% data variables.product.prodname_pro %} includes: +- {% data variables.contact.github_support %} via email +- 3,000 {% data variables.product.prodname_actions %} minutes +- 2GB {% data variables.product.prodname_registry %} storage +- Advanced tools and insights in private repositories: + - Required pull request reviewers + - Multiple pull request reviewers + - Auto-linked references - {% data variables.product.prodname_pages %} - Wikis - - Branches protegidos - - Proprietários de código - - Gráficos de informações de repositório: Pulse, contribuidores, tráfego, commits, frequência de códigos, rede e bifurcações + - Protected branches + - Code owners + - Repository insights graphs: Pulse, contributors, traffic, commits, code frequency, network, and forks -### {% data variables.product.prodname_free_team %} para organizações +### {% data variables.product.prodname_free_team %} for organizations -Com o {% data variables.product.prodname_free_team %} para organizações, você pode trabalhar com colaboradores ilimitados em repositórios públicos ilimitados com um conjunto completo de recursos ou em repositórios privados ilimitados com um conjunto de recursos limitado. +With {% data variables.product.prodname_free_team %} for organizations, you can work with unlimited collaborators on unlimited public repositories with a full feature set, or unlimited private repositories with a limited feature set. -Além dos recursos disponíveis no {% data variables.product.prodname_free_user %} para contas de usuário, o {% data variables.product.prodname_free_team %} para organizações inclui: +In addition to the features available with {% data variables.product.prodname_free_user %} for user accounts, {% data variables.product.prodname_free_team %} for organizations includes: - {% data variables.product.prodname_gcf %} -- Discussões de equipe -- Controles de acesso de equipes para gerenciar grupos -- 2.000 {% data variables.product.prodname_actions %} minutos -- 500MB {% data variables.product.prodname_registry %} de armazenamento +- Team discussions +- Team access controls for managing groups +- 2,000 {% data variables.product.prodname_actions %} minutes +- 500MB {% data variables.product.prodname_registry %} storage ### {% data variables.product.prodname_team %} -Além dos recursos disponíveis no {% data variables.product.prodname_free_team %} para organizações, o {% data variables.product.prodname_team %} inclui: -- {% data variables.contact.github_support %} via e-mail -- 3.000 {% data variables.product.prodname_actions %} minutos -- 2GB {% data variables.product.prodname_registry %} de armazenamento -- Ferramentas avançadas e insights em repositórios privados: - - Revisores de pull request necessários - - Múltiplos revisores de pull request +In addition to the features available with {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %} includes: +- {% data variables.contact.github_support %} via email +- 3,000 {% data variables.product.prodname_actions %} minutes +- 2GB {% data variables.product.prodname_registry %} storage +- Advanced tools and insights in private repositories: + - Required pull request reviewers + - Multiple pull request reviewers - {% data variables.product.prodname_pages %} - Wikis - - Branches protegidos - - Proprietários de código - - Gráficos de informações de repositório: Pulse, contribuidores, tráfego, commits, frequência de códigos, rede e bifurcações - - Pull requests de rascunho - - Equipe de revisores de pull request - - Lembretes agendados + - Protected branches + - Code owners + - Repository insights graphs: Pulse, contributors, traffic, commits, code frequency, network, and forks + - Draft pull requests + - Team pull request reviewers + - Scheduled reminders {% data reusables.github-actions.actions-billing %} ### {% data variables.product.prodname_enterprise %} -O {% data variables.product.prodname_enterprise %} inclui duas opções de implementação: hospedagem em nuvem e auto-hospedagem. +{% data variables.product.prodname_enterprise %} includes two deployment options: cloud-hosted and self-hosted. -Além dos recursos disponíveis no {% data variables.product.prodname_team %}, o {% data variables.product.prodname_enterprise %} inclui: +In addition to the features available with {% data variables.product.prodname_team %}, {% data variables.product.prodname_enterprise %} includes: - {% data variables.contact.enterprise_support %} -- Segurança adicional, conformidade e controles de instalação -- Autenticação com SAML de logon único -- Provisionamento de acesso com SAML ou SCIM +- Additional security, compliance, and deployment controls +- Authentication with SAML single sign-on +- Access provisioning with SAML or SCIM - {% data variables.product.prodname_github_connect %} -O {% data variables.product.prodname_ghe_cloud %} também inclui: -- {% data variables.contact.enterprise_support %}. Para obter mais informações, consulte "{% data variables.product.prodname_ghe_cloud %} suporte" e "{% data variables.product.prodname_ghe_cloud %} Adendo" -- 50.000 {% data variables.product.prodname_actions %} minutos -- 50GB {% data variables.product.prodname_registry %} de armazenamento -- Um contrato de nível de serviço para 99,95% do tempo de atividade mensal -- A opção de gerenciar de forma centralizada a política e cobrança para várias organizações {% data variables.product.prodname_dotcom_the_website %} com uma conta corporativa. Para obter mais informações, consulte "Sobre contas corporativas". +{% data variables.product.prodname_ghe_cloud %} also includes: +- {% data variables.contact.enterprise_support %}. For more information, see "{% data variables.product.prodname_ghe_cloud %} support" and "{% data variables.product.prodname_ghe_cloud %} Addendum." +- 50,000 {% data variables.product.prodname_actions %} minutes +- 50GB {% data variables.product.prodname_registry %} storage +- A service level agreement for 99.9% monthly uptime +- The option to centrally manage policy and billing for multiple {% data variables.product.prodname_dotcom_the_website %} organizations with an enterprise account. For more information, see "About enterprise accounts." -Você pode configurar uma versão para avaliar o {% data variables.product.prodname_ghe_cloud %}. Para obter mais informações, consulte "[Configurar uma versão de avaliação do {% data variables.product.prodname_ghe_cloud %}](/articles/setting-up-a-trial-of-github-enterprise-cloud)". +You can set up a trial to evaluate {% data variables.product.prodname_ghe_cloud %}. For more information, see "[Setting up a trial of {% data variables.product.prodname_ghe_cloud %}](/articles/setting-up-a-trial-of-github-enterprise-cloud)." -Para obter mais informações sobre hospedar sua própria instância do [{% data variables.product.prodname_ghe_server %}](https://enterprise.github.com), entre em contato com {% data variables.contact.contact_enterprise_sales %}. {% data reusables.enterprise_installation.request-a-trial %} +For more information about hosting your own instance of [{% data variables.product.prodname_ghe_server %}](https://enterprise.github.com), contact {% data variables.contact.contact_enterprise_sales %}. {% data reusables.enterprise_installation.request-a-trial %} ### {% data variables.product.prodname_ghe_one %} -O {% data variables.product.prodname_ghe_one %} inclui [{% data variables.product.prodname_enterprise %}](#github-enterprise), mais: +{% data variables.product.prodname_ghe_one %} includes [{% data variables.product.prodname_enterprise %}](#github-enterprise), plus: - {% data variables.contact.github_support %} {% data variables.product.premium_plus_support_plan %} - {% data variables.product.prodname_insights %} -- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" e "[Sobre {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta).{% endif %}{% if enterpriseServerVersions contém currentVersion e currentVersion ver_gt "enterprise-server@2.21" %}. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} -- [{% data variables.product.prodname_learning %} para organizações](https://lab.github.com/organizations) +- {% data variables.product.prodname_advanced_security %}{% if currentVersion == "free-pro-team@latest" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)" and "[About {% data variables.product.prodname_secret_scanning %}](/github/administering-a-repository/about-secret-scanning) (beta)."{% endif %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning) (beta)."{% endif %} +- [{% data variables.product.prodname_learning %} for organizations](https://lab.github.com/organizations) -Para obter mais informações sobre a inscrição em {% data variables.product.prodname_ghe_one %}, entre em contato com a equipe de vendas do [{% data variables.product.product_name %}](https://enterprise.github.com/contact). +For more information about signing up for {% data variables.product.prodname_ghe_one %}, contact [{% data variables.product.product_name %}'s Sales team](https://enterprise.github.com/contact). From 8b804e0dec4acabaa5f9344962b27211870e949c Mon Sep 17 00:00:00 2001 From: Martin Lopes <54248166+martin389@users.noreply.github.com> Date: Wed, 28 Oct 2020 09:41:34 +1000 Subject: [PATCH 34/40] Add note about GraphQL query behaviour (#16235) * Adds note about separate queries for issues and pull requests * Added note formatting * Updated variable for new convention --- content/graphql/reference/queries.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/content/graphql/reference/queries.md b/content/graphql/reference/queries.md index c121b670aa..acf2f1b98c 100644 --- a/content/graphql/reference/queries.md +++ b/content/graphql/reference/queries.md @@ -14,6 +14,12 @@ Every GraphQL schema has a root type for both queries and mutations. The [query For more information, see "[About queries](/v4/guides/forming-calls#about-queries)." +{% note %} + +**Note:** For [user-to-server](/developers/apps/identifying-and-authorizing-users-for-github-apps#user-to-server-requests) {% data variables.product.prodname_github_app %} requests, you should use separate queries for issues and pull requests. For example, use the `is:issue` or `is:pull-request` filters and their equivalents. Using the `search` connection to return a combination of issues and pull requests in a single query will result in an empty set of nodes. + +{% endnote %} + ## Connections {% for item in graphql.schemaForCurrentVersion.queries.connections %} From abca0ca795fe18df1f13be926c18619831561a0f Mon Sep 17 00:00:00 2001 From: Chiedo John <2156688+chiedo@users.noreply.github.com> Date: Tue, 27 Oct 2020 20:22:01 -0400 Subject: [PATCH 35/40] Remove another broken translation (#16255) Co-authored-by: Chiedo --- ...bout-alerts-for-vulnerable-dependencies.md | 60 +++++++++---------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index 5f052b8a24..b6e48cbaec 100644 --- a/translations/pt-BR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -1,6 +1,6 @@ --- -title: Sobre alertas para dependências vulneráveis -intro: '{% data variables.product.product_name %} envia {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}alertas de segurança{% endif %} quando detectarmos vulnerabilidades que afetam o repositório.' +title: About alerts for vulnerable dependencies +intro: '{% data variables.product.product_name %} sends {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} when we detect vulnerabilities affecting your repository.' redirect_from: - /articles/about-security-alerts-for-vulnerable-dependencies - /github/managing-security-vulnerabilities/about-security-alerts-for-vulnerable-dependencies @@ -9,80 +9,76 @@ versions: enterprise-server: '*' --- -### Sobre as dependências vulneráveis +### About vulnerable dependencies {% data reusables.repositories.a-vulnerability-is %} -Quando o seu código depende de um pacote que tenha uma vulnerabilidade de segurança, essa dependência vulnerável pode causar uma série de problemas para o seu projeto ou para as pessoas que o usam. +When your code depends on a package that has a security vulnerability, this vulnerable dependency can cause a range of problems for your project or the people who use it. -### Detecção de dependências vulneráveis +### Detection of vulnerable dependencies - {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot %} detecta dependências vulneráveis e envia {% data variables.product.prodname_dependabot_short %} alertas{% else %}{% data variables.product.product_name %} detecta dependências vulneráveis e envia alertas de segurança{% endif %} quando: + {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %} detects vulnerable dependencies and sends {% data variables.product.prodname_dependabot_short %} alerts{% else %}{% data variables.product.product_name %} detects vulnerable dependencies and sends security alerts{% endif %} when: {% if currentVersion == "free-pro-team@latest" %} -- Uma nova vulnerabilidade foi adicionada ao {% data variables.product.prodname_advisory_database %}. Para obter mais informações, consulte "[Pesquisar vulnerabilidades de segurança no {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)". -- São processados dados de nova vulnerabilidade retirados de [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database).{% else %} -- São sincronizados novos dados de consultoria com {% data variables.product.prodname_ghe_server %} a cada hora a partir de {% data variables.product.prodname_dotcom_the_website %}. Para obter mais informações sobre dados de consultoria, consulte "Procurar vulnerabilidades de segurança no {% data variables.product.prodname_advisory_database %}{% endif %} -- O gráfico de dependências para alterações de repositório. Por exemplo, quando um colaborador faz push de um commit para alterar os pacotes ou versões de que depende{% if currentVersion == "free-pro-team@latest" %} ou quando o código de uma das dependências muda{% endif %}. Para obter mais informações, consulte "[Sobre o gráfico de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)". +- A new vulnerability is added to the {% data variables.product.prodname_advisory_database %}. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)." +- New vulnerability data from [WhiteSource](https://www.whitesourcesoftware.com/vulnerability-database) is processed.{% else %} +- New advisory data is synchronized to {% data variables.product.prodname_ghe_server %} each hour from {% data variables.product.prodname_dotcom_the_website %}. For more information about advisory data, see "Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}."{% endif %} +- The dependency graph for a repository changes. For example, when a contributor pushes a commit to change the packages or versions it depends on{% if currentVersion == "free-pro-team@latest" %}, or when the code of one of the dependencies changes{% endif %}. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)." -Para obter uma lista dos ecossistemas para os quais o {% data variables.product.product_name %} pode detectar vulnerabilidades e dependências, consulte "[Ecossistemas de pacotes compatíveis](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)". +For a list of the ecosystems that {% data variables.product.product_name %} can detect vulnerabilities and dependencies for, see "[Supported package ecosystems](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)." {% note %} -**Observação:** É importante manter seus manifestos atualizados e seu arquivos bloqueados. Se o gráfico de dependências não refletir corretamente suas dependências e versões atuais, você poderá perder alertas para dependências vulneráveis que você usar. Você também pode receber alertas de dependências que você já não usa. +**Note:** It is important to keep your manifest and lock files up to date. If the dependency graph doesn't accurately reflect your current dependencies and versions, then you could miss alerts for vulnerable dependencies that you use. You may also get alerts for dependencies that you no longer use. {% endnote %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" % %} -### Alertas do {% data variables.product.prodname_dependabot %} para dependências vulneráveis +### {% data variables.product.prodname_dependabot %} alerts for vulnerable dependencies {% else %} -### Alertas de segurança para dependências vulneráveis +### Security alerts for vulnerable dependencies {% endif %} {% data reusables.repositories.enable-security-alerts %} -{% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom %} detecta e alerta usuários para dependências vulneráveis em repositórios _públicos_ por padrão. Os proprietários de repositórios privados ou pessoas com acesso de administrador, podem habilitar o {% data variables.product.prodname_dependabot_alerts %} ativando o gráfico de dependências e {% data variables.product.prodname_dependabot_alerts %} para seus repositórios. +{% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom %} detects and alerts users to vulnerable dependencies in _public_ repositories by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories. -Você também pode habilitar ou desabilitar alertas do {% data variables.product.prodname_dependabot %} para todos os repositórios pertencentes à sua conta de usuário ou organização. Para mais informações consulte "[Gerenciar as configurações de segurança e análise da sua conta de usuário](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" ou "[Gerenciar as configurações de segurança e análise da sua organização](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)". +You can also enable or disable {% data variables.product.prodname_dependabot %} alerts for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." -{% data variables.product.product_name %} começa a gerar o gráfico de dependências imediatamente e envia alertas para quaisquer dependências vulneráveis assim que forem identificadas. O gráfico geralmente é preenchido em minutos, mas isso pode levar mais tempo para repositórios com muitas dependências. Para obter mais informações, consulte "[Gerenciando configurações do uso de dados de seu repositório privado](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)". +{% data variables.product.product_name %} starts generating the dependency graph immediately and sends alerts for any vulnerable dependencies as soon as they are identified. The graph is usually populated within minutes but this may take longer for repositories with many dependencies. For more information, see "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)." {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -Quando -{% data variables.product.product_name %} identifica uma dependência vulnerável, enviamos um alerta de {% data variables.product.prodname_dependabot_short %} aos mantenedores dos repositórios afetados com informações sobre a vulnerabilidade, um link para o arquivo afetado no projeto e informações sobre uma versão corrigida. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert will also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."{% endif %} +When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert will also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."{% endif %} {% endif %} {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} -Quando -{% data variables.product.product_name %} identifica uma dependência vulnerável, enviamos um alerta de segurança aos mantenedores dos repositórios afetados, com informações sobre a vulnerabilidade, um link para o arquivo afetado no projeto e informações sobre uma versão corrigida. +When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a security alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% endif %} {% warning %} -**Observação**: Os recursos de segurança de {% data variables.product.product_name %} não reivindicam garantem que todas as vulnerabilidades sejam detectadas. Embora estejamos sempre tentando atualizar nosso banco de dados de vulnerabilidades e alertar você com nossas informações mais atualizadas, não podemos capturar tudo nem alertar sobre vulnerabilidades conhecidas dentro de um prazo garantido. Esses recursos não substituem a revisão humana de cada dependência em busca de possíveis vulnerabilidades ou algum outro problema, e nossa sugestão é consultar um serviço de segurança ou realizar uma revisão completa de vulnerabilidade quando necessário. +**Note**: {% data variables.product.product_name %}'s security features do not claim to catch all vulnerabilities. Though we are always trying to update our vulnerability database and alert you with our most up-to-date information, we will not be able to catch everything or alert you to known vulnerabilities within a guaranteed time frame. These features are not substitutes for human review of each dependency for potential vulnerabilities or any other issues, and we recommend consulting with a security service or conducting a thorough vulnerability review when necessary. {% endwarning %} -### Acesso a {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}alertas de segurança{% endif %} +### Access to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts -É possível ver todos os alertas que afetam um determinado projeto{% if currentVersion == "free-pro-team@latest" %} na aba Segurança do repositório ou{% endif %} no gráfico de dependências do repositório.{% if currentVersion == "free-pro-team@latest" %} Para obter mais informações, consulte "[Visualizar e atualizar dependências vulneráveis no seu repositório](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository){% endif %} +You can see all of the alerts that affect a particular project{% if currentVersion == "free-pro-team@latest" %} on the repository's Security tab or{% endif %} in the repository's dependency graph.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -Nós enviamos -alertas de {% data variables.product.prodname_dependabot_short %} a pessoas com permissões de administrador nos repositórios afetados por padrão. {% data variables.product.product_name %} nunca divulga publicamente vulnerabilidades identificadas para qualquer repositório.{% if currentVersion == "free-pro-team@latest" %} Você também pode habilitar alertas de {% data variables.product.prodname_dependabot_short %} para repositórios de trabalho adicionais de equipes que você possui ou tem permissões de administrador. Para obter mais informações, consulte "[Gerenciar configurações de segurança e análise do repositório](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)".{% endif %} +We send {% data variables.product.prodname_dependabot_short %} alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository.{% if currentVersion == "free-pro-team@latest" %} You can also enable {% data variables.product.prodname_dependabot_short %} alerts for additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."{% endif %} {% endif %} {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} -Enviamos alertas de segurança para as pessoas com permissões de administrador nos repositórios afetados por padrão. -O {% data variables.product.product_name %} nunca divulga publicamente vulnerabilidades identificadas para qualquer repositório. +We send security alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. {% endif %} -{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %}{% if enterpriseServerVersions contém currentVersion e currentVersion ver_lt "enterprise-server@2. 1" %} Para mais informações, consulte "[Escolher o método de entrega para suas notificações](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2. 0" %} Para mais informações, consulte "[Configurar notificações para dependências vulneráveis](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."{% endif %} +{% data reusables.notifications.vulnerable-dependency-notification-delivery-method-customization %}{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %} For more information, see "[Choosing the delivery method for your notifications](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications)."{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" %} For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."{% endif %} {% if currentVersion == "free-pro-team@latest" %} -### Leia mais +### Further reading - "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" -- "[Exibir e atualizar dependências vulneráveis no repositório](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)" -- "[Entender como o {% data variables.product.product_name %} usa e protege seus dados](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %} +- "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)" +- "[Understanding how {% data variables.product.product_name %} uses and protects your data](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %} From 69132c04fa7ddd66b5625e8a73ad33d125db1762 Mon Sep 17 00:00:00 2001 From: Lucas Costi Date: Wed, 28 Oct 2020 10:32:57 +1000 Subject: [PATCH 36/40] Add multi callback URLs for GitHub Apps (#16207) Co-authored-by: Martin Lopes <54248166+martin389@users.noreply.github.com> --- .../github_apps_callback_url_multiple.png | Bin 0 -> 88759 bytes .../developers/apps/creating-a-github-app.md | 8 ++++++++ .../developers/apps/creating-an-oauth-app.md | 7 +++++++ ...ing-and-authorizing-users-for-github-apps.md | 4 ++-- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 assets/images/github-apps/github_apps_callback_url_multiple.png diff --git a/assets/images/github-apps/github_apps_callback_url_multiple.png b/assets/images/github-apps/github_apps_callback_url_multiple.png new file mode 100644 index 0000000000000000000000000000000000000000..2ce0e6f10d477a50cc9afb09e1d07f3ded533b94 GIT binary patch literal 88759 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�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 Nqw?Zug_2ds{{ZnPt7!lL literal 0 HcmV?d00001 diff --git a/content/developers/apps/creating-a-github-app.md b/content/developers/apps/creating-a-github-app.md index 25acc191d8..d159e1e918 100644 --- a/content/developers/apps/creating-a-github-app.md +++ b/content/developers/apps/creating-a-github-app.md @@ -34,8 +34,16 @@ versions: ![Field for a description of your GitHub App](/assets/images/github-apps/github_apps_description.png) 7. In "Homepage URL", type the full URL to your app's website. ![Field for the homepage URL of your GitHub App](/assets/images/github-apps/github_apps_homepage_url.png) +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} +8. In "Callback URL", type the full URL to redirect to after a user authorizes the installation. This URL is used if your app needs to identify and authorize user-to-server requests. + + You can use **Add callback URL** to provide additional callback URLs, up to a maximum of 10. + + ![Button for 'Add callback URL' and field for callback URL](/assets/images/github-apps/github_apps_callback_url_multiple.png) +{% else %} 8. In "User authorization callback URL", type the full URL to redirect to after a user authorizes an installation. This URL is used if your app needs to identify and authorize user-to-server requests. ![Field for the user authorization callback URL of your GitHub App](/assets/images/github-apps/github_apps_user_authorization.png) +{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} 9. By default, to improve your app's security, your app will use expiring user authorization tokens. To opt-out of using expiring user tokens, you must deselect "Expire user authorization tokens". To learn more about setting up a refresh token flow and the benefits of expiring user tokens, see "[Refreshing user-to-server access tokens](/apps/building-github-apps/refreshing-user-to-server-access-tokens/)." ![Option to opt-in to expiring user tokens during GitHub Apps setup](/assets/images/github-apps/expire-user-tokens-selection.png) diff --git a/content/developers/apps/creating-an-oauth-app.md b/content/developers/apps/creating-an-oauth-app.md index 25fcff288b..0f4072e6be 100644 --- a/content/developers/apps/creating-an-oauth-app.md +++ b/content/developers/apps/creating-an-oauth-app.md @@ -43,5 +43,12 @@ versions: ![Field for a description of your app](/assets/images/oauth-apps/oauth_apps_application_description.png) 9. In "Authorization callback URL", type the callback URL of your app. ![Field for the authorization callback URL of your app](/assets/images/oauth-apps/oauth_apps_authorization_callback_url.png) +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} + {% note %} + + **Note:** OAuth Apps cannot have multiple callback URLs, unlike {% data variables.product.prodname_github_apps %}. + + {% endnote %} +{% endif %} 10. Click **Register application**. ![Button to register an application](/assets/images/oauth-apps/oauth_apps_register_application.png) diff --git a/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md index 9aa4f1b0ee..1acc095476 100644 --- a/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md +++ b/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md @@ -46,7 +46,7 @@ When your GitHub App specifies a `login` parameter, it prompts users with a spec Name | Type | Description -----|------|------------ `client_id` | `string` | **Required.** The client ID for your GitHub App. You can find this in your [GitHub App settings](https://github.com/settings/apps) when you select your app. -`redirect_uri` | `string` | The URL in your application where users will be sent after authorization. This must be an exact match to the URL you provided in the **User authorization callback URL** field when setting up your GitHub App and can't contain any additional parameters. +`redirect_uri` | `string` | The URL in your application where users will be sent after authorization. This must be an exact match to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} one of the URLs you provided as a **Callback URL** {% else %} the URL you provided in the **User authorization callback URL** field{% endif %} when setting up your GitHub App and can't contain any additional parameters. `state` | `string` | This should contain a random string to protect against forgery attacks and could contain any other arbitrary data. `login` | `string` | Suggests a specific account to use for signing in and authorizing the app. @@ -79,7 +79,7 @@ Name | Type | Description `client_id` | `string` | **Required.** The client ID for your GitHub App. `client_secret` | `string` | **Required.** The client secret for your GitHub App. `code` | `string` | **Required.** The code you received as a response to Step 1. -`redirect_uri` | `string` | The URL in your application where users are sent after authorization. +`redirect_uri` | `string` | The URL in your application where users will be sent after authorization. This must be an exact match to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} one of the URLs you provided as a **Callback URL** {% else %} the URL you provided in the **User authorization callback URL** field{% endif %} when setting up your GitHub App and can't contain any additional parameters. `state` | `string` | The unguessable random string you provided in Step 1. ##### Response From 04a94d0df6bec73fcad2d11827fe9c510110d53a Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 27 Oct 2020 20:42:44 -0400 Subject: [PATCH 37/40] chore: Only run freeze reminder on internal repo (#768) --- .github/workflows/repo-freeze-reminders.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/repo-freeze-reminders.yml b/.github/workflows/repo-freeze-reminders.yml index be29ec5553..83a9708395 100644 --- a/.github/workflows/repo-freeze-reminders.yml +++ b/.github/workflows/repo-freeze-reminders.yml @@ -11,6 +11,7 @@ jobs: check-freezer: name: Remind about deployment freezes runs-on: ubuntu-latest + if: github.repository == 'github/docs-internal' steps: - name: Send Slack notification if repo is frozen From face4b6952064dc362c00bb08c8fcd9d5745b38e Mon Sep 17 00:00:00 2001 From: Lucas Costi Date: Wed, 28 Oct 2020 10:47:36 +1000 Subject: [PATCH 38/40] Add overview of OpenAPI description (#16046) Co-authored-by: Martin Lopes <54248166+martin389@users.noreply.github.com> --- content/rest/overview/index.md | 1 + content/rest/overview/openapi-description.md | 27 ++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 content/rest/overview/openapi-description.md diff --git a/content/rest/overview/index.md b/content/rest/overview/index.md index b66e745f49..05b787c18f 100644 --- a/content/rest/overview/index.md +++ b/content/rest/overview/index.md @@ -15,4 +15,5 @@ versions: {% link_in_list /troubleshooting %} {% link_in_list /api-previews %} {% link_in_list /libraries %} +{% link_in_list /openapi-description %} {% link_in_list /endpoints-available-for-github-apps %} diff --git a/content/rest/overview/openapi-description.md b/content/rest/overview/openapi-description.md new file mode 100644 index 0000000000..cdd2e1188e --- /dev/null +++ b/content/rest/overview/openapi-description.md @@ -0,0 +1,27 @@ +--- +title: OpenAPI description +intro: The {% data variables.product.product_name %} REST API is fully described in an OpenAPI 3.0 compliant document. +versions: + free-pro-team: '*' + enterprise-server: '*' +--- + +### About OpenAPI descriptions + +[OpenAPI](https://swagger.io/docs/specification/about/) is a standard specification for describing REST APIs. OpenAPI descriptions allow both humans and machines to discover the capabilities of an API without needing to first read documentation or understand the implementation. {% data variables.product.company_short %} has made its REST API publicly available as an OpenAPI 3.0 compliant document. + +### Getting the {% data variables.product.company_short %} OpenAPI description + +You can find the description in the open source [REST API OpenAPI Description](https://github.com/github/rest-api-description) repository. + +We provide the description in two formats. The bundled version works for most cases, as it includes OpenAPI components for reuse and readability. If your tooling does not support inline references to components, we also provide a fully dereferenced version. + +### Using the {% data variables.product.company_short %} OpenAPI description + +There are many uses for an OpenAPI description. For example, you could: + +* Generate your own API client. +* Validate and test a {% data variables.product.company_short %} REST API integration. +* Explore and interact with the {% data variables.product.product_name %} REST API using third-party tools, such as Insomnia or Postman. + +For example, {% data variables.product.company_short %} uses the REST OpenAPI description to generate the {% data variables.product.product_name %} [REST API reference documentation](/rest/reference). From c3a3163c05134d552eecb6712202c677fc54b150 Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Wed, 28 Oct 2020 09:53:18 +0000 Subject: [PATCH 39/40] Update information on Dependabot notifications (#16238) --- ...dependencies-on-github-enterprise-server.md | 6 +++--- ...about-alerts-for-vulnerable-dependencies.md | 16 ++++++++++------ ...otifications-for-vulnerable-dependencies.md | 2 +- ...lnerable-dependencies-in-your-repository.md | 2 +- ...lnerable-dependency-notification-options.md | 18 +++++++++--------- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md index 30b49af880..c47c88e47d 100644 --- a/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md +++ b/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md @@ -18,13 +18,13 @@ You can connect {% data variables.product.product_location_enterprise %} to {% d After connecting {% data variables.product.product_location_enterprise %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. You can also choose to manually sync vulnerability data at any time. No code or information about code from {% data variables.product.product_location_enterprise %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}. -{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send {% data variables.product.prodname_dependabot_short %} alerts. You can customize how you receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)." +{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_short %} alerts. You can customize how you receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)." {% endif %} -{% if currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts. You can customize how you receive security alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)." +{% if currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate security alerts. You can customize how you receive security alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)." {% endif %} -{% if currentVersion ver_lt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and send security alerts. You can customize how you receive security alerts. For more information, see "[Choosing the delivery method for your notifications](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications#choosing-the-delivery-method-for-security-alerts-for-vulnerable-dependencies)." +{% if currentVersion ver_lt "enterprise-server@2.21" %}When {% data variables.product.product_location_enterprise %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate security alerts. You can customize how you receive security alerts. For more information, see "[Choosing the delivery method for your notifications](/github/receiving-notifications-about-activity-on-github/choosing-the-delivery-method-for-your-notifications#choosing-the-delivery-method-for-security-alerts-for-vulnerable-dependencies)." {% endif %} {% if currentVersion ver_gt "enterprise-server@2.21" %} diff --git a/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index b6e48cbaec..2056d1ac51 100644 --- a/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -41,15 +41,19 @@ For a list of the ecosystems that {% data variables.product.product_name %} can {% data reusables.repositories.enable-security-alerts %} -{% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom %} detects and alerts users to vulnerable dependencies in _public_ repositories by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories. +{% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom %} detects vulnerable dependencies in _public_ repositories and generates {% data variables.product.prodname_dependabot_alerts %} by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories. -You can also enable or disable {% data variables.product.prodname_dependabot %} alerts for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." -{% data variables.product.product_name %} starts generating the dependency graph immediately and sends alerts for any vulnerable dependencies as soon as they are identified. The graph is usually populated within minutes but this may take longer for repositories with many dependencies. For more information, see "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)." +{% data variables.product.product_name %} starts generating the dependency graph immediately and generates alerts for any vulnerable dependencies as soon as they are identified. The graph is usually populated within minutes but this may take longer for repositories with many dependencies. For more information, see "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)." {% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -When {% data variables.product.product_name %} identifies a vulnerable dependency, we send a {% data variables.product.prodname_dependabot_short %} alert to the maintainers of affected repositories with details of the vulnerability, a link to the affected file in the project, and information about a fixed version. {% if currentVersion == "free-pro-team@latest" %}For repositories that have enabled {% data variables.product.prodname_dependabot_security_updates %}, the alert will also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."{% endif %} +When {% data variables.product.product_name %} identifies a vulnerable dependency, we generate a {% data variables.product.prodname_dependabot_short %} alert and display it on the Security tab for the repository. The alert includes a link to the affected file in the project, and information about a fixed version. {% data variables.product.product_name %} also notifies the maintainers of affected repositories about the new alert according to their notification preferences. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)." +{% endif %} + +{% if currentVersion == "free-pro-team@latest" %} +For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, the alert may also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)." {% endif %} {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} @@ -58,7 +62,7 @@ When {% data variables.product.product_name %} identifies a vulnerable dependenc {% warning %} -**Note**: {% data variables.product.product_name %}'s security features do not claim to catch all vulnerabilities. Though we are always trying to update our vulnerability database and alert you with our most up-to-date information, we will not be able to catch everything or alert you to known vulnerabilities within a guaranteed time frame. These features are not substitutes for human review of each dependency for potential vulnerabilities or any other issues, and we recommend consulting with a security service or conducting a thorough vulnerability review when necessary. +**Note**: {% data variables.product.product_name %}'s security features do not claim to catch all vulnerabilities. Though we are always trying to update our vulnerability database and generate alerts with our most up-to-date information, we will not be able to catch everything or tell you about known vulnerabilities within a guaranteed time frame. These features are not substitutes for human review of each dependency for potential vulnerabilities or any other issues, and we recommend consulting with a security service or conducting a thorough vulnerability review when necessary. {% endwarning %} @@ -67,7 +71,7 @@ When {% data variables.product.product_name %} identifies a vulnerable dependenc You can see all of the alerts that affect a particular project{% if currentVersion == "free-pro-team@latest" %} on the repository's Security tab or{% endif %} in the repository's dependency graph.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} -We send {% data variables.product.prodname_dependabot_short %} alerts to people with admin permissions in the affected repositories by default. {% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository.{% if currentVersion == "free-pro-team@latest" %} You can also enable {% data variables.product.prodname_dependabot_short %} alerts for additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."{% endif %} +By default, we notify people with admin permissions in the affected repositories about new {% data variables.product.prodname_dependabot_short %} alerts.{% endif %} {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. You can also make {% data variables.product.prodname_dependabot_short %} alerts visible to additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)." {% endif %} {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} diff --git a/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md index dbf47ece95..8ba51b3b5b 100644 --- a/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md +++ b/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md @@ -9,7 +9,7 @@ versions: ### About notifications for vulnerable dependencies -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we send you {% data variables.product.prodname_dependabot_short %} alerts.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot_short %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. {% endif %} {% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)." diff --git a/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index d60cba9bf6..37ed54adfe 100644 --- a/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -14,7 +14,7 @@ You can enable automatic security updates for any repository that uses {% data v ### About updates for vulnerable dependencies in your repository -{% data variables.product.product_name %} sends {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} 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. +{% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} 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. ### Viewing and updating vulnerable dependencies diff --git a/data/reusables/notifications/vulnerable-dependency-notification-options.md b/data/reusables/notifications/vulnerable-dependency-notification-options.md index 75a04dc372..6fd66803d4 100644 --- a/data/reusables/notifications/vulnerable-dependency-notification-options.md +++ b/data/reusables/notifications/vulnerable-dependency-notification-options.md @@ -1,19 +1,19 @@ {% if currentVersion == "free-pro-team@latest" %} -By default, you will receive {% data variables.product.prodname_dependabot_alerts %}: -- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) -- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) -- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) -- in your inbox, as web notifications (**Web** option) +By default, you will receive notification of new {% data variables.product.prodname_dependabot_alerts %}: +- by email, an email is sent every time a vulnerability with a critical or high severity is found (**Email each time a vulnerability is found** option) +- in the user interface, a warning is shown in your repository's file and code views if there are any vulnerable dependencies (**UI alerts** option) +- on the command line, warnings are displayed as callbacks when you push to repositories with any vulnerable dependencies (**Command Line** option) +- in your inbox, as web notifications for new vulnerabilities with a critical or high severity (**Web** option) You can customize the way you are notified about {% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. {% endif %} {% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %} By default, if your site administrator has configured email for notifications on your instance, you will receive {% data variables.product.prodname_dependabot_alerts %}: -- by email, an email is sent every time a vulnerability is found (**Email each time a vulnerability is found** option) -- in the user interface, as warnings in your repository's file and code views (**UI alerts** option) -- on the command line, as warnings that are displayed as callbacks when you push to repositories with vulnerabilities (**Command Line** option) -- in your inbox, as web notifications (**Web** option) +- by email, an email is sent every time a vulnerability {% if currentVersion ver_gt "enterprise-server@2.23" %}with a critical or high severity {% endif %}is found (**Email each time a vulnerability is found** option) +- in the user interface, a warning is shown in your repository's file and code views if there are any vulnerable dependencies (**UI alerts** option) +- on the command line, warnings are displayed as callbacks when you push to repositories with any vulnerable dependencies (**Command Line** option) +- in your inbox, as web notifications {% if currentVersion ver_gt "enterprise-server@2.23" %}for new vulnerabilities with a critical or high severity {% endif %}(**Web** option) You can customize the way you are notified about {% data variables.product.prodname_dependabot_alerts %}. For example, you can receive a weekly digest email summarizing alerts for up to 10 of your repositories using the **Email a digest summary of vulnerabilities** and **Weekly security email digest** options. {% endif %} From 660d664ac7157992c2cfea66696922d1f0cb463c Mon Sep 17 00:00:00 2001 From: Larry Claman <25161683+larryclaman@users.noreply.github.com> Date: Wed, 28 Oct 2020 07:36:54 -0400 Subject: [PATCH 40/40] Changed 'people' to 'accounts' (#765) * Changed 'people' to 'accounts' Adding some precision: Changed 'People with write permission to a repository can manage' to 'Accounts with write permission to a repository can manage" People don't have permission; accounts have permission. * edits for clarity * clarity * Update content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md Co-authored-by: hubwriter <54933897+hubwriter@users.noreply.github.com> Co-authored-by: hubwriter <54933897+hubwriter@users.noreply.github.com> --- .../configuring-the-codeql-workflow-for-compiled-languages.md | 2 +- .../enabling-code-scanning-for-a-repository.md | 2 +- .../managing-code-scanning-alerts-for-your-repository.md | 2 +- .../triaging-code-scanning-alerts-in-pull-requests.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages.md index 62932f450f..ee17b9a2ab 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-workflow-for-compiled-languages.md @@ -3,7 +3,7 @@ title: Configuring the CodeQL workflow for compiled languages shortTitle: Configuring for compiled languages intro: 'You can configure how {% data variables.product.prodname_dotcom %} uses the {% data variables.product.prodname_codeql_workflow %} to scan code written in compiled languages for vulnerabilities and errors.' product: '{% data reusables.gated-features.code-scanning %}' -permissions: 'People with write permissions to a repository can configure {% data variables.product.prodname_code_scanning %} for the repository.' +permissions: 'If you have write permissions to a repository, you can configure {% data variables.product.prodname_code_scanning %} for that repository.' redirect_from: - /github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning-for-compiled-languages - /github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-the-codeql-action-for-compiled-languages diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md index 897fc3a74f..d44cd2e445 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md @@ -3,7 +3,7 @@ title: Enabling code scanning for a repository shortTitle: Enabling code scanning intro: 'You can enable {% data variables.product.prodname_code_scanning %} for your project''s repository.' product: '{% data reusables.gated-features.code-scanning %}' -permissions: 'People with write permissions to a repository can enable {% data variables.product.prodname_code_scanning %} for the repository.' +permissions: 'If you have write permissions to a repository, you can enable {% data variables.product.prodname_code_scanning %} for that repository.' redirect_from: - /github/managing-security-vulnerabilities/configuring-automated-code-scanning - /github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md index d8dc845a31..4dd31e54eb 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md @@ -3,7 +3,7 @@ title: Managing code scanning alerts for your repository shortTitle: Managing alerts intro: 'You can view, fix, {% if currentVersion == "enterprise-server@2.22" %}or close{% else %}dismiss, or delete{% endif %} alerts for potential vulnerabilities or errors in your project''s code.' product: '{% data reusables.gated-features.code-scanning %}' -permissions: 'People with write permission to a repository can manage {% data variables.product.prodname_code_scanning %} alerts for the repository.' +permissions: 'If you have write permission to a repository you can manage {% data variables.product.prodname_code_scanning %} alerts for that repository.' versions: free-pro-team: '*' enterprise-server: '>=2.22' diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md index ab7bf0dbc9..0013b8b96b 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md @@ -3,7 +3,7 @@ title: Triaging code scanning alerts in pull requests shortTitle: Triaging alerts in pull requests intro: 'When {% data variables.product.prodname_code_scanning %} identifies a problem in a pull request, you can review the highlighted code and resolve the alert.' product: '{% data reusables.gated-features.code-scanning %}' -permissions: 'People with write permission to a repository can resolve {% data variables.product.prodname_code_scanning %} alerts.' +permissions: 'If you have write permission to a repository, you can resolve {% data variables.product.prodname_code_scanning %} alerts for that repository.' versions: free-pro-team: '*' enterprise-server: '>=2.22'

    - + {% octicon "logo-github" height="30" %}

    {% data ui.footer.product.heading %}

    {% data ui.footer.platform.heading %}

    diff --git a/javascripts/search.js b/javascripts/search.js index 4f9f5fd8db..de27b03f00 100644 --- a/javascripts/search.js +++ b/javascripts/search.js @@ -14,7 +14,7 @@ const maxContentLength = 300 const hasStandaloneSearch = () => document.getElementById('landing') || document.querySelector('body.error-404') !== null const resultTemplate = (item) => { - // Attach an `algolia-query` param to each result link so Google Analytics + // Attach an `algolia-query` param to each result link so analytics // can track the search query that led the user to this result const input = document.querySelector('#search-input-container input') if (input) { @@ -189,12 +189,12 @@ export default function () { searchWithYourKeyboard('#search-input-container input', '.ais-Hits-item') toggleSearchDisplay() - // delay removal of the query param so Google Analytics client code has a chance to track it + // delay removal of the query param so analytics client code has a chance to track it setTimeout(() => { removeAlgoliaQueryTrackingParam() }, 500) } -// When a user performs an in-site search an `agolia-query` param is -// added to the URL so Google Analytics can track the queries and the pages +// When a user performs an in-site search an `algolia-query` param is +// added to the URL so analytics can track the queries and the pages // they lead to. This function strips the query from the URL after page load, // so the bare article URL can be copied/bookmarked/shared, sans tracking param function removeAlgoliaQueryTrackingParam () { diff --git a/middleware/csp.js b/middleware/csp.js index f91f8108ca..ad381c54dd 100644 --- a/middleware/csp.js +++ b/middleware/csp.js @@ -8,7 +8,6 @@ module.exports = contentSecurityPolicy({ defaultSrc: ["'none'"], connectSrc: [ "'self'", - '*.google-analytics.com', '*.algolia.net', '*.algolianet.com' ], @@ -19,7 +18,6 @@ module.exports = contentSecurityPolicy({ ], imgSrc: [ "'self'", - '*.google-analytics.com', 'github.githubassets.com', 'github-images.s3.amazonaws.com', 'octodex.github.com', @@ -32,8 +30,7 @@ module.exports = contentSecurityPolicy({ "'self'", 'data:', "'unsafe-eval'", // exception for Algolia instantsearch - "'unsafe-inline'", - '*.google-analytics.com' + "'unsafe-inline'" ], frameSrc: [ // exceptions for GraphQL Explorer 'https://graphql-explorer.githubapp.com', // production env diff --git a/tests/rendering/server.js b/tests/rendering/server.js index 9f38adfe80..1d0641edc4 100644 --- a/tests/rendering/server.js +++ b/tests/rendering/server.js @@ -49,14 +49,12 @@ describe('server', () => { expect(csp.get('connect-src').includes('*.algolianet.com')).toBe(true) expect(csp.get('img-src').includes("'self'")).toBe(true) - expect(csp.get('img-src').includes('*.google-analytics.com')).toBe(true) expect(csp.get('img-src').includes('github-images.s3.amazonaws.com')).toBe(true) expect(csp.get('img-src').includes('octodex.github.com')).toBe(true) expect(csp.get('script-src').includes("'self'")).toBe(true) expect(csp.get('script-src').includes("'unsafe-eval'")).toBe(true) // exception for Algolia instantsearch expect(csp.get('script-src').includes("'unsafe-inline'")).toBe(true) - expect(csp.get('script-src').includes('*.google-analytics.com')).toBe(true) expect(csp.get('style-src').includes("'self'")).toBe(true) expect(csp.get('style-src').includes("'unsafe-inline'")).toBe(true) diff --git a/tests/routing/top-developer-site-path-redirects.js b/tests/routing/top-developer-site-path-redirects.js index e88703cef6..2dbf24b09c 100644 --- a/tests/routing/top-developer-site-path-redirects.js +++ b/tests/routing/top-developer-site-path-redirects.js @@ -3,7 +3,7 @@ const { head } = require('../helpers') describe('developer.github.com redirects', () => { jest.setTimeout(30 * 60 * 1000) - it('responds with 200 for the top historical request paths from google analytics', async () => { + it('responds with 200 for the top historical request paths', async () => { // ignore paths that are not (yet?) being redirected from developer.github.com to docs.github.com const ignoredPatterns = [ /^\/changes/, From f22a82fcfbe920cba8a2724186f4c00729d1de3a Mon Sep 17 00:00:00 2001 From: Rachael Sewell Date: Mon, 26 Oct 2020 14:38:30 -0700 Subject: [PATCH 16/40] translate openapi versioning (#16202) --- lib/all-versions.js | 9 ++-- lib/rest.js | 41 ++++++++++--------- middleware/contextualizers/rest.js | 6 +-- .../developer-links-and-images.js | 2 +- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/lib/all-versions.js b/lib/all-versions.js index 25cc47a8e8..e233a61e66 100644 --- a/lib/all-versions.js +++ b/lib/all-versions.js @@ -12,14 +12,16 @@ const plans = [ planTitle: 'Free, Pro, and Team', releases: [latestNonNumberedRelease], latestRelease: latestNonNumberedRelease, - nonEnterpriseDefault: true // permanent way to refer to this plan if the name changes + nonEnterpriseDefault: true, // permanent way to refer to this plan if the name changes + openApiBaseName: 'dotcom' }, { plan: 'enterprise-server', planTitle: 'Enterprise Server', releases: enterpriseServerReleases.supported, latestRelease: enterpriseServerReleases.latest, - hasNumberedReleases: true + hasNumberedReleases: true, + openApiBaseName: '' } ] @@ -35,7 +37,8 @@ plans.forEach(planObj => { version, versionTitle: planObj.hasNumberedReleases ? `${planObj.planTitle} ${release}` : planObj.planTitle, latestVersion: `${planObj.plan}${versionDelimiter}${planObj.latestRelease}`, - currentRelease: release + currentRelease: release, + openApiVersionName: planObj.hasNumberedReleases ? `${planObj.openApiBaseName}${release}` : planObj.openApiBaseName } allVersions[version] = Object.assign(versionObj, planObj) diff --git a/lib/rest.js b/lib/rest.js index 923e6177aa..426f788678 100644 --- a/lib/rest.js +++ b/lib/rest.js @@ -1,31 +1,34 @@ -const { chain, get, union, flatten, groupBy } = require('lodash') -const { supported } = require('./enterprise-server-releases') +const { chain, get, groupBy } = require('lodash') const operations = require('@github/rest-api-operations') -const { getOldVersionFromNewVersion } = require('./old-versions-utils') -const allVersions = Object.keys(require('./all-versions')) +const allVersions = require('./all-versions') +const allVersionKeys = Object.keys(allVersions) -// This list is generated for use in the tests, -// so we can verify that the names of the markdown files -// in content/rest/reference/*.md are congruous with the -// set of REST resource names like activity, gists, repos, etc. -function getCategories (operations) { - return chain(operations).map('category').sort().uniq().value() -} -const dotcomCategories = getCategories(operations.dotcom) -const enterpriseCategories = flatten(supported.map(v => getCategories(operations[v]))) -const categories = union(dotcomCategories, enterpriseCategories) +let allCategories = [] +allVersionKeys.forEach(currentVersion => { + // Translate the versions from the openapi to versions used in the docs + const openApiVersion = allVersions[currentVersion].openApiVersionName + operations[currentVersion] = operations[openApiVersion] + delete operations[openApiVersion] -// Attach convenience properties to each operation that can't easily be created in Liquid -allVersions.forEach(currentVersion => { - operations[getOldVersionFromNewVersion(currentVersion)].forEach(operation => { + // This list is generated for use in the tests, + // so we can verify that the names of the markdown files + // in content/rest/reference/*.md are congruous with the + // set of REST resource names like activity, gists, repos, etc. + allCategories = allCategories.concat(chain(operations[currentVersion]).map('category').sort().uniq().value()) + + // Attach convenience properties to each operation that can't easily be created in Liquid + operations[currentVersion].forEach(operation => { operation.hasRequiredPreviews = get(operation, 'x-github.previews', []).some(preview => preview.required) }) }) +// Get the unique set of categories +const categories = [...new Set(allCategories)] + // This is a collection of operations that have `enabledForGitHubApps = true` // It's grouped by resource title to make rendering easier -const operationsEnabledForGitHubApps = allVersions.reduce((acc, currentVersion) => { - acc[currentVersion] = chain(operations[getOldVersionFromNewVersion(currentVersion)] || []) +const operationsEnabledForGitHubApps = allVersionKeys.reduce((acc, currentVersion) => { + acc[currentVersion] = chain(operations[currentVersion] || []) .filter(operation => operation['x-github'].enabledForGitHubApps) .orderBy('category') .value() diff --git a/middleware/contextualizers/rest.js b/middleware/contextualizers/rest.js index 68a518e960..0d63f8d93f 100644 --- a/middleware/contextualizers/rest.js +++ b/middleware/contextualizers/rest.js @@ -1,13 +1,9 @@ const rest = require('../../lib/rest') const { getVersionedPathWithLanguage } = require('../../lib/path-utils') -const { getOldVersionFromNewVersion } = require('../../lib/old-versions-utils') module.exports = async function (req, res, next) { req.context.rest = rest - // TODO need to update this to the new versions in coordination with the updater scripts - const currentOldVersion = getOldVersionFromNewVersion(req.context.currentVersion) - // link to include in `Works with GitHub Apps` notes // e.g. /ja/rest/reference/apps or /en/enterprise/2.20/user/rest/reference/apps req.context.restGitHubAppsLink = getVersionedPathWithLanguage( @@ -28,7 +24,7 @@ module.exports = async function (req, res, next) { // ignore empty strings or bare `/` if (!category || category.length < 2) return next() - const operationsForCurrentProduct = req.context.rest.operations[currentOldVersion] || [] + const operationsForCurrentProduct = req.context.rest.operations[req.context.currentVersion] || [] // find all operations with a category matching the current path req.context.currentRestOperations = operationsForCurrentProduct.filter(operation => operation.category === category) diff --git a/tests/links-and-images/developer-links-and-images.js b/tests/links-and-images/developer-links-and-images.js index 42c2a3af98..ddb327b3ee 100644 --- a/tests/links-and-images/developer-links-and-images.js +++ b/tests/links-and-images/developer-links-and-images.js @@ -88,7 +88,7 @@ describe('page rendering', () => { languageCode ) - context.operationsForCurrentProduct = context.rest.operations[currentOldVersion] || [] + context.operationsForCurrentProduct = context.rest.operations[pageVersion] || [] if (relevantPermalink.href.includes('rest/reference/')) { const docsPath = relevantPermalink.href From e56772d35531eea3c85ceacde32830e2a59f7f2a Mon Sep 17 00:00:00 2001 From: Jesse Gennrich Date: Mon, 26 Oct 2020 15:15:32 -0700 Subject: [PATCH 17/40] fixed typo (master to main) Renamed "master" to "main" to match the branch name used in the example block that follows, and in the rest of the document. --- .../syncing-a-fork.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md index a3d3ac7f76..191d4d0093 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md +++ b/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md @@ -12,7 +12,7 @@ Before you can sync your fork with an upstream repository, you must [configure a {% data reusables.command_line.open_the_multi_os_terminal %} 2. Change the current working directory to your local project. -3. Fetch the branches and their respective commits from the upstream repository. Commits to `master` will be stored in a local branch, `upstream/master`. +3. Fetch the branches and their respective commits from the upstream repository. Commits to `main` will be stored in a local branch, `upstream/main`. ```shell $ git fetch upstream > remote: Counting objects: 75, done. From 13c33d403977983ecce80c6138fbc16f9735b5e8 Mon Sep 17 00:00:00 2001 From: Rachael Sewell Date: Mon, 26 Oct 2020 17:25:09 -0700 Subject: [PATCH 18/40] [Shipping 10.23.20] add webhook config REST API (#16144) * add webhook config REST API * add versioning for dotcom/2.23+ * check for empty parameters with request bodies * add latest rest-api-operation module * Apply suggestions from code review Co-authored-by: jmarlena <6732600+jmarlena@users.noreply.github.com> --- .../webhooks-and-events/creating-webhooks.md | 3 +++ .../securing-your-webhooks.md | 1 + content/rest/reference/apps.md | 9 +++++++++ content/rest/reference/orgs.md | 2 +- content/rest/reference/repos.md | 2 +- .../webhooks/webhooks-rest-api-links.md | 4 ++++ includes/rest_operation.html | 2 +- package-lock.json | 18 +++++++++--------- package.json | 2 +- 9 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 data/reusables/webhooks/webhooks-rest-api-links.md diff --git a/content/developers/webhooks-and-events/creating-webhooks.md b/content/developers/webhooks-and-events/creating-webhooks.md index 675e45372d..b0efd58bb6 100644 --- a/content/developers/webhooks-and-events/creating-webhooks.md +++ b/content/developers/webhooks-and-events/creating-webhooks.md @@ -14,6 +14,9 @@ Now that we understand [the basics of webhooks][webhooks-overview], let's go thr Creating a webhook is a two-step process. You'll first need to set up how you want your webhook to behave through {% data variables.product.product_name %}--what events should it listen to. After that, you'll set up your server to receive and manage the payload. + +{% data reusables.webhooks.webhooks-rest-api-links %} + ### Setting up a Webhook You can install webhooks on an organization or on a specific repository. diff --git a/content/developers/webhooks-and-events/securing-your-webhooks.md b/content/developers/webhooks-and-events/securing-your-webhooks.md index 4cbe3ab696..6061ac632b 100644 --- a/content/developers/webhooks-and-events/securing-your-webhooks.md +++ b/content/developers/webhooks-and-events/securing-your-webhooks.md @@ -12,6 +12,7 @@ versions: Once your server is configured to receive payloads, it'll listen for any payload sent to the endpoint you configured. For security reasons, you probably want to limit requests to those coming from GitHub. There are a few ways to go about this--for example, you could opt to allow requests from GitHub's IP address--but a far easier method is to set up a secret token and validate the information. +{% data reusables.webhooks.webhooks-rest-api-links %} ### Setting your secret token diff --git a/content/rest/reference/apps.md b/content/rest/reference/apps.md index ffbdc5fa03..96bd001676 100644 --- a/content/rest/reference/apps.md +++ b/content/rest/reference/apps.md @@ -61,3 +61,12 @@ Be sure to replace stubbed endpoints with production endpoints before deploying {% endfor %} {% endif %} + +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +## Webhooks + +{% for operation in currentRestOperations %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} +{% endfor %} + +{% endif %} \ No newline at end of file diff --git a/content/rest/reference/orgs.md b/content/rest/reference/orgs.md index 3725e1f913..8ca05be120 100644 --- a/content/rest/reference/orgs.md +++ b/content/rest/reference/orgs.md @@ -56,5 +56,5 @@ For more best practices, [see our guide](/guides/best-practices-for-integrators/ {% data variables.product.product_name %} will send along several HTTP headers to differentiate between event types and payload identifiers. See [webhook headers](/webhooks/event-payloads/#delivery-headers) for details. {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} diff --git a/content/rest/reference/repos.md b/content/rest/reference/repos.md index d74c2686c4..32b3272fcd 100644 --- a/content/rest/reference/repos.md +++ b/content/rest/reference/repos.md @@ -288,7 +288,7 @@ The Repository Webhooks API allows repository admins to manage the post-receive If you would like to set up a single webhook to receive events from all of your organization's repositories, see our API documentation for [Organization Webhooks](/rest/reference/orgs#webhooks). {% for operation in currentRestOperations %} - {% if operation.subcategory == 'hooks' %}{% include rest_operation %}{% endif %} + {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %} {% endfor %} ### Receiving Webhooks diff --git a/data/reusables/webhooks/webhooks-rest-api-links.md b/data/reusables/webhooks/webhooks-rest-api-links.md new file mode 100644 index 0000000000..3882222b05 --- /dev/null +++ b/data/reusables/webhooks/webhooks-rest-api-links.md @@ -0,0 +1,4 @@ +You can use the repository, organization, and app webhook REST APIs to create, update, delete, and ping webhooks. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}You can also use the REST API to change the configuration of the webhook. For example, you can modify the payload URL, content type, SSL verification, and secret. {% endif %}For more information, see: +- [Repository Webhooks REST API](/rest/reference/repos#webhooks) +- [Organization Webhooks REST API](/rest/reference/orgs#webhooks){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} +- [GitHub App Webhooks REST API](/rest/reference/apps#webhooks){% endif %} diff --git a/includes/rest_operation.html b/includes/rest_operation.html index eafee56e23..ac04714366 100644 --- a/includes/rest_operation.html +++ b/includes/rest_operation.html @@ -7,7 +7,7 @@ 
    {{operation.verb}} {{operation.requestPath}}
    - {% if operation.parameters.size > 0 %} + {% if operation.parameters.size > 0 or operation.bodyParameters.size > 0 %}

    {% data ui.products.rest.reference.parameters %}

    diff --git a/package-lock.json b/package-lock.json index 63ae8cf871..cb43c9871d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1156,9 +1156,9 @@ } }, "@github/rest-api-operations": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@github/rest-api-operations/-/rest-api-operations-3.1.4.tgz", - "integrity": "sha512-3BCTMhl9UhT0eKGNJvgawnsL7818Ivs15qptB1zApXyYN2qc2FQ+M4PBydGrkQ/ZFdc0x7iT7zIKb2G8peIULQ==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@github/rest-api-operations/-/rest-api-operations-3.2.0.tgz", + "integrity": "sha512-DOEASW/Ec95Fz8eswIC0kX9jtdHiWiDax2opIozg5IqhJKtrjJ3LxehcGPND2XAGeduhmlwssoXPZzlAI4GGqA==" }, "@hapi/address": { "version": "2.1.4", @@ -4206,7 +4206,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "requires": { "buffer-xor": "^1.0.3", @@ -4240,7 +4240,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "requires": { "bn.js": "^4.1.0", @@ -5657,7 +5657,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "requires": { "cipher-base": "^1.0.1", @@ -5669,7 +5669,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "requires": { "cipher-base": "^1.0.3", @@ -6396,7 +6396,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "requires": { "bn.js": "^4.1.0", @@ -19071,7 +19071,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "requires": { "inherits": "^2.0.1", diff --git a/package.json b/package.json index a7dd3bbd09..8411b1f276 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@github-docs/data-directory": "^1.2.0", "@github-docs/frontmatter": "^1.3.1", "@github-docs/render-content": "^5.2.0", - "@github/rest-api-operations": "^3.1.4", + "@github/rest-api-operations": "^3.2.0", "@octokit/rest": "^16.38.1", "@primer/css": "^15.1.0", "@primer/octicons": "^11.0.0", From 665a2f8072e75d64d975472a41d2d56342fd0e3f Mon Sep 17 00:00:00 2001 From: Eli Perkins Date: Tue, 27 Oct 2020 05:39:24 -0400 Subject: [PATCH 19/40] Update sharing feedback for mobile to split bugs out from feature requests (#16171) --- .../github/getting-started-with-github/github-for-mobile.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/github/getting-started-with-github/github-for-mobile.md b/content/github/getting-started-with-github/github-for-mobile.md index 44ec853d10..a3735d1678 100644 --- a/content/github/getting-started-with-github/github-for-mobile.md +++ b/content/github/getting-started-with-github/github-for-mobile.md @@ -43,8 +43,9 @@ To re-enable Universal Links, long-press any {% data variables.product.prodname_ ### Sharing feedback -If you have feedback or feature requests for {% data variables.product.prodname_mobile %}, you can email us at mobilefeedback@github.com. +If you find a bug in {% data variables.product.prodname_mobile %}, you can email us at mobilefeedback@github.com. +You can submit feature requests or other feedback for {% data variables.product.prodname_mobile %} [on GitHub Discussions](https://github.com/github/feedback/discussions?discussions_q=category%3A%22Mobile+Feedback%22). ### Opting out of beta releases for iOS From 5777cb85024b21f5257fe0d6288e6fa48cf0da06 Mon Sep 17 00:00:00 2001 From: Sarah Edwards Date: Tue, 27 Oct 2020 09:14:52 -0700 Subject: [PATCH 20/40] update rest-api-operations to 3.2.1 (#16228) * install rest-api-operations 3.2.1 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb43c9871d..ecdbd69070 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1156,9 +1156,9 @@ } }, "@github/rest-api-operations": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@github/rest-api-operations/-/rest-api-operations-3.2.0.tgz", - "integrity": "sha512-DOEASW/Ec95Fz8eswIC0kX9jtdHiWiDax2opIozg5IqhJKtrjJ3LxehcGPND2XAGeduhmlwssoXPZzlAI4GGqA==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@github/rest-api-operations/-/rest-api-operations-3.2.1.tgz", + "integrity": "sha512-GRJ5NtdWAvamDHXMfmwCNZ7O3TI/h79MyloWnHH+uWEN37DJadpbg3l3tIN2QyC/sZU1lk3o90YhiRaPC80muA==" }, "@hapi/address": { "version": "2.1.4", diff --git a/package.json b/package.json index 8411b1f276..af56ebc65b 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@github-docs/data-directory": "^1.2.0", "@github-docs/frontmatter": "^1.3.1", "@github-docs/render-content": "^5.2.0", - "@github/rest-api-operations": "^3.2.0", + "@github/rest-api-operations": "^3.2.1", "@octokit/rest": "^16.38.1", "@primer/css": "^15.1.0", "@primer/octicons": "^11.0.0", From 85ce256a6d4a58427c79f2a78ea8794ac2a2923c Mon Sep 17 00:00:00 2001 From: Jason Etcovitch Date: Tue, 27 Oct 2020 12:39:54 -0400 Subject: [PATCH 21/40] Fix broken "Enabled for GitHub Apps" link (#16236) * Fix the thing * Use enabledForGitHubApps boolean properly * Update includes/rest_operation.html Co-authored-by: Sarah Schneider Co-authored-by: Sarah Schneider --- includes/rest_operation.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/includes/rest_operation.html b/includes/rest_operation.html index ac04714366..afe3e801ba 100644 --- a/includes/rest_operation.html +++ b/includes/rest_operation.html @@ -115,12 +115,17 @@ 
    Status: {{ response.httpStatusCode }} {{ response.httpStatusMessage }}
    {{ response.payload }}
    {% endfor %} - {% if operation.notes.size > 0 %} + {% if operation.notes.size > 0 or operation.x-github.enabledForGitHubApps %}

    Notes

      - {% for note in operation.notes %} -
    • {{ note }}
      • - {% endfor %} + {% if operation.x-github.enabledForGitHubApps %} +
    • Works with GitHub Apps
      • + {% endif %} + {% for note in operation.notes %} + {% unless note == 'Works with GitHub Apps' %} +
    • {{ note }}
      • + {% endunless %} + {% endfor %}
    {% endif %} {% if operation.x-github.previews.size > 0 %} From 813d0d22a754d78736aaa6b713a0199f70e81cb2 Mon Sep 17 00:00:00 2001 From: Adrian L Thomas Date: Tue, 27 Oct 2020 17:45:37 +0000 Subject: [PATCH 22/40] Removed double 'and' --- .../sharing-workflows-with-your-organization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md b/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md index 7f7957f718..4dc25fdd48 100644 --- a/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md +++ b/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md @@ -14,7 +14,7 @@ versions: ### Overview -If you need to share workflows and other {% data variables.product.prodname_actions %} features with your team, then consider collaborating within a {% data variables.product.prodname_dotcom %} organization. An organization allows you to centrally store and and manage secrets, artifacts, and self-hosted runners. You can also create workflow templates in the `.github` repository and share them with other users in your organization. +If you need to share workflows and other {% data variables.product.prodname_actions %} features with your team, then consider collaborating within a {% data variables.product.prodname_dotcom %} organization. An organization allows you to centrally store and manage secrets, artifacts, and self-hosted runners. You can also create workflow templates in the `.github` repository and share them with other users in your organization. ### Creating a workflow template From 174d8539c642d4c60bf628ae217383266997e251 Mon Sep 17 00:00:00 2001 From: Jason Etcovitch Date: Tue, 27 Oct 2020 13:53:10 -0400 Subject: [PATCH 23/40] Support arbitrary keys in new featuredLinks frontmatter (#16239) * Add featuredLinks to frontmatter * Parse them in featured-links.js * Remove old raw setup * Use them * Missed a couple * Update translation files * Fix frontmatter schema * Loop over the right object * Also update translations' usage * Update docs and tests * Better README comment Co-authored-by: Sarah Schneider * Return next() Co-authored-by: Sarah Schneider --- content/README.md | 18 ++++++++++---- content/actions/index.md | 25 ++++++++++---------- content/index.md | 23 +++++++++--------- content/insights/index.md | 17 ++++++------- content/packages/index.md | 25 ++++++++++---------- includes/article.html | 2 +- includes/featured-links.html | 4 ++-- lib/frontmatter.js | 19 ++++++++------- lib/page.js | 9 ------- middleware/featured-links.js | 9 ++++--- tests/content/featured-links.js | 6 ++--- translations/de-DE/content/actions/index.md | 25 ++++++++++---------- translations/de-DE/content/index.md | 23 +++++++++--------- translations/de-DE/content/insights/index.md | 17 ++++++------- translations/de-DE/content/packages/index.md | 25 ++++++++++---------- translations/es-XL/content/actions/index.md | 25 ++++++++++---------- translations/es-XL/content/index.md | 23 +++++++++--------- translations/es-XL/content/insights/index.md | 17 ++++++------- translations/es-XL/content/packages/index.md | 25 ++++++++++---------- translations/ja-JP/content/actions/index.md | 25 ++++++++++---------- translations/ja-JP/content/index.md | 23 +++++++++--------- translations/ja-JP/content/insights/index.md | 17 ++++++------- translations/ja-JP/content/packages/index.md | 25 ++++++++++---------- translations/ko-KR/content/actions/index.md | 25 ++++++++++---------- translations/ko-KR/content/index.md | 23 +++++++++--------- translations/ko-KR/content/insights/index.md | 17 ++++++------- translations/ko-KR/content/packages/index.md | 25 ++++++++++---------- translations/pt-BR/content/actions/index.md | 25 ++++++++++---------- translations/pt-BR/content/index.md | 23 +++++++++--------- translations/pt-BR/content/insights/index.md | 17 ++++++------- translations/pt-BR/content/packages/index.md | 25 ++++++++++---------- translations/ru-RU/content/actions/index.md | 25 ++++++++++---------- translations/ru-RU/content/index.md | 23 +++++++++--------- translations/ru-RU/content/insights/index.md | 17 ++++++------- translations/ru-RU/content/packages/index.md | 25 ++++++++++---------- translations/zh-CN/content/actions/index.md | 25 ++++++++++---------- translations/zh-CN/content/index.md | 23 +++++++++--------- translations/zh-CN/content/insights/index.md | 17 ++++++------- translations/zh-CN/content/packages/index.md | 25 ++++++++++---------- 39 files changed, 412 insertions(+), 375 deletions(-) diff --git a/content/README.md b/content/README.md index 2fea939f42..d2c0789cca 100644 --- a/content/README.md +++ b/content/README.md @@ -16,7 +16,7 @@ See the [contributing docs](/CONTRIBUTING.md) for general information about work - [`product`](#product) - [`layout`](#layout) - [`mapTopic`](#maptopic) - - [`gettingStartedLinks` and `popularLinks`](#gettingstartedlinks-and-popularlinks) + - [`featuredLinks`](#featuredlinks) - [`showMiniToc`](#showminitoc) - [`miniTocMaxHeadingLevel`](#minitocmaxheadinglevel) - [`allowTitleToDifferFromFilename`](#allowtitletodifferfromfilename) @@ -132,12 +132,22 @@ For a layout named `layouts/article.html`, the value would be `article`. - Type: `Boolean`. Default is `false`. - Optional. -### `gettingStartedLinks` and `popularLinks` +### `featuredLinks` -- Purpose: Renders the linked articles' titles and intros under `Getting started` and `Popular articles` headings, respectively. See site homepage for an example. -- Type: `Array`. +- Purpose: Renders the linked articles' titles and intros on product landing pages and the homepage. +- Type: `Object`. - Optional. +Example: + +```yaml +featuredLinks: + gettingStarted: + - /path/to/page + guides: + - /guides/example +``` + ### `showMiniToc` - Purpose: Indicates whether an article should show a mini TOC above the rest of the content. See [Autogenerated mini TOCs](#autogenerated-mini-tocs) for more info. diff --git a/content/actions/index.md b/content/actions/index.md index 7d2f2b7304..7cbfa42321 100644 --- a/content/actions/index.md +++ b/content/actions/index.md @@ -5,15 +5,16 @@ intro: 'Automate, customize, and execute your software development workflows rig introLinks: quickstart: /actions/quickstart learn: /actions/learn-github-actions -gettingStartedLinks: - - /actions/managing-workflow-runs - - /actions/hosting-your-own-runners -guideLinks: - - /actions/guides/setting-up-continuous-integration-using-workflow-templates - - /actions/guides/about-packaging-with-github-actions -popularLinks: - - /actions/reference/workflow-syntax-for-github-actions - - /actions/reference/events-that-trigger-workflows +featuredLinks: + gettingStarted: + - /actions/managing-workflow-runs + - /actions/hosting-your-own-runners + guide: + - /actions/guides/setting-up-continuous-integration-using-workflow-templates + - /actions/guides/about-packaging-with-github-actions + popular: + - /actions/reference/workflow-syntax-for-github-actions + - /actions/reference/events-that-trigger-workflows redirect_from: - /articles/automating-your-workflow-with-github-actions/ - /articles/customizing-your-project-with-github-actions/ @@ -42,7 +43,7 @@ versions:

    {% data ui.toc.guides %}

      - {% for link in guideLinks %} + {% for link in featuredLinks.guide %}
    • {% include featured-link %}
      • {% endfor %}
    @@ -53,7 +54,7 @@ versions:

    {% data ui.toc.popular_articles %}

      - {% for link in popularLinks %} + {% for link in featuredLinks.popular %}
    • {% include featured-link %}
      • {% endfor %}
    @@ -64,7 +65,7 @@ versions:

    Manage workflows