repo sync

content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request.md

@@ -1,6 +1,6 @@
 ---
 title: Filtering files in a pull request
-intro: 'To help you quickly review changes in a large pull request, you can filter changed files.'
+intro: 'To help you quickly review changes in a large pull request, you can filter changed files{% if pr-tree-view %} or use the file tree to navigate between files{% endif %}.'
 redirect_from:
   - /github/collaborating-with-issues-and-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request
   - /articles/filtering-files-in-a-pull-request-by-file-type
@@ -16,7 +16,9 @@ topics:
   - Pull requests
 shortTitle: Filter files
 ---
-You can filter files in a pull request by file extension type, such as `.html` or `.js`, lack of an extension, code ownership, or dotfiles.
+You can filter files in a pull request by file extension type, such as `.html` or `.js`, lack of an extension, code ownership, or dotfiles.{% if pr-tree-view %} You can also use the file tree to filter by file path, navigate between files, or see a high level view of the changed files.{% endif %}
+
+## Using the file filter dropdown
 
 {% tip %}
 
@@ -32,6 +34,26 @@ You can filter files in a pull request by file extension type, such as `.html` o
 5. Optionally, to clear the filter selection, under the **Files changed** tab, click **Clear**.
   ![Clear file filter selection](/assets/images/help/pull_requests/clear-file-filter.png)
 
+{% if pr-tree-view %}
+## Using the file tree
+
+{% data reusables.repositories.sidebar-pr %}
+1. In the list of pull requests, click the pull request you'd like to filter.
+{% data reusables.repositories.changed-files %}
+1. If the file tree is hidden, click **Show file tree** to display the file tree.
+
+   {% note %}
+
+   **Note**: The file tree will not display if your screen width is too narrow or if the pull request only includes one file.
+
+   {% endnote %}
+
+1. Click on a file in the file tree to view the corresponding file diff.
+   ![Pull request file tree](/assets/images/help/pull_requests/pr-file-tree.png)
+1. To filter by file path, enter part or all of the file path in the **Filter changed files** search box. Alternatively, use the file filter dropdown. For more information, see "[Using the file filter dropdown](#using-the-file-filter-dropdown)."
+
+{% endif %}
+
 ## Further reading
 
 - "[About comparing branches in a pull request](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests)"

content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md

@@ -36,6 +36,7 @@ You can review changes in a pull request one file at a time. While reviewing the
 
    You can also choose to hide whitespace differences. The choice you make only applies to this pull request and will be remembered the next time you visit this page.
 {% endif %}
+1. Optionally, filter the files to show only the files you want to review{% if pr-tree-view %} or use the file tree to navigate to a specific file{% endif %}. For more information, see "[Filtering files in a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request)."
 {% data reusables.repositories.start-line-comment %}
 {% data reusables.repositories.type-line-comment %}
 {% data reusables.repositories.suggest-changes %}

data/features/pr-tree-view.yml

@@ -0,0 +1,7 @@
+# Issue 5892
+# PR file tree view
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.5'
+  ghae: 'issue-5892'

data/reusables/dependabot/beta-security-and-version-updates-onboarding.md

@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note:** Dependabot security updates and version updates are currently available for {% data variables.product.prodname_ghe_cloud %} and in beta for {% data variables.product.prodname_ghe_server %} 3.3. To request access to the beta release, [contact your account management team](https://enterprise.github.com/contact).
+**Note:** Dependabot security updates and version updates are currently available for {% data variables.product.prodname_ghe_cloud %} and in beta for {% data variables.product.prodname_ghe_server %} 3.3. Please [contact your account management team](https://enterprise.github.com/contact) for instructions on enabling Dependabot updates.
 
 {% endnote %}
 

data/reusables/dependabot/beta-security-and-version-updates.md

@@ -4,7 +4,7 @@
 {% if dependabot-updates-github-connect %}
 **Note:** {% data variables.product.prodname_dependabot %} security and version updates are currently in public beta and subject to change.
 {% else %}
-**Note:** {% data variables.product.prodname_dependabot %} security and version updates are currently in private beta and subject to change. To request access to the beta release, [contact your account management team](https://enterprise.github.com/contact).
+**Note:** {% data variables.product.prodname_dependabot %} security and version updates are currently in private beta and subject to change. Please [contact your account management team](https://enterprise.github.com/contact) for instructions on enabling Dependabot updates.
 {% endif %}
 {% endnote %}
 

translations/log/cn-resets.csv

@@ -84,6 +84,7 @@ translations/zh-CN/content/billing/managing-billing-for-your-github-account/inde
 translations/zh-CN/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md,parsing error
 translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md,broken liquid tags
 translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md,broken liquid tags
+translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise.md,parsing error
 translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md,parsing error
 translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server.md,broken liquid tags
 translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md,broken liquid tags

translations/zh-CN/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md

@@ -122,7 +122,7 @@ shortTitle: 管理运行器组
     ![添加运行器组](/assets/images/help/settings/actions-enterprise-account-add-runner-group.png)
 1. 输入运行程序组的名称，并分配组织访问策略。
 
-    您可以配置运行器组供特定的组织列表或企业中所有组织访问。 默认情况下，只有私有仓库可以访问运行器组中的运行器，但您可以覆盖此设置。 This setting can't be overridden if configuring an organization's runner group that was shared by an enterprise.
+    您可以配置运行器组供特定的组织列表或企业中所有组织访问。 默认情况下，只有私有仓库可以访问运行器组中的运行器，但您可以覆盖此设置。 如果配置企业共享的组织的运行组，则不能覆盖此设置。
 
    {% warning %}
 

translations/zh-CN/content/actions/using-workflows/reusing-workflows.md

@@ -113,7 +113,7 @@ You can define inputs and secrets, which can be passed from the caller workflow
        runs-on: ubuntu-latest
        environment: production
        steps:
-         - uses: ./.github/actions/my-action
+         - uses: ./.github/workflows/my-action
            with:
              username: ${{ inputs.username }}
              token: ${{ secrets.envPAT }}
@@ -154,7 +154,7 @@ jobs:
     name: Pass input and secrets to my-action
     runs-on: ubuntu-latest
     steps:
-      - uses: ./.github/actions/my-action
+      - uses: ./.github/workflows/my-action
         with:
           username: ${{ inputs.username }}
           token: ${{ secrets.token }}

translations/zh-CN/content/actions/using-workflows/triggering-a-workflow.md

@@ -195,7 +195,11 @@ If you want more granular control than events, event activity types, or event fi
 
 ### Using conditionals
 
-You can use conditionals to further control whether jobs or steps in your workflow will run. For example, if you want the workflow to run when a specific label is added to an issue, you can trigger on the `issues labeled` event activity type and use a conditional to check what label triggered the workflow. The following workflow will run when any label is added to an issue in the workflow's repository, but the `run_if_label_matches` job will only execute if the label is named `bug`.
+You can use conditionals to further control whether jobs or steps in your workflow will run.
+
+#### Example using a value in the event payload
+
+For example, if you want the workflow to run when a specific label is added to an issue, you can trigger on the `issues labeled` event activity type and use a conditional to check what label triggered the workflow. The following workflow will run when any label is added to an issue in the workflow's repository, but the `run_if_label_matches` job will only execute if the label is named `bug`.
 
 ```yaml
 on:
@@ -211,7 +215,34 @@ jobs:
       - run: echo 'The label was bug'
 ```
 
-For more information, see "[Expressions](/actions/learn-github-actions/expressions)."
+#### Example using event type
+
+For example, if you want to run different jobs or steps depending on what event triggered the workflow, you can use a conditional to check whether a specific event type exists in the event context. The following workflow will run whenever an issue or pull request is closed. If the workflow ran because an issue was closed, the `github.event` context will contain a value for `issue` but not for `pull_request`. Therefore, the `if_issue` step will run but the `if_pr` step will not run. Conversely, if the workflow ran because a pull request was closed, the `if_pr` step will run but the `if_issue` step will not run.
+
+```yaml
+on:
+  issues:
+    types:
+      - closed
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  state_event_type:
+    runs-on: ubuntu-latest
+    steps:
+    - name: if_issue
+      if: github.event.issue
+      run: |
+        echo An issue was closed
+    - name: if_pr
+      if: github.event.pull_request
+      run: |
+        echo A pull request was closed
+```
+
+For more information about what information is available in the event context, see "[Using event information](#using-event-information)." For more information about how to use conditionals, see "[Expressions](/actions/learn-github-actions/expressions)."
 
 {% ifversion fpt or ghae or ghes > 3.1 or ghec %}
 

translations/zh-CN/content/admin/overview/about-enterprise-accounts.md

@@ -50,7 +50,7 @@ For more information about the management of policies for your enterprise accoun
 
 {% ifversion ghes or ghae %}
 
-From your enterprise account on {% ifversion ghae %}{% data variables.product.product_name %}{% elsif ghes %}a {% data variables.product.prodname_ghe_server %} instance{% endif %}, administrators can view enterprise membership and manage the following for the {% ifversion ghes %}{% data variables.product.prodname_ghe_server %} instance{% elsif ghae %}enterprise on {% data variables.product.prodname_ghe_managed %}{% endif %}.
+From your enterprise account on {% ifversion ghae %}{% data variables.product.product_name %}{% elsif ghes %}a {% data variables.product.prodname_ghe_server %} instance{% endif %}, administrators can view{% if remove-enterprise-members %} and manage{% endif %} enterprise membership{% if enterprise-owner-join-org %}, manage their own membership in organizations owned by the enterprise,{% endif %} and manage the following for the {% ifversion ghes %}{% data variables.product.prodname_ghe_server %} instance{% elsif ghae %}enterprise on {% data variables.product.prodname_ghe_managed %}{% endif %}.
 
 {% ifversion ghes %}
 - License usage{% endif %}
@@ -65,7 +65,7 @@ From your enterprise account on {% ifversion ghae %}{% data variables.product.pr
 
 {% endif %}
 
-{% ifversion ghec or ghes %}When you try or purchase {% data variables.product.prodname_enterprise %}, you can{% ifversion ghes %} also{% endif %} create an enterprise account for {% data variables.product.prodname_ghe_cloud %} on {% data variables.product.prodname_dotcom_the_website %}. Administrators for the enterprise account on {% data variables.product.prodname_dotcom_the_website %} can view membership and manage the following for the enterprise account{% ifversion ghes %} on {% data variables.product.prodname_dotcom_the_website %}{% endif %}.
+{% ifversion ghec or ghes %}When you try or purchase {% data variables.product.prodname_enterprise %}, you can{% ifversion ghes %} also{% endif %} create an enterprise account for {% data variables.product.prodname_ghe_cloud %} on {% data variables.product.prodname_dotcom_the_website %}. Administrators for the enterprise account on {% data variables.product.prodname_dotcom_the_website %} can view {% if remove-enterprise-members %} and manage{% endif %} enterprise membership{% if enterprise-owner-join-org %}, manage their own membership in organizations owned by the enterprise,{% endif %} and manage the following for the enterprise account{% ifversion ghes %} on {% data variables.product.prodname_dotcom_the_website %}{% endif %}.
 
 - Billing and usage (services on {% data variables.product.prodname_dotcom_the_website %}, {% data variables.product.prodname_GH_advanced_security %}, user licenses)
 - Security (single sign-on, IP allow lists, SSH certificate authorities, two-factor authentication)

translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/index.md

@@ -25,6 +25,7 @@ children:
   - /adding-people-to-teams
   - /viewing-the-audit-logs-for-organizations-in-your-enterprise
   - /streaming-the-audit-logs-for-organizations-in-your-enterprise-account
+  - /managing-your-role-in-an-organization-owned-by-your-enterprise
   - /removing-users-from-teams-and-organizations
   - /removing-organizations-from-your-enterprise
   - /restoring-a-deleted-organization

translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md

@@ -0,0 +1,54 @@
+---
+title: Managing your role in an organization owned by your enterprise
+intro: You can manage your membership in any organization owned by your enterprise and change your role within the organization.
+permissions: Enterprise owners can manage their role in an organization owned by the enterprise.
+versions:
+  feature: enterprise-owner-join-org
+type: how_to
+topics:
+  - Administrator
+  - Enterprise
+  - Organizations
+shortTitle: Manage your organization roles
+---
+
+{% note %}
+
+**Note:** The ability for enterprise owners to manage their role in an organization owned by the enterprise is in beta and subject to change.
+
+{% endnote %}
+
+## About role management
+
+You can choose to join an organization owned by your enterprise as a member or as an organization owner, change your role within the organization, or leave the organization.
+
+{% warning %}
+
+**Warning**: If an organization uses SCIM to provision users, joining the organization this way could have unintended consequences. 更多信息请参阅“[关于 SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)”。
+
+{% endwarning %}
+
+## Managing your role with the enterprise settings
+
+You can join an organization owned by your enterprise and manage your role within the organization, directly from the settings for your enterprise account.
+
+If an organization enforces SAML single sign-on (SSO), you cannot use the enterprise settings to join the organization. Instead, you must join the organization using that organization's identity provider (IdP). Then, you can manage your role in your enterprise settings. For more information, see "[Joining an organization that enforces SAML SSO](#joining-an-organization-that-enforces-saml-sso)."
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+1. On the **Organizations** tab, to the right of the organization you want to manage your role in, select the {% octicon "gear" aria-label="The gear icon" %} dropdown menu and click the action you want to take.
+
+   ![Screenshot of the dropdown menu for the gear icon for an organization](/assets/images/help/business-accounts/change-role-in-org.png)
+
+## Joining an organization that enforces SAML SSO
+
+If an organization enforces SAML SSO, you cannot use the enterprise settings to join the organization. Instead, you must join the organization using that organization's identity provider (IdP).
+
+1. You must be assigned access in your IdP to the application for {% data variables.product.prodname_ghe_cloud %} that is used by the organization. If you're unable to configure your IdP yourself, contact your IdP administrator.
+1. Authenticate to the organization using SAML SSO.
+
+   - If the organization uses SCIM, accept the organization invitation that will be generated by the SCIM integration.
+   - If the organization does not use SCIM, visit the following URL, replacing ORGANIZATION with the name of the organization, then follow the prompts to authenticate.
+
+    `https://github.com/orgs/ORGANIZATION/sso`
+
+After you've joined the organization, you can use the enterprise settings to manage your role in the organization, such as becoming an organization owner. For more information, see "[Managing your role with the enterprise settings](#managing-your-role-with-the-enterprise-settings)."

translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/index.md

@@ -27,6 +27,7 @@ children:
   - /viewing-and-managing-a-users-saml-access-to-your-enterprise
   - /auditing-users-across-your-enterprise
   - /impersonating-a-user
+  - /removing-a-member-from-your-enterprise
   - /managing-dormant-users
   - /suspending-and-unsuspending-users
   - /placing-a-legal-hold-on-a-user-or-organization

translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md

@@ -0,0 +1,39 @@
+---
+title: Removing a member from your enterprise
+intro: You can remove a member from all organizations owned by your enterprise.
+permissions: Enterprise owners can remove an enterprise member from the enterprise.
+versions:
+  feature: remove-enterprise-members
+type: how_to
+topics:
+  - Enterprise
+shortTitle: Remove member
+---
+
+{% note %}
+
+**Note:** The ability to remove enterprise members is in beta and subject to change.
+
+{% endnote %}
+
+## About removal of enterprise members
+
+When you remove an enterprise member from your enterprise, the member is removed from all organizations owned by your enterprise.
+
+If the enterprise member you're removing is the last owner of an organization owned by your enterprise, you will become an owner of that organization.
+
+If your enterprise or any of the organizations owned by your enterprise uses an identity provider (IdP) to manage organization membership, the member may be added back to the organization by the IdP. Make sure to also make any necessary changes in your IdP.
+
+## Removing a member from your enterprise
+
+{% note %}
+
+**Note:** If an enterprise member uses only {% data variables.product.prodname_ghe_server %}, and not {% data variables.product.prodname_ghe_cloud %}, you cannot remove the enterprise member this way.
+
+{% endnote %}
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.people-tab %}
+1. To the right of the person you want to remove, select the {% octicon "gear" aria-label="The gear icon" %} dropdown menu and click **Remove from enterprise**.
+
+   ![Screenshot of the "Remove from enterprise" option for an enterprise member](/assets/images/help/business-accounts/remove-member.png)