diff --git a/components/article/PlatformPicker.tsx b/components/article/PlatformPicker.tsx index accb40ae3f..caffe1600c 100644 --- a/components/article/PlatformPicker.tsx +++ b/components/article/PlatformPicker.tsx @@ -1,4 +1,4 @@ -import { useEffect, useState } from 'react' +import { useCallback, useEffect, useState } from 'react' import Cookies from 'js-cookie' import { SubNav, TabNav, UnderlineNav } from '@primer/react' import { sendEvent, EventType } from 'components/lib/events' @@ -7,6 +7,7 @@ import { useRouter } from 'next/router' import { useArticleContext } from 'components/context/ArticleContext' import { parseUserAgent } from 'components/lib/user-agent' +const platformQueryKey = 'platform' const platforms = [ { id: 'mac', label: 'Mac' }, { id: 'windows', label: 'Windows' }, @@ -49,9 +50,10 @@ type Props = { variant?: 'subnav' | 'tabnav' | 'underlinenav' } export const PlatformPicker = ({ variant = 'subnav' }: Props) => { + const router = useRouter() + const { query, asPath, locale } = router const { defaultPlatform, detectedPlatforms } = useArticleContext() const [currentPlatform, setCurrentPlatform] = useState(defaultPlatform || '') - const { asPath } = useRouter() // Run on mount for client-side only features useEffect(() => { @@ -60,7 +62,15 @@ export const PlatformPicker = ({ variant = 'subnav' }: Props) => { userAgent = 'mac' } - const platform = defaultPlatform || Cookies.get('osPreferred') || userAgent || 'linux' + // If it's a valid platform option, set platform from query param + let platform = + query[platformQueryKey] && Array.isArray(query[platformQueryKey]) + ? query[platformQueryKey][0] + : query[platformQueryKey] || '' + if (!platform || !platforms.some((platform) => platform.id === query.platform)) { + platform = defaultPlatform || Cookies.get('osPreferred') || userAgent || 'linux' + } + setCurrentPlatform(platform) // always trigger this on initial render. if the default doesn't change the other useEffect won't fire @@ -75,23 +85,31 @@ export const PlatformPicker = ({ variant = 'subnav' }: Props) => { } }, [currentPlatform, detectedPlatforms.join(',')]) - const onClickPlatform = (platform: string) => { - setCurrentPlatform(platform) + const onClickPlatform = useCallback( + (platform: string) => { + // Set platform in query param without altering other query params + const [pathRoot, pathQuery = ''] = asPath.split('?') + const params = new URLSearchParams(pathQuery) + params.set(platformQueryKey, platform) + router.push({ pathname: pathRoot, query: params.toString() }, undefined, { + shallow: true, + locale, + }) - // imperatively modify the article content - showPlatformSpecificContent(platform) + sendEvent({ + type: EventType.preference, + preference_name: 'os', + preference_value: platform, + }) - sendEvent({ - type: EventType.preference, - preference_name: 'os', - preference_value: platform, - }) - - Cookies.set('osPreferred', platform, { - sameSite: 'strict', - secure: true, - }) - } + Cookies.set('osPreferred', platform, { + sameSite: 'strict', + secure: document.location.protocol !== 'http:', + expires: 365, + }) + }, + [asPath] + ) // only show platforms that are in the current article const platformOptions = platforms.filter((platform) => detectedPlatforms.includes(platform.id)) @@ -128,15 +146,20 @@ export const PlatformPicker = ({ variant = 'subnav' }: Props) => { } if (variant === 'underlinenav') { + const [, pathQuery = ''] = asPath.split('?') + const params = new URLSearchParams(pathQuery) return ( {platformOptions.map((option) => { + params.set(platformQueryKey, option.id) return ( { + onClick={(event) => { + event.preventDefault() onClickPlatform(option.id) }} > diff --git a/components/article/ToolPicker.tsx b/components/article/ToolPicker.tsx index 9549531228..71e7018d73 100644 --- a/components/article/ToolPicker.tsx +++ b/components/article/ToolPicker.tsx @@ -1,4 +1,4 @@ -import { useEffect, useState } from 'react' +import { useCallback, useEffect, useState } from 'react' import { useRouter } from 'next/router' import Cookies from 'js-cookie' import { UnderlineNav } from '@primer/react' @@ -47,11 +47,13 @@ function getDefaultTool(defaultTool: string | undefined, detectedTools: Array { - const { asPath } = useRouter() + const router = useRouter() + const { asPath, query, locale } = router // allTools comes from the ArticleContext which contains the list of tools available const { defaultTool, detectedTools, allTools } = useArticleContext() const [currentTool, setCurrentTool] = useState(getDefaultTool(defaultTool, detectedTools)) @@ -73,38 +75,69 @@ export const ToolPicker = ({ variant = 'subnav' }: Props) => { } }, []) - // Whenever the currentTool is changed, update the article content + // Whenever the currentTool is changed, update the article content or selected tool from query param useEffect(() => { preserveAnchorNodePosition(document, () => { showToolSpecificContent(currentTool, Object.keys(allTools)) }) + + // If tool from query is a valid option, use it + const tool = + query[toolQueryKey] && Array.isArray(query[toolQueryKey]) + ? query[toolQueryKey][0] + : query[toolQueryKey] || '' + if (tool && detectedTools.includes(tool)) { + setCurrentTool(tool) + } }, [currentTool, asPath]) - function onClickTool(tool: string) { - setCurrentTool(tool) - sendEvent({ - type: EventType.preference, - preference_name: 'application', - preference_value: tool, - }) - Cookies.set('toolPreferred', tool, { sameSite: 'strict', secure: true }) - } + const onClickTool = useCallback( + (tool: string) => { + // Set tool in query param without altering other query params + const [pathRoot, pathQuery = ''] = asPath.split('?') + const params = new URLSearchParams(pathQuery) + params.set(toolQueryKey, tool) + router.push({ pathname: pathRoot, query: params.toString() }, undefined, { + shallow: true, + locale, + }) + + sendEvent({ + type: EventType.preference, + preference_name: 'application', + preference_value: tool, + }) + Cookies.set('toolPreferred', tool, { + sameSite: 'strict', + secure: document.location.protocol !== 'http:', + expires: 365, + }) + }, + [asPath] + ) if (variant === 'underlinenav') { + const [, pathQuery = ''] = asPath.split('?') + const params = new URLSearchParams(pathQuery) return ( - {detectedTools.map((tool) => ( - { - onClickTool(tool) - }} - > - {allTools[tool]} - - ))} + {detectedTools.map((tool) => { + params.set(toolQueryKey, tool) + return ( + { + event.preventDefault() + onClickTool(tool) + }} + > + {allTools[tool]} + + ) + })} ) } diff --git a/components/context/MainContext.tsx b/components/context/MainContext.tsx index b4e6d511ce..e06ef3cfcf 100644 --- a/components/context/MainContext.tsx +++ b/components/context/MainContext.tsx @@ -125,7 +125,7 @@ export type MainContextT = { fullUrl: string } -export const getMainContext = (req: any, res: any): MainContextT => { +export const getMainContext = async (req: any, res: any): Promise => { // Our current translation process adds 'ms.*' frontmatter properties to files // it translates including when data/ui.yml is translated. We don't use these // properties and their syntax (e.g. 'ms.openlocfilehash', diff --git a/components/lib/events.ts b/components/lib/events.ts index 7a1758342a..7acfeefc02 100644 --- a/components/lib/events.ts +++ b/components/lib/events.ts @@ -26,7 +26,7 @@ export function getUserEventsId() { if (cookieValue) return cookieValue cookieValue = uuidv4() Cookies.set(COOKIE_NAME, cookieValue, { - secure: true, + secure: document.location.protocol !== 'http:', sameSite: 'strict', expires: 365, }) diff --git a/components/playground/PlaygroundArticlePage.tsx b/components/playground/PlaygroundArticlePage.tsx index 07d4638410..d2ce7a7d12 100644 --- a/components/playground/PlaygroundArticlePage.tsx +++ b/components/playground/PlaygroundArticlePage.tsx @@ -88,7 +88,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => return { props: { - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), }, } } diff --git a/components/rest/RestCodeSamples.tsx b/components/rest/RestCodeSamples.tsx index 5b0e3b6d01..f7938a7092 100644 --- a/components/rest/RestCodeSamples.tsx +++ b/components/rest/RestCodeSamples.tsx @@ -102,7 +102,7 @@ export function RestCodeSamples({ operation, slug }: Props) { setSelectedLanguage(languageKey) Cookies.set('codeSampleLanguagePreferred', languageKey, { sameSite: 'strict', - secure: true, + secure: document.location.protocol !== 'http:', }) } diff --git a/components/sidebar/AllProductsLink.tsx b/components/sidebar/AllProductsLink.tsx index beecbab575..db98f99a13 100644 --- a/components/sidebar/AllProductsLink.tsx +++ b/components/sidebar/AllProductsLink.tsx @@ -1,6 +1,7 @@ import { useRouter } from 'next/router' import { ArrowLeftIcon } from '@primer/octicons-react' import { DEFAULT_VERSION, useVersion } from 'components/hooks/useVersion' +import { Link } from 'components/Link' export const AllProductsLink = () => { const router = useRouter() @@ -9,13 +10,13 @@ export const AllProductsLink = () => { return (
  • - All products - +
    • ) } diff --git a/content/actions/using-workflows/workflow-commands-for-github-actions.md b/content/actions/using-workflows/workflow-commands-for-github-actions.md index 5a6de2d67d..60e836a70a 100644 --- a/content/actions/using-workflows/workflow-commands-for-github-actions.md +++ b/content/actions/using-workflows/workflow-commands-for-github-actions.md @@ -169,6 +169,8 @@ Sets an action's output parameter. Optionally, you can also declare output parameters in an action's metadata file. For more information, see "[Metadata syntax for {% data variables.product.prodname_actions %}](/articles/metadata-syntax-for-github-actions#outputs-for-docker-container-and-javascript-actions)." +You can escape multiline strings for setting an output parameter by creating an environment variable and using it in a workflow command. For more information, see "[Setting an environment variable](#setting-an-environment-variable)." + ### Example: Setting an output parameter {% bash %} diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance.md b/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance.md index 4477b847a8..82d3255404 100644 --- a/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance.md +++ b/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance.md @@ -244,7 +244,11 @@ Optionally, to validate the restore, configure an IP exception list to allow acc {% note %} -**Note:** The network settings are excluded from the backup snapshot. You must manually configure the network on the target {% data variables.product.prodname_ghe_server %} appliance as required for your environment. +**Note:** + +- The network settings are excluded from the backup snapshot. You must manually configure the network on the target {% data variables.product.prodname_ghe_server %} appliance as required for your environment. + +- When restoring to new disks on an existing or empty {% data variables.product.prodname_ghe_server %} instance, stale UUIDs may be present, resulting in Git and/or Alambic replication reporting as out of sync. Stale server entry IDs can be the result of a retired node in a high availability configuration still being present in the application database, but not in the restored replication configuration. To remediate, stale UUIDs can be torn down using `ghe-repl-teardown` once the restore has completed and prior to starting replication. In this scenario, contact {% data variables.contact.contact_ent_support %} for further assistance. {% endnote %} diff --git a/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md b/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md index 203f3fa1fb..bd71918b12 100644 --- a/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md +++ b/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md @@ -1,7 +1,7 @@ --- title: Backing up and restoring GitHub Enterprise Server with GitHub Actions enabled shortTitle: Backing up and restoring -intro: '{% data variables.product.prodname_actions %} data on your external storage provider is not included in regular {% data variables.product.prodname_ghe_server %} backups, and must be backed up separately.' +intro: 'To restore a backup of {% data variables.product.product_location %} when {% data variables.product.prodname_actions %} is enabled, you must configure {% data variables.product.prodname_actions %} before restoring the backup with {% data variables.product.prodname_enterprise_backup_utilities %}.' versions: ghes: '*' type: how_to @@ -13,43 +13,32 @@ topics: redirect_from: - /admin/github-actions/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled --- -{% data reusables.actions.enterprise-storage-ha-backups %} -If you use {% data variables.product.prodname_enterprise_backup_utilities %} to back up {% data variables.product.product_location %}, it's important to note that {% data variables.product.prodname_actions %} data stored on your external storage provider is not included in the backup. +## About backups of {% data variables.product.product_name %} when using {% data variables.product.prodname_actions %} -This is an overview of the steps required to restore {% data variables.product.product_location %} with {% data variables.product.prodname_actions %} to a new appliance: +You can use {% data variables.product.prodname_enterprise_backup_utilities %} to back up and restore the data and configuration for {% data variables.product.product_location %} to a new instance. For more information, see "[Configuring backups on your appliance](/admin/configuration/configuring-backups-on-your-appliance)." -1. Confirm that the original appliance is offline. -1. Manually configure network settings on the replacement {% data variables.product.prodname_ghe_server %} appliance. Network settings are excluded from the backup snapshot, and are not overwritten by `ghe-restore`. -1. To configure the replacement appliance to use the same {% data variables.product.prodname_actions %} external storage configuration as the original appliance, from the new appliance, set the required parameters with `ghe-config` command. - - - Azure Blob Storage - ```shell - ghe-config secrets.actions.storage.blob-provider "azure" - ghe-config secrets.actions.storage.azure.connection-string "_Connection_String_" - ``` - - Amazon S3 - ```shell - ghe-config secrets.actions.storage.blob-provider "s3" - ghe-config secrets.actions.storage.s3.bucket-name "_S3_Bucket_Name" - ghe-config secrets.actions.storage.s3.service-url "_S3_Service_URL_" - ghe-config secrets.actions.storage.s3.access-key-id "_S3_Access_Key_ID_" - ghe-config secrets.actions.storage.s3.access-secret "_S3_Access_Secret_" - ``` - - Optionally, to enable S3 force path style, enter the following command: - ```shell - ghe-config secrets.actions.storage.s3.force-path-style true - ``` - +However, not all the data for {% data variables.product.prodname_actions %} is included in these backups. {% data reusables.actions.enterprise-storage-ha-backups %} -1. Enable {% data variables.product.prodname_actions %} on the replacement appliance. This will connect the replacement appliance to the same external storage for {% data variables.product.prodname_actions %}. +## Restoring a backup of {% data variables.product.product_name %} when {% data variables.product.prodname_actions %} is enabled - ```shell - ghe-config app.actions.enabled true - ghe-config-apply - ``` +To restore a backup of {% data variables.product.product_location %} with {% data variables.product.prodname_actions %}, you must manually configure network settings and external storage on the destination instance before you restore your backup from {% data variables.product.prodname_enterprise_backup_utilities %}. -1. After {% data variables.product.prodname_actions %} is configured and enabled, use the `ghe-restore` command to restore the rest of the data from the backup. For more information, see "[Restoring a backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)." -1. Re-register your self-hosted runners on the replacement appliance. For more information, see [Adding self-hosted runners](/actions/hosting-your-own-runners/adding-self-hosted-runners). +1. Confirm that the source instance is offline. +1. Manually configure network settings on the replacement {% data variables.product.prodname_ghe_server %} instance. Network settings are excluded from the backup snapshot, and are not overwritten by `ghe-restore`. For more information, see "[Configuring network settings](/admin/configuration/configuring-network-settings)." +1. SSH into the destination instance. For more information, see "[Accessing the administrative shell (SSH)](/admin/configuration/accessing-the-administrative-shell-ssh)." -For more information on backing up and restoring {% data variables.product.prodname_ghe_server %}, see "[Configuring backups on your appliance](/admin/configuration/configuring-backups-on-your-appliance)." + ```shell{:copy} + $ ssh -p 122 admin@HOSTNAME + ``` +1. Configure the destination instance to use the same external storage service for {% data variables.product.prodname_actions %} as the source instance by entering one of the following commands. +{% indented_data_reference reusables.actions.configure-storage-provider-platform-commands spaces=3 %} +{% data reusables.actions.configure-storage-provider %} +1. To prepare to enable {% data variables.product.prodname_actions %} on the destination instance, enter the following command. + + ```shell{:copy} + ghe-config app.actions.enabled true + ``` +{% data reusables.actions.apply-configuration-and-enable %} +1. After {% data variables.product.prodname_actions %} is configured and enabled, to restore the rest of the data from the backup, use the `ghe-restore` command. For more information, see "[Restoring a backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)." +1. Re-register your self-hosted runners on the destination instance. For more information, see "[Adding self-hosted runners](/actions/hosting-your-own-runners/adding-self-hosted-runners)." diff --git a/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md b/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md index d82586d25b..6fa069a0f2 100644 --- a/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md +++ b/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md @@ -5,13 +5,14 @@ redirect_from: - /enterprise/admin/installation/setting-up-a-staging-instance - /admin/installation/setting-up-a-staging-instance versions: - ghes: '*' + ghes: "*" type: how_to topics: - Enterprise - Infrastructure - Upgrades shortTitle: Set up a staging instance +miniTocMaxHeadingLevel: 3 --- ## About staging instances @@ -38,10 +39,118 @@ To thoroughly test {% data variables.product.product_name %} and recreate an env ## Setting up a staging instance -1. Perform a backup of your production instance using {% data variables.product.prodname_enterprise_backup_utilities %}. For more information, see the "About {% data variables.product.prodname_enterprise_backup_utilities %}" section of "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance#about-github-enterprise-server-backup-utilities)." -2. Set up a new instance to act as your staging environment. You can use the same guides for provisioning and installing your staging instance as you did for your production instance. For more information, see "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise/admin/guides/installation/setting-up-a-github-enterprise-server-instance/)." -3. Optionally, if you plan to test {% data variables.product.prodname_actions %} functionality in your test environment, review the considerations for your logs and storage. For more information, see "[Using a staging environment](/admin/github-actions/advanced-configuration-and-troubleshooting/using-a-staging-environment)." -4. Restore your backup onto your staging instance. For more information, see the "Restoring a backup" section of "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance#restoring-a-backup)." +You can set up a staging instance from scratch and configure the instance however you like. For more information, see "[Setting up a {% data variables.product.product_name %} instance](/admin/installation/setting-up-a-github-enterprise-server-instance)" and "[Configuring your enterprise](/admin/configuration/configuring-your-enterprise)." + +Alternatively, you can create a staging instance that reflects your production configuration by restoring a backup of your production instance to the staging instance. + +1. [Back up your production instance](#1-back-up-your-production-instance). +2. [Set up a staging instance](#2-set-up-a-staging-instance). +3. [Configure {% data variables.product.prodname_actions %}](#3-configure-github-actions). +4. [Configure {% data variables.product.prodname_registry %}](#4-configure-github-packages). +5. [Restore your production backup](#5-restore-your-production-backup). +6. [Review the instance's configuration](#6-review-the-instances-configuration). +7. [Apply the instance's configuration](#7-apply-the-instances-configuration). + +### 1. Back up your production instance + +If you want to test changes on an instance that contains the same data and configuration as your production instance, back up the data and configuration from the production instance using {% data variables.product.prodname_enterprise_backup_utilities %}. For more information, see "[Configuring backups on your appliance](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance)." + +{% warning %} + +**Warning**: If you use {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} in production, your backup will include your production configuration for external storage. To avoid potential loss of data by writing to your production storage from your staging instance, you must configure each feature in steps 3 and 4 before you restore your backup. + +{% endwarning %} + +### 2. Set up a staging instance + +Set up a new instance to act as your staging environment. You can use the same guides for provisioning and installing your staging instance as you did for your production instance. For more information, see "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise/admin/guides/installation/setting-up-a-github-enterprise-server-instance/)." + +If you plan to restore a backup of your production instance, continue to the next step. Alternatively, you can configure the instance manually and skip the following steps. + +### 3. Configure {% data variables.product.prodname_actions %} + +Optionally, if you use {% data variables.product.prodname_actions %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_actions %}, skip to "[4. Configure {% data variables.product.prodname_registry %}](#4-configure-github-packages)." + +{% warning %} + +**Warning**: If you don't configure {% data variables.product.prodname_actions %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance. For more information, see "[Using a staging environment](/admin/github-actions/advanced-configuration-and-troubleshooting/using-a-staging-environment)." + +{% endwarning %} + +{% data reusables.enterprise_installation.ssh-into-staging-instance %} +1. To configure the staging instance to use an external storage provider for {% data variables.product.prodname_actions %}, enter one of the following commands. +{% indented_data_reference reusables.actions.configure-storage-provider-platform-commands spaces=3 %} +{% data reusables.actions.configure-storage-provider %} +1. To prepare to enable {% data variables.product.prodname_actions %} on the staging instance, enter the following command. + + ```shell{:copy} + ghe-config app.actions.enabled true + ``` + +### 4. Configure {% data variables.product.prodname_registry %} + +Optionally, if you use {% data variables.product.prodname_registry %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_registry %}, skip to "[5. Restore your production backup](#5-restore-your-production-backup)." + +{% warning %} + +**Warning**: If you don't configure {% data variables.product.prodname_actions %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance. + +{% endwarning %} + +1. Review the backup you will restore to the staging instance. + - If you took the backup with {% data variables.product.prodname_enterprise_backup_utilities %} 3.5 or later, the backup includes the configuration for {% data variables.product.prodname_registry %}. Continue to the next step. + - If you took the backup with {% data variables.product.prodname_enterprise_backup_utilities %} 3.4 or earlier, configure {% data variables.product.prodname_registry %} on the staging instance. For more information, see "[Getting started with {% data variables.product.prodname_registry %} for your enterprise](/admin/packages/getting-started-with-github-packages-for-your-enterprise)." +{% data reusables.enterprise_installation.ssh-into-staging-instance %} +1. Configure the external storage connection by entering the following commands, replacing the placeholder values with actual values for your connection. + - Azure Blob Storage: + + ```shell{:copy} + ghe-config secrets.packages.blob-storage-type "azure" + ghe-config secrets.packages.azure-container-name "AZURE CONTAINER NAME" + ghe-config secrets.packages.azure-connection-string "CONNECTION STRING" + ``` + - Amazon S3: + + ```shell{:copy} + ghe-config secrets.packages.blob-storage-type "s3" + ghe-config secrets.packages.service-url "S3 SERVICE URL" + ghe-config secrets.packages.s3-bucket "S3 BUCKET NAME" + ghe-config secrets.packages.aws-access-key "S3 ACCESS KEY ID" + ghe-config secrets.packages.aws-secret-key "S3 ACCESS SECRET" + ``` +1. To prepare to enable {% data variables.product.prodname_registry %} on the staging instance, enter the following command. + + ```shell{:copy} + ghe-config app.packages.enabled true + ``` + +### 5. Restore your production backup + +Use the `ghe-restore` command to restore the rest of the data from the backup. For more information, see "[Restoring a backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)." + +If the staging instance is already configured and you're about to overwrite settings, certificate, and license data, add the `-c` option to the command. For more information about the option, see [Using the backup and restore commands](https://github.com/github/backup-utils/blob/master/docs/usage.md#restoring-settings-tls-certificate-and-license) in the {% data variables.product.prodname_enterprise_backup_utilities %} documentation. + +### 6. Review the instance's configuration + +To access the staging instance using the same hostname, update your local hosts file to resolve the staging instance's hostname by IP address by editing the `/etc/hosts` file in macOS or Linux, or the `C:\Windows\system32\drivers\etc` file in Windows. + +{% note %} + +**Note**: Your staging instance must be accessible from the same hostname as your production instance. Changing the hostname for {% data variables.product.product_location %} is not supported. For more information, see "[Configuring a hostname](/admin/configuration/configuring-network-settings/configuring-a-hostname)." + +{% endnote %} + +Then, review the staging instance's configuration in the {% data variables.enterprise.management_console %}. For more information, see "[Accessing the {% data variables.enterprise.management_console %}](/admin/configuration/configuring-your-enterprise/accessing-the-management-console)." + +{% warning %} + +**Warning**: If you configured {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} for the staging instance, to avoid overwriting production data, ensure that the external storage configuration in the {% data variables.enterprise.management_console %} does not match your production instance. + +{% endwarning %} + +### 7. Apply the instance's configuration + +To apply the configuration from the {% data variables.enterprise.management_console %}, click **Save settings**. ## Further reading diff --git a/content/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry.md b/content/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry.md index 51ae89d06d..f8ef3037ef 100644 --- a/content/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry.md +++ b/content/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry.md @@ -14,23 +14,23 @@ shortTitle: Private image registry A registry is a secure space for storing, managing, and fetching private container images. You may use one to store one or more images. There are many examples of registries, such as {% data variables.product.prodname_container_registry %}, {% data variables.product.prodname_npm_registry %}, Azure Container Registry, or DockerHub. -{% data variables.product.prodname_ghcr_and_npm_registry %} can be configured to allow container images to be pulled seamlessly into {% data variables.product.prodname_github_codespaces %} during codespace creation, without having to provide any authentication credentials. For other image registries, you must create secrets in {% data variables.product.prodname_dotcom %} to store the access details, which will allow {% data variables.product.prodname_github_codespaces %} to access images stored in that registry. +{% data variables.packages.prodname_ghcr_and_npm_registry %} can be configured to allow container images to be pulled seamlessly into {% data variables.product.prodname_github_codespaces %} during codespace creation, without having to provide any authentication credentials. For other image registries, you must create secrets in {% data variables.product.prodname_dotcom %} to store the access details, which will allow {% data variables.product.prodname_github_codespaces %} to access images stored in that registry. -## Accessing images stored in {% data variables.product.prodname_ghcr_and_npm_registry %} +## Accessing images stored in {% data variables.packages.prodname_ghcr_and_npm_registry %} -{% data variables.product.prodname_ghcr_and_npm_registry %} provide the easiest way for {% data variables.product.prodname_github_codespaces %} to consume dev container images. +{% data variables.packages.prodname_ghcr_and_npm_registry %} provide the easiest way for {% data variables.product.prodname_github_codespaces %} to consume dev container images. For more information, see "[Working with the Container registry](/packages/working-with-a-github-packages-registry/working-with-the-container-registry)" and "[Working with the npm registry](/packages/working-with-a-github-packages-registry/working-with-the-npm-registry)". ### Accessing an image published to the same repository as the codespace -If you publish a container image to {% data variables.product.prodname_ghcr_or_npm_registry %} in the same repository that the codespace is being launched in, you will automatically be able to fetch that image on codespace creation. You won't have to provide any additional credentials, unless the **Inherit access from repo** option was unselected when the container image was published. +If you publish a container image to {% data variables.packages.prodname_ghcr_or_npm_registry %} in the same repository that the codespace is being launched in, you will automatically be able to fetch that image on codespace creation. You won't have to provide any additional credentials, unless the **Inherit access from repo** option was unselected when the container image was published. #### Inheriting access from the repository from which an image was published -By default, when you publish a container image to {% data variables.product.prodname_ghcr_or_npm_registry %}, the image inherits the access setting of the repository from which the image was published. For example, if the repository is public, the image is also public. If the repository is private, the image is also private, but is accessible from the repository. +By default, when you publish a container image to {% data variables.packages.prodname_ghcr_or_npm_registry %}, the image inherits the access setting of the repository from which the image was published. For example, if the repository is public, the image is also public. If the repository is private, the image is also private, but is accessible from the repository. -This behavior is controlled by the **Inherit access from repo** option. **Inherit access from repo** is selected by default when publishing via {% data variables.product.prodname_actions %}, but not when publishing directly to {% data variables.product.prodname_ghcr_or_npm_registry %} using a Personal Access Token (PAT). +This behavior is controlled by the **Inherit access from repo** option. **Inherit access from repo** is selected by default when publishing via {% data variables.product.prodname_actions %}, but not when publishing directly to {% data variables.packages.prodname_ghcr_or_npm_registry %} using a Personal Access Token (PAT). If the **Inherit access from repo** option was not selected when the image was published, you can manually add the repository to the published container image's access controls. For more information, see "[Configuring a package's access control and visibility](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility#inheriting-access-for-a-container-image-from-a-repository)." @@ -46,13 +46,13 @@ If you want to allow a subset of an organization's repositories to access a cont ### Publishing a container image from a codespace -Seamless access from a codespace to {% data variables.product.prodname_ghcr_or_npm_registry %} is limited to pulling container images. If you want to publish a container image from inside a codespace, you must use a personal access token (PAT) with the `write:packages` scope. +Seamless access from a codespace to {% data variables.packages.prodname_ghcr_or_npm_registry %} is limited to pulling container images. If you want to publish a container image from inside a codespace, you must use a personal access token (PAT) with the `write:packages` scope. We recommend publishing images via {% data variables.product.prodname_actions %}. For more information, see "[Publishing Docker images](/actions/publishing-packages/publishing-docker-images)" and "[Publishing Node.js packages](/actions/publishing-packages/publishing-nodejs-packages)." ## Accessing images stored in other container registries -If you are accessing a container image from a registry that isn't {% data variables.product.prodname_ghcr_or_npm_registry %}, {% data variables.product.prodname_github_codespaces %} checks for the presence of three secrets, which define the server name, username, and personal access token (PAT) for a container registry. If these secrets are found, {% data variables.product.prodname_github_codespaces %} will make the registry available inside your codespace. +If you are accessing a container image from a registry that isn't {% data variables.packages.prodname_ghcr_or_npm_registry %}, {% data variables.product.prodname_github_codespaces %} checks for the presence of three secrets, which define the server name, username, and personal access token (PAT) for a container registry. If these secrets are found, {% data variables.product.prodname_github_codespaces %} will make the registry available inside your codespace. - `<*>_CONTAINER_REGISTRY_SERVER` - `<*>_CONTAINER_REGISTRY_USER` diff --git a/content/developers/apps/building-oauth-apps/authorizing-oauth-apps.md b/content/developers/apps/building-oauth-apps/authorizing-oauth-apps.md index a0b3a1820c..b6bbec65b2 100644 --- a/content/developers/apps/building-oauth-apps/authorizing-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/authorizing-oauth-apps.md @@ -299,9 +299,9 @@ subdirectory of the callback URL. BAD: http://oauth.example.com:8080/path BAD: http://example.org -### Localhost redirect urls +### Loopback redirect urls -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. +The optional `redirect_uri` parameter can also be used for loopback URLs. If the application specifies a loopback 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. For the `http://127.0.0.1/path` callback URL, you can use this `redirect_uri`: @@ -309,6 +309,8 @@ For the `http://127.0.0.1/path` callback URL, you can use this `redirect_uri`: http://127.0.0.1:1234/path ``` +Note that OAuth RFC [recommends not to use `localhost`](https://datatracker.ietf.org/doc/html/rfc8252#section-7.3), but instead to use loopback literal `127.0.0.1` or IPv6 `::1`. + ## Creating multiple tokens for OAuth Apps You can create multiple tokens for a user/application/scope combination to create tokens for specific use cases. diff --git a/content/get-started/using-github/keyboard-shortcuts.md b/content/get-started/using-github/keyboard-shortcuts.md index f0ef5e37da..63db7352b5 100644 --- a/content/get-started/using-github/keyboard-shortcuts.md +++ b/content/get-started/using-github/keyboard-shortcuts.md @@ -150,7 +150,7 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr | Keyboard shortcut | Description |-----------|------------ -|⌘+f (Mac) or Ctrl+f (Windows/Linux) | Focus filter field +|Command+f (Mac) or Ctrl+f (Windows/Linux) | Focus filter field |← | Move cell focus to the left |→ | Move cell focus to the right |↑ | Move cell focus up @@ -162,7 +162,7 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr |-----------|------------ |Enter | Toggle edit mode for the focused cell |Escape | Cancel editing for the focused cell -|⌘+Shift+\ (Mac) or Ctrl+Shift+\ (Windows/Linux) | Open row actions menu +|Command+Shift+\ (Mac) or Ctrl+Shift+\ (Windows/Linux) | Open row actions menu |Shift+Space | Select item |Space | Open selected item |e | Archive selected items diff --git a/content/get-started/writing-on-github/working-with-advanced-formatting/autolinked-references-and-urls.md b/content/get-started/writing-on-github/working-with-advanced-formatting/autolinked-references-and-urls.md index 658fa51f1c..7898abc4e9 100644 --- a/content/get-started/writing-on-github/working-with-advanced-formatting/autolinked-references-and-urls.md +++ b/content/get-started/writing-on-github/working-with-advanced-formatting/autolinked-references-and-urls.md @@ -52,6 +52,11 @@ The URL of a label can be found by navigating to the labels page and clicking on ```md https://github.com/github/docs/labels/enhancement ``` +{% note %} + +**Note:** If the label name contains a period (`.`), the label will not automatically render from the label URL. + +{% endnote %} ## Commit SHAs diff --git a/content/index.md b/content/index.md index 483ef9a756..07ba324c2a 100644 --- a/content/index.md +++ b/content/index.md @@ -75,6 +75,10 @@ childGroups: octicon: ShieldLockIcon children: - code-security + - code-security/supply-chain-security + - code-security/dependabot + - code-security/code-scanning + - code-security/secret-scanning - name: Client apps octicon: DeviceMobileIcon children: diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md index 00afbd2daa..58f47d8e9d 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md @@ -55,6 +55,13 @@ You can enable or disable features for all repositories. {% data reusables.advanced-security.note-org-enable-uses-seats %} +{% ifversion ghes or ghec or ghae %} +{% note %} + +**Note:** If you encounter an error that reads "GitHub Advanced Security cannot be enabled because of a policy setting for the organization," contact your enterprise admin and ask them to change the GitHub Advanced Security policy for your enterprise. For more information, see "[Enforcing policies for Advanced Security in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise)." +{% endnote %} +{% endif %} + 1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." 2. Under "Code security and analysis", to the right of the feature, click **Disable all** or **Enable all**. {% ifversion ghes or ghec %}The control for "{% data variables.product.prodname_GH_advanced_security %}" is disabled if you have no available seats in your {% data variables.product.prodname_GH_advanced_security %} license.{% endif %} {% ifversion fpt %} @@ -88,7 +95,7 @@ You can enable or disable features for all repositories. {% endif %} {% ifversion ghae or ghes %} -3. Click **Enable/Disable all** or **Enable/Disable for eligible repositories** to confirm the change. +5. Click **Enable/Disable all** or **Enable/Disable for eligible repositories** to confirm the change. ![Button to enable feature for all the eligible repositories in the organization](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-secret-scanning-existing-repos-ghae.png) {% endif %} diff --git a/content/packages/learn-github-packages/about-permissions-for-github-packages.md b/content/packages/learn-github-packages/about-permissions-for-github-packages.md index 18235d4ef4..68dd781bd9 100644 --- a/content/packages/learn-github-packages/about-permissions-for-github-packages.md +++ b/content/packages/learn-github-packages/about-permissions-for-github-packages.md @@ -26,14 +26,14 @@ The {% data variables.product.prodname_registry %} registries below **only** use - Apache Maven registry - NuGet registry -{% ifversion packages-npm-v2 %}For {% data variables.product.prodname_ghcr_and_npm_registry %}, you can choose to allow packages to be scoped to a user, an organization, or linked to a repository.{% endif %} +{% ifversion packages-npm-v2 %}For {% data variables.packages.prodname_ghcr_and_npm_registry %}, you can choose to allow packages to be scoped to a user, an organization, or linked to a repository.{% endif %} {% ifversion fpt or ghec %} ## Granular permissions for user/organization-scoped packages Packages with granular permissions are scoped to a personal user or organization account. You can change the access control and visibility of the package separately from a repository that is connected (or linked) to a package. -Currently, the {% data variables.product.prodname_ghcr_and_npm_registry %} offer granular permissions for your container image packages. +Currently, the {% data variables.packages.prodname_ghcr_and_npm_registry %} offer granular permissions for your container image packages. ## Visibility and access permissions for container images diff --git a/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md b/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md index 536a07b00e..3e7204200c 100644 --- a/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md +++ b/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md @@ -15,7 +15,7 @@ shortTitle: Access control & visibility Packages with granular permissions are scoped to a personal user or organization account. You can change the access control and visibility of a package separately from the repository that it is connected (or linked) to. -Currently, you can only use granular permissions with the {% data variables.product.prodname_ghcr_and_npm_registry %}. Granular permissions are not supported in our other package registries, such as the RubyGems registry.{% ifversion docker-ghcr-enterprise-migration %} For more information about migration to the {% data variables.product.prodname_container_registry %}, see "[Migrating to the {% data variables.product.prodname_container_registry %} from the Docker registry](/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry)."{% endif %} +Currently, you can only use granular permissions with the {% data variables.packages.prodname_ghcr_and_npm_registry %}. Granular permissions are not supported in our other package registries, such as the RubyGems registry.{% ifversion docker-ghcr-enterprise-migration %} For more information about migration to the {% data variables.product.prodname_container_registry %}, see "[Migrating to the {% data variables.product.prodname_container_registry %} from the Docker registry](/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry)."{% endif %} For more information about permissions for repository-scoped packages, packages-related scopes for PATs, or managing permissions for your actions workflows, see "[About permissions for GitHub Packages](/packages/learn-github-packages/about-permissions-for-github-packages)." @@ -105,7 +105,7 @@ To further customize access to your container image, see "[Configuring access to {% ifversion fpt or ghec %} ## Ensuring {% data variables.product.prodname_github_codespaces %} access to your package -By default, a codespace can seamlessly access certain packages in the {% data variables.product.prodname_ghcr_and_npm_registry %}, such as those published in the same repository with the **Inherit access** option selected. For more information on which access is automatically configured, see "[Allowing your codespace to access a private image registry](/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry#accessing-images-stored-in-container-registry-and-npm-registry)." +By default, a codespace can seamlessly access certain packages in the {% data variables.packages.prodname_ghcr_and_npm_registry %}, such as those published in the same repository with the **Inherit access** option selected. For more information on which access is automatically configured, see "[Allowing your codespace to access a private image registry](/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry#accessing-images-stored-in-container-registry-and-npm-registry)." Otherwise, to ensure that a codespace has access to your package, you must grant access to the repository where the codespace is being launched. diff --git a/content/packages/learn-github-packages/deleting-and-restoring-a-package.md b/content/packages/learn-github-packages/deleting-and-restoring-a-package.md index 456eca2565..f3595a34ff 100644 --- a/content/packages/learn-github-packages/deleting-and-restoring-a-package.md +++ b/content/packages/learn-github-packages/deleting-and-restoring-a-package.md @@ -62,7 +62,7 @@ The {% data variables.product.prodname_registry %} registries below **only** use - Apache Maven registry - NuGet registry -{% ifversion packages-npm-v2 %}For {% data variables.product.prodname_ghcr_and_npm_registry %}, you can choose to allow packages to be scoped to a user, an organization, or linked to a repository.{% endif %} +{% ifversion packages-npm-v2 %}For {% data variables.packages.prodname_ghcr_and_npm_registry %}, you can choose to allow packages to be scoped to a user, an organization, or linked to a repository.{% endif %} {% ifversion fpt or ghec %} diff --git a/content/packages/learn-github-packages/introduction-to-github-packages.md b/content/packages/learn-github-packages/introduction-to-github-packages.md index 5450ffcff9..530f6d7efe 100644 --- a/content/packages/learn-github-packages/introduction-to-github-packages.md +++ b/content/packages/learn-github-packages/introduction-to-github-packages.md @@ -51,7 +51,7 @@ For more information about the configuration of {% data variables.product.prodna | | | |--------------------|--------------------| -| Permissions | {% ifversion fpt or ghec %}The permissions for a package are either inherited from the repository where the package is hosted or, for packages in the {% data variables.product.prodname_ghcr_and_npm_registry %}, they can be defined for specific user or organization accounts. For more information, see "[Configuring a package’s access control and visibility](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility)." {% else %}Each package inherits the permissions of the repository where the package is hosted.

    For example, anyone with read permissions for a repository can install a package as a dependency in a project, and anyone with write permissions can publish a new package version.{% endif %} | +| Permissions | {% ifversion fpt or ghec %}The permissions for a package are either inherited from the repository where the package is hosted or, for packages in the {% data variables.packages.prodname_ghcr_and_npm_registry %}, they can be defined for specific user or organization accounts. For more information, see "[Configuring a package’s access control and visibility](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility)." {% else %}Each package inherits the permissions of the repository where the package is hosted.

    For example, anyone with read permissions for a repository can install a package as a dependency in a project, and anyone with write permissions can publish a new package version.{% endif %} | | Visibility | {% data reusables.package_registry.public-or-private-packages %} | For more information, see "[About permissions for {% data variables.product.prodname_registry %}](/packages/learn-github-packages/about-permissions-for-github-packages)." diff --git a/content/packages/learn-github-packages/viewing-packages.md b/content/packages/learn-github-packages/viewing-packages.md index 4c67fda41e..3c239df022 100644 --- a/content/packages/learn-github-packages/viewing-packages.md +++ b/content/packages/learn-github-packages/viewing-packages.md @@ -31,7 +31,7 @@ Repository-scoped packages inherit their permissions and visibility from the rep - NuGet registry {% ifversion fpt or ghec %} -The {% data variables.product.prodname_ghcr_and_npm_registry %} offer you the option of granular permissions and visibility settings that can be customized for each package owned by a personal user or organization account. You can choose to use granular permissions or connect the package to a repository and inherit it's permissions. For more information, see "[Connecting a repository to a package](/packages/learn-github-packages/connecting-a-repository-to-a-package)." +The {% data variables.packages.prodname_ghcr_and_npm_registry %} offer you the option of granular permissions and visibility settings that can be customized for each package owned by a personal user or organization account. You can choose to use granular permissions or connect the package to a repository and inherit it's permissions. For more information, see "[Connecting a repository to a package](/packages/learn-github-packages/connecting-a-repository-to-a-package)." {% endif %} For more information, see "[About permissions for GitHub Packages](/packages/learn-github-packages/about-permissions-for-github-packages){% ifversion fpt or ghec %}" and "[Configuring a package's access control and visibility](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility){% endif %}." diff --git a/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md b/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md index 6b3f8fc7cd..34d324af49 100644 --- a/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md +++ b/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md @@ -24,7 +24,7 @@ shortTitle: Publish & install with Actions You can extend the CI and CD capabilities of your repository by publishing or installing packages as part of your workflow. {% ifversion fpt or ghec %} -### Authenticating to the {% data variables.product.prodname_ghcr_and_npm_registry %} +### Authenticating to the {% data variables.packages.prodname_ghcr_and_npm_registry %} {% data reusables.package_registry.authenticate_with_pat_for_v2_registry %} @@ -40,7 +40,7 @@ You can reference the `GITHUB_TOKEN` in your workflow file using the {% raw %}`{ {% note %} -**Note:** Some registries, such as RubyGems, {% ifversion packages-npm-v2 %}{% else %}npm, {% endif %}Apache Maven, NuGet, {% ifversion fpt or ghec %}and Gradle{% else %}Gradle, and Docker packages that use the package namespace `docker.pkg.github.com`{% endif %}, only allow repository-owned packages. With {% data variables.product.prodname_ghcr_and_npm_registry_full %} you can choose to allow packages to be owned by a user, an organization, or linked to a repository. +**Note:** Some registries, such as RubyGems, {% ifversion packages-npm-v2 %}{% else %}npm, {% endif %}Apache Maven, NuGet, {% ifversion fpt or ghec %}and Gradle{% else %}Gradle, and Docker packages that use the package namespace `docker.pkg.github.com`{% endif %}, only allow repository-owned packages. With {% data variables.packages.prodname_ghcr_and_npm_registry_full %} you can choose to allow packages to be owned by a user, an organization, or linked to a repository. {% endnote %} @@ -49,11 +49,11 @@ When you enable GitHub Actions, GitHub installs a GitHub App on your repository. {% data variables.product.prodname_registry %} allows you to push and pull packages through the `GITHUB_TOKEN` available to a {% data variables.product.prodname_actions %} workflow. {% ifversion fpt or ghec %} -## About permissions and package access for {% data variables.product.prodname_ghcr_and_npm_registry %} +## About permissions and package access for {% data variables.packages.prodname_ghcr_and_npm_registry %} -The {% data variables.product.prodname_ghcr_and_npm_registry_full %} allows users to create and administer packages as free-standing resources at the organization level. Packages can be owned by an organization or personal account and you can customize access to each of your packages separately from repository permissions. +The {% data variables.packages.prodname_ghcr_and_npm_registry_full %} allows users to create and administer packages as free-standing resources at the organization level. Packages can be owned by an organization or personal account and you can customize access to each of your packages separately from repository permissions. -All workflows accessing the {% data variables.product.prodname_ghcr_and_npm_registry %} should use the `GITHUB_TOKEN` instead of a personal access token. For more information about security best practices, see "[Security hardening for GitHub Actions](/actions/learn-github-actions/security-hardening-for-github-actions#using-secrets)." +All workflows accessing the {% data variables.packages.prodname_ghcr_and_npm_registry %} should use the `GITHUB_TOKEN` instead of a personal access token. For more information about security best practices, see "[Security hardening for GitHub Actions](/actions/learn-github-actions/security-hardening-for-github-actions#using-secrets)." ## Default permissions and access settings for containers modified through workflows @@ -486,7 +486,7 @@ Installing packages hosted by {% data variables.product.prodname_registry %} thr {% ifversion fpt or ghec %} ## Upgrading a workflow that accesses a registry using a PAT -The {% data variables.product.prodname_ghcr_and_npm_registry %} support the `GITHUB_TOKEN` for easy and secure authentication in your workflows. If your workflow is using a personal access token (PAT) to authenticate to the registry, then we highly recommend you update your workflow to use the `GITHUB_TOKEN`. +The {% data variables.packages.prodname_ghcr_and_npm_registry %} support the `GITHUB_TOKEN` for easy and secure authentication in your workflows. If your workflow is using a personal access token (PAT) to authenticate to the registry, then we highly recommend you update your workflow to use the `GITHUB_TOKEN`. For more information about the `GITHUB_TOKEN`, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#using-the-github_token-in-a-workflow)." diff --git a/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md b/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md index ea41e01734..ea7aab41cd 100644 --- a/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md +++ b/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md @@ -31,7 +31,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th {% data reusables.command_line.open_the_multi_os_terminal %} 2. Create a bare clone of the repository. ```shell - $ git clone --bare https://{% data variables.command_line.codeblock %}/OLD-REPOSITORY.git/OLD-REPOSITORY.git + $ git clone --bare https://{% data variables.command_line.codeblock %}/EXAMPLE-USER/OLD-REPOSITORY.git ``` 3. Mirror-push to the new repository. ```shell @@ -49,7 +49,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th {% data reusables.command_line.open_the_multi_os_terminal %} 2. Create a bare clone of the repository. Replace the example username with the name of the person or organization who owns the repository, and replace the example repository name with the name of the repository you'd like to duplicate. ```shell - $ git clone --bare https://{% data variables.command_line.codeblock %}/OLD-REPOSITORY.git/OLD-REPOSITORY.git + $ git clone --bare https://{% data variables.command_line.codeblock %}/EXAMPLE-USER/OLD-REPOSITORY.git ``` 3. Navigate to the repository you just cloned. ```shell @@ -61,7 +61,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th ``` 5. Mirror-push to the new repository. ```shell - $ git push --mirror https://{% data variables.command_line.codeblock %}/OLD-REPOSITORY.git/NEW-REPOSITORY.git + $ git push --mirror https://{% data variables.command_line.codeblock %}EXAMPLE-USER/NEW-REPOSITORY.git ``` 6. Push the repository's {% data variables.large_files.product_name_long %} objects to your mirror. ```shell diff --git a/content/repositories/creating-and-managing-repositories/transferring-a-repository.md b/content/repositories/creating-and-managing-repositories/transferring-a-repository.md index 92900222ad..dff4c98d4d 100644 --- a/content/repositories/creating-and-managing-repositories/transferring-a-repository.md +++ b/content/repositories/creating-and-managing-repositories/transferring-a-repository.md @@ -30,7 +30,7 @@ Prerequisites for repository transfers: - When you transfer a repository that you own to another personal account, the new owner will receive a confirmation email.{% ifversion fpt or ghec %} The confirmation email includes instructions for accepting the transfer. If the new owner doesn't accept the transfer within one day, the invitation will expire.{% endif %} - To transfer a repository that you own to an organization, you must have permission to create a repository in the target organization. - The target account must not have a repository with the same name, or a fork in the same network. -- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghes < 3.7 %} +- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghes < 3.7 or ghae %} - Internal repositories can't be transferred.{% endif %} - Private forks can't be transferred. diff --git a/contributing/content-style-guide.md b/contributing/content-style-guide.md index 14b2bd4caf..df6a25fb56 100644 --- a/contributing/content-style-guide.md +++ b/contributing/content-style-guide.md @@ -244,6 +244,7 @@ Introduce links consistently using a standard format that clearly indicates wher For links to other articles in the GitHub docs: `For more information, see "[Page or article title]()."` For links to another section in the same article: `For more information, see "[Header text]()."` For links to specific sections in other articles in the GitHub docs: `For more information, see "[Article title]()."` +For links to an article with a specific tool selected: `For more information, see the TOOLNAME documentation in "[ARTICLE TITLE](/PATH/TO/ARTICLE?tool=TOOLNAME).` For links to external documentation: `For more information, see [Page or article title]() in the X documentation.` Do not include quotation marks within a hyperlink. @@ -283,6 +284,12 @@ To link to a specific header in the same article, use this format: To link to a specific header in a different article, use this format: > For more information, see "[ARTICLE TITLE](path-to-article#HEADER-TITLE)." +### Links to a specific tool + +When we link to content with a specific tool selected, we want to make sure that someone knows that they will be looking at content relevant to a specific tool even if they do not view the tool switcher tabs in the article. + +> For more information, see the TOOLNAME documentation in "[ARTICLE TITLE](/PATH/TO/ARTICLE?tool=TOOLNAME). + ### Links to learning paths Use this format to link to a learning path. diff --git a/contributing/tool-switcher.md b/contributing/tool-switcher.md index 1509409bd3..25c265e1ed 100644 --- a/contributing/tool-switcher.md +++ b/contributing/tool-switcher.md @@ -21,9 +21,9 @@ Do not use the tool switcher just to show examples in different languages. Only ### How to use tool tags Tool tags are Liquid tags that wrap content specific to a tool. For more information on using tool tags in an article, see the [content markup reference](./content-markup-reference.md#tool-tags). -Only include a maximum of eight different tools in an article. Including more tools causes the tool switcher tabs to overflow with an article's table of contents, which prevents people from using either the tool switcher or table of contents. It is unlikely that you will ever need to include eight separate tools in an article. In general, plan to use as few separate tools as possible in an article. +Put tools in alphabetical order. By default, the first tool tag will be selected for an article. You can define a different default tool for an article in the article's frontmatter. For more information, see the [content README](../content/README.md#defaulttool). You can also link to an article with a specific tool selected by adding `?tool=TOOLNAME` to the end of the link. For more information, see the [content style guide](./content-style-guide.md#links-to-a-specific-tool). -Tool tags are displayed alphabetically. You can define a default tool for an article in the article's frontmatter. For more information, see the [content README](../content/README.md#defaulttool). +Only include a maximum of eight different tools in an article. Including more tools causes the tool switcher tabs to overflow with an article's table of contents, which prevents people from using either the tool switcher or table of contents. It is unlikely that you will ever need to include eight separate tools in an article. In general, plan to use as few separate tools as possible in an article. ## Adding new tools If a writer determines that adding a new tool is the only way to accurately document something, they should explain their reasoning in the content planning stage. Whoever reviews content plan should consider if there are any alternative ways to address the documentation need without adding a new tool. If a new tool is the only way to create accurate documentation, the new tool should be added. If there is an alternative content solution that does not add a new tool, that option should be used. diff --git a/data/reusables/actions/apply-configuration-and-enable.md b/data/reusables/actions/apply-configuration-and-enable.md new file mode 100644 index 0000000000..4794ca96fc --- /dev/null +++ b/data/reusables/actions/apply-configuration-and-enable.md @@ -0,0 +1,5 @@ +1. To apply the configuration and enable {% data variables.product.prodname_actions %} to connect to your external storage provider, enter the following command. + + ```shell{:copy} + ghe-config-apply + ``` diff --git a/data/reusables/actions/configure-storage-provider-platform-commands.md b/data/reusables/actions/configure-storage-provider-platform-commands.md new file mode 100644 index 0000000000..7fe2767e34 --- /dev/null +++ b/data/reusables/actions/configure-storage-provider-platform-commands.md @@ -0,0 +1,10 @@ +- Azure Blob Storage: + + ```shell{:copy} + ghe-config secrets.actions.storage.blob-provider "azure" + ``` +- Amazon S3: + + ```shell{:copy} + ghe-config secrets.actions.storage.blob-provider "s3" + ``` diff --git a/data/reusables/actions/configure-storage-provider.md b/data/reusables/actions/configure-storage-provider.md new file mode 100644 index 0000000000..a2858c74b6 --- /dev/null +++ b/data/reusables/actions/configure-storage-provider.md @@ -0,0 +1,20 @@ +1. Configure the external storage connection by entering the following commands, replacing the placeholder values with actual values for your connection. + + - Azure Blob Storage: + + ```shell{:copy} + ghe-config secrets.actions.storage.azure.connection-string "CONNECTION STRING" + ``` + - Amazon S3: + + ```shell{:copy} + ghe-config secrets.actions.storage.s3.bucket-name "S3 BUCKET NAME" + ghe-config secrets.actions.storage.s3.service-url "S3 SERVICE URL" + ghe-config secrets.actions.storage.s3.access-key-id "S3 ACCESS KEY ID" + ghe-config secrets.actions.storage.s3.access-secret "S3 ACCESS SECRET" + ``` + Optionally, to force path-style addressing for S3, also enter the following command. + + ```shell{:copy} + ghe-config secrets.actions.storage.s3.force-path-style true + ``` diff --git a/data/reusables/enterprise_installation/ssh-into-staging-instance.md b/data/reusables/enterprise_installation/ssh-into-staging-instance.md new file mode 100644 index 0000000000..017373c533 --- /dev/null +++ b/data/reusables/enterprise_installation/ssh-into-staging-instance.md @@ -0,0 +1,5 @@ +1. SSH into the staging instance. For more information, see "[Accessing the administrative shell (SSH)](/admin/configuration/accessing-the-administrative-shell-ssh)." + + ```shell{:copy} + $ ssh -p 122 admin@HOSTNAME + ``` diff --git a/data/variables/packages.yml b/data/variables/packages.yml new file mode 100644 index 0000000000..edb27e50e2 --- /dev/null +++ b/data/variables/packages.yml @@ -0,0 +1,3 @@ +prodname_ghcr_and_npm_registry: '{% data variables.product.prodname_container_registry %}{% ifversion packages-npm-v2 %} and {% data variables.product.prodname_npm_registry %}{% endif %}' +prodname_ghcr_or_npm_registry: '{% data variables.product.prodname_container_registry %}{% ifversion packages-npm-v2 %} or {% data variables.product.prodname_npm_registry %}{% endif %}' +prodname_ghcr_and_npm_registry_full: '{% data variables.product.prodname_container_registry %} (`ghcr.io`){% ifversion packages-npm-v2 %} and {% data variables.product.prodname_npm_registry %} (`npm.pkg.github.com`){% endif %}' diff --git a/data/variables/product.yml b/data/variables/product.yml index 341d7a62a1..769d6949b3 100644 --- a/data/variables/product.yml +++ b/data/variables/product.yml @@ -140,9 +140,6 @@ prodname_container_registries: 'Container registries' prodname_docker_registry_namespace: '{% ifversion fpt or ghec %}`docker.pkg.github.com`{% elsif ghes or ghae %}docker.HOSTNAME{% endif %}' prodname_container_registry_namespace: '{% ifversion fpt or ghec %}`ghcr.io`{% elsif ghes or ghae %}containers.HOSTNAME{% endif %}' prodname_npm_registry: 'npm registry' -prodname_ghcr_and_npm_registry: '{% data variables.product.prodname_container_registry %}{% ifversion packages-npm-v2 %} and {% data variables.product.prodname_npm_registry %}{% endif %}' -prodname_ghcr_or_npm_registry: '{% data variables.product.prodname_container_registry %}{% ifversion packages-npm-v2 %} or {% data variables.product.prodname_npm_registry %}{% endif %}' -prodname_ghcr_and_npm_registry_full: '{% data variables.product.prodname_container_registry %} (`ghcr.io`){% ifversion packages-npm-v2 %} and {% data variables.product.prodname_npm_registry %} (`npm.pkg.github.com`){% endif %}' # GitHub Insights prodname_insights: 'GitHub Insights' diff --git a/lib/all-products.js b/lib/all-products.js index 7364b34cba..1593436582 100644 --- a/lib/all-products.js +++ b/lib/all-products.js @@ -9,7 +9,6 @@ const homepage = path.posix.join(process.cwd(), 'content/index.md') const { data } = frontmatter(await fs.readFile(homepage, 'utf8')) export const productIds = data.children -export const productGroups = [] const externalProducts = data.externalProducts const internalProducts = {} @@ -45,17 +44,39 @@ for (const productId of productIds) { export const productMap = Object.assign({}, internalProducts, externalProducts) -for (const group of data.childGroups) { - productGroups.push({ - name: group.name, - icon: group.icon || null, - octicon: group.octicon || null, - children: group.children.map((id) => productMap[id]), +function getPage(id, lang, pageMap) { + const productId = id.split('/')[0] + const product = productMap[productId] + const href = removeFPTFromPath(path.posix.join('/', lang, product.versions[0], id)) + const page = pageMap[href] + if (!page) { + throw new Error( + `Unable to find a page by the href '${href}'. Review your 'childGroups' frontmatter maybe.` + ) + } + // Return only the props needed for the ProductSelectionCard, since + // that's the only place this is ever used. + return { + id, + name: page.shortTitle || page.title, + href: href.replace(`/${lang}/`, '/'), + versions: page.applicableVersions, + } +} + +export function getProductGroups(pageMap, lang) { + return data.childGroups.map((group) => { + return { + name: group.name, + icon: group.icon || null, + octicon: group.octicon || null, + // Typically the children are product IDs, but we support deeper page paths too + children: group.children.map((id) => productMap[id] || getPage(id, lang, pageMap)), + } }) } export default { productIds, productMap, - productGroups, } diff --git a/lib/search/indexes/github-docs-3.2-cn-records.json.br b/lib/search/indexes/github-docs-3.2-cn-records.json.br index 6a6f4cec7b..a5e2719a6f 100644 --- a/lib/search/indexes/github-docs-3.2-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.2-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9096abc19fd610cb2c8c378d5c0d7077f835b860c33a75863bc2c1b4b045e03 -size 786003 +oid sha256:e3337f502268d39fb00cac7d3b2c92b4ad2b3b9329e13fd54c842413af2428f5 +size 785792 diff --git a/lib/search/indexes/github-docs-3.2-cn.json.br b/lib/search/indexes/github-docs-3.2-cn.json.br index 5e57b6e424..9c93507d6e 100644 --- a/lib/search/indexes/github-docs-3.2-cn.json.br +++ b/lib/search/indexes/github-docs-3.2-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0884a8ad90a41d235ec6bd6fe605fff7e289fb547d09d3d8cbf9393cb6edd387 -size 1630652 +oid sha256:a6f33647ebd5323232c6660277e75d65431ce548facc623b4b50f4862d47a0f3 +size 1638014 diff --git a/lib/search/indexes/github-docs-3.2-en-records.json.br b/lib/search/indexes/github-docs-3.2-en-records.json.br index 803c747c39..72394beda0 100644 --- a/lib/search/indexes/github-docs-3.2-en-records.json.br +++ b/lib/search/indexes/github-docs-3.2-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab00fe69f597263829db37b9d7b3bae58bc8f61d88c6e5321d5e6958297eed95 -size 1099589 +oid sha256:f5762b7accf53bd01842e6f41129e5cfe30588a86f9c395f9f7d6f3c05e59a7f +size 1100546 diff --git a/lib/search/indexes/github-docs-3.2-en.json.br b/lib/search/indexes/github-docs-3.2-en.json.br index f402ac4129..70e4217ee6 100644 --- a/lib/search/indexes/github-docs-3.2-en.json.br +++ b/lib/search/indexes/github-docs-3.2-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d78910956c2b829e4f56f827e59fae859fa6d1c15c31503b08bf8652f920935 -size 4478960 +oid sha256:3849b289dced75fa8b31853c76f7c12ce6353aaff8cd0e2f8dc0f95fb4f22002 +size 4482669 diff --git a/lib/search/indexes/github-docs-3.2-es-records.json.br b/lib/search/indexes/github-docs-3.2-es-records.json.br index 9ecf559f10..46acc5d8c2 100644 --- a/lib/search/indexes/github-docs-3.2-es-records.json.br +++ b/lib/search/indexes/github-docs-3.2-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da0b309bc6a27026ec18ce162c6a6de30c55105735763c874b61c9938c3708ac -size 746101 +oid sha256:452e86d5533ccb3cef463a1d7331d73a7992cbbdb73e9069bca3e9d39ab17239 +size 746044 diff --git a/lib/search/indexes/github-docs-3.2-es.json.br b/lib/search/indexes/github-docs-3.2-es.json.br index 7897c0a889..322753111e 100644 --- a/lib/search/indexes/github-docs-3.2-es.json.br +++ b/lib/search/indexes/github-docs-3.2-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39aa481f3887f2bc987f836ea792c29a2cb2be6e3dbf358e27ef4b0765581d4f -size 3142042 +oid sha256:970995438a0659edbbd085692c02abb262c6fdcec33bbae1a9f67df6ba159b88 +size 3141561 diff --git a/lib/search/indexes/github-docs-3.2-ja-records.json.br b/lib/search/indexes/github-docs-3.2-ja-records.json.br index 3819743a7f..6807a35d25 100644 --- a/lib/search/indexes/github-docs-3.2-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.2-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:980fac67fe917f30d363194355b93d312aa0cf954861fe67a9eb6ef9b3c0e251 -size 827933 +oid sha256:b2177add6f5e5b86af5a28dd93bf19fd1359375f6465b3140bfd70661c7f86f3 +size 827391 diff --git a/lib/search/indexes/github-docs-3.2-ja.json.br b/lib/search/indexes/github-docs-3.2-ja.json.br index 1336e110e8..24eab24f4d 100644 --- a/lib/search/indexes/github-docs-3.2-ja.json.br +++ b/lib/search/indexes/github-docs-3.2-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12ef167343058a348ab92ea1313bde32aa78b8e36e14b0afdae68cce5a835dd4 -size 4409805 +oid sha256:5e9b204a4ea983ff4228f6f41cc07f138c287e180c4c705424f2df62c2831e92 +size 4411342 diff --git a/lib/search/indexes/github-docs-3.2-pt-records.json.br b/lib/search/indexes/github-docs-3.2-pt-records.json.br index 4cbd679a78..f923b9a4f3 100644 --- a/lib/search/indexes/github-docs-3.2-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.2-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a62ed478cbcf2c5f9075ab3d3df616c8f6f15d0ddbcab132c35f37c760f694d6 -size 732706 +oid sha256:da79154b9e898c6daf75892c3dc6a4092613c950ae690c7f16aeed976a60c85d +size 733267 diff --git a/lib/search/indexes/github-docs-3.2-pt.json.br b/lib/search/indexes/github-docs-3.2-pt.json.br index 0ffba0728e..7526da39c1 100644 --- a/lib/search/indexes/github-docs-3.2-pt.json.br +++ b/lib/search/indexes/github-docs-3.2-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c202dbca2f807dba0e0b3aca6d5aaa568b94e57bb330ed6efb7b4a81cc880a3 -size 3121273 +oid sha256:90718e28d4039003ee4f1bf91e3f285ac1a68fcaca1c4ee1c8bf87ab4fe3bda9 +size 3129162 diff --git a/lib/search/indexes/github-docs-3.3-cn-records.json.br b/lib/search/indexes/github-docs-3.3-cn-records.json.br index 8342b71f91..4e13fe1ab1 100644 --- a/lib/search/indexes/github-docs-3.3-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.3-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c77d4522bc469b32042ef2ac0f44f7a982a614a23d622655c368d70d0e7ec943 -size 810633 +oid sha256:5923ade9c95a9cde3df8d409b3ec1929f6ef4459fd5280590932b5e28ddd0721 +size 810225 diff --git a/lib/search/indexes/github-docs-3.3-cn.json.br b/lib/search/indexes/github-docs-3.3-cn.json.br index bdc8c2dd02..d3067741b8 100644 --- a/lib/search/indexes/github-docs-3.3-cn.json.br +++ b/lib/search/indexes/github-docs-3.3-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca512db457beca47d4a40bd2b11c3a2e6e5aa53d6b85cfbf87b841f39df18954 -size 1685649 +oid sha256:b4045e61bb5df9ec00684ef8cf4cb5e02db0b9f3a020bdb8df4667ca5b6ff07a +size 1692440 diff --git a/lib/search/indexes/github-docs-3.3-en-records.json.br b/lib/search/indexes/github-docs-3.3-en-records.json.br index bdf7d4ca0f..655933245d 100644 --- a/lib/search/indexes/github-docs-3.3-en-records.json.br +++ b/lib/search/indexes/github-docs-3.3-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc71cf691842f4dc241fe0482d63c1289b3965f7b969f06fbffbb40d2228dea9 -size 1135008 +oid sha256:b547e4dab5e263d38bb43d3e265c0a7e43bc9cc00026a3fbd39290cf25fff74c +size 1136187 diff --git a/lib/search/indexes/github-docs-3.3-en.json.br b/lib/search/indexes/github-docs-3.3-en.json.br index ebadf808d6..58153b37de 100644 --- a/lib/search/indexes/github-docs-3.3-en.json.br +++ b/lib/search/indexes/github-docs-3.3-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b84dbbabccd2d09985a4603ecb0b1016225361dd1efc4de7315366a2d975de36 -size 4582285 +oid sha256:d9c0dd5120b89971a2eafd1028269975fade4409de6f396d1e5e6fa747d52e62 +size 4587661 diff --git a/lib/search/indexes/github-docs-3.3-es-records.json.br b/lib/search/indexes/github-docs-3.3-es-records.json.br index 06b27eb464..eb181fe3e4 100644 --- a/lib/search/indexes/github-docs-3.3-es-records.json.br +++ b/lib/search/indexes/github-docs-3.3-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80dc0685bedd1efd5143e2c77d94a59debb954452e73f3f7c22fb89ac5431737 -size 767877 +oid sha256:d373b957a01b0327d2c541825b1e5394b20e480a6a4bd4d58eb49d92e39f17d4 +size 767911 diff --git a/lib/search/indexes/github-docs-3.3-es.json.br b/lib/search/indexes/github-docs-3.3-es.json.br index fcbf48d0fe..cc947abeb8 100644 --- a/lib/search/indexes/github-docs-3.3-es.json.br +++ b/lib/search/indexes/github-docs-3.3-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17bae625525e5b516ecc520bf67eeb197fba396d1ce45ceb40d6571fa2ff81d6 -size 3237456 +oid sha256:17c72e78b46b74c65f75ab5d52e7e697e51808f13f0f0c2dc301d768672fb5ce +size 3237827 diff --git a/lib/search/indexes/github-docs-3.3-ja-records.json.br b/lib/search/indexes/github-docs-3.3-ja-records.json.br index 2f561e164c..8fe10d2126 100644 --- a/lib/search/indexes/github-docs-3.3-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.3-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:855961eb32d07c31f8b2d295ef29668e61470aac07e6f5b3575d3155006b22b7 -size 851931 +oid sha256:56b9a4884bbe4ca85c0a0cd07dbe7dd5c2b9eb6dd1e71aa5984e7b35444051c2 +size 851382 diff --git a/lib/search/indexes/github-docs-3.3-ja.json.br b/lib/search/indexes/github-docs-3.3-ja.json.br index 7c10c931cd..470d0c4d46 100644 --- a/lib/search/indexes/github-docs-3.3-ja.json.br +++ b/lib/search/indexes/github-docs-3.3-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5be3c66cd67b98240116da453ea79c63071018a129197727d4838bf0342ac666 -size 4542292 +oid sha256:2e3fc1f95cca587876890217aac6a0cbbce525c44f5083d231d6d94bb728aa5b +size 4542530 diff --git a/lib/search/indexes/github-docs-3.3-pt-records.json.br b/lib/search/indexes/github-docs-3.3-pt-records.json.br index b6bdcfccfa..d65e0388b4 100644 --- a/lib/search/indexes/github-docs-3.3-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.3-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35dc56508a5caffce4ab40daca63c0b7c00bd37ac71694437a706ea97c1cb461 -size 754685 +oid sha256:4442d4e9dfbc51aea51604571ae255c7aa3867a2a6fb15830213534e9df906f3 +size 755353 diff --git a/lib/search/indexes/github-docs-3.3-pt.json.br b/lib/search/indexes/github-docs-3.3-pt.json.br index 6a8fa85644..705d8a0ef4 100644 --- a/lib/search/indexes/github-docs-3.3-pt.json.br +++ b/lib/search/indexes/github-docs-3.3-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ab871585edd6174f62ff09a3c19e54c22f6b5de17b4c0e39e8487d1dccb0326 -size 3216725 +oid sha256:0cc5bf7ff22eff172f3d6a36c3cbca68d65e8cb5393a0af466019d68061558ee +size 3224926 diff --git a/lib/search/indexes/github-docs-3.4-cn-records.json.br b/lib/search/indexes/github-docs-3.4-cn-records.json.br index 9fa525c211..73d2e9d0c6 100644 --- a/lib/search/indexes/github-docs-3.4-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.4-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fd4cc833041309f5e2d53098c83286fd2af7ffd44beefb60a316f5981098148 -size 813051 +oid sha256:dbcd9f92528219cc625c4cc5f42d96a3bc5a1b83357fe65e5cba31cf9cfd9aa3 +size 812639 diff --git a/lib/search/indexes/github-docs-3.4-cn.json.br b/lib/search/indexes/github-docs-3.4-cn.json.br index 6caac38be9..cd3c6c744d 100644 --- a/lib/search/indexes/github-docs-3.4-cn.json.br +++ b/lib/search/indexes/github-docs-3.4-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bee13ea3722970fda5807751fc476f28fc2d4a31b578117eab255d6f33e9db2c -size 1699643 +oid sha256:f77cf3854a977218aab4b619e0eee8fbf10395ebc08c1195ae6fe18cf78ec8a3 +size 1705165 diff --git a/lib/search/indexes/github-docs-3.4-en-records.json.br b/lib/search/indexes/github-docs-3.4-en-records.json.br index 976284eeab..333226231e 100644 --- a/lib/search/indexes/github-docs-3.4-en-records.json.br +++ b/lib/search/indexes/github-docs-3.4-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbbcdcd683bebd293ebe299aedf6f38d83782cefc799163d6633a9e24b4cd3f1 -size 1146781 +oid sha256:6e8d742054ea3c1a31e2d7de30eec9676c37210f6a0b7ffcd5a560a5152c30cb +size 1148099 diff --git a/lib/search/indexes/github-docs-3.4-en.json.br b/lib/search/indexes/github-docs-3.4-en.json.br index f6d6da073b..34532e0567 100644 --- a/lib/search/indexes/github-docs-3.4-en.json.br +++ b/lib/search/indexes/github-docs-3.4-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abfd69b8825f97959862e74b69277c1db34a790b860475b82228b3e63ef2913b -size 4643472 +oid sha256:7bd281be76840d903d97ed582b09cbb92745f2daf2f06d11447248701bb64dae +size 4648724 diff --git a/lib/search/indexes/github-docs-3.4-es-records.json.br b/lib/search/indexes/github-docs-3.4-es-records.json.br index a7e74c998b..90284ac51f 100644 --- a/lib/search/indexes/github-docs-3.4-es-records.json.br +++ b/lib/search/indexes/github-docs-3.4-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88fbd9119f40dbff772c574458e68bccb16c53314f3f826124a23b4ab5ab2042 -size 772341 +oid sha256:289aeca42f0779e938debf79b0dcc890b8d93d99b74a36c58ee431e77559e18b +size 772262 diff --git a/lib/search/indexes/github-docs-3.4-es.json.br b/lib/search/indexes/github-docs-3.4-es.json.br index cb379e2db8..e31c0e85c0 100644 --- a/lib/search/indexes/github-docs-3.4-es.json.br +++ b/lib/search/indexes/github-docs-3.4-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9918c3cd701985bba37cc248f6c779d7741f42d30e25e8bd0564c0ac03f220f2 -size 3265286 +oid sha256:d0811c80d6fb1c3ae7c4b4a82d3f0ca17962a8ef713aaa65ec56bca119b903b1 +size 3264921 diff --git a/lib/search/indexes/github-docs-3.4-ja-records.json.br b/lib/search/indexes/github-docs-3.4-ja-records.json.br index 1adc439b62..38919e0d43 100644 --- a/lib/search/indexes/github-docs-3.4-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.4-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d487f6da1d11951bec00c357182ca85f08647cf23d4fdcd51da9398d84748ec -size 854038 +oid sha256:dd5b5961acab7183175222780aac627d202ec174e7c9fa0b4624b3510a450b81 +size 853387 diff --git a/lib/search/indexes/github-docs-3.4-ja.json.br b/lib/search/indexes/github-docs-3.4-ja.json.br index deee2dbe80..546a34176e 100644 --- a/lib/search/indexes/github-docs-3.4-ja.json.br +++ b/lib/search/indexes/github-docs-3.4-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c58ea624b7895c9464761015c63bbe441bf36639c0e0dc5baa97d5c3e40bdd9 -size 4569229 +oid sha256:9a34817a47c789dfc68a2bb36fc5606ef058a07f8f8cff63e5b109f16a0fe78a +size 4570550 diff --git a/lib/search/indexes/github-docs-3.4-pt-records.json.br b/lib/search/indexes/github-docs-3.4-pt-records.json.br index 9f7a7e4523..ffe9a882ca 100644 --- a/lib/search/indexes/github-docs-3.4-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.4-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec3d7668f1432ac51651e86b6aa80e4dc6f8d3e2e22d2f60471bdcdf39cd5c2d -size 759020 +oid sha256:0fc9779a23c39f7e54a9f2a5e5022d909c5e9d13f1d0815826a30279f9a3bda8 +size 759699 diff --git a/lib/search/indexes/github-docs-3.4-pt.json.br b/lib/search/indexes/github-docs-3.4-pt.json.br index 79ddd7ecea..5009811618 100644 --- a/lib/search/indexes/github-docs-3.4-pt.json.br +++ b/lib/search/indexes/github-docs-3.4-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4d8155075eb8900f2906bedba8964d0b829266ea43281da1310a9ebd2ccd940 -size 3243989 +oid sha256:8b8b18f480045173ed73d39c18de8f164cd498707e2ecf0a12f4d5c4f9734857 +size 3252156 diff --git a/lib/search/indexes/github-docs-3.5-cn-records.json.br b/lib/search/indexes/github-docs-3.5-cn-records.json.br index 8594e6216a..a7704578a0 100644 --- a/lib/search/indexes/github-docs-3.5-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.5-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0eaf44546b00de93b7d55514bd22feac01f10032a5730f4cef0a6bcd01273fc -size 843361 +oid sha256:1303ed5ef099d89d438a5908cc4b50097a5db0f5cc41d7509ff86e9cb710236e +size 843003 diff --git a/lib/search/indexes/github-docs-3.5-cn.json.br b/lib/search/indexes/github-docs-3.5-cn.json.br index c119f13e96..ad08d10172 100644 --- a/lib/search/indexes/github-docs-3.5-cn.json.br +++ b/lib/search/indexes/github-docs-3.5-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a79db220285e4cef8e1d512753035ac5ebea83a17e7e14b3d6c5680bc217135 -size 1764779 +oid sha256:fb1c86f031c5031a5dfd46a2f7a615f656724937861b32167ca7269e4ab8f625 +size 1772730 diff --git a/lib/search/indexes/github-docs-3.5-en-records.json.br b/lib/search/indexes/github-docs-3.5-en-records.json.br index 995c517d8f..06b4f90a59 100644 --- a/lib/search/indexes/github-docs-3.5-en-records.json.br +++ b/lib/search/indexes/github-docs-3.5-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee4699f8d37add278bcc1c847dba45a586fbf395f579f269fa4ae650db2ceda3 -size 1186653 +oid sha256:36c9b86da28da29b6f01aba1c5d4bbbe6845a12c90d01637dfb4570243aeed0e +size 1188580 diff --git a/lib/search/indexes/github-docs-3.5-en.json.br b/lib/search/indexes/github-docs-3.5-en.json.br index 1c2f314735..abb88cc01e 100644 --- a/lib/search/indexes/github-docs-3.5-en.json.br +++ b/lib/search/indexes/github-docs-3.5-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd73134bddefff82090ca8efb4c290c752ea0ffb7a3b52042e96af76b5b9b57a -size 4809378 +oid sha256:d5993965d46d722314526978073f94febeb0e94691dbaa34afec22e848d9699a +size 4815131 diff --git a/lib/search/indexes/github-docs-3.5-es-records.json.br b/lib/search/indexes/github-docs-3.5-es-records.json.br index 29453bfbbd..57d3f52fc1 100644 --- a/lib/search/indexes/github-docs-3.5-es-records.json.br +++ b/lib/search/indexes/github-docs-3.5-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05d46b30080f7e90b6fe4c0acfddc2efb19bcec26e59eec1947b1492313772e9 -size 797266 +oid sha256:c38f1532f24a3773359cbceaa726ce60302d9ac42a717eac4f824277cbfeac4d +size 797234 diff --git a/lib/search/indexes/github-docs-3.5-es.json.br b/lib/search/indexes/github-docs-3.5-es.json.br index 8141a83d52..44c02ab0e9 100644 --- a/lib/search/indexes/github-docs-3.5-es.json.br +++ b/lib/search/indexes/github-docs-3.5-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1163a399c98b0fc399c30034a18690f77529ec4e34a7feff063bec888d163cb8 -size 3378998 +oid sha256:722675f82df860f8a33fe7dc4112d3d225ee4f452929cff1c41010ef7a74b28a +size 3378885 diff --git a/lib/search/indexes/github-docs-3.5-ja-records.json.br b/lib/search/indexes/github-docs-3.5-ja-records.json.br index 23d9c0af2e..ffc7a7c8d2 100644 --- a/lib/search/indexes/github-docs-3.5-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.5-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d82f9243272f643e5a582df2c1e4ef9064735e975bfaceb2354e4f80cd4d5ce -size 884316 +oid sha256:0de5f148b11b0d5992240461a60099139edb2a5f1f9dcc0460c2852c82a0d03d +size 883437 diff --git a/lib/search/indexes/github-docs-3.5-ja.json.br b/lib/search/indexes/github-docs-3.5-ja.json.br index be841fa503..cd809c327a 100644 --- a/lib/search/indexes/github-docs-3.5-ja.json.br +++ b/lib/search/indexes/github-docs-3.5-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb91fc4c28fc13d034553b04d374e6f127743175c028caa57e2368823e09dca6 -size 4738783 +oid sha256:7552b90afcadc9ebf2d0c3c7ecc65dd1bead061aa0a859fec0785f21202d4214 +size 4739901 diff --git a/lib/search/indexes/github-docs-3.5-pt-records.json.br b/lib/search/indexes/github-docs-3.5-pt-records.json.br index d1bc51e9b4..416b18b6aa 100644 --- a/lib/search/indexes/github-docs-3.5-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.5-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93bc7f3b60aa5d82a39d2f5e013147aa2dd1aafd11b0c16c7fc115fb90b170ed -size 783979 +oid sha256:a101dbe68f7c67f48996525becd9be401f68cb64f2575539d33de2cbda7e6d25 +size 784871 diff --git a/lib/search/indexes/github-docs-3.5-pt.json.br b/lib/search/indexes/github-docs-3.5-pt.json.br index 8e5e166b1c..6c59b69c8d 100644 --- a/lib/search/indexes/github-docs-3.5-pt.json.br +++ b/lib/search/indexes/github-docs-3.5-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:676e39af3e90266af9ffcc17ca92d781ab5022ac577712a578470495e755fae3 -size 3359612 +oid sha256:4afa9d28aa0c2a37502cf4b54713590e9ab10f9b08d40e4ccc10306e62070749 +size 3368220 diff --git a/lib/search/indexes/github-docs-3.6-cn-records.json.br b/lib/search/indexes/github-docs-3.6-cn-records.json.br index 10fe5d96f3..0a01599709 100644 --- a/lib/search/indexes/github-docs-3.6-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.6-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76a1f842ffbbb68b7e3c6b04fb31a5eb11c7c31fa920d77597f5fec23517887d -size 866621 +oid sha256:5e48834c77e75a328a6563af6993e2fe358277805ab9164db7db9c4d2c90074c +size 866217 diff --git a/lib/search/indexes/github-docs-3.6-cn.json.br b/lib/search/indexes/github-docs-3.6-cn.json.br index 58e721d0e2..0b71da44cd 100644 --- a/lib/search/indexes/github-docs-3.6-cn.json.br +++ b/lib/search/indexes/github-docs-3.6-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8146cec763166aa18dc6278f5bd979e5a2c347742e35172a950bf2ac97da60cf -size 1808306 +oid sha256:4f9c144f23a8c31c7c15d089c91f7d7585c1c3f8ce14c9a4a44814513db17b07 +size 1814534 diff --git a/lib/search/indexes/github-docs-3.6-en-records.json.br b/lib/search/indexes/github-docs-3.6-en-records.json.br index 9ea785af76..f25a0afe43 100644 --- a/lib/search/indexes/github-docs-3.6-en-records.json.br +++ b/lib/search/indexes/github-docs-3.6-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25f4fbc47c229a25ade293b28aa25ec2467bf4656b42942f424972b7b19fb855 -size 1221723 +oid sha256:70779311088c2496d68b7f90d5817bde76e34b3b3789c188a663928d21b9e5eb +size 1223030 diff --git a/lib/search/indexes/github-docs-3.6-en.json.br b/lib/search/indexes/github-docs-3.6-en.json.br index b316675ce8..86bd1ad241 100644 --- a/lib/search/indexes/github-docs-3.6-en.json.br +++ b/lib/search/indexes/github-docs-3.6-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b06e2935958c29f88be24ac4715e05f4427ad6d701f85000cd3c7f8113b3488d -size 4948058 +oid sha256:785e5ab9eaac5f5a1f6df8da5a8c50bd7764467c1dbd2f74a0708a79531e475e +size 4952533 diff --git a/lib/search/indexes/github-docs-3.6-es-records.json.br b/lib/search/indexes/github-docs-3.6-es-records.json.br index 7f9cf91b56..cfe30ba8f4 100644 --- a/lib/search/indexes/github-docs-3.6-es-records.json.br +++ b/lib/search/indexes/github-docs-3.6-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72a393ee06ec8ce9ba5da70188377022d768e2d29b485972d4ccde006d49d3d8 -size 821195 +oid sha256:03d26aa9cfb112ecdb7053fed2dc01c2262096965e4c43c9e6f4c1e4a0009e68 +size 821186 diff --git a/lib/search/indexes/github-docs-3.6-es.json.br b/lib/search/indexes/github-docs-3.6-es.json.br index 7a1585dd20..14d09e86bd 100644 --- a/lib/search/indexes/github-docs-3.6-es.json.br +++ b/lib/search/indexes/github-docs-3.6-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d077f03870a4658c4d6454a4100680ae367b7e871f0afcbd75fddc8a49050e93 -size 3486648 +oid sha256:8fc5d70be211d1329ea09351e8f7abfd921d2fedb7b5cd7c55027ef50fd83e0e +size 3486385 diff --git a/lib/search/indexes/github-docs-3.6-ja-records.json.br b/lib/search/indexes/github-docs-3.6-ja-records.json.br index 79bb1fb09a..bc7fb2cd47 100644 --- a/lib/search/indexes/github-docs-3.6-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.6-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b32d249bfe88a5fb828eb7c0fff056810a788edc4c5fbf67d69f2f0e657a2d3a -size 909946 +oid sha256:be5220ce5532c308310b8abded79da6bd2c04d5a1c1e891c757876e21504771c +size 909519 diff --git a/lib/search/indexes/github-docs-3.6-ja.json.br b/lib/search/indexes/github-docs-3.6-ja.json.br index 97c01b912d..592baf1c07 100644 --- a/lib/search/indexes/github-docs-3.6-ja.json.br +++ b/lib/search/indexes/github-docs-3.6-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46779bf213f54260bcc6b65f581b60a2321c574f42eb2e263eea4e0e0ddf7ebc -size 4880263 +oid sha256:7876603c54c051db03ea57354a3e889382415cb979c1ce6e4dcaa6aee9d4b8d6 +size 4881098 diff --git a/lib/search/indexes/github-docs-3.6-pt-records.json.br b/lib/search/indexes/github-docs-3.6-pt-records.json.br index 6994bdc6d3..0c3c8b8ead 100644 --- a/lib/search/indexes/github-docs-3.6-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.6-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d601803cc68f7b6fc7314e540f63f2c0e5e68b975f327a669d4ff6f1155946f -size 806875 +oid sha256:2ef80e117f85802edab3973fd19b2573e991bd4c7eece40aee8c534a3d48ae04 +size 807731 diff --git a/lib/search/indexes/github-docs-3.6-pt.json.br b/lib/search/indexes/github-docs-3.6-pt.json.br index 29824886db..9f79b13333 100644 --- a/lib/search/indexes/github-docs-3.6-pt.json.br +++ b/lib/search/indexes/github-docs-3.6-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05216f28f04f5cb7f446c6da99a767e808bb735d0b7d4521c78187fb4f0e5d7e -size 3460958 +oid sha256:5afa94c328289993078435483e53ef57db525f6e99dd4edb98ff940122b13305 +size 3469206 diff --git a/lib/search/indexes/github-docs-dotcom-cn-records.json.br b/lib/search/indexes/github-docs-dotcom-cn-records.json.br index 4b79d43c62..4a92970cf7 100644 --- a/lib/search/indexes/github-docs-dotcom-cn-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f839d5e5b6fce941753dc63a19b16d3a8f265430a9d530d778c4190aa142f419 -size 1018074 +oid sha256:b94c3b09a47e355ef510ffc333a176df6fed405b89a0679c1c4a61457dd1b803 +size 1016271 diff --git a/lib/search/indexes/github-docs-dotcom-cn.json.br b/lib/search/indexes/github-docs-dotcom-cn.json.br index 7c0ca73f23..8092658007 100644 --- a/lib/search/indexes/github-docs-dotcom-cn.json.br +++ b/lib/search/indexes/github-docs-dotcom-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41d328a417fda9f7877a585b29beab4cac56fa30d8553b5c494db1fe4719a08f -size 1904584 +oid sha256:e3bcc2d5bc4b4363399fc207d7103793da6232a2a9265bc815789f5867e15c4f +size 1906120 diff --git a/lib/search/indexes/github-docs-dotcom-en-records.json.br b/lib/search/indexes/github-docs-dotcom-en-records.json.br index 0bea4ad6a9..17a538f3be 100644 --- a/lib/search/indexes/github-docs-dotcom-en-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b537aa943987f42f4d131b6d538886d55cc125849dd8569a39f26c7ec8b301f6 -size 1472639 +oid sha256:a8b61e3ce9767e40fe0231c70875d923063fba68954644c35701bddf7216a76e +size 1465501 diff --git a/lib/search/indexes/github-docs-dotcom-en.json.br b/lib/search/indexes/github-docs-dotcom-en.json.br index 1bf77d641b..8bf1543ad3 100644 --- a/lib/search/indexes/github-docs-dotcom-en.json.br +++ b/lib/search/indexes/github-docs-dotcom-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f82725dfb8572f505443d519cac14d58b895fa0434f8726db050fba51dbfb23 -size 5688044 +oid sha256:60b91efc1991ba5dc3cc9613d7ac6e096fc7f4221e30e51b8fd942de383fa4cf +size 5688763 diff --git a/lib/search/indexes/github-docs-dotcom-es-records.json.br b/lib/search/indexes/github-docs-dotcom-es-records.json.br index 928202a7b9..445582b77f 100644 --- a/lib/search/indexes/github-docs-dotcom-es-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17c4fc4d3fdb5ad17e2f91ba1f55a84c3d9f83fe433b820f96c26dd13859fae8 -size 950843 +oid sha256:d0aec5b609de458e4a5f3c413b2d1b76d61e1766af52c6a7fd037acb22c4da12 +size 950827 diff --git a/lib/search/indexes/github-docs-dotcom-es.json.br b/lib/search/indexes/github-docs-dotcom-es.json.br index 4fdae8559e..08b5d7c0a2 100644 --- a/lib/search/indexes/github-docs-dotcom-es.json.br +++ b/lib/search/indexes/github-docs-dotcom-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5061eb80fd017f756d513c9dde746e8a577c21605b8a77afc362a582807eed8 -size 3948763 +oid sha256:740c6b101d30e362ec0d61ab100a4faa293e2f36bb155bbe08cacb90ba6178f6 +size 3948939 diff --git a/lib/search/indexes/github-docs-dotcom-ja-records.json.br b/lib/search/indexes/github-docs-dotcom-ja-records.json.br index 39a51c831e..4d0513cf15 100644 --- a/lib/search/indexes/github-docs-dotcom-ja-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c8d2cad60aa4f927581e5bfaffb8b9e6e028fda7f4f433a8a7a03b3228b97d9 -size 1064657 +oid sha256:2dbd39e4a47da7aa5d38eec10ab871aca475891020306972e5ccef18aa52d705 +size 1063648 diff --git a/lib/search/indexes/github-docs-dotcom-ja.json.br b/lib/search/indexes/github-docs-dotcom-ja.json.br index 4e7735c405..821c2c72db 100644 --- a/lib/search/indexes/github-docs-dotcom-ja.json.br +++ b/lib/search/indexes/github-docs-dotcom-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54c20f492ba0ad4022dc0db8001a281bca2367da623e04ba2f1d51fccf6dd86d -size 5552465 +oid sha256:70a7f3a41e4575cad760d53faa2bf4164c0a66b763146c69740e5d383b1a291f +size 5549526 diff --git a/lib/search/indexes/github-docs-dotcom-pt-records.json.br b/lib/search/indexes/github-docs-dotcom-pt-records.json.br index 0ee0fb246c..2b9e8c14c7 100644 --- a/lib/search/indexes/github-docs-dotcom-pt-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9f50e41d31732796971ea6af77df513db95d155a508a2b44f2ae793a9d5c0fb -size 933822 +oid sha256:a78e02008be657c6978c9180f7779e62dbcf5e78af1af467be3388115f7fb844 +size 933959 diff --git a/lib/search/indexes/github-docs-dotcom-pt.json.br b/lib/search/indexes/github-docs-dotcom-pt.json.br index bc7e236fd6..402b6a3308 100644 --- a/lib/search/indexes/github-docs-dotcom-pt.json.br +++ b/lib/search/indexes/github-docs-dotcom-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f4f193b3684085c93704c8b49ce21ef653d5a6aa9ed4cd76cc486661666999d -size 3906054 +oid sha256:3f77c9e1898dbc2168925e0fabdad21d1993516f14888bcb7380308f2ef57624 +size 3908799 diff --git a/lib/search/indexes/github-docs-ghae-cn-records.json.br b/lib/search/indexes/github-docs-ghae-cn-records.json.br index 52190dbe5f..bfad684c07 100644 --- a/lib/search/indexes/github-docs-ghae-cn-records.json.br +++ b/lib/search/indexes/github-docs-ghae-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4841bf9df42a552b7ce6317501c21e1f825356d9868008d2c4df10adf34b0197 -size 650462 +oid sha256:c2ad1675d8bd0e380fa15be98199089dc3f7084d5f2e4e669b0d2eb7081581f8 +size 649661 diff --git a/lib/search/indexes/github-docs-ghae-cn.json.br b/lib/search/indexes/github-docs-ghae-cn.json.br index 5416af90b0..490e2a71e1 100644 --- a/lib/search/indexes/github-docs-ghae-cn.json.br +++ b/lib/search/indexes/github-docs-ghae-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19c0275dabc40c645261bb7e9f4387bf60afed131d0fd2e17a53d7e261e441f2 -size 1376971 +oid sha256:dce87a3db3d213f270f1d75e09249406dd5968301d85caee3d3bbf37f03afce2 +size 1379197 diff --git a/lib/search/indexes/github-docs-ghae-en-records.json.br b/lib/search/indexes/github-docs-ghae-en-records.json.br index 836e8c4552..78879c9d41 100644 --- a/lib/search/indexes/github-docs-ghae-en-records.json.br +++ b/lib/search/indexes/github-docs-ghae-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:523d1e5d6b782f885f5f53da55cc796232dcb3d9083b8d15b8e3c05040bee7e8 -size 943508 +oid sha256:83285b6acc47388b64dbfb1ac941b17ee4c86e0ed7541cfd5ebe640d1c583b3e +size 943853 diff --git a/lib/search/indexes/github-docs-ghae-en.json.br b/lib/search/indexes/github-docs-ghae-en.json.br index 85dc81cc39..af57f48d49 100644 --- a/lib/search/indexes/github-docs-ghae-en.json.br +++ b/lib/search/indexes/github-docs-ghae-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78ade404fd68e77399e7b468ada01239b6136a64a3a906a7be079895ed64958d -size 3774973 +oid sha256:aa36f8cd00dece9165452f365a280d6b748c30d567fd59fc0194e33e1800afe6 +size 3776585 diff --git a/lib/search/indexes/github-docs-ghae-es-records.json.br b/lib/search/indexes/github-docs-ghae-es-records.json.br index 0d850d4ac9..7d03d171c5 100644 --- a/lib/search/indexes/github-docs-ghae-es-records.json.br +++ b/lib/search/indexes/github-docs-ghae-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adec1398cfe6f2c9db5980c86daddc687e828d930ce1fcf7ca77bfe99af42ab5 -size 627009 +oid sha256:f070967208d1de9187be3ad5c77b6d39a87e69799fa9a04e2f2adcc30c8cfd89 +size 627027 diff --git a/lib/search/indexes/github-docs-ghae-es.json.br b/lib/search/indexes/github-docs-ghae-es.json.br index b88ad82f4f..85c3907191 100644 --- a/lib/search/indexes/github-docs-ghae-es.json.br +++ b/lib/search/indexes/github-docs-ghae-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba47c490c531a629cd32e2caf02e9cb74ecbabdab1f678f69f7430b6f93ec334 -size 2582598 +oid sha256:498a55e8f7302963965a572b2d270faeaad2f4f0cdcf21cf8e83da9c874e73a0 +size 2582507 diff --git a/lib/search/indexes/github-docs-ghae-ja-records.json.br b/lib/search/indexes/github-docs-ghae-ja-records.json.br index 2c4d39498b..32ae5e397d 100644 --- a/lib/search/indexes/github-docs-ghae-ja-records.json.br +++ b/lib/search/indexes/github-docs-ghae-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47ae3563dbe49b4e873f525b6467e9a9a794b63062ff4c7aaf933809c585c08e -size 683444 +oid sha256:f2211c0862988b2aa1ba5ad46511b5a4a7aad623c0a74ac2a855e90ada41d02c +size 682385 diff --git a/lib/search/indexes/github-docs-ghae-ja.json.br b/lib/search/indexes/github-docs-ghae-ja.json.br index c6fce89fb5..14fbd554aa 100644 --- a/lib/search/indexes/github-docs-ghae-ja.json.br +++ b/lib/search/indexes/github-docs-ghae-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b17f2a1b316c325cd523dfb5968f7fbafd97b7e7a7ba34d2cf020db61b30617b -size 3572946 +oid sha256:1ce6d514bcb797fe7b3bb72783b10a4431f7bb8c38246b14ec35450896948914 +size 3571038 diff --git a/lib/search/indexes/github-docs-ghae-pt-records.json.br b/lib/search/indexes/github-docs-ghae-pt-records.json.br index 94ee32a0c7..86fa3562d1 100644 --- a/lib/search/indexes/github-docs-ghae-pt-records.json.br +++ b/lib/search/indexes/github-docs-ghae-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:214a20003164627971e2bcd5fa2b751423a5b6b9bb8129f31033486aff294cb9 -size 616374 +oid sha256:700280b46dd56c0082d8ba9b630076a7bcc84358c8adaf427838ba0587955488 +size 616544 diff --git a/lib/search/indexes/github-docs-ghae-pt.json.br b/lib/search/indexes/github-docs-ghae-pt.json.br index 01e691f928..2c4a64f21c 100644 --- a/lib/search/indexes/github-docs-ghae-pt.json.br +++ b/lib/search/indexes/github-docs-ghae-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64e7ed8716f738495bbd449d3266b5cf5f588bc0c613fc8cc6c8527cfea6ef6b -size 2568607 +oid sha256:9ee8fe497eee501ebae71a15498c3e2cca830df2be998742201079f934b51a6c +size 2571397 diff --git a/lib/search/indexes/github-docs-ghec-cn-records.json.br b/lib/search/indexes/github-docs-ghec-cn-records.json.br index 040247085e..ee386eea45 100644 --- a/lib/search/indexes/github-docs-ghec-cn-records.json.br +++ b/lib/search/indexes/github-docs-ghec-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f82e5fe2874ff2d8a81f067f61f74d875e7d792e89897c809425e768216c884 -size 996095 +oid sha256:427c212ea89b171ccb61b96015fa72b1d55dbbd8e3da6687629b374165173165 +size 994275 diff --git a/lib/search/indexes/github-docs-ghec-cn.json.br b/lib/search/indexes/github-docs-ghec-cn.json.br index e039fada6f..14d13aefab 100644 --- a/lib/search/indexes/github-docs-ghec-cn.json.br +++ b/lib/search/indexes/github-docs-ghec-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:741ed9fd729937565a6badff74390d85b5905311c780d3e8575e9fea7597666a -size 2062349 +oid sha256:e25e242fc33518d6338aeeaf5d34afd874984379469cd8d11df9e48752e8fb9e +size 2063091 diff --git a/lib/search/indexes/github-docs-ghec-en-records.json.br b/lib/search/indexes/github-docs-ghec-en-records.json.br index 128aad18e2..82a8958f30 100644 --- a/lib/search/indexes/github-docs-ghec-en-records.json.br +++ b/lib/search/indexes/github-docs-ghec-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fefe43d9499ea1b90e2a2c656c583945e06dcec6dd86a0f71ce0209250ca0d28 -size 1412383 +oid sha256:fb3fce4fa1d8c75d7374fbb6af856b8ce25e5eaf39391bca8252c7d180f40212 +size 1412814 diff --git a/lib/search/indexes/github-docs-ghec-en.json.br b/lib/search/indexes/github-docs-ghec-en.json.br index b5cd0b3f66..b74b5f3549 100644 --- a/lib/search/indexes/github-docs-ghec-en.json.br +++ b/lib/search/indexes/github-docs-ghec-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba18bb85643926d07d3eadac1a90ee4260093452d85798dcfa87b6ae5b27b176 -size 5763244 +oid sha256:70f630bec8986f7b84c3c77280c9f271493f16af3e54248956fcd204473661b1 +size 5764921 diff --git a/lib/search/indexes/github-docs-ghec-es-records.json.br b/lib/search/indexes/github-docs-ghec-es-records.json.br index 1c07468b7b..d74be933ce 100644 --- a/lib/search/indexes/github-docs-ghec-es-records.json.br +++ b/lib/search/indexes/github-docs-ghec-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c84f1673100cc0135183a4d767150fe8236355d8e486fdba921f89cbbb0d6a80 -size 956729 +oid sha256:1ccbbc7159f4733acff97319739017156ad69c73709b2ecfb8a9a4454a4c90d6 +size 956747 diff --git a/lib/search/indexes/github-docs-ghec-es.json.br b/lib/search/indexes/github-docs-ghec-es.json.br index 2f4fd11d56..48fc2dc984 100644 --- a/lib/search/indexes/github-docs-ghec-es.json.br +++ b/lib/search/indexes/github-docs-ghec-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fae55d3fbdab1cf46e8b08d69bed3517fb095d952725feed9d4a8645140220e -size 4127575 +oid sha256:31bf11325cd266e8ed708134e04db00780e59d51ff44961131a16fb04a5b67f5 +size 4128056 diff --git a/lib/search/indexes/github-docs-ghec-ja-records.json.br b/lib/search/indexes/github-docs-ghec-ja-records.json.br index 60c655628f..3ffd7031b3 100644 --- a/lib/search/indexes/github-docs-ghec-ja-records.json.br +++ b/lib/search/indexes/github-docs-ghec-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a45c0cee3c5f7d1212bc3bcadb85d76328a2f72401508eb03cecae5729f8f81b -size 1052870 +oid sha256:705956000f9708a30920055ae96b3ccf7ccee3d83442f1ae4809ae33f33deb42 +size 1051882 diff --git a/lib/search/indexes/github-docs-ghec-ja.json.br b/lib/search/indexes/github-docs-ghec-ja.json.br index 8d3966dc85..c92db32daf 100644 --- a/lib/search/indexes/github-docs-ghec-ja.json.br +++ b/lib/search/indexes/github-docs-ghec-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7504e0651b4e74ffd8db05a2387356e444e2780094f0646154021355596c7497 -size 5696464 +oid sha256:2d14bafa8563829a0941f515e6a72b53c5267a6e922e54e71eb822b7c1798c51 +size 5693687 diff --git a/lib/search/indexes/github-docs-ghec-pt-records.json.br b/lib/search/indexes/github-docs-ghec-pt-records.json.br index 1815cb0f69..e395106aff 100644 --- a/lib/search/indexes/github-docs-ghec-pt-records.json.br +++ b/lib/search/indexes/github-docs-ghec-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57bbfe4842b3c0e8ccc97da184b74bd277627009849674f15f15911243fb25b4 -size 939091 +oid sha256:31ce128370a016de066561774f6b155cbff02773c2bc69b240695341a877b5d7 +size 939316 diff --git a/lib/search/indexes/github-docs-ghec-pt.json.br b/lib/search/indexes/github-docs-ghec-pt.json.br index 861e08a0e7..1c2ca54840 100644 --- a/lib/search/indexes/github-docs-ghec-pt.json.br +++ b/lib/search/indexes/github-docs-ghec-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e482ef6e69439c4cca0f28126218c84f208ee6fa95619a8e98c154d78eae1913 -size 4074491 +oid sha256:aeae670cb1970751c1b0d23f0af8b8e8ffa9bf5292c0d883954688b616e104c1 +size 4077484 diff --git a/middleware/cache-control.js b/middleware/cache-control.js index 8b2aa91183..db849d20b3 100644 --- a/middleware/cache-control.js +++ b/middleware/cache-control.js @@ -18,7 +18,7 @@ // Max age is in seconds export function cacheControlFactory( maxAge = 60 * 60, - { key = 'cache-control', public_ = true, immutable = false } = {} + { key = 'cache-control', public_ = true, immutable = false, maxAgeZero = false } = {} ) { const directives = [ maxAge && public_ && 'public', @@ -26,6 +26,7 @@ export function cacheControlFactory( maxAge && immutable && 'immutable', !maxAge && 'private', !maxAge && 'no-store', + maxAgeZero && 'max-age=0', ] .filter(Boolean) .join(', ') diff --git a/middleware/context.js b/middleware/context.js index c935660f2b..6cc53abb73 100644 --- a/middleware/context.js +++ b/middleware/context.js @@ -1,7 +1,7 @@ import languages from '../lib/languages.js' import enterpriseServerReleases from '../lib/enterprise-server-releases.js' import { allVersions } from '../lib/all-versions.js' -import { productMap, productGroups } from '../lib/all-products.js' +import { productMap, getProductGroups } from '../lib/all-products.js' import pathUtils from '../lib/path-utils.js' import productNames from '../lib/product-names.js' import warmServer from '../lib/warm-server.js' @@ -39,7 +39,7 @@ export default async function contextualize(req, res, next) { req.context.currentProduct = getProductStringFromPath(req.pagePath) req.context.currentCategory = getCategoryStringFromPath(req.pagePath) req.context.productMap = productMap - req.context.productGroups = productGroups + req.context.productGroups = getProductGroups(pageMap, req.language) req.context.activeProducts = activeProducts req.context.allVersions = allVersions req.context.currentPathWithoutLanguage = getPathWithoutLanguage(req.pagePath) diff --git a/middleware/fast-root-redirect.js b/middleware/fast-root-redirect.js index 8545ca281a..a725aeafd3 100644 --- a/middleware/fast-root-redirect.js +++ b/middleware/fast-root-redirect.js @@ -3,14 +3,19 @@ import { getLanguageCodeFromHeader } from './detect-language.js' import { PREFERRED_LOCALE_COOKIE_NAME } from '../lib/constants.js' const cacheControl = cacheControlFactory(0) +const noCacheSurrogateControl = cacheControlFactory(0, { + key: 'surrogate-control', + maxAgeZero: true, +}) export default function fastRootRedirect(req, res, next) { if (!req.headers.cookie || !req.headers.cookie.includes(PREFERRED_LOCALE_COOKIE_NAME)) { // No preferred language cookie header! const language = getLanguageCodeFromHeader(req) || 'en' cacheControl(res) - res.set('location', `/${language}`) - return res.status(302).send('') + // See #2287 + noCacheSurrogateControl(res) + return res.redirect(`/${language}`) } next() } diff --git a/middleware/handle-errors.js b/middleware/handle-errors.js index f923b7c431..62b6522058 100644 --- a/middleware/handle-errors.js +++ b/middleware/handle-errors.js @@ -23,6 +23,7 @@ async function logException(error, req) { if (process.env.NODE_ENV !== 'test' && shouldLogException(error)) { await FailBot.report(error, { path: req.path, + url: req.url, }) } } diff --git a/pages/[versionId]/[productId]/index.tsx b/pages/[versionId]/[productId]/index.tsx index dd0393ac35..63fba249ca 100644 --- a/pages/[versionId]/[productId]/index.tsx +++ b/pages/[versionId]/[productId]/index.tsx @@ -107,7 +107,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => const res = context.res as any const props: Props = { - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), } const { currentLayoutName, relativePath } = props.mainContext diff --git a/pages/[versionId]/admin/release-notes.tsx b/pages/[versionId]/admin/release-notes.tsx index 5d51e042ab..3f12f960df 100644 --- a/pages/[versionId]/admin/release-notes.tsx +++ b/pages/[versionId]/admin/release-notes.tsx @@ -31,7 +31,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => const { latestPatch = '', latestRelease = '' } = req.context return { props: { - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), ghesContext: currentVersion.plan === 'enterprise-server' ? { diff --git a/pages/[versionId]/graphql/overview/breaking-changes.tsx b/pages/[versionId]/graphql/overview/breaking-changes.tsx index b2a6ab79b2..5f1d28f723 100644 --- a/pages/[versionId]/graphql/overview/breaking-changes.tsx +++ b/pages/[versionId]/graphql/overview/breaking-changes.tsx @@ -53,7 +53,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => return { props: { - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), automatedPageContext, schema, }, diff --git a/pages/[versionId]/graphql/overview/changelog.tsx b/pages/[versionId]/graphql/overview/changelog.tsx index 22dd4ff710..b8b21d6d47 100644 --- a/pages/[versionId]/graphql/overview/changelog.tsx +++ b/pages/[versionId]/graphql/overview/changelog.tsx @@ -46,7 +46,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => return { props: { - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), automatedPageContext, schema, }, diff --git a/pages/[versionId]/graphql/overview/explorer.tsx b/pages/[versionId]/graphql/overview/explorer.tsx index 4b5899ffd3..7bc7456d77 100644 --- a/pages/[versionId]/graphql/overview/explorer.tsx +++ b/pages/[versionId]/graphql/overview/explorer.tsx @@ -52,7 +52,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => return { props: { - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), graphqlExplorerUrl, }, } diff --git a/pages/[versionId]/graphql/overview/schema-previews.tsx b/pages/[versionId]/graphql/overview/schema-previews.tsx index 1e518d5f87..5eafe01b23 100644 --- a/pages/[versionId]/graphql/overview/schema-previews.tsx +++ b/pages/[versionId]/graphql/overview/schema-previews.tsx @@ -48,7 +48,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => return { props: { - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), automatedPageContext, schema, }, diff --git a/pages/[versionId]/graphql/reference/[page].tsx b/pages/[versionId]/graphql/reference/[page].tsx index ab33d5089b..23c5cc0807 100644 --- a/pages/[versionId]/graphql/reference/[page].tsx +++ b/pages/[versionId]/graphql/reference/[page].tsx @@ -66,7 +66,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => return { props: { - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), automatedPageContext, schema, language, diff --git a/pages/[versionId]/rest/[category]/[subcategory].tsx b/pages/[versionId]/rest/[category]/[subcategory].tsx index 8ea6cb1458..d92f7cfdf9 100644 --- a/pages/[versionId]/rest/[category]/[subcategory].tsx +++ b/pages/[versionId]/rest/[category]/[subcategory].tsx @@ -74,7 +74,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => return { props: { restOperations, - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), automatedPageContext: getAutomatedPageContextFromRequest(req), }, } diff --git a/pages/[versionId]/rest/[category]/index.tsx b/pages/[versionId]/rest/[category]/index.tsx index aa92bb9802..f266278930 100644 --- a/pages/[versionId]/rest/[category]/index.tsx +++ b/pages/[versionId]/rest/[category]/index.tsx @@ -193,7 +193,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => return { props: { restOperations, - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), automatedPageContext: getAutomatedPageContextFromRequest(req), tocLandingContext, }, diff --git a/pages/[versionId]/rest/overview/endpoints-available-for-github-apps.tsx b/pages/[versionId]/rest/overview/endpoints-available-for-github-apps.tsx index acd9fc87ce..dea06fe6eb 100644 --- a/pages/[versionId]/rest/overview/endpoints-available-for-github-apps.tsx +++ b/pages/[versionId]/rest/overview/endpoints-available-for-github-apps.tsx @@ -92,7 +92,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => const req = context.req as object const res = context.res as object const currentVersion = context.query.versionId as string - const mainContext = getMainContext(req, res) + const mainContext = await getMainContext(req, res) const automatedPageContext = getAutomatedPageContextFromRequest(req) if (!enabledForApps) { diff --git a/pages/index.tsx b/pages/index.tsx index e3b00cc927..751d5d1997 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -66,7 +66,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => return { props: { - mainContext: getMainContext(req, res), + mainContext: await getMainContext(req, res), gettingStartedLinks: req.context.featuredLinks.gettingStarted.map( ({ title, href, intro }: any) => ({ title, href, intro }) ), diff --git a/pages/search.tsx b/pages/search.tsx index 8b29825278..830f7a3999 100644 --- a/pages/search.tsx +++ b/pages/search.tsx @@ -42,7 +42,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => } } - const mainContext = getMainContext(req, res) + const mainContext = await getMainContext(req, res) return { props: { diff --git a/tests/rendering/server.js b/tests/rendering/server.js index 66f71f47d5..0f09e56839 100644 --- a/tests/rendering/server.js +++ b/tests/rendering/server.js @@ -6,6 +6,7 @@ import { loadPages } from '../../lib/page-data.js' import CspParse from 'csp-parse' import { productMap } from '../../lib/all-products.js' import { SURROGATE_ENUMS } from '../../middleware/set-fastly-surrogate-key.js' +import { getPathWithoutVersion } from '../../lib/path-utils.js' import { describe, jest } from '@jest/globals' const AZURE_STORAGE_URL = 'githubdocs.azureedge.net' @@ -79,21 +80,24 @@ describe('server', () => { test('renders the Enterprise homepages with links to expected products in both the sidebar and page body', async () => { const enterpriseProducts = [ - `/en/enterprise-server@${enterpriseServerReleases.latest}`, - '/en/enterprise-cloud@latest', + `enterprise-server@${enterpriseServerReleases.latest}`, + 'enterprise-cloud@latest', ] - enterpriseProducts.forEach(async (ep) => { - const $ = await getDOM(ep) + for (const ep of enterpriseProducts) { + const $ = await getDOM(`/en/${ep}`) const sidebarItems = $('[data-testid=sidebar] li a').get() const sidebarTitles = sidebarItems.map((el) => $(el).text().trim()) const sidebarHrefs = sidebarItems.map((el) => $(el).attr('href')) - const productItems = $('[data-testid=product] div a').get() - const productTitles = productItems.map((el) => $(el).text().trim()) - const productHrefs = productItems.map((el) => $(el).attr('href')) + const productItems = activeProducts.filter( + (prod) => prod.external || prod.versions.includes(ep) + ) + const productTitles = productItems.map((prod) => prod.name) + const productHrefs = productItems.map((prod) => + prod.external ? prod.href : `/en/${ep}${getPathWithoutVersion(prod.href)}` + ) const titlesInProductsButNotSidebar = lodash.difference(productTitles, sidebarTitles) - const hrefsInProductsButNotSidebar = lodash.difference(productHrefs, sidebarHrefs) expect( @@ -104,7 +108,7 @@ describe('server', () => { hrefsInProductsButNotSidebar.length, `Found hrefs missing from sidebar: ${hrefsInProductsButNotSidebar.join(', ')}` ).toBe(0) - }) + } }) test('sets Content Security Policy (CSP) headers', async () => { diff --git a/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md b/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md index 179729b210..850fdd4282 100644 --- a/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md +++ b/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md @@ -1,6 +1,6 @@ --- -title: プロフィールをパーソナライズする -intro: 'プロフィール画像を設定し、プロフィールに略歴を追加することで、自分自身についての情報を他の {% data variables.product.product_name %} ユーザと共有することができます。' +title: Personalizing your profile +intro: 'You can share information about yourself with other {% data variables.product.product_name %} users by setting a profile picture and adding a bio to your profile.' redirect_from: - /articles/adding-a-bio-to-your-profile - /articles/setting-your-profile-picture @@ -18,156 +18,186 @@ versions: topics: - Profiles shortTitle: Personalize -ms.openlocfilehash: c12fccd91144428fe9aad2f01d2c0b0941fdd4d4 -ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 -ms.translationtype: HT -ms.contentlocale: ja-JP -ms.lasthandoff: 09/05/2022 -ms.locfileid: '146681054' --- -## プロフィール画像を変更する +## Changing your profile picture -プロフィール画像は、{% data variables.product.product_name %} のプルリクエスト、コメント、コントリビューションページ、およびグラフにおいて、あなたを識別するのに役立ちます。 +Your profile picture helps identify you across {% data variables.product.product_name %} in pull requests, comments, contributions pages, and graphs. -アカウントにサインアップすると、{% data variables.product.product_name %} はとりあえずランダムなアイデンティコンを生成します。 [アイデンティコン](https://github.com/blog/1586-identicons)はユーザー ID のハッシュから生成されるので、その色やパターンを制御する方法はありません。 アイデンティコンは、あなたを表す画像に置き換えることができます。 +When you sign up for an account, {% data variables.product.product_name %} provides you with a randomly generated "identicon". [Your identicon](https://github.com/blog/1586-identicons) generates from a hash of your user ID, so there's no way to control its color or pattern. You can replace your identicon with an image that represents you. {% note %} -**注{% ifversion ghec %}{% endif %}** : {% ifversion ghec %} +**Note{% ifversion ghec %}s{% endif %}**: {% ifversion ghec %} -* {% endif %}プロフィール画像は、PNG、JPG、または GIF ファイルでなければならず、1 MB 未満のサイズで、3000 x 3000 ピクセルより小さいものにする必要があります。 最高の画質をもたらすには、画像を 500 × 500 ピクセルに収めることを推奨します。 -{% ifversion ghec %}* Gravatar プロファイル画像は {% data variables.product.prodname_emus %} ではサポートされていません。{% endif %} +* {% endif %}Your profile picture should be a PNG, JPG, or GIF file, and it must be less than 1 MB in size and smaller than 3000 by 3000 pixels. For the best quality rendering, we recommend keeping the image at about 500 by 500 pixels. +{% ifversion ghec %}* Gravatar profile pictures are not supported with {% data variables.product.prodname_emus %}.{% endif %} {% endnote %} -### プロフィール画像を設定する +### Setting a profile picture {% data reusables.user-settings.access_settings %} -2. **[Profile Picture]\(プロファイル画像\)** の下にある {% octicon "pencil" aria-label="The edit icon" %} **[Edit]\(編集\)** をクリックします。 -![プロファイル画像を編集する](/assets/images/help/profile/edit-profile-photo.png) -3. **[写真のアップロード]** をクリックします。{% ifversion not ghae %} ![プロフィール画像を更新する](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} -3. 画像をクロッピングします。 作業を終えたら **[Set new profile picture]\(新しいプロファイル画像の設定\)** をクリックします。 - ![アップロードした画像をトリミングする](/assets/images/help/profile/avatar_crop_and_save.png) +2. Under **Profile Picture**, click {% octicon "pencil" aria-label="The edit icon" %} **Edit**. +![Edit profile picture](/assets/images/help/profile/edit-profile-photo.png) +3. Click **Upload a photo...**.{% ifversion not ghae %} +![Update profile picture](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} +3. Crop your picture. When you're done, click **Set new profile picture**. + ![Crop uploaded photo](/assets/images/help/profile/avatar_crop_and_save.png) -### プロフィール画像をアイデンティコンへリセットする +### Resetting your profile picture to the identicon {% data reusables.user-settings.access_settings %} -2. **[Profile Picture]\(プロファイル画像\)** の下にある {% octicon "pencil" aria-label="The edit icon" %} **[Edit]\(編集\)** をクリックします。 -![プロファイル画像を編集する](/assets/images/help/profile/edit-profile-photo.png) -3. アイデンティコンに戻すには、 **[Remove photo]\(画像の削除\)** をクリックします。 {% ifversion not ghae %}メール アドレスが [Gravatar](https://en.gravatar.com/) に関連付けられている場合、アイデンティコンに戻すことはできません。 代わりに **[Revert to Gravatar]\(Gravatar に戻す\)** をクリックします。 -![プロフィール画像を更新する](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} +2. Under **Profile Picture**, click {% octicon "pencil" aria-label="The edit icon" %} **Edit**. +![Edit profile picture](/assets/images/help/profile/edit-profile-photo.png) +3. To revert to your identicon, click **Remove photo**. {% ifversion not ghae %}If your email address is associated with a [Gravatar](https://en.gravatar.com/), you cannot revert to your identicon. Click **Revert to Gravatar** instead. +![Update profile picture](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} -## プロフィール名を変更する +## Changing your profile name -プロフィールに表示される名前は変更可能です。 この名前は、Organization が所有するプライベートリポジトリへのコメントの横に表示されることもあります。 詳細については、「[組織のメンバー名表示を管理する](/articles/managing-the-display-of-member-names-in-your-organization)」を参照してください。 +You can change the name that is displayed on your profile. This name may also be displayed next to comments you make on private repositories owned by an organization. For more information, see "[Managing the display of member names in your organization](/articles/managing-the-display-of-member-names-in-your-organization)." -{% ifversion fpt or ghec %} {% note %} +{% ifversion fpt or ghec %} +{% note %} -**注:** {% data variables.product.prodname_emu_enterprise %} のメンバーである場合、プロファイル名の変更は {% data variables.product.prodname_dotcom_the_website %} ではなく、ID プロバイダーを介して行う必要があります。 {% data reusables.enterprise-accounts.emu-more-info-account %} +**Note:** If you're a member of an {% data variables.product.prodname_emu_enterprise %}, any changes to your profile name must be made through your identity provider instead of {% data variables.product.prodname_dotcom_the_website %}. {% data reusables.enterprise-accounts.emu-more-info-account %} -{% endnote %} {% endif %} +{% endnote %} +{% endif %} {% data reusables.user-settings.access_settings %} -2. [Name] の下に、プロフィールに表示する名前を入力します。 - ![プロファイル設定の [Name]\(名前\) フィールド](/assets/images/help/profile/name-field.png) +2. Under "Name", type the name you want to be displayed on your profile. + ![Name field in profile settings](/assets/images/help/profile/name-field.png) -## プロフィールに略歴を追加する +## Adding a bio to your profile -自分に関する情報を他の {% data variables.product.product_name %} ユーザーと共有するには、プロフィールに略歴を追加します。 [@mentions](/articles/basic-writing-and-formatting-syntax) と絵文字を使えば、あなたの現在または過去の職場、職種、飲んでいるコーヒーの種類といった情報も含めることができます。 +Add a bio to your profile to share information about yourself with other {% data variables.product.product_name %} users. With the help of [@mentions](/articles/basic-writing-and-formatting-syntax) and emoji, you can include information about where you currently or have previously worked, what type of work you do, or even what kind of coffee you drink. {% ifversion fpt or ghes or ghec %} -自分に関するカスタマイズした情報を長いフォームで、もっと目立つように表示する場合は、プロフィール README を使用することもできます。 詳細については、「[プロファイルの README を管理する](/github/setting-up-and-managing-your-github-profile/managing-your-profile-readme)」を参照してください。 +For a longer-form and more prominent way of displaying customized information about yourself, you can also use a profile README. For more information, see "[Managing your profile README](/github/setting-up-and-managing-your-github-profile/managing-your-profile-readme)." {% endif %} {% note %} -**注:** プロファイルでアクティビティ概要のセクションを有効にしており、プロファイルの略歴で自分がメンバーである組織に @mention した場合、アクティビティの概要ではその組織が最初に表示されます。 詳細については、「[プロファイルでアクティビティの概要を表示する](/articles/showing-an-overview-of-your-activity-on-your-profile)」を参照してください。 +**Note:** + If you have the activity overview section enabled for your profile and you @mention an organization you're a member of in your profile bio, then that organization will be featured first in your activity overview. For more information, see "[Showing an overview of your activity on your profile](/articles/showing-an-overview-of-your-activity-on-your-profile)." {% endnote %} {% data reusables.user-settings.access_settings %} -2. **[Bio]\(略歴\)** の下で、自分のプロファイルに表示する内容を追加します。 略歴フィールドの上限は 160 文字です。 - ![プロファイルの略歴を更新する](/assets/images/help/profile/bio-field.png) +2. Under **Bio**, add the content that you want displayed on your profile. The bio field is limited to 160 characters. + ![Update bio on profile](/assets/images/help/profile/bio-field.png) {% tip %} - **ヒント:** 組織に @mention すると、自分がメンバーであるものだけがオートコンプリートされます。 以前の職場など、自分がメンバーではない組織に @mention することもできますが、その組織の名前はオートコンプリートされません。 + **Tip:** When you @mention an organization, only those that you're a member of will autocomplete. You can still @mention organizations that you're not a member of, like a previous employer, but the organization name won't autocomplete for you. {% endtip %} -3. **[プロファイルの更新]** をクリックします。 - ![[Update profile]\(プロファイルの更新\) ボタン](/assets/images/help/profile/update-profile-button.png) +{% data reusables.profile.update-profile %} -## ステータスを設定する +{% ifversion profile-time-zone %} -ステータスを設定すると、あなたの現在の状況に関する情報を {% data variables.product.product_name %} に表示することができます。 ステータスは次の場所や状況で表示されます: -- {% data variables.product.product_name %} のプロフィールページ。 -- {% data variables.product.product_name %} でユーザがあなたのユーザ名やアバターにカーソルを置いたとき。 -- 自分が Team メンバーになっている Team の Team ページ。 詳細については、「[Team について](/articles/about-teams/#team-pages)」を参照してください。 -- メンバーになっている Organization の Organization ダッシュボード。 詳細については、「[Organization ダッシュボードについて](/articles/about-your-organization-dashboard/)」を参照してください。 +## Setting your location and time zone -ステータスを設定すると、あなたの時間的な制約について、{% data variables.product.product_name %} で他のユーザーに知らせることもできます。 +You can set a location and time zone on your profile to show other people your local time. Your location and time zone will be visible: +- on your {% data variables.product.product_name %} profile page. +- when people hover over your username or avatar on {% data variables.product.product_name %}. -![@メンションされたユーザー名の横に "busy"(ビジー) ノートが表示される](/assets/images/help/profile/username-with-limited-availability-text.png) +When you view your profile, you will see your location, local time, and your time zone in relation to Universal Time Coordinated. -![依頼されたレビュー担当者には、ユーザー名の横に "busy"(ビジー) ノートが表示されます。](/assets/images/help/profile/request-a-review-limited-availability-status.png) + ![Screenshot of the Octocat profile page emphasizing the location, local time, and time zone fields.](/assets/images/help/profile/profile-location-and-time.png) -[Busy]\(ビジー\) オプションを選ぶと、自分のユーザー名に誰かが @mention したとき、自分に issue や pull request が割り当てられたとき、または自分が pull request レビューをリクエストしたとき、ユーザー名の横にビジーであることを示すノートが表示されます。 また、自分が所属するチームに割り当てられた pull request の自動レビュー割り当てからも除外されます。 詳細については、「[チームのコード レビュー設定の管理](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)」を参照してください。 +When others view your profile, they will see your location, local time, and the time difference in hours from their own local time. -1. {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %} の右上にあるプロファイル画像をクリックし、 **[Set your status]\(ステータスの設定\)** をクリックします。または既にステータスが設定されている場合は、現在のステータスをクリックします。 - ![ステータスを設定するプロファイルのボタン](/assets/images/help/profile/set-status-on-profile.png) -2. ステータスにカスタムテキストを追加する場合は、テキストフィールドをクリックしてステータスメッセージを入力します。 - ![ステータス メッセージを入力するフィールド](/assets/images/help/profile/type-a-status-message.png) -3. オプションで、ステータス絵文字を設定する場合は、絵文字のアイコンをクリックしてリストから選択します。 - ![絵文字のステータスを選ぶボタン](/assets/images/help/profile/select-emoji-status.png) -4. オプションで、時間に制約があるという情報を共有するには、[Busy] を選択します。 - ![[Edit status]\(ステータスの編集\) オプションで選ばれている [Busy]\(ビジー\) オプション](/assets/images/help/profile/limited-availability-status.png) -5. **[Clear status]\(ステータスのクリア\)** ドロップダウン メニューを使って、ステータスの有効期限を選びます。 ステータスの有効期限を設定しない場合は、クリアするか編集するまで同じステータスのままになります。 - ![ステータスの有効期限が切れたときに選ぶドロップダウン メニュー](/assets/images/help/profile/status-expiration.png) -6. ドロップダウンメニューを使って、ステータスを表示する Organization をクリックします。 Organization を選択しない場合、あなたのステータスはパブリックになります。 - ![ステータスが表示されるときに選ぶドロップダウン メニュー](/assets/images/help/profile/status-visibility.png) -7. **[Set status]\(ステータスの設定\)** をクリックします。 - ![ステータスを設定するボタン](/assets/images/help/profile/set-status-button.png) + ![Screenshot of the Octocat profile page emphasizing the location, local time, and relative time fields.](/assets/images/help/profile/profile-relative-time.png) + +{% data reusables.user-settings.access_settings %} +1. Under **Location**, type the location you want to be displayed on your profile. + + ![Screenshot of the location and local time settings emphasizing the location field.](/assets/images/help/profile/location-field.png) + +1. Optionally, to display the current local time on your profile, select **Display current local time**. + + ![Screenshot of the location and local time settings emphasizing the display current local time checkbox.](/assets/images/help/profile/display-local-time-checkbox.png) + + - Select the **Time zone** dropdown menu, then click your local time zone. + + ![Screenshot of the location and local time settings emphasizing the time zone dropdown menu.](/assets/images/help/profile/time-zone-dropdown.png) + +{% data reusables.profile.update-profile %} + +{% endif %} + +## Setting a status + +You can set a status to display information about your current availability on {% data variables.product.product_name %}. Your status will show: +- on your {% data variables.product.product_name %} profile page. +- when people hover over your username or avatar on {% data variables.product.product_name %}. +- on a team page for a team where you're a team member. For more information, see "[About teams](/articles/about-teams/#team-pages)." +- on the organization dashboard in an organization where you're a member. For more information, see "[About your organization dashboard](/articles/about-your-organization-dashboard/)." + +When you set your status, you can also let people know that you have limited availability on {% data variables.product.product_name %}. + +![At-mentioned username shows "busy" note next to username](/assets/images/help/profile/username-with-limited-availability-text.png) + +![Requested reviewer shows "busy" note next to username](/assets/images/help/profile/request-a-review-limited-availability-status.png) + +If you select the "Busy" option, when people @mention your username, assign you an issue or pull request, or request a pull request review from you, a note next to your username will show that you're busy. You will also be excluded from automatic review assignment for pull requests assigned to any teams you belong to. For more information, see "[Managing code review settings for your team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)." + +1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click **Set your status** or, if you already have a status set, click your current status. + ![Button on profile to set your status](/assets/images/help/profile/set-status-on-profile.png) +2. To add custom text to your status, click in the text field and type a status message. + ![Field to type a status message](/assets/images/help/profile/type-a-status-message.png) +3. Optionally, to set an emoji status, click the smiley icon and select an emoji from the list. + ![Button to select an emoji status](/assets/images/help/profile/select-emoji-status.png) +4. Optionally, if you'd like to share that you have limited availability, select "Busy." + ![Busy option selected in Edit status options](/assets/images/help/profile/limited-availability-status.png) +5. Use the **Clear status** drop-down menu, and select when you want your status to expire. If you don't select a status expiration, you will keep your status until you clear or edit your status. + ![Drop down menu to choose when your status expires](/assets/images/help/profile/status-expiration.png) +6. Use the drop-down menu and click the organization you want your status visible to. If you don't select an organization, your status will be public. + ![Drop down menu to choose who your status is visible to](/assets/images/help/profile/status-visibility.png) +7. Click **Set status**. + ![Button to set status](/assets/images/help/profile/set-status-button.png) {% ifversion fpt or ghec %} -## プロフィールでバッジを表示する +## Displaying badges on your profile -特定のプログラムに参加すると、{% data variables.product.prodname_dotcom %} でプロフィールに自動的にバッジが表示されます。 +When you participate in certain programs, {% data variables.product.prodname_dotcom %} automatically displays a badge on your profile. -| バッジ | プログラム | 説明 | +| Badge | Program | Description | | --- | --- | --- | -| {% octicon "cpu" aria-label="The Developer Program icon" %} | **開発者プログラム メンバー** | {% data variables.product.prodname_dotcom %} 開発者プログラムの登録メンバーである場合は、{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API を使ってアプリをビルドすると、プロファイルに開発者プログラム メンバー バッジが表示されます。 {% data variables.product.prodname_dotcom %} 開発者プログラムの詳細については、[GitHub 開発者](/program/)に関するページを参照してください。 | -| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | {% data variables.product.prodname_pro %} を使用すると、プロフィールで PRO バッジを取得します。 {% data variables.product.prodname_pro %} の詳細については、「[{% data variables.product.prodname_dotcom %} の製品](/github/getting-started-with-github/githubs-products#github-pro)」を参照してください。 | -| {% octicon "lock" aria-label="The lock icon" %} | **セキュリティ バグ バウンティ ハンター** | セキュリティの脆弱性検出を支援した場合、プロファイルにセキュリティ バグ バウンティ ハンター バッジが表示されます。 {% data variables.product.prodname_dotcom %} セキュリティ プログラムの詳細については、[{% data variables.product.prodname_dotcom %} のセキュリティ](https://bounty.github.com/)に関するページを参照してください。 | -| {% octicon "mortar-board" aria-label="The mortar-board icon" %} | **{% data variables.product.prodname_dotcom %} キャンパス エキスパート** | {% data variables.product.prodname_campus_program %} に参加すると、プロファイルに {% data variables.product.prodname_dotcom %} キャンパス エキスパート バッジが表示されます。 キャンパス エキスパート プログラムの詳細については、[キャンパス エキスパート](https://education.github.com/experts)に関するページを参照してください。 | -| {% octicon "shield" aria-label="The shield icon" %} | **セキュリティ アドバイザリ クレジット** | [{% data variables.product.prodname_dotcom %} Advisory Database](https://github.com/advisories) に送信したセキュリティ アドバイザリが受け入れられると、プロフィールにセキュリティ アドバイザリ クレジット バッジが表示されます。 {% data variables.product.prodname_dotcom %} セキュリティ アドバイザリについて詳しくは、[{% data variables.product.prodname_dotcom %} セキュリティ アドバイザリ](/code-security/repository-security-advisories/about-github-security-advisories-for-repositories)に関するページをご覧ください。 | -| {% octicon "check" aria-label="The check icon" %} | **回答済みディスカッション** | ディスカッションへの返信が回答としてマークされている場合は、プロフィールに回答済みディスカッション バッジが表示されます。 {% data variables.product.prodname_dotcom %} のディスカッションについて詳しくは、「[ディスカッションについて](/discussions/collaborating-with-your-community-using-discussions/about-discussions)」をご覧ください。 | +| {% octicon "cpu" aria-label="The Developer Program icon" %} | **Developer Program Member** | If you're a registered member of the {% data variables.product.prodname_dotcom %} Developer Program, building an app with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, you'll get a Developer Program Member badge on your profile. For more information on the {% data variables.product.prodname_dotcom %} Developer Program, see [GitHub Developer](/program/). | +| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | If you use {% data variables.product.prodname_pro %} you'll get a PRO badge on your profile. For more information about {% data variables.product.prodname_pro %}, see "[{% data variables.product.prodname_dotcom %}'s products](/github/getting-started-with-github/githubs-products#github-pro)." | +| {% octicon "lock" aria-label="The lock icon" %} | **Security Bug Bounty Hunter** | If you helped out hunting down security vulnerabilities, you'll get a Security Bug Bounty Hunter badge on your profile. For more information about the {% data variables.product.prodname_dotcom %} Security program, see [{% data variables.product.prodname_dotcom %} Security](https://bounty.github.com/). | +| {% octicon "mortar-board" aria-label="The mortar-board icon" %} | **{% data variables.product.prodname_dotcom %} Campus Expert** | If you participate in the {% data variables.product.prodname_campus_program %}, you will get a {% data variables.product.prodname_dotcom %} Campus Expert badge on your profile. For more information about the Campus Experts program, see [Campus Experts](https://education.github.com/experts). | +| {% octicon "shield" aria-label="The shield icon" %} | **Security advisory credit** | If a security advisory you submit to the [{% data variables.product.prodname_dotcom %} Advisory Database](https://github.com/advisories) is accepted, you'll get a Security advisory credit badge on your profile. For more information about {% data variables.product.prodname_dotcom %} Security Advisories, see [{% data variables.product.prodname_dotcom %} Security Advisories](/code-security/repository-security-advisories/about-github-security-advisories-for-repositories). | +| {% octicon "check" aria-label="The check icon" %} | **Discussion answered** | If your reply to a discussion is marked as the answer, you'll get a Discussion answered badge on your profile. For more information about {% data variables.product.prodname_dotcom %} Discussions, see [About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions). | {% endif %} {% ifversion fpt or ghec %} -## アチーブメントの獲得 +## Earning Achievements -アチーブメントは、{% data variables.product.prodname_dotcom %} で発生する特定のイベントとアクションを示します。 それは、プロフィールのサイドバーの小さなバッジとして表示されます。 アチーブメントをクリックまたはポイントすると、アチーブメントがどのようにして獲得されたのかがわかる詳細と、簡単な説明および関連するイベントへのリンクが表示されます。 イベント リンクは、イベントが発生したリポジトリまたは Organization にアクセスできるユーザーに対してだけ表示されます。 アクセス権のないすべてのユーザーには、アクセスできないイベント リンクが表示されます。 +Achievements celebrate specific events and actions that happen on {% data variables.product.prodname_dotcom %}. They will appear as small badges listed in the sidebar of your profile. Clicking or hovering on an achievement will show a detailed view that hints at how the achievement was earned, with a short description and links to the contributing events. The event links will only be visible to users that have access to the repository or organization that the event took place in. Event links will appear inaccessible to all users without access. -非公開の貢献がアチーブメントにカウントされないようにするには、またはアチーブメントを完全にオフにするには、「[プロフィールに非公開の貢献とアチーブメントを表示する](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)」をご覧ください。 +To stop private contributions from counting toward your Achievements, or to turn off Achievements entirely, see "[Showing your private contributions and Achievements on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)." {% note %} -**注:** この機能は現在ベータ版であり、変更されることがあります。 +**Note:** This feature is currently in beta and subject to change. {% endnote %} {% endif %} -## Mars 2020 ヘリコプター共同作成者アチーブメントの対象リポジトリの一覧 +## List of qualifying repositories for Mars 2020 Helicopter Contributor achievement -次に示す 1 つ以上のリポジトリの一覧にあるタグについて、コミット履歴に存在するコミットを作成した場合、Mars 2020 ヘリコプター共同作成者アチーブメントがプロフィールに表示されます。 {% data variables.product.prodname_dotcom %} が適格な貢献と判断した時点であなたのアカウントに関連付けられていた、検証済みメール アドレスを使って作成したコミットである必要があります。これは、あなたの貢献と判断するために必要です。 そのコミットの元の作成者または[共同作成者の 1 人](/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors)である場合があります。 将来的に検証済みメール アドレスを変更しても、このバッジに影響はありません。 NASA の Jet Propulsion 研究所から受け取った情報に基づいて一覧を作成しました。 +If you authored any commit(s) present in the commit history for the listed tag of one or more of the repositories below, you'll receive the Mars 2020 Helicopter Contributor achievement on your profile. The authored commit must be with a verified email address, associated with your account at the time {% data variables.product.prodname_dotcom %} determined the eligible contributions, in order to be attributed to you. You can be the original author or [one of the co-authors](/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors) of the commit. Future changes to verified emails will not have an effect on the badge. We built the list based on information received from NASA's Jet Propulsion Laboratory. -| {% data variables.product.prodname_dotcom %} リポジトリ | バージョン | タグ | +| {% data variables.product.prodname_dotcom %} Repository | Version | Tag | |---|---|---| | [torvalds/linux](https://github.com/torvalds/linux) | 3.4 | [v3.4](https://github.com/torvalds/linux/releases/tag/v3.4) | | [python/cpython](https://github.com/python/cpython) | 3.9.2 | [v3.9.2](https://github.com/python/cpython/releases/tag/v3.9.2) | @@ -238,6 +268,6 @@ ms.locfileid: '146681054' | [locationtech/jts](https://github.com/locationtech/jts) | 1.15.0 | [jts-1.15.0](https://github.com/locationtech/jts/releases/tag/jts-1.15.0) | | [apache/logging-log4j2](https://github.com/apache/logging-log4j2) | 2.11 | [log4j-2.11.0](https://github.com/apache/logging-log4j2/releases/tag/log4j-2.11.0) | -## 参考資料 +## Further reading -- "[プロフィールについて](/articles/about-your-profile)" +- "[About your profile](/articles/about-your-profile)" diff --git a/translations/ja-JP/content/actions/security-guides/security-hardening-for-github-actions.md b/translations/ja-JP/content/actions/security-guides/security-hardening-for-github-actions.md index c39ef22235..9b7fb1a826 100644 --- a/translations/ja-JP/content/actions/security-guides/security-hardening-for-github-actions.md +++ b/translations/ja-JP/content/actions/security-guides/security-hardening-for-github-actions.md @@ -275,7 +275,7 @@ This list describes the recommended approaches for accessing repository data wit {% ifversion fpt or ghec %}**Self-hosted**{% elsif ghes or ghae %}Self-hosted{% endif %} runners for {% data variables.product.product_name %} do not have guarantees around running in ephemeral clean virtual machines, and can be persistently compromised by untrusted code in a workflow. -{% ifversion fpt or ghec %}As a result, self-hosted runners should almost [never be used for public repositories](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories) on {% data variables.product.product_name %}, because any user can open pull requests against the repository and compromise the environment. Similarly, be{% elsif ghes or ghae %}Be{% endif %} cautious when using self-hosted runners on private or internal repositories, as anyone who can fork the repository and open a pull request (generally those with read access to the repository) are able to compromise the self-hosted runner environment, including gaining access to secrets and the `GITHUB_TOKEN` which, depending on its settings, can grant write access to the repository. Although workflows can control access to environment secrets by using environments and required reviews, these workflows are not run in an isolated environment and are still susceptible to the same risks when run on a self-hosted runner. +{% ifversion fpt or ghec %}As a result, self-hosted runners should almost [never be used for public repositories](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security) on {% data variables.product.product_name %}, because any user can open pull requests against the repository and compromise the environment. Similarly, be{% elsif ghes or ghae %}Be{% endif %} cautious when using self-hosted runners on private or internal repositories, as anyone who can fork the repository and open a pull request (generally those with read access to the repository) are able to compromise the self-hosted runner environment, including gaining access to secrets and the `GITHUB_TOKEN` which, depending on its settings, can grant write access to the repository. Although workflows can control access to environment secrets by using environments and required reviews, these workflows are not run in an isolated environment and are still susceptible to the same risks when run on a self-hosted runner. When a self-hosted runner is defined at the organization or enterprise level, {% data variables.product.product_name %} can schedule workflows from multiple repositories onto the same runner. Consequently, a security compromise of these environments can result in a wide impact. To help reduce the scope of a compromise, you can create boundaries by organizing your self-hosted runners into separate groups. You can restrict what {% ifversion restrict-groups-to-workflows %}workflows, {% endif %}organizations and repositories can access runner groups. For more information, see "[Managing access to self-hosted runners using groups](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)." diff --git a/translations/ja-JP/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md b/translations/ja-JP/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md index 5be57987a6..bd71918b12 100644 --- a/translations/ja-JP/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md +++ b/translations/ja-JP/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md @@ -1,7 +1,7 @@ --- -title: GitHub Actions を有効化して GitHub Enterprise Server をバックアップおよび復元する +title: Backing up and restoring GitHub Enterprise Server with GitHub Actions enabled shortTitle: Backing up and restoring -intro: '外部ストレージプロバイダの {% data variables.product.prodname_actions %} データは、通常の {% data variables.product.prodname_ghe_server %} バックアップに含まれていないため、個別にバックアップする必要があります。' +intro: 'To restore a backup of {% data variables.product.product_location %} when {% data variables.product.prodname_actions %} is enabled, you must configure {% data variables.product.prodname_actions %} before restoring the backup with {% data variables.product.prodname_enterprise_backup_utilities %}.' versions: ghes: '*' type: how_to @@ -12,50 +12,33 @@ topics: - Infrastructure redirect_from: - /admin/github-actions/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled -ms.openlocfilehash: def12b4e9e93a75ee1aa58f8290ca1b6e7d13cd5 -ms.sourcegitcommit: fcf3546b7cc208155fb8acdf68b81be28afc3d2d -ms.translationtype: HT -ms.contentlocale: ja-JP -ms.lasthandoff: 09/10/2022 -ms.locfileid: '145120462' --- -{% data reusables.actions.enterprise-storage-ha-backups %} -{% data variables.product.prodname_enterprise_backup_utilities %} を使用して {% data variables.product.product_location %} をバックアップする場合、外部ストレージプロバイダに保存されている {% data variables.product.prodname_actions %} データはバックアップに含まれないことにご注意ください。 +## About backups of {% data variables.product.product_name %} when using {% data variables.product.prodname_actions %} -以下は、{% data variables.product.product_location %} と {% data variables.product.prodname_actions %} を新しいアプライアンスに復元するために必要なステップの概要です。 +You can use {% data variables.product.prodname_enterprise_backup_utilities %} to back up and restore the data and configuration for {% data variables.product.product_location %} to a new instance. For more information, see "[Configuring backups on your appliance](/admin/configuration/configuring-backups-on-your-appliance)." -1. 元のアプライアンスがオフラインであることを確認します。 -1. 交換用の {% data variables.product.prodname_ghe_server %} アプライアンスでネットワーク設定を手動設定します。 ネットワーク設定はバックアップスナップショットから除外され、`ghe-restore` で上書きされません。 -1. もともとのアプライアンスと同じ {% data variables.product.prodname_actions %} 外部ストレージ構成を使用するように交換アプライアンスを構成するには、新しいアプライアンスから、必須のパラメーターを `ghe-config` コマンドで設定します。 - - - Azure Blob Storage - ```shell - ghe-config secrets.actions.storage.blob-provider "azure" - ghe-config secrets.actions.storage.azure.connection-string "_Connection_String_" - ``` - - Amazon S3 - ```shell - ghe-config secrets.actions.storage.blob-provider "s3" - ghe-config secrets.actions.storage.s3.bucket-name "_S3_Bucket_Name" - ghe-config secrets.actions.storage.s3.service-url "_S3_Service_URL_" - ghe-config secrets.actions.storage.s3.access-key-id "_S3_Access_Key_ID_" - ghe-config secrets.actions.storage.s3.access-secret "_S3_Access_Secret_" - ``` - - 必要に応じて、S3 強制パススタイルを有効にするには、次のコマンドを入力します。 - ```shell - ghe-config secrets.actions.storage.s3.force-path-style true - ``` - +However, not all the data for {% data variables.product.prodname_actions %} is included in these backups. {% data reusables.actions.enterprise-storage-ha-backups %} -1. 交換用アプライアンスで {% data variables.product.prodname_actions %} を有効化します。 これにより、交換用アプライアンスが {% data variables.product.prodname_actions %} の同じ外部ストレージに接続されます。 +## Restoring a backup of {% data variables.product.product_name %} when {% data variables.product.prodname_actions %} is enabled - ```shell - ghe-config app.actions.enabled true - ghe-config-apply - ``` +To restore a backup of {% data variables.product.product_location %} with {% data variables.product.prodname_actions %}, you must manually configure network settings and external storage on the destination instance before you restore your backup from {% data variables.product.prodname_enterprise_backup_utilities %}. -1. {% data variables.product.prodname_actions %} が構成され、有効になったら、`ghe-restore` コマンドを使い、残りのデータをバックアップから復元します。 詳しくは、「[バックアップの復元](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)」を参照してください。 -1. セルフホストランナーを交換用アプライアンスに再登録します。 詳細については、「[セルフホステッド ランナーの追加](/actions/hosting-your-own-runners/adding-self-hosted-runners)」をご覧ください。 +1. Confirm that the source instance is offline. +1. Manually configure network settings on the replacement {% data variables.product.prodname_ghe_server %} instance. Network settings are excluded from the backup snapshot, and are not overwritten by `ghe-restore`. For more information, see "[Configuring network settings](/admin/configuration/configuring-network-settings)." +1. SSH into the destination instance. For more information, see "[Accessing the administrative shell (SSH)](/admin/configuration/accessing-the-administrative-shell-ssh)." -{% data variables.product.prodname_ghe_server %} のバックアップと復元について詳しくは、「[アプライアンスでバックアップを構成する](/admin/configuration/configuring-backups-on-your-appliance)」を参照してください。 + ```shell{:copy} + $ ssh -p 122 admin@HOSTNAME + ``` +1. Configure the destination instance to use the same external storage service for {% data variables.product.prodname_actions %} as the source instance by entering one of the following commands. +{% indented_data_reference reusables.actions.configure-storage-provider-platform-commands spaces=3 %} +{% data reusables.actions.configure-storage-provider %} +1. To prepare to enable {% data variables.product.prodname_actions %} on the destination instance, enter the following command. + + ```shell{:copy} + ghe-config app.actions.enabled true + ``` +{% data reusables.actions.apply-configuration-and-enable %} +1. After {% data variables.product.prodname_actions %} is configured and enabled, to restore the rest of the data from the backup, use the `ghe-restore` command. For more information, see "[Restoring a backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)." +1. Re-register your self-hosted runners on the destination instance. For more information, see "[Adding self-hosted runners](/actions/hosting-your-own-runners/adding-self-hosted-runners)." diff --git a/translations/ja-JP/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md b/translations/ja-JP/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md index c1e82392a8..6fa069a0f2 100644 --- a/translations/ja-JP/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md +++ b/translations/ja-JP/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md @@ -1,53 +1,157 @@ --- -title: ステージングインスタンスのセットアップ -intro: '別の分離された環境に {% data variables.product.product_name %} インスタンスを設定し、そのインスタンスを使って変更の検証とテストを行うことができます。' +title: Setting up a staging instance +intro: 'You can set up a {% data variables.product.product_name %} instance in a separate, isolated environment, and use the instance to validate and test changes.' redirect_from: - /enterprise/admin/installation/setting-up-a-staging-instance - /admin/installation/setting-up-a-staging-instance versions: - ghes: '*' + ghes: "*" type: how_to topics: - Enterprise - Infrastructure - Upgrades shortTitle: Set up a staging instance -ms.openlocfilehash: 86006b3dd1fcdd7a7139f35934cafce1f208c8bb -ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 -ms.translationtype: HT -ms.contentlocale: ja-JP -ms.lasthandoff: 09/05/2022 -ms.locfileid: '147065363' +miniTocMaxHeadingLevel: 3 --- -## ステージング インスタンスについて -{% data variables.product.company_short %} では、{% data variables.product.product_location %} の構成のバックアップ、更新、または変更をテストするために別の環境を設定することを推奨しています。 運用システムから分離する必要があるこの環境は、ステージング環境と呼ばれます。 +## About staging instances -たとえば、データの損失から保護するために、運用インスタンスのバックアップを定期的に検証できます。 ステージング環境の別の {% data variables.product.product_name %} インスタンスに、運用データのバックアップを定期的に復元できます。 このステージング インスタンスでは、{% data variables.product.product_name %} の最新の機能リリースへのアップグレードをテストすることもできます。 +{% data variables.product.company_short %} recommends that you set up a separate environment to test backups, updates, or changes to the configuration for {% data variables.product.product_location %}. This environment, which you should isolate from your production systems, is called a staging environment. + +For example, to protect against loss of data, you can regularly validate the backup of your production instance. You can regularly restore the backup of your production data to a separate {% data variables.product.product_name %} instance in a staging environment. On this staging instance, you could also test the upgrade to the latest feature release of {% data variables.product.product_name %}. {% tip %} -**ヒント:** ステージング インスタンスを本番容量で使用しない限り、既存の {% data variables.product.prodname_enterprise %} ライセンス ファイルを再利用できます。 +**Tip:** You may reuse your existing {% data variables.product.prodname_enterprise %} license file as long as the staging instance is not used in a production capacity. {% endtip %} -## ステージング環境に関する考慮事項 +## Considerations for a staging environment -{% data variables.product.product_name %} を十分にテストし、運用環境とできるだけ似た環境を再作成するには、インスタンスと対話する外部システムを検討してください。 たとえば、ステージング環境では次をテストできます。 +To thoroughly test {% data variables.product.product_name %} and recreate an environment that's as similar to your production environment as possible, consider the external systems that interact with your instance. For example, you may want to test the following in your staging environment. -- 認証 (特に SAML などの外部認証プロバイダーを使用する場合) -- 外部のチケットシステムとの統合 -- 継続的インテグレーションサーバとの統合 -- {% data variables.product.prodname_enterprise_api %}を利用する外部のスクリプトあるいはソフトウェア -- メール通知のための外部のSMTPサーバ +- Authentication, especially if you use an external authentication provider like SAML +- Integration with an external ticketing system +- Integration with a continuous integration server +- External scripts or software that use the {% data variables.product.prodname_enterprise_api %} +- External SMTP server for email notifications -## ステージングインスタンスのセットアップ +## Setting up a staging instance -1. {% data variables.product.prodname_enterprise_backup_utilities %}を使って本番インスタンスをバックアップしてください。 詳細については、「[アプライアンスでバックアップを構成する](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance#about-github-enterprise-server-backup-utilities)」の「{% data variables.product.prodname_enterprise_backup_utilities %} について」セクションを参照してください。 -2. 新しいインスタンスをステージング環境として動作するようにセットアップしてください。 ステージングインスタンスのプロビジョニングとインストールについては、本番インスタンスと同じガイドが利用できます。 詳細については、「[{% data variables.product.prodname_ghe_server %} インスタンスをセットアップする](/enterprise/admin/guides/installation/setting-up-a-github-enterprise-server-instance/)」を参照してください。 -3. 必要に応じて、テスト環境で {% data variables.product.prodname_actions %} 機能をテストする場合は、ログとストレージに関する考慮事項を確認してください。 詳細については、「[ステージング環境を使用する](/admin/github-actions/advanced-configuration-and-troubleshooting/using-a-staging-environment)」を参照してください。 -4. バックアップをステージングインスタンスにリストアしてください。 詳細については、「[アプライアンスでバックアップを構成する](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance#restoring-a-backup)」の「バックアップの復元」セクションを参照してください。 +You can set up a staging instance from scratch and configure the instance however you like. For more information, see "[Setting up a {% data variables.product.product_name %} instance](/admin/installation/setting-up-a-github-enterprise-server-instance)" and "[Configuring your enterprise](/admin/configuration/configuring-your-enterprise)." -## 参考資料 +Alternatively, you can create a staging instance that reflects your production configuration by restoring a backup of your production instance to the staging instance. -- 「[新しいリリースへのアップグレードについて](/admin/overview/about-upgrades-to-new-releases)」 +1. [Back up your production instance](#1-back-up-your-production-instance). +2. [Set up a staging instance](#2-set-up-a-staging-instance). +3. [Configure {% data variables.product.prodname_actions %}](#3-configure-github-actions). +4. [Configure {% data variables.product.prodname_registry %}](#4-configure-github-packages). +5. [Restore your production backup](#5-restore-your-production-backup). +6. [Review the instance's configuration](#6-review-the-instances-configuration). +7. [Apply the instance's configuration](#7-apply-the-instances-configuration). + +### 1. Back up your production instance + +If you want to test changes on an instance that contains the same data and configuration as your production instance, back up the data and configuration from the production instance using {% data variables.product.prodname_enterprise_backup_utilities %}. For more information, see "[Configuring backups on your appliance](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance)." + +{% warning %} + +**Warning**: If you use {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} in production, your backup will include your production configuration for external storage. To avoid potential loss of data by writing to your production storage from your staging instance, you must configure each feature in steps 3 and 4 before you restore your backup. + +{% endwarning %} + +### 2. Set up a staging instance + +Set up a new instance to act as your staging environment. You can use the same guides for provisioning and installing your staging instance as you did for your production instance. For more information, see "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise/admin/guides/installation/setting-up-a-github-enterprise-server-instance/)." + +If you plan to restore a backup of your production instance, continue to the next step. Alternatively, you can configure the instance manually and skip the following steps. + +### 3. Configure {% data variables.product.prodname_actions %} + +Optionally, if you use {% data variables.product.prodname_actions %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_actions %}, skip to "[4. Configure {% data variables.product.prodname_registry %}](#4-configure-github-packages)." + +{% warning %} + +**Warning**: If you don't configure {% data variables.product.prodname_actions %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance. For more information, see "[Using a staging environment](/admin/github-actions/advanced-configuration-and-troubleshooting/using-a-staging-environment)." + +{% endwarning %} + +{% data reusables.enterprise_installation.ssh-into-staging-instance %} +1. To configure the staging instance to use an external storage provider for {% data variables.product.prodname_actions %}, enter one of the following commands. +{% indented_data_reference reusables.actions.configure-storage-provider-platform-commands spaces=3 %} +{% data reusables.actions.configure-storage-provider %} +1. To prepare to enable {% data variables.product.prodname_actions %} on the staging instance, enter the following command. + + ```shell{:copy} + ghe-config app.actions.enabled true + ``` + +### 4. Configure {% data variables.product.prodname_registry %} + +Optionally, if you use {% data variables.product.prodname_registry %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_registry %}, skip to "[5. Restore your production backup](#5-restore-your-production-backup)." + +{% warning %} + +**Warning**: If you don't configure {% data variables.product.prodname_actions %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance. + +{% endwarning %} + +1. Review the backup you will restore to the staging instance. + - If you took the backup with {% data variables.product.prodname_enterprise_backup_utilities %} 3.5 or later, the backup includes the configuration for {% data variables.product.prodname_registry %}. Continue to the next step. + - If you took the backup with {% data variables.product.prodname_enterprise_backup_utilities %} 3.4 or earlier, configure {% data variables.product.prodname_registry %} on the staging instance. For more information, see "[Getting started with {% data variables.product.prodname_registry %} for your enterprise](/admin/packages/getting-started-with-github-packages-for-your-enterprise)." +{% data reusables.enterprise_installation.ssh-into-staging-instance %} +1. Configure the external storage connection by entering the following commands, replacing the placeholder values with actual values for your connection. + - Azure Blob Storage: + + ```shell{:copy} + ghe-config secrets.packages.blob-storage-type "azure" + ghe-config secrets.packages.azure-container-name "AZURE CONTAINER NAME" + ghe-config secrets.packages.azure-connection-string "CONNECTION STRING" + ``` + - Amazon S3: + + ```shell{:copy} + ghe-config secrets.packages.blob-storage-type "s3" + ghe-config secrets.packages.service-url "S3 SERVICE URL" + ghe-config secrets.packages.s3-bucket "S3 BUCKET NAME" + ghe-config secrets.packages.aws-access-key "S3 ACCESS KEY ID" + ghe-config secrets.packages.aws-secret-key "S3 ACCESS SECRET" + ``` +1. To prepare to enable {% data variables.product.prodname_registry %} on the staging instance, enter the following command. + + ```shell{:copy} + ghe-config app.packages.enabled true + ``` + +### 5. Restore your production backup + +Use the `ghe-restore` command to restore the rest of the data from the backup. For more information, see "[Restoring a backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)." + +If the staging instance is already configured and you're about to overwrite settings, certificate, and license data, add the `-c` option to the command. For more information about the option, see [Using the backup and restore commands](https://github.com/github/backup-utils/blob/master/docs/usage.md#restoring-settings-tls-certificate-and-license) in the {% data variables.product.prodname_enterprise_backup_utilities %} documentation. + +### 6. Review the instance's configuration + +To access the staging instance using the same hostname, update your local hosts file to resolve the staging instance's hostname by IP address by editing the `/etc/hosts` file in macOS or Linux, or the `C:\Windows\system32\drivers\etc` file in Windows. + +{% note %} + +**Note**: Your staging instance must be accessible from the same hostname as your production instance. Changing the hostname for {% data variables.product.product_location %} is not supported. For more information, see "[Configuring a hostname](/admin/configuration/configuring-network-settings/configuring-a-hostname)." + +{% endnote %} + +Then, review the staging instance's configuration in the {% data variables.enterprise.management_console %}. For more information, see "[Accessing the {% data variables.enterprise.management_console %}](/admin/configuration/configuring-your-enterprise/accessing-the-management-console)." + +{% warning %} + +**Warning**: If you configured {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} for the staging instance, to avoid overwriting production data, ensure that the external storage configuration in the {% data variables.enterprise.management_console %} does not match your production instance. + +{% endwarning %} + +### 7. Apply the instance's configuration + +To apply the configuration from the {% data variables.enterprise.management_console %}, click **Save settings**. + +## Further reading + +- "[About upgrades to new releases](/admin/overview/about-upgrades-to-new-releases)" diff --git a/translations/ja-JP/content/get-started/using-github/keyboard-shortcuts.md b/translations/ja-JP/content/get-started/using-github/keyboard-shortcuts.md index f0ef5e37da..63db7352b5 100644 --- a/translations/ja-JP/content/get-started/using-github/keyboard-shortcuts.md +++ b/translations/ja-JP/content/get-started/using-github/keyboard-shortcuts.md @@ -150,7 +150,7 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr | Keyboard shortcut | Description |-----------|------------ -|⌘+f (Mac) or Ctrl+f (Windows/Linux) | Focus filter field +|Command+f (Mac) or Ctrl+f (Windows/Linux) | Focus filter field |← | Move cell focus to the left |→ | Move cell focus to the right |↑ | Move cell focus up @@ -162,7 +162,7 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr |-----------|------------ |Enter | Toggle edit mode for the focused cell |Escape | Cancel editing for the focused cell -|⌘+Shift+\ (Mac) or Ctrl+Shift+\ (Windows/Linux) | Open row actions menu +|Command+Shift+\ (Mac) or Ctrl+Shift+\ (Windows/Linux) | Open row actions menu |Shift+Space | Select item |Space | Open selected item |e | Archive selected items diff --git a/translations/ja-JP/content/index.md b/translations/ja-JP/content/index.md index 5385321f93..91ea171895 100644 --- a/translations/ja-JP/content/index.md +++ b/translations/ja-JP/content/index.md @@ -75,6 +75,10 @@ childGroups: octicon: ShieldLockIcon children: - code-security + - code-security/supply-chain-security + - code-security/dependabot + - code-security/code-scanning + - code-security/secret-scanning - name: Client apps octicon: DeviceMobileIcon children: diff --git a/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md b/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md index b628d23e81..58f47d8e9d 100644 --- a/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md +++ b/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md @@ -1,6 +1,6 @@ --- -title: Organization のセキュリティおよび分析設定を管理する -intro: '{% data variables.product.prodname_dotcom %} 上の Organization のプロジェクトでコードを保護し分析する機能を管理できます。' +title: Managing security and analysis settings for your organization +intro: 'You can control features that secure and analyze the code in your organization''s projects on {% data variables.product.prodname_dotcom %}.' permissions: Organization owners can manage security and analysis settings for repositories in the organization. redirect_from: - /github/setting-up-and-managing-organizations-and-teams/managing-secret-scanning-for-your-organization @@ -15,115 +15,156 @@ topics: - Organizations - Teams shortTitle: Manage security & analysis -ms.openlocfilehash: 83104f606266279a239c5173e838c9241832fb84 -ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 -ms.translationtype: HT -ms.contentlocale: ja-JP -ms.lasthandoff: 09/05/2022 -ms.locfileid: '147063211' --- -## セキュリティおよび分析設定の管理について -{% data variables.product.prodname_dotcom %} を使用して、Organization のリポジトリを保護できます。 Organization でメンバーが作成する既存または新規のリポジトリすべてについて、セキュリティおよび分析機能を管理できます。 {% ifversion ghec %}{% data variables.product.prodname_GH_advanced_security %} のライセンスを持っている場合は、これらの機能へのアクセスを管理することもできます。 {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion fpt %}{% data variables.product.prodname_GH_advanced_security %}のライセンス付きで{% data variables.product.prodname_ghe_cloud %}を使用するOrganizationは、それらの機能へのアクセスも管理できます。 詳細については、[{% data variables.product.prodname_ghe_cloud %} ドキュメント](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)を参照してください。{% endif %} +## About management of security and analysis settings -{% data reusables.security.some-security-and-analysis-features-are-enabled-by-default %} {% data reusables.security.security-and-analysis-features-enable-read-only %} +{% data variables.product.prodname_dotcom %} can help secure the repositories in your organization. You can manage the security and analysis features for all existing or new repositories that members create in your organization. {% ifversion ghec %}If you have a license for {% data variables.product.prodname_GH_advanced_security %} then you can also manage access to these features. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion fpt %}Organizations that use {% data variables.product.prodname_ghe_cloud %} with a license for {% data variables.product.prodname_GH_advanced_security %} can also manage access to these features. For more information, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization).{% endif %} -## セキュリティと分析の設定を表示する +{% data reusables.security.some-security-and-analysis-features-are-enabled-by-default %} +{% data reusables.security.security-and-analysis-features-enable-read-only %} -{% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.security-and-analysis %} +## Displaying the security and analysis settings -表示されるページでは、Organization 内のリポジトリのすべてのセキュリティおよび分析機能を有効化または無効化にできます。 +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} +{% data reusables.organizations.security-and-analysis %} -{% ifversion ghec %}Organization が {% data variables.product.prodname_GH_advanced_security %} のライセンスを持つ Enterprise に属している場合、ページには {% data variables.product.prodname_advanced_security %} 機能を有効化または無効化するオプションも含まれます。 {% data variables.product.prodname_GH_advanced_security %} を使用するリポジトリは、ページの下部に一覧表示されます。{% endif %} +The page that's displayed allows you to enable or disable all security and analysis features for the repositories in your organization. -{% ifversion ghes %}{% data variables.product.prodname_GH_advanced_security %} のライセンスを持っている場合、ページには {% data variables.product.prodname_advanced_security %} 機能を有効化または無効化するオプションも含まれます。 {% data variables.product.prodname_GH_advanced_security %} を使用するリポジトリは、ページの下部に一覧表示されます。{% endif %} +{% ifversion ghec %}If your organization belongs to an enterprise with a license for {% data variables.product.prodname_GH_advanced_security %}, the page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %} -{% ifversion ghae %}このページには、{% data variables.product.prodname_advanced_security %} 機能を有効または無効にするオプションも含まれています。 {% data variables.product.prodname_GH_advanced_security %} を使用するリポジトリは、ページの下部に一覧表示されます。{% endif %} +{% ifversion ghes %}If you have a license for {% data variables.product.prodname_GH_advanced_security %}, the page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %} -## 既存のすべてのリポジトリの機能を有効または無効にする +{% ifversion ghae %}The page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %} -すべてのリポジトリの機能を有効化または無効化できます。 {% ifversion fpt or ghec %}変更が Organization 内のリポジトリに与える影響は、リポジトリの可視性によって決まります。 +## Enabling or disabling a feature for all existing repositories -- **依存関係グラフ** - この機能はパブリック リポジトリに対して常に有効になっているため、変更はプライベート リポジトリにのみ影響します。 -- **{% data variables.product.prodname_dependabot_alerts %}** - 変更はすべてのリポジトリに影響します。 -- **{% data variables.product.prodname_dependabot_security_updates %}** - 変更はすべてのリポジトリに影響します。 +You can enable or disable features for all repositories. +{% ifversion fpt or ghec %}The impact of your changes on repositories in your organization is determined by their visibility: + +- **Dependency graph** - Your changes affect only private repositories because the feature is always enabled for public repositories. +- **{% data variables.product.prodname_dependabot_alerts %}** - Your changes affect all repositories. +- **{% data variables.product.prodname_dependabot_security_updates %}** - Your changes affect all repositories. {%- ifversion ghec %} -- **{% data variables.product.prodname_GH_advanced_security %}** - {% data variables.product.prodname_GH_advanced_security %} および関連機能は常にパブリック リポジトリに対して有効になっているため、変更はプライベート リポジトリにのみ影響します。 -- **{% data variables.product.prodname_secret_scanning_caps %}** - 変更は、{% data variables.product.prodname_GH_advanced_security %}も有効になっているリポジトリにのみ影響します。 このオプションは、{% data variables.product.prodname_secret_scanning_GHAS %}が有効になっているかどうかを制御します。 {% data variables.product.prodname_secret_scanning_partner_caps %}は、すべてのパブリックリポジトリ上で常に実行されます。 +- **{% data variables.product.prodname_GH_advanced_security %}** - Your changes affect only private repositories because {% data variables.product.prodname_GH_advanced_security %} and the related features are always enabled for public repositories. +- **{% data variables.product.prodname_secret_scanning_caps %}** - Your changes affect repositories where {% data variables.product.prodname_GH_advanced_security %} is also enabled. This option controls whether or not {% data variables.product.prodname_secret_scanning_GHAS %} is enabled. {% data variables.product.prodname_secret_scanning_partner_caps %} always runs on all public repositories. {% endif %} {% endif %} {% data reusables.advanced-security.note-org-enable-uses-seats %} -1. 組織のセキュリティと分析の設定に移動します。 詳細については、「[セキュリティと分析の設定を表示する](#displaying-the-security-and-analysis-settings)」を参照してください。 -2. [Code security and analysis] の下で機能の右にある **[Disable all]** または **[Enable all]** をクリックします。 {% ifversion ghes or ghec %}{% data variables.product.prodname_GH_advanced_security %} ライセンスに空きシートがない場合、"{% data variables.product.prodname_GH_advanced_security %}" のコントロールは無効になります。{% endif %} {% ifversion fpt %}![[セキュリティと分析の構成] 機能の [すべて有効にする] または [すべて無効にする] ボタン](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-fpt.png){% endif %} {% ifversion ghec %}![[セキュリティと分析の構成] 機能の [すべて有効にする] または [すべて無効にする] ボタン](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-ghas-ghec.png){% endif %} {% ifversion ghes > 3.2 %}![[セキュリティと分析の構成] 機能の [すべて有効にする] または [すべて無効にする] ボタン](/assets/images/enterprise/3.3/organizations/security-and-analysis-disable-or-enable-all-ghas.png){% endif %} {% ifversion ghes = 3.2 %}![[セキュリティと分析の構成] 機能の [すべて有効にする] または [すべて無効にする] ボタン](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-disable-or-enable-all-ghas.png){% endif %} +{% ifversion ghes or ghec or ghae %} +{% note %} + +**Note:** If you encounter an error that reads "GitHub Advanced Security cannot be enabled because of a policy setting for the organization," contact your enterprise admin and ask them to change the GitHub Advanced Security policy for your enterprise. For more information, see "[Enforcing policies for Advanced Security in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise)." +{% endnote %} +{% endif %} + +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +2. Under "Code security and analysis", to the right of the feature, click **Disable all** or **Enable all**. {% ifversion ghes or ghec %}The control for "{% data variables.product.prodname_GH_advanced_security %}" is disabled if you have no available seats in your {% data variables.product.prodname_GH_advanced_security %} license.{% endif %} + {% ifversion fpt %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-fpt.png) + {% endif %} + {% ifversion ghec %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-ghas-ghec.png) + {% endif %} + {% ifversion ghes > 3.2 %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/enterprise/3.3/organizations/security-and-analysis-disable-or-enable-all-ghas.png) + {% endif %} + {% ifversion ghes = 3.2 %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-disable-or-enable-all-ghas.png) + {% endif %} - {% ifversion ghae %}![[セキュリティと分析の構成] 機能の [すべて有効にする] または [すべて無効にする] ボタン](/assets/images/enterprise/github-ae/organizations/security-and-analysis-disable-or-enable-all-ghae.png){% endif %} {% ifversion fpt or ghec %} -3. オプションで、Organization の新しいリポジトリに対して機能をデフォルトで有効にすることもできます。 - {% ifversion fpt or ghec %}![新しいリポジトリの [既定で有効にする] オプション](/assets/images/help/organizations/security-and-analysis-enable-by-default-in-modal.png){% endif %} + {% ifversion ghae %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/enterprise/github-ae/organizations/security-and-analysis-disable-or-enable-all-ghae.png) + {% endif %} + {% ifversion fpt or ghec %} +3. Optionally, enable the feature by default for new repositories in your organization. + {% ifversion fpt or ghec %} + !["Enable by default" option for new repositories](/assets/images/help/organizations/security-and-analysis-enable-by-default-in-modal.png) + {% endif %} - {% endif %} {% ifversion fpt or ghec %} -4. **[機能の無効化]** または **[機能の有効化]** をクリックし、Organization のすべてのリポジトリに対してこの機能を無効または有効にします。 - {% ifversion fpt or ghec %}![機能を無効または有効にするボタン](/assets/images/help/organizations/security-and-analysis-enable-dependency-graph.png){% endif %} + {% endif %} + {% ifversion fpt or ghec %} +4. Click **Disable FEATURE** or **Enable FEATURE** to disable or enable the feature for all the repositories in your organization. + {% ifversion fpt or ghec %} + ![Button to disable or enable feature](/assets/images/help/organizations/security-and-analysis-enable-dependency-graph.png) + {% endif %} - {% endif %} {% ifversion ghae or ghes %} -3. **[すべて有効にする]/[すべて無効にする]** または **[対象リポジトリの有効化]/[対象リポジトリの無効化]** をクリックして、変更を確定します。 - ![Organization 内の適格なすべてのリポジトリの機能を有効化するボタン](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-secret-scanning-existing-repos-ghae.png) {% endif %} + {% endif %} + {% ifversion ghae or ghes %} +5. Click **Enable/Disable all** or **Enable/Disable for eligible repositories** to confirm the change. + ![Button to enable feature for all the eligible repositories in the organization](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-secret-scanning-existing-repos-ghae.png) + {% endif %} {% data reusables.security.displayed-information %} -## 新しいリポジトリが追加されたときに機能を自動的に有効化または無効化する +## Enabling or disabling a feature automatically when new repositories are added -1. 組織のセキュリティと分析の設定に移動します。 詳細については、「[セキュリティと分析の設定を表示する](#displaying-the-security-and-analysis-settings)」を参照してください。 -2. "Code security and analysis（コードのセキュリティと分析）"の下で、機能の右から、Organizationの新しいリポジトリ{% ifversion fpt or ghec %}、もしくはすべての新しいプライベートリポジトリ{% endif %}でデフォルトでこの機能を有効化もしくは無効化してください。 - {% ifversion fpt or ghec %}![新しいリポジトリの機能を有効にするためのチェックボックスのスクリーンショット](/assets/images/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png){% endif %} {% ifversion ghes > 3.2 %}![新しいリポジトリの機能を有効にするためのチェックボックスのスクリーンショット](/assets/images/enterprise/3.3/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png){% endif %} {% ifversion ghes = 3.2 %}![新しいリポジトリの機能を有効にするためのチェックボックスのスクリーンショット](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png){% endif %} {% ifversion ghae %}![新しいリポジトリの機能を有効にするためのチェックボックスのスクリーンショット](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-or-disable-secret-scanning-checkbox-ghae.png){% endif %} +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +2. Under "Code security and analysis", to the right of the feature, enable or disable the feature by default for new repositories{% ifversion fpt or ghec %}, or all new private repositories,{% endif %} in your organization. + {% ifversion fpt or ghec %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) + {% endif %} + {% ifversion ghes > 3.2 %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/enterprise/3.3/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) + {% endif %} + {% ifversion ghes = 3.2 %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) + {% endif %} + {% ifversion ghae %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-or-disable-secret-scanning-checkbox-ghae.png) + {% endif %} {% ifversion fpt or ghec or ghes > 3.2 %} -## {% data variables.product.prodname_dependabot %} のプライベート依存関係へのアクセスを許可する +## Allowing {% data variables.product.prodname_dependabot %} to access private dependencies -{% data variables.product.prodname_dependabot %} は、プロジェクト内の古い依存関係参照をチェックし、それらを更新するためのプルリクエストを自動的に生成できます。 これを行うには、{% data variables.product.prodname_dependabot %} がすべてのターゲット依存関係ファイルにアクセスできる必要があります。 通常、1 つ以上の依存関係にアクセスできない場合、バージョン更新は失敗します。 詳細については、「[{% data variables.product.prodname_dependabot %} のバージョン アップデートについて](/github/administering-a-repository/about-dependabot-version-updates)」を参照してください。 +{% data variables.product.prodname_dependabot %} can check for outdated dependency references in a project and automatically generate a pull request to update them. To do this, {% data variables.product.prodname_dependabot %} must have access to all of the targeted dependency files. Typically, version updates will fail if one or more dependencies are inaccessible. For more information, see "[About {% data variables.product.prodname_dependabot %} version updates](/github/administering-a-repository/about-dependabot-version-updates)." -デフォルトでは、{% data variables.product.prodname_dependabot %} はプライベートリポジトリまたはプライベートパッケージレジストリにある依存関係を更新できません。 ただし、依存関係が、その依存関係を使用するプロジェクトと同じ Organization 内のプライベート {% data variables.product.prodname_dotcom %} リポジトリにある場合は、ホストリポジトリへのアクセスを許可することで、{% data variables.product.prodname_dependabot %} がバージョンを正常に更新できるようにすることができます。 +By default, {% data variables.product.prodname_dependabot %} can't update dependencies that are located in private repositories or private package registries. However, if a dependency is in a private {% data variables.product.prodname_dotcom %} repository within the same organization as the project that uses that dependency, you can allow {% data variables.product.prodname_dependabot %} to update the version successfully by giving it access to the host repository. -コードがプライベートレジストリ内のパッケージに依存している場合は、リポジトリレベルでこれを設定することにより、{% data variables.product.prodname_dependabot %} がこれらの依存関係のバージョンを更新できるようにすることができます。 これを行うには、リポジトリの _dependabot.yml_ ファイルに認証の詳細を追加します。 詳細については、「[dependabot.yml ファイルの構成オプション](/github/administering-a-repository/configuration-options-for-dependency-updates#configuration-options-for-private-registries)」を参照してください。 +If your code depends on packages in a private registry, you can allow {% data variables.product.prodname_dependabot %} to update the versions of these dependencies by configuring this at the repository level. You do this by adding authentication details to the _dependabot.yml_ file for the repository. For more information, see "[Configuration options for the dependabot.yml file](/github/administering-a-repository/configuration-options-for-dependency-updates#configuration-options-for-private-registries)." -{% data variables.product.prodname_dependabot %} がプライベート {% data variables.product.prodname_dotcom %} リポジトリにアクセスできるようにするには： +To allow {% data variables.product.prodname_dependabot %} to access a private {% data variables.product.prodname_dotcom %} repository: -1. 組織のセキュリティと分析の設定に移動します。 詳細については、「[セキュリティと分析の設定を表示する](#displaying-the-security-and-analysis-settings)」を参照してください。 -1. [{% data variables.product.prodname_dependabot %} プライベート リポジトリ アクセス] で、 **[プライベート リポジトリの追加]** または **[内部およびプライベート リポジトリの追加]** をクリックします。 - ![[リポジトリの追加] ボタン](/assets/images/help/organizations/dependabot-private-repository-access.png) -1. 許可するリポジトリの名前の入力を開始します。 - ![フィルタされたドロップダウンを持つリポジトリ検索フィールド](/assets/images/help/organizations/dependabot-private-repo-choose.png) -1. 許可するリポジトリをクリックします。 +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +1. Under "{% data variables.product.prodname_dependabot %} private repository access", click **Add private repositories** or **Add internal and private repositories**. + ![Add repositories button](/assets/images/help/organizations/dependabot-private-repository-access.png) +1. Start typing the name of the repository you want to allow. + ![Repository search field with filtered dropdown](/assets/images/help/organizations/dependabot-private-repo-choose.png) +1. Click the repository you want to allow. -1. あるいは、リストからリポジトリを差k除するには、リポジトリの右の{% octicon "x" aria-label="The X icon" %}をクリックします。 - ![リポジトリを削除するための [X] ボタン](/assets/images/help/organizations/dependabot-private-repository-list.png){% endif %} +1. Optionally, to remove a repository from the list, to the right of the repository, click {% octicon "x" aria-label="The X icon" %}. + !["X" button to remove a repository](/assets/images/help/organizations/dependabot-private-repository-list.png) +{% endif %} {% ifversion ghes or ghec %} -## Organization 内の個々のリポジトリから {% data variables.product.prodname_GH_advanced_security %} へのアクセスを削除する +## Removing access to {% data variables.product.prodname_GH_advanced_security %} from individual repositories in an organization -リポジトリの {% data variables.product.prodname_GH_advanced_security %} 機能へのアクセスは、[設定] タブで管理できます。詳細については、「[リポジトリのセキュリティと分析設定を管理する](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)」を参照してください。 ただし、Organization の [Settings] タブから、リポジトリの {% data variables.product.prodname_GH_advanced_security %} 機能を無効にすることもできます。 +You can manage access to {% data variables.product.prodname_GH_advanced_security %} features for a repository from its "Settings" tab. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." However, you can also disable {% data variables.product.prodname_GH_advanced_security %} features for a repository from the "Settings" tab for the organization. -1. 組織のセキュリティと分析の設定に移動します。 詳細については、「[セキュリティと分析の設定を表示する](#displaying-the-security-and-analysis-settings)」を参照してください。 -1. {% data variables.product.prodname_GH_advanced_security %} が有効になっている Organization 内のすべてのリポジトリのリストを表示するには、「{% data variables.product.prodname_GH_advanced_security %} リポジトリ」セクションまでスクロールします。 - ![[{% data variables.product.prodname_GH_advanced_security %} リポジトリ] セクション](/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png)テーブルには、各リポジトリの一意のコミッターがリストされています。 これは、{% data variables.product.prodname_GH_advanced_security %} へのアクセスを削除することによりライセンスで解放できるシートの数です。 詳細については、「[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)」(GitHub Advanced Security の課金について) を参照してください。 -1. リポジトリから {% data variables.product.prodname_GH_advanced_security %} へのアクセスを削除し、リポジトリ固有のコミッターが使用するシートを解放するには、隣接する {% octicon "x" aria-label="X symbol" %} をクリックします。 -1. 確認ダイアログで、 **[リポジトリの削除]** をクリックして、{% data variables.product.prodname_GH_advanced_security %} の機能へのアクセスを削除します。 +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +1. To see a list of all the repositories in your organization with {% data variables.product.prodname_GH_advanced_security %} enabled, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section. + ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png) + The table lists the number of unique committers for each repository. This is the number of seats you could free up on your license by removing access to {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." +1. To remove access to {% data variables.product.prodname_GH_advanced_security %} from a repository and free up seats used by any committers that are unique to the repository, click the adjacent {% octicon "x" aria-label="X symbol" %}. +1. In the confirmation dialog, click **Remove repository** to remove access to the features of {% data variables.product.prodname_GH_advanced_security %}. {% note %} -**注:** リポジトリの {% data variables.product.prodname_GH_advanced_security %} へのアクセスを削除する場合は、影響を受ける開発チームと連絡を取り、変更が意図されたものかを確認する必要があります。 これにより、失敗したコードスキャンの実行をデバッグすることに時間を費すことがなくなります。 +**Note:** If you remove access to {% data variables.product.prodname_GH_advanced_security %} for a repository, you should communicate with the affected development team so that they know that the change was intended. This ensures that they don't waste time debugging failed runs of code scanning. {% endnote %} {% endif %} -## 参考資料 +## Further reading -- 「[リポジトリの保護](/code-security/getting-started/securing-your-repository)」{% ifversion not fpt %} -- 「[シークレット スキャンについて](/github/administering-a-repository/about-secret-scanning)」{% endif %}{% ifversion not ghae %} -- [依存関係グラフについて](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph){% endif %} -- [サプライ チェーンのセキュリティについて](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security) +- "[Securing your repository](/code-security/getting-started/securing-your-repository)"{% ifversion not fpt %} +- "[About secret scanning](/github/administering-a-repository/about-secret-scanning)"{% endif %}{% ifversion not ghae %} +- "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)"{% endif %} +- "[About supply chain security](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security)" diff --git a/translations/ja-JP/content/repositories/creating-and-managing-repositories/transferring-a-repository.md b/translations/ja-JP/content/repositories/creating-and-managing-repositories/transferring-a-repository.md index 92900222ad..dff4c98d4d 100644 --- a/translations/ja-JP/content/repositories/creating-and-managing-repositories/transferring-a-repository.md +++ b/translations/ja-JP/content/repositories/creating-and-managing-repositories/transferring-a-repository.md @@ -30,7 +30,7 @@ Prerequisites for repository transfers: - When you transfer a repository that you own to another personal account, the new owner will receive a confirmation email.{% ifversion fpt or ghec %} The confirmation email includes instructions for accepting the transfer. If the new owner doesn't accept the transfer within one day, the invitation will expire.{% endif %} - To transfer a repository that you own to an organization, you must have permission to create a repository in the target organization. - The target account must not have a repository with the same name, or a fork in the same network. -- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghes < 3.7 %} +- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghes < 3.7 or ghae %} - Internal repositories can't be transferred.{% endif %} - Private forks can't be transferred. diff --git a/translations/log/msft-cn-resets.csv b/translations/log/msft-cn-resets.csv index 77b0429297..c3e505a62b 100644 --- a/translations/log/msft-cn-resets.csv +++ b/translations/log/msft-cn-resets.csv @@ -234,6 +234,7 @@ translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifi translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md,rendering error translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile.md,rendering error translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme.md,broken liquid tags +translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md,broken liquid tags translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/setting-your-profile-to-private.md,broken liquid tags translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/showing-your-private-contributions-and-achievements-on-your-profile.md,rendering error translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/index.md,broken liquid tags @@ -295,6 +296,7 @@ translations/zh-CN/content/admin/configuration/configuring-your-enterprise/confi translations/zh-CN/content/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise.md,broken liquid tags translations/zh-CN/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md,broken liquid tags translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md,rendering error +translations/zh-CN/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md,broken liquid tags translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md,rendering error translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md,rendering error translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md,rendering error @@ -305,6 +307,7 @@ translations/zh-CN/content/admin/identity-and-access-management/using-enterprise translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/migrating-from-saml-to-oidc.md,broken liquid tags translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam.md,rendering error translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference.md,broken liquid tags +translations/zh-CN/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md,broken liquid tags translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md,rendering error translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md,rendering error translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md,broken liquid tags @@ -482,6 +485,7 @@ translations/zh-CN/content/issues/planning-and-tracking-with-projects/managing-y translations/zh-CN/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-visibility-of-your-projects.md,broken liquid tags translations/zh-CN/content/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests.md,rendering error translations/zh-CN/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md,rendering error +translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md,broken liquid tags translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md,rendering error translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md,rendering error translations/zh-CN/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md,rendering error @@ -526,7 +530,7 @@ translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your- translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md,rendering error translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md,rendering error translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md,rendering error -translations/zh-CN/content/repositories/creating-and-managing-repositories/transferring-a-repository.md,broken liquid tags +translations/zh-CN/content/repositories/creating-and-managing-repositories/transferring-a-repository.md,rendering error translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners.md,rendering error translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-readmes.md,rendering error translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md,rendering error diff --git a/translations/log/msft-ja-resets.csv b/translations/log/msft-ja-resets.csv index 2b21018c94..c1e0bdd8ea 100644 --- a/translations/log/msft-ja-resets.csv +++ b/translations/log/msft-ja-resets.csv @@ -252,6 +252,7 @@ translations/ja-JP/content/account-and-profile/managing-subscriptions-and-notifi translations/ja-JP/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md,rendering error translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile.md,rendering error translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme.md,broken liquid tags +translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md,broken liquid tags translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/setting-your-profile-to-private.md,broken liquid tags translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/showing-your-private-contributions-and-achievements-on-your-profile.md,broken liquid tags translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md,rendering error @@ -299,18 +300,20 @@ translations/ja-JP/content/actions/using-workflows/events-that-trigger-workflows translations/ja-JP/content/actions/using-workflows/reusing-workflows.md,rendering error translations/ja-JP/content/actions/using-workflows/sharing-workflows-secrets-and-runners-with-your-organization.md,rendering error translations/ja-JP/content/actions/using-workflows/triggering-a-workflow.md,rendering error -translations/ja-JP/content/actions/using-workflows/workflow-commands-for-github-actions.md,broken liquid tags +translations/ja-JP/content/actions/using-workflows/workflow-commands-for-github-actions.md,rendering error translations/ja-JP/content/actions/using-workflows/workflow-syntax-for-github-actions.md,rendering error translations/ja-JP/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md,broken liquid tags translations/ja-JP/content/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise.md,rendering error translations/ja-JP/content/admin/configuration/configuring-your-enterprise/configuring-rate-limits.md,rendering error translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md,rendering error +translations/ja-JP/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md,broken liquid tags translations/ja-JP/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md,rendering error translations/ja-JP/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md,rendering error translations/ja-JP/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md,rendering error translations/ja-JP/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication.md,rendering error translations/ja-JP/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users.md,broken liquid tags translations/ja-JP/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference.md,rendering error +translations/ja-JP/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md,broken liquid tags translations/ja-JP/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md,rendering error translations/ja-JP/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md,rendering error translations/ja-JP/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md,broken liquid tags @@ -469,6 +472,7 @@ translations/ja-JP/content/issues/planning-and-tracking-with-projects/automating translations/ja-JP/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-access-to-your-projects.md,broken liquid tags translations/ja-JP/content/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests.md,rendering error translations/ja-JP/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md,rendering error +translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md,broken liquid tags translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md,rendering error translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md,rendering error translations/ja-JP/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md,rendering error @@ -511,7 +515,7 @@ translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your- translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md,rendering error translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md,rendering error translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md,rendering error -translations/ja-JP/content/repositories/creating-and-managing-repositories/transferring-a-repository.md,broken liquid tags +translations/ja-JP/content/repositories/creating-and-managing-repositories/transferring-a-repository.md,rendering error translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners.md,rendering error translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-readmes.md,rendering error translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md,rendering error diff --git a/translations/log/msft-pt-resets.csv b/translations/log/msft-pt-resets.csv index cd4a45228b..9a3733877a 100644 --- a/translations/log/msft-pt-resets.csv +++ b/translations/log/msft-pt-resets.csv @@ -240,6 +240,7 @@ translations/pt-BR/content/account-and-profile/managing-subscriptions-and-notifi translations/pt-BR/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md,rendering error translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile.md,rendering error translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme.md,broken liquid tags +translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md,broken liquid tags translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/setting-your-profile-to-private.md,broken liquid tags translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/showing-your-private-contributions-and-achievements-on-your-profile.md,broken liquid tags translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/index.md,broken liquid tags @@ -298,6 +299,7 @@ translations/pt-BR/content/admin/configuration/configuring-your-enterprise/confi translations/pt-BR/content/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise.md,broken liquid tags translations/pt-BR/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md,broken liquid tags translations/pt-BR/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md,rendering error +translations/pt-BR/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md,broken liquid tags translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md,rendering error translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md,rendering error translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md,rendering error @@ -307,6 +309,7 @@ translations/pt-BR/content/admin/identity-and-access-management/using-enterprise translations/pt-BR/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-support-for-your-idps-conditional-access-policy.md,broken liquid tags translations/pt-BR/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/migrating-from-saml-to-oidc.md,broken liquid tags translations/pt-BR/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference.md,broken liquid tags +translations/pt-BR/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md,broken liquid tags translations/pt-BR/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise.md,rendering error translations/pt-BR/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md,rendering error translations/pt-BR/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md,broken liquid tags @@ -477,6 +480,7 @@ translations/pt-BR/content/issues/planning-and-tracking-with-projects/managing-y translations/pt-BR/content/issues/planning-and-tracking-with-projects/managing-your-project/managing-visibility-of-your-projects.md,broken liquid tags translations/pt-BR/content/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests.md,rendering error translations/pt-BR/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md,rendering error +translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md,broken liquid tags translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md,rendering error translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md,rendering error translations/pt-BR/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md,rendering error @@ -518,7 +522,7 @@ translations/pt-BR/content/repositories/configuring-branches-and-merges-in-your- translations/pt-BR/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md,rendering error translations/pt-BR/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md,rendering error translations/pt-BR/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md,rendering error -translations/pt-BR/content/repositories/creating-and-managing-repositories/transferring-a-repository.md,broken liquid tags +translations/pt-BR/content/repositories/creating-and-managing-repositories/transferring-a-repository.md,rendering error translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners.md,rendering error translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-readmes.md,rendering error translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md,rendering error diff --git a/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md b/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md index f4fa565ae4..850fdd4282 100644 --- a/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md +++ b/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md @@ -1,6 +1,6 @@ --- -title: Personalizar seu perfil -intro: 'É possível compartilhar informações sobre você mesmo com outros usuários do {% data variables.product.product_name %} definindo uma imagem e adicionando uma bio ao seu perfil.' +title: Personalizing your profile +intro: 'You can share information about yourself with other {% data variables.product.product_name %} users by setting a profile picture and adding a bio to your profile.' redirect_from: - /articles/adding-a-bio-to-your-profile - /articles/setting-your-profile-picture @@ -18,156 +18,186 @@ versions: topics: - Profiles shortTitle: Personalize -ms.openlocfilehash: c12fccd91144428fe9aad2f01d2c0b0941fdd4d4 -ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 -ms.translationtype: HT -ms.contentlocale: pt-BR -ms.lasthandoff: 09/05/2022 -ms.locfileid: '146681050' --- -## Alterar sua imagem de perfil +## Changing your profile picture -Sua imagem de perfil ajuda a identificá-lo no {% data variables.product.product_name %} em pull requests, comentários, páginas de contribuições e gráficos. +Your profile picture helps identify you across {% data variables.product.product_name %} in pull requests, comments, contributions pages, and graphs. -Ao se inscrever em uma conta, o {% data variables.product.product_name %} fornece a você uma "identicon" gerada aleatoriamente. [Seu identicon](https://github.com/blog/1586-identicons) é gerado com base em um hash da sua ID de usuário, portanto, não há como controlar a cor ou o padrão. É possível substituir sua identicon por uma imagem que represente você. +When you sign up for an account, {% data variables.product.product_name %} provides you with a randomly generated "identicon". [Your identicon](https://github.com/blog/1586-identicons) generates from a hash of your user ID, so there's no way to control its color or pattern. You can replace your identicon with an image that represents you. {% note %} -**Observação{% ifversion ghec %}s{% endif %}** : {% ifversion ghec %} +**Note{% ifversion ghec %}s{% endif %}**: {% ifversion ghec %} -* {% endif %}Sua imagem de perfil deve ser um arquivo PNG, JPG ou GIF com menos de 1 MB de tamanho e menos de 3000 por 3000 pixels. Para melhor qualidade de renderização, recomendamos uma imagem de aproximadamente 500 por 500 pixels. -{% ifversion ghec %}* As imagens de perfil do Gravatar não são compatíveis com {% data variables.product.prodname_emus %}.{% endif %} +* {% endif %}Your profile picture should be a PNG, JPG, or GIF file, and it must be less than 1 MB in size and smaller than 3000 by 3000 pixels. For the best quality rendering, we recommend keeping the image at about 500 by 500 pixels. +{% ifversion ghec %}* Gravatar profile pictures are not supported with {% data variables.product.prodname_emus %}.{% endif %} {% endnote %} -### Definir uma imagem de perfil +### Setting a profile picture {% data reusables.user-settings.access_settings %} -2. Em **Imagem de Perfil**, clique em {% octicon "pencil" aria-label="The edit icon" %} **Editar**. -![Editar imagem de perfil](/assets/images/help/profile/edit-profile-photo.png) -3. Clique em **Carregar uma foto...** .{% ifversion not ghae %} ![Atualizar imagem de perfil](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} -3. Recorte sua imagem. Quando terminar, clique em **Definir nova imagem de perfil**. - ![Cortar a foto carregada](/assets/images/help/profile/avatar_crop_and_save.png) +2. Under **Profile Picture**, click {% octicon "pencil" aria-label="The edit icon" %} **Edit**. +![Edit profile picture](/assets/images/help/profile/edit-profile-photo.png) +3. Click **Upload a photo...**.{% ifversion not ghae %} +![Update profile picture](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} +3. Crop your picture. When you're done, click **Set new profile picture**. + ![Crop uploaded photo](/assets/images/help/profile/avatar_crop_and_save.png) -### Redefinir sua imagem de perfil para a identicon +### Resetting your profile picture to the identicon {% data reusables.user-settings.access_settings %} -2. Em **Imagem de Perfil**, clique em {% octicon "pencil" aria-label="The edit icon" %} **Editar**. -![Editar imagem de perfil](/assets/images/help/profile/edit-profile-photo.png) -3. Para reverter para o identicon, clique em **Remover foto**. {% ifversion not ghae %}Se o endereço de email estiver associado a um [Gravatar](https://en.gravatar.com/), você não poderá reverter para o identicon. Em vez disso, clique em **Reverter para Gravatar**. -![Atualizar a imagem de perfil](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} +2. Under **Profile Picture**, click {% octicon "pencil" aria-label="The edit icon" %} **Edit**. +![Edit profile picture](/assets/images/help/profile/edit-profile-photo.png) +3. To revert to your identicon, click **Remove photo**. {% ifversion not ghae %}If your email address is associated with a [Gravatar](https://en.gravatar.com/), you cannot revert to your identicon. Click **Revert to Gravatar** instead. +![Update profile picture](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} -## Alterar seu nome de perfil +## Changing your profile name -Você pode alterar o nome que é exbido em seu perfil. Este nome também pode ser exibido ao lado dos comentários que você fizer em repositórios privados pertencentes a uma organização. Para obter mais informações, confira "[Gerenciando a exibição de nomes de membros em sua organização](/articles/managing-the-display-of-member-names-in-your-organization)". +You can change the name that is displayed on your profile. This name may also be displayed next to comments you make on private repositories owned by an organization. For more information, see "[Managing the display of member names in your organization](/articles/managing-the-display-of-member-names-in-your-organization)." -{% ifversion fpt or ghec %} {% note %} +{% ifversion fpt or ghec %} +{% note %} -**Observação:** se você é integrante de um {% data variables.product.prodname_emu_enterprise %}, todas as alterações no nome do seu perfil devem ser feitas por meio do seu provedor de identidade ao invés de {% data variables.product.prodname_dotcom_the_website %}. {% data reusables.enterprise-accounts.emu-more-info-account %} +**Note:** If you're a member of an {% data variables.product.prodname_emu_enterprise %}, any changes to your profile name must be made through your identity provider instead of {% data variables.product.prodname_dotcom_the_website %}. {% data reusables.enterprise-accounts.emu-more-info-account %} -{% endnote %} {% endif %} +{% endnote %} +{% endif %} {% data reusables.user-settings.access_settings %} -2. Em "Name" (Nome), digite o nome que deseja exibir em seu perfil. - ![Campo nome em configurações de perfil](/assets/images/help/profile/name-field.png) +2. Under "Name", type the name you want to be displayed on your profile. + ![Name field in profile settings](/assets/images/help/profile/name-field.png) -## Adicionar uma bio ao seu perfil +## Adding a bio to your profile -Adicione uma bio em seu perfil para compartilhar informações sobre si mesmo com outros usuários {% data variables.product.product_name %}. Com a ajuda de [@mentions](/articles/basic-writing-and-formatting-syntax) e o emoji, você pode incluir informações sobre o local em que você trabalhou ou que trabalha atualmente, o tipo de trabalho você faz ou até mesmo o tipo de café você bebe. +Add a bio to your profile to share information about yourself with other {% data variables.product.product_name %} users. With the help of [@mentions](/articles/basic-writing-and-formatting-syntax) and emoji, you can include information about where you currently or have previously worked, what type of work you do, or even what kind of coffee you drink. {% ifversion fpt or ghes or ghec %} -Para um formulário mais longo e uma maneira mais proeminente de exibir informações personalizadas sobre você, também é possível usar um README do perfil. Para obter mais informações, confira "[Como gerenciar o LEIAME do seu perfil](/github/setting-up-and-managing-your-github-profile/managing-your-profile-readme)". +For a longer-form and more prominent way of displaying customized information about yourself, you can also use a profile README. For more information, see "[Managing your profile README](/github/setting-up-and-managing-your-github-profile/managing-your-profile-readme)." {% endif %} {% note %} -**Observação:** se você tiver a seção de visão geral da atividade habilitada em seu perfil e você @mention uma organização da qual você é membro em sua biografia do perfil, essa organização será apresentada primeiro em sua visão geral da atividade. Para obter mais informações, veja "[Mostrando uma visão geral de sua atividade em seu perfil](/articles/showing-an-overview-of-your-activity-on-your-profile)". +**Note:** + If you have the activity overview section enabled for your profile and you @mention an organization you're a member of in your profile bio, then that organization will be featured first in your activity overview. For more information, see "[Showing an overview of your activity on your profile](/articles/showing-an-overview-of-your-activity-on-your-profile)." {% endnote %} {% data reusables.user-settings.access_settings %} -2. Em **Bio**, adicione o conteúdo que você quer exibir em seu perfil. O campo bio é limitado a 160 caracteres. - ![Atualizar a bio no perfil](/assets/images/help/profile/bio-field.png) +2. Under **Bio**, add the content that you want displayed on your profile. The bio field is limited to 160 characters. + ![Update bio on profile](/assets/images/help/profile/bio-field.png) {% tip %} - **Dica:** quando você @mention uma organização, somente aquelas das quais você é membro terão o preenchimento automático. Você ainda pode @mention organizações das quais não é membro, como um empregador anterior, mas o nome da organização você não terá o preenchimento automático. + **Tip:** When you @mention an organization, only those that you're a member of will autocomplete. You can still @mention organizations that you're not a member of, like a previous employer, but the organization name won't autocomplete for you. {% endtip %} -3. Clique em **Atualizar perfil**. - ![Botão Atualizar perfil](/assets/images/help/profile/update-profile-button.png) +{% data reusables.profile.update-profile %} -## Definir um status +{% ifversion profile-time-zone %} -Você pode definir um status para exibir informações sobre sua disponibilidade atual no {% data variables.product.product_name %}. Seu status será mostrado: -- em sua página de perfil do {% data variables.product.product_name %}. -- quando as pessoas passarem o mouse em cima de seu nome de usuário ou avatar no {% data variables.product.product_name %}. -- em uma página de equipe da qual você é integrante. Para obter mais informações, confira "[Sobre as equipes](/articles/about-teams/#team-pages)". -- no painel da organização da qual você é integrante. Para obter mais informações, veja "[Sobre o painel da sua organização](/articles/about-your-organization-dashboard/)". +## Setting your location and time zone -Ao definir o seu status, você também pode informar às pessoas que sua disponibilidade é limitada no {% data variables.product.product_name %}. +You can set a location and time zone on your profile to show other people your local time. Your location and time zone will be visible: +- on your {% data variables.product.product_name %} profile page. +- when people hover over your username or avatar on {% data variables.product.product_name %}. -![O nome de usuário mencionado mostra a observação "ocupado" ao lado](/assets/images/help/profile/username-with-limited-availability-text.png) +When you view your profile, you will see your location, local time, and your time zone in relation to Universal Time Coordinated. -![O revisor solicitado mostra a observação "ocupado" ao lado do nome de usuário](/assets/images/help/profile/request-a-review-limited-availability-status.png) + ![Screenshot of the Octocat profile page emphasizing the location, local time, and time zone fields.](/assets/images/help/profile/profile-location-and-time.png) -Se você selecionar a opção "Ocupado", quando as pessoas @mention seu nome de usuário, atribuírem um problema ou uma solicitação de pull ou lhe solicitarem uma revisão, uma observação ao lado do seu nome de usuário mostrará que você está ocupado. Você também será excluído da atribuição automática de revisão para os pull requests atribuídos a qualquer equipe a que você pertença. Para obter mais informações, confira "[Gerenciando as configurações de revisão de código para sua equipe](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)". +When others view your profile, they will see your location, local time, and the time difference in hours from their own local time. -1. No canto superior direito de {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, clique em sua foto de perfil e clique em **Definir seu status** ou, se você já tiver um status definido, clique no status atual. - ![Botão no perfil para definir seu status](/assets/images/help/profile/set-status-on-profile.png) -2. Para adicionar um texto personalizado ao seu status, clique no campo de texto e digite uma mensagem. - ![Campo para digitar uma mensagem de status](/assets/images/help/profile/type-a-status-message.png) -3. Opcionalmente, para definir um status com emoji, clique no ícone de carinhas e selecione um emoji da lista. - ![Botão para selecionar status com emoji](/assets/images/help/profile/select-emoji-status.png) -4. Como opção, se você deseja compartilhar que tem disponibilidade limitada, selecione "Busy" (Ocupado). - ![Opção Ocupado marcada nas opções de Editar status](/assets/images/help/profile/limited-availability-status.png) -5. Use o menu suspenso **Limpar status** e selecione quando você quer que seu status expire. Caso não selecione um prazo de validade, o status será mantido até que você o limpe ou o edite. - ![Menu suspenso para escolher quando o status expira](/assets/images/help/profile/status-expiration.png) -6. Use o menu suspenso e clique na organização para a qual você deseja que seu status esteja visível. Se não selecionar uma organização, seu status será público. - ![Menu suspenso para escolher para quem seu status fica visível](/assets/images/help/profile/status-visibility.png) -7. Clique em **Definir status**. - ![Botão para definir o status](/assets/images/help/profile/set-status-button.png) + ![Screenshot of the Octocat profile page emphasizing the location, local time, and relative time fields.](/assets/images/help/profile/profile-relative-time.png) + +{% data reusables.user-settings.access_settings %} +1. Under **Location**, type the location you want to be displayed on your profile. + + ![Screenshot of the location and local time settings emphasizing the location field.](/assets/images/help/profile/location-field.png) + +1. Optionally, to display the current local time on your profile, select **Display current local time**. + + ![Screenshot of the location and local time settings emphasizing the display current local time checkbox.](/assets/images/help/profile/display-local-time-checkbox.png) + + - Select the **Time zone** dropdown menu, then click your local time zone. + + ![Screenshot of the location and local time settings emphasizing the time zone dropdown menu.](/assets/images/help/profile/time-zone-dropdown.png) + +{% data reusables.profile.update-profile %} + +{% endif %} + +## Setting a status + +You can set a status to display information about your current availability on {% data variables.product.product_name %}. Your status will show: +- on your {% data variables.product.product_name %} profile page. +- when people hover over your username or avatar on {% data variables.product.product_name %}. +- on a team page for a team where you're a team member. For more information, see "[About teams](/articles/about-teams/#team-pages)." +- on the organization dashboard in an organization where you're a member. For more information, see "[About your organization dashboard](/articles/about-your-organization-dashboard/)." + +When you set your status, you can also let people know that you have limited availability on {% data variables.product.product_name %}. + +![At-mentioned username shows "busy" note next to username](/assets/images/help/profile/username-with-limited-availability-text.png) + +![Requested reviewer shows "busy" note next to username](/assets/images/help/profile/request-a-review-limited-availability-status.png) + +If you select the "Busy" option, when people @mention your username, assign you an issue or pull request, or request a pull request review from you, a note next to your username will show that you're busy. You will also be excluded from automatic review assignment for pull requests assigned to any teams you belong to. For more information, see "[Managing code review settings for your team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)." + +1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click **Set your status** or, if you already have a status set, click your current status. + ![Button on profile to set your status](/assets/images/help/profile/set-status-on-profile.png) +2. To add custom text to your status, click in the text field and type a status message. + ![Field to type a status message](/assets/images/help/profile/type-a-status-message.png) +3. Optionally, to set an emoji status, click the smiley icon and select an emoji from the list. + ![Button to select an emoji status](/assets/images/help/profile/select-emoji-status.png) +4. Optionally, if you'd like to share that you have limited availability, select "Busy." + ![Busy option selected in Edit status options](/assets/images/help/profile/limited-availability-status.png) +5. Use the **Clear status** drop-down menu, and select when you want your status to expire. If you don't select a status expiration, you will keep your status until you clear or edit your status. + ![Drop down menu to choose when your status expires](/assets/images/help/profile/status-expiration.png) +6. Use the drop-down menu and click the organization you want your status visible to. If you don't select an organization, your status will be public. + ![Drop down menu to choose who your status is visible to](/assets/images/help/profile/status-visibility.png) +7. Click **Set status**. + ![Button to set status](/assets/images/help/profile/set-status-button.png) {% ifversion fpt or ghec %} -## Exibir selos no seu perfil +## Displaying badges on your profile -Ao participar de determinados programas, {% data variables.product.prodname_dotcom %} exibe automaticamente um selo no seu perfil. +When you participate in certain programs, {% data variables.product.prodname_dotcom %} automatically displays a badge on your profile. -| Selo | Programa | Descrição | +| Badge | Program | Description | | --- | --- | --- | -| {% octicon "cpu" aria-label="The Developer Program icon" %} | **Membro do programa de desenvolvedores** | Se você for um integrante registrado do Programa de Desenvolvedor de {% data variables.product.prodname_dotcom %}, ao criar um aplicativo com a API de {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %}, você receberá um selo de integrante do Programa no seu perfil. Para obter mais informações sobre o Programa de Desenvolvedores do {% data variables.product.prodname_dotcom %}, confira [GitHub Developer](/program/). | -| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | Se você usar {% data variables.product.prodname_pro %}, você receberá um selo PRO no seu perfil. Para obter mais informações sobre o {% data variables.product.prodname_pro %}, confira "[Produtos do {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/githubs-products#github-pro)". | -| {% octicon "lock" aria-label="The lock icon" %} | **Security Bug Bounty Hunter** | Se você ajudou a identificar vulnerabilidades de segurança, o seu perfil receberá um selo Security Bug Bounty Hunter. Para obter mais informações sobre os dados Programa de segurança do {% data variables.product.prodname_dotcom %}, confira [Segurança do {% data variables.product.prodname_dotcom %}](https://bounty.github.com/). | -| {% octicon "mortar-board" aria-label="The mortar-board icon" %} | **Campus Expert do {% data variables.product.prodname_dotcom %}** | Se você participar do {% data variables.product.prodname_campus_program %}, você receberá um selo do especialista de campus de {% data variables.product.prodname_dotcom %} no seu perfil. Para obter mais informações sobre o programa Campus Experts, confira [Campus Experts](https://education.github.com/experts). | -| {% octicon "shield" aria-label="The shield icon" %} | **Crédito de aviso de segurança** | Se um aviso de segurança que você enviar ao [{% data variables.product.prodname_dotcom %} Advisory Database](https://github.com/advisories) for aceito, você receberá um selo de crédito de aviso de segurança em seu perfil. Para obter mais informações sobre avisos de segurança do {% data variables.product.prodname_dotcom %}, confira [Avisos de segurança do {% data variables.product.prodname_dotcom %}](/code-security/repository-security-advisories/about-github-security-advisories-for-repositories). | -| {% octicon "check" aria-label="The check icon" %} | **Discussão respondida** | Se sua resposta a uma discussão for marcada como a resposta, você receberá um selo de discussão respondida em seu perfil. Para obter mais informações sobre as Discussões do {% data variables.product.prodname_dotcom %}, confira [Sobre as discussões](/discussions/collaborating-with-your-community-using-discussions/about-discussions). | +| {% octicon "cpu" aria-label="The Developer Program icon" %} | **Developer Program Member** | If you're a registered member of the {% data variables.product.prodname_dotcom %} Developer Program, building an app with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, you'll get a Developer Program Member badge on your profile. For more information on the {% data variables.product.prodname_dotcom %} Developer Program, see [GitHub Developer](/program/). | +| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | If you use {% data variables.product.prodname_pro %} you'll get a PRO badge on your profile. For more information about {% data variables.product.prodname_pro %}, see "[{% data variables.product.prodname_dotcom %}'s products](/github/getting-started-with-github/githubs-products#github-pro)." | +| {% octicon "lock" aria-label="The lock icon" %} | **Security Bug Bounty Hunter** | If you helped out hunting down security vulnerabilities, you'll get a Security Bug Bounty Hunter badge on your profile. For more information about the {% data variables.product.prodname_dotcom %} Security program, see [{% data variables.product.prodname_dotcom %} Security](https://bounty.github.com/). | +| {% octicon "mortar-board" aria-label="The mortar-board icon" %} | **{% data variables.product.prodname_dotcom %} Campus Expert** | If you participate in the {% data variables.product.prodname_campus_program %}, you will get a {% data variables.product.prodname_dotcom %} Campus Expert badge on your profile. For more information about the Campus Experts program, see [Campus Experts](https://education.github.com/experts). | +| {% octicon "shield" aria-label="The shield icon" %} | **Security advisory credit** | If a security advisory you submit to the [{% data variables.product.prodname_dotcom %} Advisory Database](https://github.com/advisories) is accepted, you'll get a Security advisory credit badge on your profile. For more information about {% data variables.product.prodname_dotcom %} Security Advisories, see [{% data variables.product.prodname_dotcom %} Security Advisories](/code-security/repository-security-advisories/about-github-security-advisories-for-repositories). | +| {% octicon "check" aria-label="The check icon" %} | **Discussion answered** | If your reply to a discussion is marked as the answer, you'll get a Discussion answered badge on your profile. For more information about {% data variables.product.prodname_dotcom %} Discussions, see [About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions). | {% endif %} {% ifversion fpt or ghec %} -## Conquistas de ganho +## Earning Achievements -As conquistas celebram eventos e ações específicos que ocorrem no {% data variables.product.prodname_dotcom %}. Eles aparecerão como pequenos selos listados na barra lateral do perfil. Ao clicar ou passar o mouse em uma conquista, você verá uma exibição detalhada indicando como a conquista foi obtida, com uma breve descrição e links para os eventos contribuintes. Os links de evento só ficarão visíveis para os usuários com acesso ao repositório ou à organização em que o evento ocorreu. Os links de evento aparecerão inacessíveis a todos os usuários sem acesso. +Achievements celebrate specific events and actions that happen on {% data variables.product.prodname_dotcom %}. They will appear as small badges listed in the sidebar of your profile. Clicking or hovering on an achievement will show a detailed view that hints at how the achievement was earned, with a short description and links to the contributing events. The event links will only be visible to users that have access to the repository or organization that the event took place in. Event links will appear inaccessible to all users without access. -Para impedir que as contribuições privadas sejam contabilizadas nas suas Conquistas ou para desativar totalmente as Conquistas, confira "[Como mostrar as contribuições privadas e conquistas em seu perfil](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)". +To stop private contributions from counting toward your Achievements, or to turn off Achievements entirely, see "[Showing your private contributions and Achievements on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)." {% note %} -**Observação**: no momento, esse recurso está em versão beta e sujeito a alterações. +**Note:** This feature is currently in beta and subject to change. {% endnote %} {% endif %} -## Lista de repositórios qualificados para o selo de Colaborador no Helicóptero de Marte de 2020 +## List of qualifying repositories for Mars 2020 Helicopter Contributor achievement -Se você criou algum commit presente no histórico de commit da tag listada em um ou mais dos repositórios abaixo, receberá o selo de Colaborador no Helicóptero de Marte de 2020 em seu perfil. O commit da autoria tem que estar com um endereço de e-mail verificado associado à sua conta no momento em que {% data variables.product.prodname_dotcom %} determinou as contribuições elegíveis, para ser atribuído a você. Você pode ser o autor original ou [um dos coautores](/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors) do commit. As alterações futuras em e-mails verificados não terão efeito no selo. Criamos a lista com base nas informações recebidas do Laboratório de Propulsão de Jato da NASA. +If you authored any commit(s) present in the commit history for the listed tag of one or more of the repositories below, you'll receive the Mars 2020 Helicopter Contributor achievement on your profile. The authored commit must be with a verified email address, associated with your account at the time {% data variables.product.prodname_dotcom %} determined the eligible contributions, in order to be attributed to you. You can be the original author or [one of the co-authors](/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors) of the commit. Future changes to verified emails will not have an effect on the badge. We built the list based on information received from NASA's Jet Propulsion Laboratory. -| {% data variables.product.prodname_dotcom %} Repositório | Versão | Marca | +| {% data variables.product.prodname_dotcom %} Repository | Version | Tag | |---|---|---| | [torvalds/linux](https://github.com/torvalds/linux) | 3.4 | [v3.4](https://github.com/torvalds/linux/releases/tag/v3.4) | | [python/cpython](https://github.com/python/cpython) | 3.9.2 | [v3.9.2](https://github.com/python/cpython/releases/tag/v3.9.2) | @@ -178,7 +208,7 @@ Se você criou algum commit presente no histórico de commit da tag listada em u | [matplotlib/cycler](https://github.com/matplotlib/cycler) | 0.10.0 | [v0.10.0](https://github.com/matplotlib/cycler/releases/tag/v0.10.0) | | [elastic/elasticsearch-py](https://github.com/elastic/elasticsearch-py) | 6.8.1 | [6.8.1](https://github.com/elastic/elasticsearch-py/releases/tag/6.8.1) | | [ianare/exif-py](https://github.com/ianare/exif-py) | 2.3.2 | [2.3.2](https://github.com/ianare/exif-py/releases/tag/2.3.2) | -| [kjd/idna](https://github.com/kjd/idna) | 2,10 | [v2.10](https://github.com/kjd/idna/releases/tag/v2.10) | +| [kjd/idna](https://github.com/kjd/idna) | 2.10 | [v2.10](https://github.com/kjd/idna/releases/tag/v2.10) | | [jmespath/jmespath.py](https://github.com/jmespath/jmespath.py) | 0.10.0 | [0.10.0](https://github.com/jmespath/jmespath.py/releases/tag/0.10.0) | | [nucleic/kiwi](https://github.com/nucleic/kiwi) | 1.3.1 | [1.3.1](https://github.com/nucleic/kiwi/releases/tag/1.3.1) | | [matplotlib/matplotlib](https://github.com/matplotlib/matplotlib) | 3.3.4 | [v3.3.4](https://github.com/matplotlib/matplotlib/releases/tag/v3.3.4) | @@ -187,7 +217,7 @@ Se você criou algum commit presente no histórico de commit da tag listada em u | [python-pillow/Pillow](https://github.com/python-pillow/Pillow) | 8.1.0 | [8.1.0](https://github.com/python-pillow/Pillow/releases/tag/8.1.0) | | [pycurl/pycurl](https://github.com/pycurl/pycurl) | 7.43.0.6 | [REL_7_43_0_6](https://github.com/pycurl/pycurl/releases/tag/REL_7_43_0_6) | | [pyparsing/pyparsing](https://github.com/pyparsing/pyparsing) | 2.4.7 | [pyparsing_2.4.7](https://github.com/pyparsing/pyparsing/releases/tag/pyparsing_2.4.7) | -| [pyserial/pyserial](https://github.com/pyserial/pyserial) | 3,5 | [v3.5](https://github.com/pyserial/pyserial/releases/tag/v3.5) | +| [pyserial/pyserial](https://github.com/pyserial/pyserial) | 3.5 | [v3.5](https://github.com/pyserial/pyserial/releases/tag/v3.5) | | [dateutil/dateutil](https://github.com/dateutil/dateutil) | 2.8.1 | [2.8.1](https://github.com/dateutil/dateutil/releases/tag/2.8.1) | | [yaml/pyyaml ](https://github.com/yaml/pyyaml) | 5.4.1 | [5.4.1](https://github.com/yaml/pyyaml/releases/tag/5.4.1) | | [psf/requests](https://github.com/psf/requests) | 2.25.1 | [v2.25.1](https://github.com/psf/requests/releases/tag/v2.25.1) | @@ -234,10 +264,10 @@ Se você criou algum commit presente no histórico de commit da tag listada em u | [JodaOrg/joda-time](https://github.com/JodaOrg/joda-time) | 2.10.1 | [v2.10.1](https://github.com/JodaOrg/joda-time/releases/tag/v2.10.1) | | [tdunning/t-digest](https://github.com/tdunning/t-digest) | 3.2 | [t-digest-3.2](https://github.com/tdunning/t-digest/releases/tag/t-digest-3.2) | | [HdrHistogram/HdrHistogram](https://github.com/HdrHistogram/HdrHistogram) | 2.1.9 | [HdrHistogram-2.1.9](https://github.com/HdrHistogram/HdrHistogram/releases/tag/HdrHistogram-2.1.9) | -| [locationtech/spatial4j](https://github.com/locationtech/spatial4j) | 0,7 | [spatial4j-0.7](https://github.com/locationtech/spatial4j/releases/tag/spatial4j-0.7) | +| [locationtech/spatial4j](https://github.com/locationtech/spatial4j) | 0.7 | [spatial4j-0.7](https://github.com/locationtech/spatial4j/releases/tag/spatial4j-0.7) | | [locationtech/jts](https://github.com/locationtech/jts) | 1.15.0 | [jts-1.15.0](https://github.com/locationtech/jts/releases/tag/jts-1.15.0) | -| [apache/logging-log4j2](https://github.com/apache/logging-log4j2) | 2,11 | [log4j-2.11.0](https://github.com/apache/logging-log4j2/releases/tag/log4j-2.11.0) | +| [apache/logging-log4j2](https://github.com/apache/logging-log4j2) | 2.11 | [log4j-2.11.0](https://github.com/apache/logging-log4j2/releases/tag/log4j-2.11.0) | -## Leitura adicional +## Further reading -- "[Sobre seu perfil](/articles/about-your-profile)" +- "[About your profile](/articles/about-your-profile)" diff --git a/translations/pt-BR/content/actions/security-guides/security-hardening-for-github-actions.md b/translations/pt-BR/content/actions/security-guides/security-hardening-for-github-actions.md index c39ef22235..9b7fb1a826 100644 --- a/translations/pt-BR/content/actions/security-guides/security-hardening-for-github-actions.md +++ b/translations/pt-BR/content/actions/security-guides/security-hardening-for-github-actions.md @@ -275,7 +275,7 @@ This list describes the recommended approaches for accessing repository data wit {% ifversion fpt or ghec %}**Self-hosted**{% elsif ghes or ghae %}Self-hosted{% endif %} runners for {% data variables.product.product_name %} do not have guarantees around running in ephemeral clean virtual machines, and can be persistently compromised by untrusted code in a workflow. -{% ifversion fpt or ghec %}As a result, self-hosted runners should almost [never be used for public repositories](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories) on {% data variables.product.product_name %}, because any user can open pull requests against the repository and compromise the environment. Similarly, be{% elsif ghes or ghae %}Be{% endif %} cautious when using self-hosted runners on private or internal repositories, as anyone who can fork the repository and open a pull request (generally those with read access to the repository) are able to compromise the self-hosted runner environment, including gaining access to secrets and the `GITHUB_TOKEN` which, depending on its settings, can grant write access to the repository. Although workflows can control access to environment secrets by using environments and required reviews, these workflows are not run in an isolated environment and are still susceptible to the same risks when run on a self-hosted runner. +{% ifversion fpt or ghec %}As a result, self-hosted runners should almost [never be used for public repositories](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security) on {% data variables.product.product_name %}, because any user can open pull requests against the repository and compromise the environment. Similarly, be{% elsif ghes or ghae %}Be{% endif %} cautious when using self-hosted runners on private or internal repositories, as anyone who can fork the repository and open a pull request (generally those with read access to the repository) are able to compromise the self-hosted runner environment, including gaining access to secrets and the `GITHUB_TOKEN` which, depending on its settings, can grant write access to the repository. Although workflows can control access to environment secrets by using environments and required reviews, these workflows are not run in an isolated environment and are still susceptible to the same risks when run on a self-hosted runner. When a self-hosted runner is defined at the organization or enterprise level, {% data variables.product.product_name %} can schedule workflows from multiple repositories onto the same runner. Consequently, a security compromise of these environments can result in a wide impact. To help reduce the scope of a compromise, you can create boundaries by organizing your self-hosted runners into separate groups. You can restrict what {% ifversion restrict-groups-to-workflows %}workflows, {% endif %}organizations and repositories can access runner groups. For more information, see "[Managing access to self-hosted runners using groups](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)." diff --git a/translations/pt-BR/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md b/translations/pt-BR/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md index ff0ad40eff..bd71918b12 100644 --- a/translations/pt-BR/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md +++ b/translations/pt-BR/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md @@ -1,7 +1,7 @@ --- -title: Fazer backup e restaurar o GitHub Enterprise Server com o GitHub Actions habilitado +title: Backing up and restoring GitHub Enterprise Server with GitHub Actions enabled shortTitle: Backing up and restoring -intro: 'Os dados de {% data variables.product.prodname_actions %} no seu provedor de armazenamento externo não estão incluídos em backups regulares de {% data variables.product.prodname_ghe_server %} e precisam ser salvos separadamente.' +intro: 'To restore a backup of {% data variables.product.product_location %} when {% data variables.product.prodname_actions %} is enabled, you must configure {% data variables.product.prodname_actions %} before restoring the backup with {% data variables.product.prodname_enterprise_backup_utilities %}.' versions: ghes: '*' type: how_to @@ -12,50 +12,33 @@ topics: - Infrastructure redirect_from: - /admin/github-actions/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled -ms.openlocfilehash: def12b4e9e93a75ee1aa58f8290ca1b6e7d13cd5 -ms.sourcegitcommit: fcf3546b7cc208155fb8acdf68b81be28afc3d2d -ms.translationtype: HT -ms.contentlocale: pt-BR -ms.lasthandoff: 09/10/2022 -ms.locfileid: '145095914' --- -{% data reusables.actions.enterprise-storage-ha-backups %} -Se você usar {% data variables.product.prodname_enterprise_backup_utilities %} para fazer backup de {% data variables.product.product_location %}, é importante observar que os dados de {% data variables.product.prodname_actions %} armazenados no seu provedor de armazenamento externo não serão incluídos no backup. +## About backups of {% data variables.product.product_name %} when using {% data variables.product.prodname_actions %} -Esta é uma visão geral das etapas necessárias para restaurar {% data variables.product.product_location %} com {% data variables.product.prodname_actions %} para um novo dispositivo: +You can use {% data variables.product.prodname_enterprise_backup_utilities %} to back up and restore the data and configuration for {% data variables.product.product_location %} to a new instance. For more information, see "[Configuring backups on your appliance](/admin/configuration/configuring-backups-on-your-appliance)." -1. Confirme se o dispositivo original está off-line. -1. Defina manualmente as configurações de rede no dispositivo de {% data variables.product.prodname_ghe_server %}. As configurações de rede são excluídas do instantâneo de backup e não são substituídas por `ghe-restore`. -1. Para configurar o dispositivo substituto para usar a mesma configuração de armazenamento externo do {% data variables.product.prodname_actions %} do dispositivo original, no novo dispositivo, defina os parâmetros obrigatórios com o comando `ghe-config`. - - - Armazenamento do Blobs do Azure - ```shell - ghe-config secrets.actions.storage.blob-provider "azure" - ghe-config secrets.actions.storage.azure.connection-string "_Connection_String_" - ``` - - Amazon S3 - ```shell - ghe-config secrets.actions.storage.blob-provider "s3" - ghe-config secrets.actions.storage.s3.bucket-name "_S3_Bucket_Name" - ghe-config secrets.actions.storage.s3.service-url "_S3_Service_URL_" - ghe-config secrets.actions.storage.s3.access-key-id "_S3_Access_Key_ID_" - ghe-config secrets.actions.storage.s3.access-secret "_S3_Access_Secret_" - ``` - - Opcionalmente, para habilitar o estilo de caminho S3, digite o comando a seguir: - ```shell - ghe-config secrets.actions.storage.s3.force-path-style true - ``` - +However, not all the data for {% data variables.product.prodname_actions %} is included in these backups. {% data reusables.actions.enterprise-storage-ha-backups %} -1. Habilite {% data variables.product.prodname_actions %} no dispositivo de substituição. Isto conectará o dispositivo de substituição ao mesmo armazenamento externo para {% data variables.product.prodname_actions %}. +## Restoring a backup of {% data variables.product.product_name %} when {% data variables.product.prodname_actions %} is enabled - ```shell - ghe-config app.actions.enabled true - ghe-config-apply - ``` +To restore a backup of {% data variables.product.product_location %} with {% data variables.product.prodname_actions %}, you must manually configure network settings and external storage on the destination instance before you restore your backup from {% data variables.product.prodname_enterprise_backup_utilities %}. -1. Depois que o {% data variables.product.prodname_actions %} estiver configurado e habilitado, use o comando `ghe-restore` para restaurar o restante dos dados do backup. Para obter mais informações, confira "[Como restaurar um backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)". -1. Registre novamente seus executores auto-hospedados no dispositivo de substituição. Para obter mais informações, confira "[Como adicionar executores auto-hospedados](/actions/hosting-your-own-runners/adding-self-hosted-runners)". +1. Confirm that the source instance is offline. +1. Manually configure network settings on the replacement {% data variables.product.prodname_ghe_server %} instance. Network settings are excluded from the backup snapshot, and are not overwritten by `ghe-restore`. For more information, see "[Configuring network settings](/admin/configuration/configuring-network-settings)." +1. SSH into the destination instance. For more information, see "[Accessing the administrative shell (SSH)](/admin/configuration/accessing-the-administrative-shell-ssh)." -Para obter mais informações sobre backup e restauração do {% data variables.product.prodname_ghe_server %}, confira "[Como configurar backups no seu dispositivo](/admin/configuration/configuring-backups-on-your-appliance)". + ```shell{:copy} + $ ssh -p 122 admin@HOSTNAME + ``` +1. Configure the destination instance to use the same external storage service for {% data variables.product.prodname_actions %} as the source instance by entering one of the following commands. +{% indented_data_reference reusables.actions.configure-storage-provider-platform-commands spaces=3 %} +{% data reusables.actions.configure-storage-provider %} +1. To prepare to enable {% data variables.product.prodname_actions %} on the destination instance, enter the following command. + + ```shell{:copy} + ghe-config app.actions.enabled true + ``` +{% data reusables.actions.apply-configuration-and-enable %} +1. After {% data variables.product.prodname_actions %} is configured and enabled, to restore the rest of the data from the backup, use the `ghe-restore` command. For more information, see "[Restoring a backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)." +1. Re-register your self-hosted runners on the destination instance. For more information, see "[Adding self-hosted runners](/actions/hosting-your-own-runners/adding-self-hosted-runners)." diff --git a/translations/pt-BR/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md b/translations/pt-BR/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md index 142cbc3a24..6fa069a0f2 100644 --- a/translations/pt-BR/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md +++ b/translations/pt-BR/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md @@ -1,53 +1,157 @@ --- -title: Configurar uma instância de preparo -intro: 'Você pode configurar uma instância do {% data variables.product.product_name %} em um ambiente separado e isolado e usá-la para validar e testar alterações.' +title: Setting up a staging instance +intro: 'You can set up a {% data variables.product.product_name %} instance in a separate, isolated environment, and use the instance to validate and test changes.' redirect_from: - /enterprise/admin/installation/setting-up-a-staging-instance - /admin/installation/setting-up-a-staging-instance versions: - ghes: '*' + ghes: "*" type: how_to topics: - Enterprise - Infrastructure - Upgrades shortTitle: Set up a staging instance -ms.openlocfilehash: 86006b3dd1fcdd7a7139f35934cafce1f208c8bb -ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 -ms.translationtype: HT -ms.contentlocale: pt-BR -ms.lasthandoff: 09/05/2022 -ms.locfileid: '147065359' +miniTocMaxHeadingLevel: 3 --- -## Sobre instâncias de preparo -O {% data variables.product.company_short %} recomenda que você configure um ambiente separado para testar backups, atualizações ou alterações na configuração do {% data variables.product.product_location %}. Esse ambiente, que você deve isolar de seus sistemas de produção, é chamado de ambiente de preparo. +## About staging instances -Por exemplo, para proteger contra perda de dados, você pode validar regularmente o backup da sua instância de produção. Você pode restaurar regularmente o backup de seus dados de produção em uma instância separada do {% data variables.product.product_name %} em um ambiente de preparo. Nesta instância de preparo, você também pode testar a atualização para a versão mais recente do recurso do {% data variables.product.product_name %}. +{% data variables.product.company_short %} recommends that you set up a separate environment to test backups, updates, or changes to the configuration for {% data variables.product.product_location %}. This environment, which you should isolate from your production systems, is called a staging environment. + +For example, to protect against loss of data, you can regularly validate the backup of your production instance. You can regularly restore the backup of your production data to a separate {% data variables.product.product_name %} instance in a staging environment. On this staging instance, you could also test the upgrade to the latest feature release of {% data variables.product.product_name %}. {% tip %} -**Dica:** talvez seja interessante reutilizar seu arquivo de licença do {% data variables.product.prodname_enterprise %}, desde que a instância de preparo não seja usada em uma capacidade de produção. +**Tip:** You may reuse your existing {% data variables.product.prodname_enterprise %} license file as long as the staging instance is not used in a production capacity. {% endtip %} -## Considerações sobre um ambiente de preparo +## Considerations for a staging environment -Para testar minuciosamente o {% data variables.product.product_name %} e recriar um ambiente com a maior semelhança possível com o ambiente de produção, considere os sistemas externos que interagem com sua instância. Por exemplo, faça os testes a seguir em seu ambiente de preparo. +To thoroughly test {% data variables.product.product_name %} and recreate an environment that's as similar to your production environment as possible, consider the external systems that interact with your instance. For example, you may want to test the following in your staging environment. -- Autenticação, principalmente se você usa um provedor de autenticação externo, como o SAML -- Integração com um sistema externo de geração de tíquetes; -- Integração com um servidor de integração contínua; -- Software ou scripts externos que usam a {% data variables.product.prodname_enterprise_api %}; -- Servidor externo SMTP para notificações de e-mail. +- Authentication, especially if you use an external authentication provider like SAML +- Integration with an external ticketing system +- Integration with a continuous integration server +- External scripts or software that use the {% data variables.product.prodname_enterprise_api %} +- External SMTP server for email notifications -## Configurar uma instância de preparo +## Setting up a staging instance -1. Faça backup da sua instância de produção usando o {% data variables.product.prodname_enterprise_backup_utilities %}. Para obter mais informações, confira a seção "Sobre dados de {% data variables.product.prodname_enterprise_backup_utilities %}" em "[Como configurar backups em seu dispositivo](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance#about-github-enterprise-server-backup-utilities)". -2. Configure uma nova instância para funcionar como ambiente de preparo. Você pode usar os mesmos guias para provisionar e instalar sua instância de preparo, assim como fez na instância de produção. Para obter mais informações, confira "[Como configurar uma instância do {% data variables.product.prodname_ghe_server %}](/enterprise/admin/guides/installation/setting-up-a-github-enterprise-server-instance/)". -3. Opcionalmente, se você planeja testar a funcionalidade do {% data variables.product.prodname_actions %} em seu ambiente de teste, examine as considerações sobre seus logs e seu armazenamento. Para obter mais informações, veja "[Como usar um ambiente de preparo](/admin/github-actions/advanced-configuration-and-troubleshooting/using-a-staging-environment)". -4. Restaure o backup na sua instância de preparo. Para obter mais informações, confira a seção "Como restaurar um backup" de "[Como configurar backups em seu dispositivo](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance#restoring-a-backup)". +You can set up a staging instance from scratch and configure the instance however you like. For more information, see "[Setting up a {% data variables.product.product_name %} instance](/admin/installation/setting-up-a-github-enterprise-server-instance)" and "[Configuring your enterprise](/admin/configuration/configuring-your-enterprise)." -## Leitura adicional +Alternatively, you can create a staging instance that reflects your production configuration by restoring a backup of your production instance to the staging instance. -- "[Sobre atualizações em novas versões](/admin/overview/about-upgrades-to-new-releases)" +1. [Back up your production instance](#1-back-up-your-production-instance). +2. [Set up a staging instance](#2-set-up-a-staging-instance). +3. [Configure {% data variables.product.prodname_actions %}](#3-configure-github-actions). +4. [Configure {% data variables.product.prodname_registry %}](#4-configure-github-packages). +5. [Restore your production backup](#5-restore-your-production-backup). +6. [Review the instance's configuration](#6-review-the-instances-configuration). +7. [Apply the instance's configuration](#7-apply-the-instances-configuration). + +### 1. Back up your production instance + +If you want to test changes on an instance that contains the same data and configuration as your production instance, back up the data and configuration from the production instance using {% data variables.product.prodname_enterprise_backup_utilities %}. For more information, see "[Configuring backups on your appliance](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance)." + +{% warning %} + +**Warning**: If you use {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} in production, your backup will include your production configuration for external storage. To avoid potential loss of data by writing to your production storage from your staging instance, you must configure each feature in steps 3 and 4 before you restore your backup. + +{% endwarning %} + +### 2. Set up a staging instance + +Set up a new instance to act as your staging environment. You can use the same guides for provisioning and installing your staging instance as you did for your production instance. For more information, see "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise/admin/guides/installation/setting-up-a-github-enterprise-server-instance/)." + +If you plan to restore a backup of your production instance, continue to the next step. Alternatively, you can configure the instance manually and skip the following steps. + +### 3. Configure {% data variables.product.prodname_actions %} + +Optionally, if you use {% data variables.product.prodname_actions %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_actions %}, skip to "[4. Configure {% data variables.product.prodname_registry %}](#4-configure-github-packages)." + +{% warning %} + +**Warning**: If you don't configure {% data variables.product.prodname_actions %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance. For more information, see "[Using a staging environment](/admin/github-actions/advanced-configuration-and-troubleshooting/using-a-staging-environment)." + +{% endwarning %} + +{% data reusables.enterprise_installation.ssh-into-staging-instance %} +1. To configure the staging instance to use an external storage provider for {% data variables.product.prodname_actions %}, enter one of the following commands. +{% indented_data_reference reusables.actions.configure-storage-provider-platform-commands spaces=3 %} +{% data reusables.actions.configure-storage-provider %} +1. To prepare to enable {% data variables.product.prodname_actions %} on the staging instance, enter the following command. + + ```shell{:copy} + ghe-config app.actions.enabled true + ``` + +### 4. Configure {% data variables.product.prodname_registry %} + +Optionally, if you use {% data variables.product.prodname_registry %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_registry %}, skip to "[5. Restore your production backup](#5-restore-your-production-backup)." + +{% warning %} + +**Warning**: If you don't configure {% data variables.product.prodname_actions %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance. + +{% endwarning %} + +1. Review the backup you will restore to the staging instance. + - If you took the backup with {% data variables.product.prodname_enterprise_backup_utilities %} 3.5 or later, the backup includes the configuration for {% data variables.product.prodname_registry %}. Continue to the next step. + - If you took the backup with {% data variables.product.prodname_enterprise_backup_utilities %} 3.4 or earlier, configure {% data variables.product.prodname_registry %} on the staging instance. For more information, see "[Getting started with {% data variables.product.prodname_registry %} for your enterprise](/admin/packages/getting-started-with-github-packages-for-your-enterprise)." +{% data reusables.enterprise_installation.ssh-into-staging-instance %} +1. Configure the external storage connection by entering the following commands, replacing the placeholder values with actual values for your connection. + - Azure Blob Storage: + + ```shell{:copy} + ghe-config secrets.packages.blob-storage-type "azure" + ghe-config secrets.packages.azure-container-name "AZURE CONTAINER NAME" + ghe-config secrets.packages.azure-connection-string "CONNECTION STRING" + ``` + - Amazon S3: + + ```shell{:copy} + ghe-config secrets.packages.blob-storage-type "s3" + ghe-config secrets.packages.service-url "S3 SERVICE URL" + ghe-config secrets.packages.s3-bucket "S3 BUCKET NAME" + ghe-config secrets.packages.aws-access-key "S3 ACCESS KEY ID" + ghe-config secrets.packages.aws-secret-key "S3 ACCESS SECRET" + ``` +1. To prepare to enable {% data variables.product.prodname_registry %} on the staging instance, enter the following command. + + ```shell{:copy} + ghe-config app.packages.enabled true + ``` + +### 5. Restore your production backup + +Use the `ghe-restore` command to restore the rest of the data from the backup. For more information, see "[Restoring a backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)." + +If the staging instance is already configured and you're about to overwrite settings, certificate, and license data, add the `-c` option to the command. For more information about the option, see [Using the backup and restore commands](https://github.com/github/backup-utils/blob/master/docs/usage.md#restoring-settings-tls-certificate-and-license) in the {% data variables.product.prodname_enterprise_backup_utilities %} documentation. + +### 6. Review the instance's configuration + +To access the staging instance using the same hostname, update your local hosts file to resolve the staging instance's hostname by IP address by editing the `/etc/hosts` file in macOS or Linux, or the `C:\Windows\system32\drivers\etc` file in Windows. + +{% note %} + +**Note**: Your staging instance must be accessible from the same hostname as your production instance. Changing the hostname for {% data variables.product.product_location %} is not supported. For more information, see "[Configuring a hostname](/admin/configuration/configuring-network-settings/configuring-a-hostname)." + +{% endnote %} + +Then, review the staging instance's configuration in the {% data variables.enterprise.management_console %}. For more information, see "[Accessing the {% data variables.enterprise.management_console %}](/admin/configuration/configuring-your-enterprise/accessing-the-management-console)." + +{% warning %} + +**Warning**: If you configured {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} for the staging instance, to avoid overwriting production data, ensure that the external storage configuration in the {% data variables.enterprise.management_console %} does not match your production instance. + +{% endwarning %} + +### 7. Apply the instance's configuration + +To apply the configuration from the {% data variables.enterprise.management_console %}, click **Save settings**. + +## Further reading + +- "[About upgrades to new releases](/admin/overview/about-upgrades-to-new-releases)" diff --git a/translations/pt-BR/content/get-started/using-github/keyboard-shortcuts.md b/translations/pt-BR/content/get-started/using-github/keyboard-shortcuts.md index f0ef5e37da..63db7352b5 100644 --- a/translations/pt-BR/content/get-started/using-github/keyboard-shortcuts.md +++ b/translations/pt-BR/content/get-started/using-github/keyboard-shortcuts.md @@ -150,7 +150,7 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr | Keyboard shortcut | Description |-----------|------------ -|⌘+f (Mac) or Ctrl+f (Windows/Linux) | Focus filter field +|Command+f (Mac) or Ctrl+f (Windows/Linux) | Focus filter field |← | Move cell focus to the left |→ | Move cell focus to the right |↑ | Move cell focus up @@ -162,7 +162,7 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr |-----------|------------ |Enter | Toggle edit mode for the focused cell |Escape | Cancel editing for the focused cell -|⌘+Shift+\ (Mac) or Ctrl+Shift+\ (Windows/Linux) | Open row actions menu +|Command+Shift+\ (Mac) or Ctrl+Shift+\ (Windows/Linux) | Open row actions menu |Shift+Space | Select item |Space | Open selected item |e | Archive selected items diff --git a/translations/pt-BR/content/index.md b/translations/pt-BR/content/index.md index b3e5601692..d4e5d5db26 100644 --- a/translations/pt-BR/content/index.md +++ b/translations/pt-BR/content/index.md @@ -75,6 +75,10 @@ childGroups: octicon: ShieldLockIcon children: - code-security + - code-security/supply-chain-security + - code-security/dependabot + - code-security/code-scanning + - code-security/secret-scanning - name: Client apps octicon: DeviceMobileIcon children: diff --git a/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md b/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md index 232135b92a..58f47d8e9d 100644 --- a/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md +++ b/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md @@ -1,6 +1,6 @@ --- -title: Gerenciando as configurações de segurança e de análise da sua organização -intro: 'Você pode controlar recursos que protegem e analisam o código nos projetos da sua organização no {% data variables.product.prodname_dotcom %}.' +title: Managing security and analysis settings for your organization +intro: 'You can control features that secure and analyze the code in your organization''s projects on {% data variables.product.prodname_dotcom %}.' permissions: Organization owners can manage security and analysis settings for repositories in the organization. redirect_from: - /github/setting-up-and-managing-organizations-and-teams/managing-secret-scanning-for-your-organization @@ -15,115 +15,156 @@ topics: - Organizations - Teams shortTitle: Manage security & analysis -ms.openlocfilehash: 83104f606266279a239c5173e838c9241832fb84 -ms.sourcegitcommit: 1309b46201604c190c63bfee47dce559003899bf -ms.translationtype: HT -ms.contentlocale: pt-BR -ms.lasthandoff: 09/10/2022 -ms.locfileid: '147063207' --- -## Sobre a gestão de configurações de segurança e análise -O {% data variables.product.prodname_dotcom %} pode ajudar a proteger os repositórios na sua organização. É possível gerenciar os recursos de segurança e análise para todos os repositórios existentes ou novos que os integrantes criarem na sua organização. {% ifversion ghec %}Se você tiver uma licença para {% data variables.product.prodname_GH_advanced_security %}, você também poderá gerenciar o acesso a essas funcionalidades. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion fpt %}Organizações que usam {% data variables.product.prodname_ghe_cloud %} com uma licença para {% data variables.product.prodname_GH_advanced_security %} também podem gerenciar o acesso a essas funcionalidades. Para obter mais informações, confira a [documentação do {% data variables.product.prodname_ghe_cloud %}](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization).{% endif %} +## About management of security and analysis settings -{% data reusables.security.some-security-and-analysis-features-are-enabled-by-default %} {% data reusables.security.security-and-analysis-features-enable-read-only %} +{% data variables.product.prodname_dotcom %} can help secure the repositories in your organization. You can manage the security and analysis features for all existing or new repositories that members create in your organization. {% ifversion ghec %}If you have a license for {% data variables.product.prodname_GH_advanced_security %} then you can also manage access to these features. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion fpt %}Organizations that use {% data variables.product.prodname_ghe_cloud %} with a license for {% data variables.product.prodname_GH_advanced_security %} can also manage access to these features. For more information, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization).{% endif %} -## Exibir as configurações de segurança e análise +{% data reusables.security.some-security-and-analysis-features-are-enabled-by-default %} +{% data reusables.security.security-and-analysis-features-enable-read-only %} -{% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.security-and-analysis %} +## Displaying the security and analysis settings -A página exibida permite que você habilite ou desabilite todas as funcionalidades de segurança e análise dos repositórios na sua organização. +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} +{% data reusables.organizations.security-and-analysis %} -{% ifversion ghec %}Se a sua organização pertence a uma empresa com uma licença para {% data variables.product.prodname_GH_advanced_security %}, a página também conterá opções para habilitar e desabilitar funcionalidades do {% data variables.product.prodname_advanced_security %}. Todos os repositórios que usam {% data variables.product.prodname_GH_advanced_security %} estão listados na parte inferior da página.{% endif %} +The page that's displayed allows you to enable or disable all security and analysis features for the repositories in your organization. -{% ifversion ghes %}Se você tiver uma licença para {% data variables.product.prodname_GH_advanced_security %}, a página também conterá opções para habilitar e desabilitar funcionalidades do {% data variables.product.prodname_advanced_security %}. Todos os repositórios que usam {% data variables.product.prodname_GH_advanced_security %} estão listados na parte inferior da página.{% endif %} +{% ifversion ghec %}If your organization belongs to an enterprise with a license for {% data variables.product.prodname_GH_advanced_security %}, the page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %} -{% ifversion ghae %}A página também conterá opções para habilitar e desabilitar funcionalidades do {% data variables.product.prodname_advanced_security %}. Todos os repositórios que usam {% data variables.product.prodname_GH_advanced_security %} estão listados na parte inferior da página.{% endif %} +{% ifversion ghes %}If you have a license for {% data variables.product.prodname_GH_advanced_security %}, the page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %} -## Como habilitar ou desabilitar um recurso para todos os repositórios existentes +{% ifversion ghae %}The page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %} -Você pode habilitar ou desabilitar funcionalidades para todos os repositórios. {% ifversion fpt or ghec %}O impacto de suas alterações nos repositórios da organização é determinado pela visibilidade: +## Enabling or disabling a feature for all existing repositories -- **Grafo de dependência** – Suas alterações afetam apenas repositórios privados porque a funcionalidade está sempre habilitada para repositórios públicos. -- **{% data variables.product.prodname_dependabot_alerts %}** – Suas alterações afetam todos os repositórios. -- **{% data variables.product.prodname_dependabot_security_updates %}** – Suas alterações afetam todos os repositórios. +You can enable or disable features for all repositories. +{% ifversion fpt or ghec %}The impact of your changes on repositories in your organization is determined by their visibility: + +- **Dependency graph** - Your changes affect only private repositories because the feature is always enabled for public repositories. +- **{% data variables.product.prodname_dependabot_alerts %}** - Your changes affect all repositories. +- **{% data variables.product.prodname_dependabot_security_updates %}** - Your changes affect all repositories. {%- ifversion ghec %} -- **{% data variables.product.prodname_GH_advanced_security %}** – As suas alterações afetam apenas repositórios privados, porque {% data variables.product.prodname_GH_advanced_security %} e as funcionalidades relacionadas estão sempre habilitadas em repositórios públicos. -- **{% data variables.product.prodname_secret_scanning_caps %}** – Suas alterações afetam repositórios em que o {% data variables.product.prodname_GH_advanced_security %} também está habilitado. Esta opção controla se {% data variables.product.prodname_secret_scanning_GHAS %} está habilitado ou não. {% data variables.product.prodname_secret_scanning_partner_caps %} sempre é executado em todos os repositórios públicos. +- **{% data variables.product.prodname_GH_advanced_security %}** - Your changes affect only private repositories because {% data variables.product.prodname_GH_advanced_security %} and the related features are always enabled for public repositories. +- **{% data variables.product.prodname_secret_scanning_caps %}** - Your changes affect repositories where {% data variables.product.prodname_GH_advanced_security %} is also enabled. This option controls whether or not {% data variables.product.prodname_secret_scanning_GHAS %} is enabled. {% data variables.product.prodname_secret_scanning_partner_caps %} always runs on all public repositories. {% endif %} {% endif %} {% data reusables.advanced-security.note-org-enable-uses-seats %} -1. Vá para as configurações de segurança e análise da sua organização. Para obter mais informações, confira "[Como exibir as configurações de segurança e análise](#displaying-the-security-and-analysis-settings)". -2. Em "Segurança e análise de código", à direita do recurso, clique em **Desabilitar tudo** ou **Habilitar tudo**. {% ifversion ghes or ghec %}O controle de "{% data variables.product.prodname_GH_advanced_security %}" será desabilitado se você não tiver estações disponíveis na licença do {% data variables.product.prodname_GH_advanced_security %}.{% endif %} {% ifversion fpt %} ![Botão "Habilitar tudo" ou "Desabilitar tudo" dos recursos de "Configurar segurança e análise"](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-fpt.png) {% endif %} {% ifversion ghec %} ![Botão "Habilitar tudo" ou "Desabilitar tudo" dos recursos de "Configurar segurança e análise"](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-ghas-ghec.png) {% endif %} {% ifversion ghes > 3.2 %} ![Botão "Habilitar tudo" ou "Desabilitar tudo" dos recursos de "Configurar segurança e análise"](/assets/images/enterprise/3.3/organizations/security-and-analysis-disable-or-enable-all-ghas.png) {% endif %} {% ifversion ghes = 3.2 %} ![Botão "Habilitar tudo" ou "Desabilitar tudo" dos recursos de "Configurar segurança e análise"](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-disable-or-enable-all-ghas.png) {% endif %} +{% ifversion ghes or ghec or ghae %} +{% note %} + +**Note:** If you encounter an error that reads "GitHub Advanced Security cannot be enabled because of a policy setting for the organization," contact your enterprise admin and ask them to change the GitHub Advanced Security policy for your enterprise. For more information, see "[Enforcing policies for Advanced Security in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise)." +{% endnote %} +{% endif %} + +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +2. Under "Code security and analysis", to the right of the feature, click **Disable all** or **Enable all**. {% ifversion ghes or ghec %}The control for "{% data variables.product.prodname_GH_advanced_security %}" is disabled if you have no available seats in your {% data variables.product.prodname_GH_advanced_security %} license.{% endif %} + {% ifversion fpt %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-fpt.png) + {% endif %} + {% ifversion ghec %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-ghas-ghec.png) + {% endif %} + {% ifversion ghes > 3.2 %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/enterprise/3.3/organizations/security-and-analysis-disable-or-enable-all-ghas.png) + {% endif %} + {% ifversion ghes = 3.2 %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-disable-or-enable-all-ghas.png) + {% endif %} - {% ifversion ghae %} ![Botão "Habilitar tudo" ou "Desabilitar tudo" para as funcionalidades de "Configurar segurança e análise"](/assets/images/enterprise/github-ae/organizations/security-and-analysis-disable-or-enable-all-ghae.png) {% endif %} {% ifversion fpt or ghec %} -3. Opcionalmente, habilite o recurso para novos repositórios na organização por padrão. - {% ifversion fpt or ghec %} ![Opção "Habilitar por padrão" para novos repositórios](/assets/images/help/organizations/security-and-analysis-enable-by-default-in-modal.png) {% endif %} + {% ifversion ghae %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/enterprise/github-ae/organizations/security-and-analysis-disable-or-enable-all-ghae.png) + {% endif %} + {% ifversion fpt or ghec %} +3. Optionally, enable the feature by default for new repositories in your organization. + {% ifversion fpt or ghec %} + !["Enable by default" option for new repositories](/assets/images/help/organizations/security-and-analysis-enable-by-default-in-modal.png) + {% endif %} - {% endif %} {% ifversion fpt or ghec %} -4. Clique em **Desabilitar RECURSO** ou em **Habilitar RECURSO** para habilitar ou desabilitar o recurso em todos os repositórios em sua organização. - {% ifversion fpt or ghec %} ![Botão para desabilitar ou habilitar o recurso](/assets/images/help/organizations/security-and-analysis-enable-dependency-graph.png) {% endif %} + {% endif %} + {% ifversion fpt or ghec %} +4. Click **Disable FEATURE** or **Enable FEATURE** to disable or enable the feature for all the repositories in your organization. + {% ifversion fpt or ghec %} + ![Button to disable or enable feature](/assets/images/help/organizations/security-and-analysis-enable-dependency-graph.png) + {% endif %} - {% endif %} {% ifversion ghae or ghes %} -3. Clique em **Habilitar/Desabilitar tudo** ou **Habilitar/Desabilitar para repositórios qualificados** a fim de confirmar a alteração. - ![Botão para habilitar o recurso para todos os repositórios qualificados na organização](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-secret-scanning-existing-repos-ghae.png) {% endif %} + {% endif %} + {% ifversion ghae or ghes %} +5. Click **Enable/Disable all** or **Enable/Disable for eligible repositories** to confirm the change. + ![Button to enable feature for all the eligible repositories in the organization](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-secret-scanning-existing-repos-ghae.png) + {% endif %} {% data reusables.security.displayed-information %} -## Habilitar ou desabilitar uma funcionalidade automaticamente quando novos repositórios forem adicionados +## Enabling or disabling a feature automatically when new repositories are added -1. Vá para as configurações de segurança e análise da sua organização. Para obter mais informações, confira "[Como exibir as configurações de segurança e análise](#displaying-the-security-and-analysis-settings)". -2. Em "Segurança e análise de código", à direita do revurso, habilite ou desabilite o recurso por padrão para novos repositórios{% ifversion fpt or ghec %}, ou todos os novos repositórios privados,{% endif %} na sua organização. - {% ifversion fpt or ghec %} ![Captura de tela de uma caixa de seleção para habilitar um recurso em novos repositórios](/assets/images/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) {% endif %} {% ifversion ghes > 3.2 %} ![Captura de tela de uma caixa de seleção para habilitar um recurso em novos repositórios](/assets/images/enterprise/3.3/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) {% endif %} {% ifversion ghes = 3.2 %} ![Captura de tela de uma caixa de seleção para habilitar um recurso em novos repositórios](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) {% endif %} {% ifversion ghae %} ![Captura de tela de uma caixa de seleção para habilitar um recurso em novos repositórios](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-or-disable-secret-scanning-checkbox-ghae.png) {% endif %} +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +2. Under "Code security and analysis", to the right of the feature, enable or disable the feature by default for new repositories{% ifversion fpt or ghec %}, or all new private repositories,{% endif %} in your organization. + {% ifversion fpt or ghec %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) + {% endif %} + {% ifversion ghes > 3.2 %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/enterprise/3.3/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) + {% endif %} + {% ifversion ghes = 3.2 %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) + {% endif %} + {% ifversion ghae %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-or-disable-secret-scanning-checkbox-ghae.png) + {% endif %} {% ifversion fpt or ghec or ghes > 3.2 %} -## Permitir que {% data variables.product.prodname_dependabot %} acesse dependências privadas +## Allowing {% data variables.product.prodname_dependabot %} to access private dependencies -{% data variables.product.prodname_dependabot %} pode verificar referências de dependências desatualizadas em um projeto e gerar automaticamente um pull request para atualizá-las. Para fazer isso, {% data variables.product.prodname_dependabot %} deve ter acesso a todos os arquivos de dependência de destino. Normalmente, atualizações da versão irão falhar se uma ou mais dependências forem inacessíveis. Para obter mais informações, confira "[Sobre as {% data variables.product.prodname_dependabot %}](/github/administering-a-repository/about-dependabot-version-updates)". +{% data variables.product.prodname_dependabot %} can check for outdated dependency references in a project and automatically generate a pull request to update them. To do this, {% data variables.product.prodname_dependabot %} must have access to all of the targeted dependency files. Typically, version updates will fail if one or more dependencies are inaccessible. For more information, see "[About {% data variables.product.prodname_dependabot %} version updates](/github/administering-a-repository/about-dependabot-version-updates)." -Por padrão, {% data variables.product.prodname_dependabot %} não pode atualizar as dependências que estão localizadas em repositórios privados ou registros de pacotes privados. Entretanto, se uma dependência estiver em um repositório privado de {% data variables.product.prodname_dotcom %} dentro da mesma organização que o projeto que usa essa dependência, você pode permitir que {% data variables.product.prodname_dependabot %} atualize a versão com sucesso, dando-lhe acesso à hospedagem do repositório. +By default, {% data variables.product.prodname_dependabot %} can't update dependencies that are located in private repositories or private package registries. However, if a dependency is in a private {% data variables.product.prodname_dotcom %} repository within the same organization as the project that uses that dependency, you can allow {% data variables.product.prodname_dependabot %} to update the version successfully by giving it access to the host repository. -Se seu código depende de pacotes em um registro privado, você pode permitir que {% data variables.product.prodname_dependabot %} atualize as versões dessas dependências configurando isso no nível do repositório. Você faz isso adicionando detalhes de autenticação ao arquivo _dependabot.yml_ do repositório. Para obter mais informações, confira "[Opções de configuração para o arquivo dependabot.yml](/github/administering-a-repository/configuration-options-for-dependency-updates#configuration-options-for-private-registries)". +If your code depends on packages in a private registry, you can allow {% data variables.product.prodname_dependabot %} to update the versions of these dependencies by configuring this at the repository level. You do this by adding authentication details to the _dependabot.yml_ file for the repository. For more information, see "[Configuration options for the dependabot.yml file](/github/administering-a-repository/configuration-options-for-dependency-updates#configuration-options-for-private-registries)." -Para permitir que {% data variables.product.prodname_dependabot %} acesse um repositório privado de {% data variables.product.prodname_dotcom %}: +To allow {% data variables.product.prodname_dependabot %} to access a private {% data variables.product.prodname_dotcom %} repository: -1. Vá para as configurações de segurança e análise da sua organização. Para obter mais informações, confira "[Como exibir as configurações de segurança e análise](#displaying-the-security-and-analysis-settings)". -1. Em "Acesso ao repositório privado do {% data variables.product.prodname_dependabot %}", clique em **Adicionar repositórios privados** ou **Adicionar repositórios internos e privados**. - ![Botão para adicionar repositórios](/assets/images/help/organizations/dependabot-private-repository-access.png) -1. Comece a digitar o nome do repositório que deseja permitir. - ![Campo de pesquisa do repositório com menu suspenso filtrado](/assets/images/help/organizations/dependabot-private-repo-choose.png) -1. Clique no repositório que deseja permitir. +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +1. Under "{% data variables.product.prodname_dependabot %} private repository access", click **Add private repositories** or **Add internal and private repositories**. + ![Add repositories button](/assets/images/help/organizations/dependabot-private-repository-access.png) +1. Start typing the name of the repository you want to allow. + ![Repository search field with filtered dropdown](/assets/images/help/organizations/dependabot-private-repo-choose.png) +1. Click the repository you want to allow. -1. Opcionalmente, para remover um repositório da lista, à direita do repositório, clique em {% octicon "x" aria-label="The X icon" %}. - ![Botão "X" para remover um repositório](/assets/images/help/organizations/dependabot-private-repository-list.png) {% endif %} +1. Optionally, to remove a repository from the list, to the right of the repository, click {% octicon "x" aria-label="The X icon" %}. + !["X" button to remove a repository](/assets/images/help/organizations/dependabot-private-repository-list.png) +{% endif %} {% ifversion ghes or ghec %} -## Remover acesso a {% data variables.product.prodname_GH_advanced_security %} de repositórios individuais em uma organização +## Removing access to {% data variables.product.prodname_GH_advanced_security %} from individual repositories in an organization -Você pode gerenciar o acesso a recursos do {% data variables.product.prodname_GH_advanced_security %} para um repositório na guia "Configurações". Para obter mais informações, confira "[Gerenciando configurações de segurança e análise para seu repositório](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)". No entanto, você também pode desabilitar funcionalidades de {% data variables.product.prodname_GH_advanced_security %} para um repositório na aba "Configurações" da organização. +You can manage access to {% data variables.product.prodname_GH_advanced_security %} features for a repository from its "Settings" tab. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." However, you can also disable {% data variables.product.prodname_GH_advanced_security %} features for a repository from the "Settings" tab for the organization. -1. Vá para as configurações de segurança e análise da sua organização. Para obter mais informações, confira "[Como exibir as configurações de segurança e análise](#displaying-the-security-and-analysis-settings)". -1. Para ver uma lista de todos os repositórios na sua organização com {% data variables.product.prodname_GH_advanced_security %} habilitados, desça até a seção "repositórios de {% data variables.product.prodname_GH_advanced_security %}". - ![Seção de repositórios do {% data variables.product.prodname_GH_advanced_security %}](/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png) A tabela lista o número de committers exclusivos de cada repositório. Este é o número de estações que você poderia liberar em sua licença, removendo acesso a {% data variables.product.prodname_GH_advanced_security %}. Para obter mais informações, confira "[Sobre a cobrança do {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)". -1. Para remover acesso ao {% data variables.product.prodname_GH_advanced_security %} de um repositório e liberar estações usadas por todos os committers que são exclusivos do repositório, clique no {% octicon "x" aria-label="X symbol" %} adjacente. -1. Na caixa de diálogo de confirmação, clique em **Remover repositório** para remover o acesso aos recursos do {% data variables.product.prodname_GH_advanced_security %}. +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +1. To see a list of all the repositories in your organization with {% data variables.product.prodname_GH_advanced_security %} enabled, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section. + ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png) + The table lists the number of unique committers for each repository. This is the number of seats you could free up on your license by removing access to {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." +1. To remove access to {% data variables.product.prodname_GH_advanced_security %} from a repository and free up seats used by any committers that are unique to the repository, click the adjacent {% octicon "x" aria-label="X symbol" %}. +1. In the confirmation dialog, click **Remove repository** to remove access to the features of {% data variables.product.prodname_GH_advanced_security %}. {% note %} -**Observação:** se você remover o acesso ao {% data variables.product.prodname_GH_advanced_security %} de um repositório, deverá se comunicar com a equipe de desenvolvimento afetada para que eles saibam que a alteração foi intencional. Isso garante que eles não perderão tempo corrigindo execuções falhas de varredura de código. +**Note:** If you remove access to {% data variables.product.prodname_GH_advanced_security %} for a repository, you should communicate with the affected development team so that they know that the change was intended. This ensures that they don't waste time debugging failed runs of code scanning. {% endnote %} {% endif %} -## Leitura adicional +## Further reading -- "[Como proteger seu repositório](/code-security/getting-started/securing-your-repository)"{% ifversion not fpt %} -- "[Sobre a verificação de segredos](/github/administering-a-repository/about-secret-scanning)"{% endif %}{% ifversion not ghae %} -- "[Sobre o grafo de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)"{% endif %} -- "[Sobre a segurança da cadeia de fornecedores](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security)" +- "[Securing your repository](/code-security/getting-started/securing-your-repository)"{% ifversion not fpt %} +- "[About secret scanning](/github/administering-a-repository/about-secret-scanning)"{% endif %}{% ifversion not ghae %} +- "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)"{% endif %} +- "[About supply chain security](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security)" diff --git a/translations/pt-BR/content/repositories/creating-and-managing-repositories/transferring-a-repository.md b/translations/pt-BR/content/repositories/creating-and-managing-repositories/transferring-a-repository.md index 92900222ad..dff4c98d4d 100644 --- a/translations/pt-BR/content/repositories/creating-and-managing-repositories/transferring-a-repository.md +++ b/translations/pt-BR/content/repositories/creating-and-managing-repositories/transferring-a-repository.md @@ -30,7 +30,7 @@ Prerequisites for repository transfers: - When you transfer a repository that you own to another personal account, the new owner will receive a confirmation email.{% ifversion fpt or ghec %} The confirmation email includes instructions for accepting the transfer. If the new owner doesn't accept the transfer within one day, the invitation will expire.{% endif %} - To transfer a repository that you own to an organization, you must have permission to create a repository in the target organization. - The target account must not have a repository with the same name, or a fork in the same network. -- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghes < 3.7 %} +- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghes < 3.7 or ghae %} - Internal repositories can't be transferred.{% endif %} - Private forks can't be transferred. diff --git a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md index 296d00bcf1..850fdd4282 100644 --- a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md +++ b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md @@ -1,6 +1,6 @@ --- -title: 个性化您的个人资料 -intro: '你可以在个人资料中设置头像和添加个人简历，与其他 {% data variables.product.product_name %} 用户共享你自己的信息。' +title: Personalizing your profile +intro: 'You can share information about yourself with other {% data variables.product.product_name %} users by setting a profile picture and adding a bio to your profile.' redirect_from: - /articles/adding-a-bio-to-your-profile - /articles/setting-your-profile-picture @@ -18,156 +18,186 @@ versions: topics: - Profiles shortTitle: Personalize -ms.openlocfilehash: c12fccd91144428fe9aad2f01d2c0b0941fdd4d4 -ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 -ms.translationtype: HT -ms.contentlocale: zh-CN -ms.lasthandoff: 09/05/2022 -ms.locfileid: '146681051' --- -## 更改头像 +## Changing your profile picture -您的头像可帮助在 {% data variables.product.product_name %} 的拉取请求、评论、参与页面及图形中识别您。 +Your profile picture helps identify you across {% data variables.product.product_name %} in pull requests, comments, contributions pages, and graphs. -在注册帐户时，{% data variables.product.product_name %} 会提供一个随机生成的“默认肖像”。 [哈希头像](https://github.com/blog/1586-identicons)根据用户 ID 的哈希生成，因此无法控制其颜色或模式。 您可以将默认肖像替换为能代表您的图片。 +When you sign up for an account, {% data variables.product.product_name %} provides you with a randomly generated "identicon". [Your identicon](https://github.com/blog/1586-identicons) generates from a hash of your user ID, so there's no way to control its color or pattern. You can replace your identicon with an image that represents you. {% note %} -注意{% ifversion ghec %}s{% endif %}：{% ifversion ghec %} +**Note{% ifversion ghec %}s{% endif %}**: {% ifversion ghec %} -* {% endif %}个人资料图片应为 PNG、JPG 或 GIF 文件，其大小必须小于 1 MB，且小于 3000 x 3000 像素。 为获取质量最佳的渲染，建议图像的像素保持在大约 500 x 500 像素。 -{% ifversion ghec %}* {% data variables.product.prodname_emus %} 不支持 Gravatar 头像。{% endif %} +* {% endif %}Your profile picture should be a PNG, JPG, or GIF file, and it must be less than 1 MB in size and smaller than 3000 by 3000 pixels. For the best quality rendering, we recommend keeping the image at about 500 by 500 pixels. +{% ifversion ghec %}* Gravatar profile pictures are not supported with {% data variables.product.prodname_emus %}.{% endif %} {% endnote %} -### 设置头像 +### Setting a profile picture {% data reusables.user-settings.access_settings %} -2. 在“个人资料图片”下，单击 {% octicon "pencil" aria-label="The edit icon" %}“编辑” 。 -![编辑个人资料图片](/assets/images/help/profile/edit-profile-photo.png) -3. 单击“上传照片...”。{% ifversion not ghae %}![更新个人资料图片](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} -3. 裁剪图片。 完成后，单击“设置新的个人资料图片”。 - ![裁剪上传的照片](/assets/images/help/profile/avatar_crop_and_save.png) +2. Under **Profile Picture**, click {% octicon "pencil" aria-label="The edit icon" %} **Edit**. +![Edit profile picture](/assets/images/help/profile/edit-profile-photo.png) +3. Click **Upload a photo...**.{% ifversion not ghae %} +![Update profile picture](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} +3. Crop your picture. When you're done, click **Set new profile picture**. + ![Crop uploaded photo](/assets/images/help/profile/avatar_crop_and_save.png) -### 将头像重置为默认肖像 +### Resetting your profile picture to the identicon {% data reusables.user-settings.access_settings %} -2. 在“个人资料图片”下，单击 {% octicon "pencil" aria-label="The edit icon" %}“编辑” 。 -![编辑个人资料图片](/assets/images/help/profile/edit-profile-photo.png) -3. 要还原为哈希头像，请单击“删除照片”。 {% ifversion not ghae %}如果电子邮件地址与 [Gravatar](https://en.gravatar.com/) 相关联，则无法还原为默认肖像。 此时请单击“还原为 Gravatar”。 -![更新个人资料图片](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} +2. Under **Profile Picture**, click {% octicon "pencil" aria-label="The edit icon" %} **Edit**. +![Edit profile picture](/assets/images/help/profile/edit-profile-photo.png) +3. To revert to your identicon, click **Remove photo**. {% ifversion not ghae %}If your email address is associated with a [Gravatar](https://en.gravatar.com/), you cannot revert to your identicon. Click **Revert to Gravatar** instead. +![Update profile picture](/assets/images/help/profile/edit-profile-picture-options.png){% endif %} -## 更改个人资料名称 +## Changing your profile name -您可以更改显示在个人资料中的名称。 此名称也可能显示在您对于组织拥有的私有仓库所做的注释旁边。 有关详细信息，请参阅“[管理组织中成员名称的显示](/articles/managing-the-display-of-member-names-in-your-organization)”。 +You can change the name that is displayed on your profile. This name may also be displayed next to comments you make on private repositories owned by an organization. For more information, see "[Managing the display of member names in your organization](/articles/managing-the-display-of-member-names-in-your-organization)." -{% ifversion fpt or ghec %} {% note %} +{% ifversion fpt or ghec %} +{% note %} -注意：如果你是 {% data variables.product.prodname_emu_enterprise %} 的成员，则必须通过你的标识提供者而不是 {% data variables.product.prodname_dotcom_the_website %} 对个人资料名称进行任何更改。 {% data reusables.enterprise-accounts.emu-more-info-account %} +**Note:** If you're a member of an {% data variables.product.prodname_emu_enterprise %}, any changes to your profile name must be made through your identity provider instead of {% data variables.product.prodname_dotcom_the_website %}. {% data reusables.enterprise-accounts.emu-more-info-account %} -{% endnote %} {% endif %} +{% endnote %} +{% endif %} {% data reusables.user-settings.access_settings %} -2. 在“Name（名称）”下，键入要显示在个人资料中的名称。 - ![个人资料设置中的名称字段](/assets/images/help/profile/name-field.png) +2. Under "Name", type the name you want to be displayed on your profile. + ![Name field in profile settings](/assets/images/help/profile/name-field.png) -## 在个人资料中添加个人简历 +## Adding a bio to your profile -在个人资料中添加个人简历，与其他 {% data variables.product.product_name %} 用户共享您自己的信息。 借助 [@mentions](/articles/basic-writing-and-formatting-syntax) 和表情符号，你可以在简历中包括以下信息：目前或以前工作的工作地点、从事的工作类型，甚至是喜欢的咖啡种类。 +Add a bio to your profile to share information about yourself with other {% data variables.product.product_name %} users. With the help of [@mentions](/articles/basic-writing-and-formatting-syntax) and emoji, you can include information about where you currently or have previously worked, what type of work you do, or even what kind of coffee you drink. {% ifversion fpt or ghes or ghec %} -要以更长和更突出的方式显示有关自己的自定义信息，您还可以使用个人资料自述文件。 有关详细信息，请参阅“[管理个人资料 README](/github/setting-up-and-managing-your-github-profile/managing-your-profile-readme)”。 +For a longer-form and more prominent way of displaying customized information about yourself, you can also use a profile README. For more information, see "[Managing your profile README](/github/setting-up-and-managing-your-github-profile/managing-your-profile-readme)." {% endif %} {% note %} -注意：如果你为个人资料启用了活动概述部分，并且在个人资料的个人简历中 @mention 你所属的组织，那么该组织将首先出现在你的活动概述中。 有关详细信息，请参阅“[在个人资料中显示活动概述](/articles/showing-an-overview-of-your-activity-on-your-profile)”。 +**Note:** + If you have the activity overview section enabled for your profile and you @mention an organization you're a member of in your profile bio, then that organization will be featured first in your activity overview. For more information, see "[Showing an overview of your activity on your profile](/articles/showing-an-overview-of-your-activity-on-your-profile)." {% endnote %} {% data reusables.user-settings.access_settings %} -2. 在“个人简历”下，添加要在个人资料中显示的内容。 个人资料字段限于 160 个字符。 - ![更新个人资料中的个人简历](/assets/images/help/profile/bio-field.png) +2. Under **Bio**, add the content that you want displayed on your profile. The bio field is limited to 160 characters. + ![Update bio on profile](/assets/images/help/profile/bio-field.png) {% tip %} - 提示：当你 @mention 组织时，只有你所属的组织才会自动填写。 你也可 @mention 不是其成员的组织（例如前雇主），但该组织名称不会自动填写。 + **Tip:** When you @mention an organization, only those that you're a member of will autocomplete. You can still @mention organizations that you're not a member of, like a previous employer, but the organization name won't autocomplete for you. {% endtip %} -3. 单击“更新个人资料”。 - ![“更新个人资料”按钮](/assets/images/help/profile/update-profile-button.png) +{% data reusables.profile.update-profile %} -## 设置状态 +{% ifversion profile-time-zone %} -您可以设置状态以显示您当前在 {% data variables.product.product_name %} 上的可用性。 您的状态将会显示： -- 在您的 {% data variables.product.product_name %} 个人资料页面上。 -- 当有人在 {% data variables.product.product_name %} 上将鼠标放在您的用户名或头像上时。 -- 在您属于其成员的团队页面上时。 有关详细信息，请参阅“[关于团队](/articles/about-teams/#team-pages)”。 -- 在您属于其成员的组织的组织仪表板上。 有关详细信息，请参阅“[关于组织仪表板](/articles/about-your-organization-dashboard/)”。 +## Setting your location and time zone -在设置状态时，您也可以让人们知道您在 {% data variables.product.product_name %} 上的可用性有限。 +You can set a location and time zone on your profile to show other people your local time. Your location and time zone will be visible: +- on your {% data variables.product.product_name %} profile page. +- when people hover over your username or avatar on {% data variables.product.product_name %}. -![提及的用户名在用户名旁边显示“忙碌”注释](/assets/images/help/profile/username-with-limited-availability-text.png) +When you view your profile, you will see your location, local time, and your time zone in relation to Universal Time Coordinated. -![请求的审阅者在用户名旁边显示“忙碌”注释](/assets/images/help/profile/request-a-review-limited-availability-status.png) + ![Screenshot of the Octocat profile page emphasizing the location, local time, and time zone fields.](/assets/images/help/profile/profile-location-and-time.png) -如果选择“忙碌”选项，当人们 @mention 你的用户名、分配给你问题或拉取请求或者请求你对拉取请求进行评审时，你的用户名旁边将会出现一条表示你在忙碌的注释。 您还将被排除在分配给您所属的任何团队的拉取请求的自动审核任务之外。 有关详细信息，请参阅“[管理团队的代码评审设置](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)”。 +When others view your profile, they will see your location, local time, and the time difference in hours from their own local time. -1. 在 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %} 的右上角，单击你的个人资料照片，然后单击“设置状态”，或者，如果已设置状态，则单击当前状态。 - ![个人资料中用于设置状态的按钮](/assets/images/help/profile/set-status-on-profile.png) -2. 要添加自定义文本到状态，请单击文本字段，然后输入状态消息。 - ![用于键入状态消息的字段](/assets/images/help/profile/type-a-status-message.png) -3. （可选）要设置表情符号状态，请单击笑脸图标并从列表中选择表情符号。 - ![选择表情符号状态的按钮](/assets/images/help/profile/select-emoji-status.png) -4. （可选）如果想表示您的可用性受限，请选择“Busy（忙碌）”。 - ![在“编辑状态”选项中选择的“忙碌”选项](/assets/images/help/profile/limited-availability-status.png) -5. 使用“清除状态”下拉菜单，选择状态的到期时间。 如果不选择状态到期时间，您的状态将保持到您清除或编辑状态为止。 - ![用于选择状态到期时间的下拉菜单](/assets/images/help/profile/status-expiration.png) -6. 使用下拉菜单，单击您要向其显示状态的组织。 如果不选择组织，您的状态将是公共的。 - ![用于选择状态可见者的下拉菜单](/assets/images/help/profile/status-visibility.png) -7. 单击“设置状态”。 - ![设置状态的按钮](/assets/images/help/profile/set-status-button.png) + ![Screenshot of the Octocat profile page emphasizing the location, local time, and relative time fields.](/assets/images/help/profile/profile-relative-time.png) + +{% data reusables.user-settings.access_settings %} +1. Under **Location**, type the location you want to be displayed on your profile. + + ![Screenshot of the location and local time settings emphasizing the location field.](/assets/images/help/profile/location-field.png) + +1. Optionally, to display the current local time on your profile, select **Display current local time**. + + ![Screenshot of the location and local time settings emphasizing the display current local time checkbox.](/assets/images/help/profile/display-local-time-checkbox.png) + + - Select the **Time zone** dropdown menu, then click your local time zone. + + ![Screenshot of the location and local time settings emphasizing the time zone dropdown menu.](/assets/images/help/profile/time-zone-dropdown.png) + +{% data reusables.profile.update-profile %} + +{% endif %} + +## Setting a status + +You can set a status to display information about your current availability on {% data variables.product.product_name %}. Your status will show: +- on your {% data variables.product.product_name %} profile page. +- when people hover over your username or avatar on {% data variables.product.product_name %}. +- on a team page for a team where you're a team member. For more information, see "[About teams](/articles/about-teams/#team-pages)." +- on the organization dashboard in an organization where you're a member. For more information, see "[About your organization dashboard](/articles/about-your-organization-dashboard/)." + +When you set your status, you can also let people know that you have limited availability on {% data variables.product.product_name %}. + +![At-mentioned username shows "busy" note next to username](/assets/images/help/profile/username-with-limited-availability-text.png) + +![Requested reviewer shows "busy" note next to username](/assets/images/help/profile/request-a-review-limited-availability-status.png) + +If you select the "Busy" option, when people @mention your username, assign you an issue or pull request, or request a pull request review from you, a note next to your username will show that you're busy. You will also be excluded from automatic review assignment for pull requests assigned to any teams you belong to. For more information, see "[Managing code review settings for your team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)." + +1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click **Set your status** or, if you already have a status set, click your current status. + ![Button on profile to set your status](/assets/images/help/profile/set-status-on-profile.png) +2. To add custom text to your status, click in the text field and type a status message. + ![Field to type a status message](/assets/images/help/profile/type-a-status-message.png) +3. Optionally, to set an emoji status, click the smiley icon and select an emoji from the list. + ![Button to select an emoji status](/assets/images/help/profile/select-emoji-status.png) +4. Optionally, if you'd like to share that you have limited availability, select "Busy." + ![Busy option selected in Edit status options](/assets/images/help/profile/limited-availability-status.png) +5. Use the **Clear status** drop-down menu, and select when you want your status to expire. If you don't select a status expiration, you will keep your status until you clear or edit your status. + ![Drop down menu to choose when your status expires](/assets/images/help/profile/status-expiration.png) +6. Use the drop-down menu and click the organization you want your status visible to. If you don't select an organization, your status will be public. + ![Drop down menu to choose who your status is visible to](/assets/images/help/profile/status-visibility.png) +7. Click **Set status**. + ![Button to set status](/assets/images/help/profile/set-status-button.png) {% ifversion fpt or ghec %} -## 在个人资料中显示徽章 +## Displaying badges on your profile -当您参与某些计划时， {% data variables.product.prodname_dotcom %} 会自动在您的个人资料中显示徽章。 +When you participate in certain programs, {% data variables.product.prodname_dotcom %} automatically displays a badge on your profile. -| 徽章 | 节目 | 说明 | +| Badge | Program | Description | | --- | --- | --- | -| {% octicon "cpu" aria-label="The Developer Program icon" %} | **开发人员计划成员** | 如果您是 {% data variables.product.prodname_dotcom %} 开发者计划的注册成员，使用 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API 构建应用程序，您的个人资料上将获得开发者计划成员徽章。 有关 {% data variables.product.prodname_dotcom %} 开发人员计划的更多信息，请参阅 [GitHub 开发人员](/program/)。 | -| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | 如果您使用 {% data variables.product.prodname_pro %}，您的个人资料中将获得一个 PRO 徽章。 有关 {% data variables.product.prodname_pro %} 的详细信息，请参阅“[{% data variables.product.prodname_dotcom %} 的产品](/github/getting-started-with-github/githubs-products#github-pro)”。 | -| {% octicon "lock" aria-label="The lock icon" %} | **Security Bug Bounty Hunter** | 如果你帮助寻找安全漏洞，您的个人资料上将获得 Security Bug Bounty Hunter 徽章。 有关 {% data variables.product.prodname_dotcom %} 安全计划的详细信息，请参阅 [{% data variables.product.prodname_dotcom %} 安全性](https://bounty.github.com/)。 | -| {% octicon "mortar-board" aria-label="The mortar-board icon" %} | **{% data variables.product.prodname_dotcom %} 校园专家** | 如果您参加 {% data variables.product.prodname_campus_program %}，您的个人资料上将获得 {% data variables.product.prodname_dotcom %} 校园专家徽章。 有关校园专家计划的详细信息，请参阅[校园专家](https://education.github.com/experts)。 | -| {% octicon "shield" aria-label="The shield icon" %} | 安全公告信用 | 如果你提交到 [{% data variables.product.prodname_dotcom %} 公告数据库](https://github.com/advisories)的安全公告被接受，你的个人资料上将获得一个安全公告信用徽章。 有关 {% data variables.product.prodname_dotcom %} 安全公告的详细信息，请参阅“[{% data variables.product.prodname_dotcom %} 安全公告](/code-security/repository-security-advisories/about-github-security-advisories-for-repositories)”。 | -| {% octicon "check" aria-label="The check icon" %} | 已回答的讨论 | 如果对讨论的答复标记为答案，你将在个人资料上获得“已回答的讨论”徽章。 有关 {% data variables.product.prodname_dotcom %} 的详细信息，请参阅[关于讨论](/discussions/collaborating-with-your-community-using-discussions/about-discussions)。 | +| {% octicon "cpu" aria-label="The Developer Program icon" %} | **Developer Program Member** | If you're a registered member of the {% data variables.product.prodname_dotcom %} Developer Program, building an app with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, you'll get a Developer Program Member badge on your profile. For more information on the {% data variables.product.prodname_dotcom %} Developer Program, see [GitHub Developer](/program/). | +| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | If you use {% data variables.product.prodname_pro %} you'll get a PRO badge on your profile. For more information about {% data variables.product.prodname_pro %}, see "[{% data variables.product.prodname_dotcom %}'s products](/github/getting-started-with-github/githubs-products#github-pro)." | +| {% octicon "lock" aria-label="The lock icon" %} | **Security Bug Bounty Hunter** | If you helped out hunting down security vulnerabilities, you'll get a Security Bug Bounty Hunter badge on your profile. For more information about the {% data variables.product.prodname_dotcom %} Security program, see [{% data variables.product.prodname_dotcom %} Security](https://bounty.github.com/). | +| {% octicon "mortar-board" aria-label="The mortar-board icon" %} | **{% data variables.product.prodname_dotcom %} Campus Expert** | If you participate in the {% data variables.product.prodname_campus_program %}, you will get a {% data variables.product.prodname_dotcom %} Campus Expert badge on your profile. For more information about the Campus Experts program, see [Campus Experts](https://education.github.com/experts). | +| {% octicon "shield" aria-label="The shield icon" %} | **Security advisory credit** | If a security advisory you submit to the [{% data variables.product.prodname_dotcom %} Advisory Database](https://github.com/advisories) is accepted, you'll get a Security advisory credit badge on your profile. For more information about {% data variables.product.prodname_dotcom %} Security Advisories, see [{% data variables.product.prodname_dotcom %} Security Advisories](/code-security/repository-security-advisories/about-github-security-advisories-for-repositories). | +| {% octicon "check" aria-label="The check icon" %} | **Discussion answered** | If your reply to a discussion is marked as the answer, you'll get a Discussion answered badge on your profile. For more information about {% data variables.product.prodname_dotcom %} Discussions, see [About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions). | {% endif %} {% ifversion fpt or ghec %} -## 获得成就 +## Earning Achievements -成就庆祝 {% data variables.product.prodname_dotcom %} 上发生的特定事件和操作。 它们将显示为你的个人资料边栏中列出的小徽章。 单击或悬停在成就上将显示一个详细视图，该视图提示如何获得成就，并提供简短说明和参与事件的链接。 事件链接将仅对有权访问发生事件的存储库或组织的用户可见。 对于没有访问权限的所有用户，事件链接将不可访问。 +Achievements celebrate specific events and actions that happen on {% data variables.product.prodname_dotcom %}. They will appear as small badges listed in the sidebar of your profile. Clicking or hovering on an achievement will show a detailed view that hints at how the achievement was earned, with a short description and links to the contributing events. The event links will only be visible to users that have access to the repository or organization that the event took place in. Event links will appear inaccessible to all users without access. -若要阻止私人贡献计入成就，或完全关闭成就，请参阅“[在个人资料上显示你的私人贡献和成就](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)”。 +To stop private contributions from counting toward your Achievements, or to turn off Achievements entirely, see "[Showing your private contributions and Achievements on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)." {% note %} -注意：此功能目前为 beta 版本，可能会有变动。 +**Note:** This feature is currently in beta and subject to change. {% endnote %} {% endif %} -## Mars 2020 Helicopter 贡献者成就的合格仓库列表 +## List of qualifying repositories for Mars 2020 Helicopter Contributor achievement -如果你为下面一个或多个仓库列出的标记撰写了提交历史记录中的任何提交，你的个人资料中将获得 Mars 2020 Helicopter 贡献者成就。 撰写的提交必须有验证过的电子邮件地址，该电子邮件地址在 {% data variables.product.prodname_dotcom %} 确定符合条件的贡献时与您帐户关联，表示该贡献归属于您。 你可以是提交的原始作者或[共同作者之一](/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors)。 将来对经过验证的电子邮件的更改不会对徽章产生影响。 我们根据从美国航天局喷气推进实验室获得的资料编制了清单。 +If you authored any commit(s) present in the commit history for the listed tag of one or more of the repositories below, you'll receive the Mars 2020 Helicopter Contributor achievement on your profile. The authored commit must be with a verified email address, associated with your account at the time {% data variables.product.prodname_dotcom %} determined the eligible contributions, in order to be attributed to you. You can be the original author or [one of the co-authors](/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors) of the commit. Future changes to verified emails will not have an effect on the badge. We built the list based on information received from NASA's Jet Propulsion Laboratory. -| {% data variables.product.prodname_dotcom %} 仓库 | 版本 | 标记 | +| {% data variables.product.prodname_dotcom %} Repository | Version | Tag | |---|---|---| | [torvalds/linux](https://github.com/torvalds/linux) | 3.4 | [v3.4](https://github.com/torvalds/linux/releases/tag/v3.4) | | [python/cpython](https://github.com/python/cpython) | 3.9.2 | [v3.9.2](https://github.com/python/cpython/releases/tag/v3.9.2) | @@ -238,6 +268,6 @@ ms.locfileid: '146681051' | [locationtech/jts](https://github.com/locationtech/jts) | 1.15.0 | [jts-1.15.0](https://github.com/locationtech/jts/releases/tag/jts-1.15.0) | | [apache/logging-log4j2](https://github.com/apache/logging-log4j2) | 2.11 | [log4j-2.11.0](https://github.com/apache/logging-log4j2/releases/tag/log4j-2.11.0) | -## 延伸阅读 +## Further reading -- [关于个人资料](/articles/about-your-profile) +- "[About your profile](/articles/about-your-profile)" diff --git a/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md b/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md index c39ef22235..9b7fb1a826 100644 --- a/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md +++ b/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md @@ -275,7 +275,7 @@ This list describes the recommended approaches for accessing repository data wit {% ifversion fpt or ghec %}**Self-hosted**{% elsif ghes or ghae %}Self-hosted{% endif %} runners for {% data variables.product.product_name %} do not have guarantees around running in ephemeral clean virtual machines, and can be persistently compromised by untrusted code in a workflow. -{% ifversion fpt or ghec %}As a result, self-hosted runners should almost [never be used for public repositories](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories) on {% data variables.product.product_name %}, because any user can open pull requests against the repository and compromise the environment. Similarly, be{% elsif ghes or ghae %}Be{% endif %} cautious when using self-hosted runners on private or internal repositories, as anyone who can fork the repository and open a pull request (generally those with read access to the repository) are able to compromise the self-hosted runner environment, including gaining access to secrets and the `GITHUB_TOKEN` which, depending on its settings, can grant write access to the repository. Although workflows can control access to environment secrets by using environments and required reviews, these workflows are not run in an isolated environment and are still susceptible to the same risks when run on a self-hosted runner. +{% ifversion fpt or ghec %}As a result, self-hosted runners should almost [never be used for public repositories](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security) on {% data variables.product.product_name %}, because any user can open pull requests against the repository and compromise the environment. Similarly, be{% elsif ghes or ghae %}Be{% endif %} cautious when using self-hosted runners on private or internal repositories, as anyone who can fork the repository and open a pull request (generally those with read access to the repository) are able to compromise the self-hosted runner environment, including gaining access to secrets and the `GITHUB_TOKEN` which, depending on its settings, can grant write access to the repository. Although workflows can control access to environment secrets by using environments and required reviews, these workflows are not run in an isolated environment and are still susceptible to the same risks when run on a self-hosted runner. When a self-hosted runner is defined at the organization or enterprise level, {% data variables.product.product_name %} can schedule workflows from multiple repositories onto the same runner. Consequently, a security compromise of these environments can result in a wide impact. To help reduce the scope of a compromise, you can create boundaries by organizing your self-hosted runners into separate groups. You can restrict what {% ifversion restrict-groups-to-workflows %}workflows, {% endif %}organizations and repositories can access runner groups. For more information, see "[Managing access to self-hosted runners using groups](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)." diff --git a/translations/zh-CN/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md b/translations/zh-CN/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md index 1961bddc1c..bd71918b12 100644 --- a/translations/zh-CN/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md +++ b/translations/zh-CN/content/admin/github-actions/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md @@ -1,7 +1,7 @@ --- -title: 在启用 GitHub Actions 的情况下备份和恢复 GitHub Enterprise Server +title: Backing up and restoring GitHub Enterprise Server with GitHub Actions enabled shortTitle: Backing up and restoring -intro: '外部存储提供程序上的 {% data variables.product.prodname_actions %} 数据不会包含在常规 {% data variables.product.prodname_ghe_server %} 备份中，必须单独备份。' +intro: 'To restore a backup of {% data variables.product.product_location %} when {% data variables.product.prodname_actions %} is enabled, you must configure {% data variables.product.prodname_actions %} before restoring the backup with {% data variables.product.prodname_enterprise_backup_utilities %}.' versions: ghes: '*' type: how_to @@ -12,50 +12,33 @@ topics: - Infrastructure redirect_from: - /admin/github-actions/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled -ms.openlocfilehash: def12b4e9e93a75ee1aa58f8290ca1b6e7d13cd5 -ms.sourcegitcommit: fb047f9450b41b24afc43d9512a5db2a2b750a2a -ms.translationtype: HT -ms.contentlocale: zh-CN -ms.lasthandoff: 09/11/2022 -ms.locfileid: '145100008' --- -{% data reusables.actions.enterprise-storage-ha-backups %} -如果您使用 {% data variables.product.prodname_enterprise_backup_utilities %} 来备份 {% data variables.product.product_location %}，请务必注意，存储在外部存储提供程序上的 {% data variables.product.prodname_actions %} 数据不会包含在备份中。 +## About backups of {% data variables.product.product_name %} when using {% data variables.product.prodname_actions %} -以下是将带有 {% data variables.product.prodname_actions %} 的 {% data variables.product.product_location %} 恢复到新设备所需步骤的概述： +You can use {% data variables.product.prodname_enterprise_backup_utilities %} to back up and restore the data and configuration for {% data variables.product.product_location %} to a new instance. For more information, see "[Configuring backups on your appliance](/admin/configuration/configuring-backups-on-your-appliance)." -1. 确认原始设备处于脱机状态。 -1. 在替换 {% data variables.product.prodname_ghe_server %} 设备上手动配置网络设置。 网络设置被排除在备份快照之外，不会被 `ghe-restore` 覆盖。 -1. 若要将替换设备配置为使用与原始设备相同的 {% data variables.product.prodname_actions %} 外部存储配置，请从新设备使用 `ghe-config` 命令设置所需的参数。 - - - Azure Blob 存储 - ```shell - ghe-config secrets.actions.storage.blob-provider "azure" - ghe-config secrets.actions.storage.azure.connection-string "_Connection_String_" - ``` - - Amazon S3 - ```shell - ghe-config secrets.actions.storage.blob-provider "s3" - ghe-config secrets.actions.storage.s3.bucket-name "_S3_Bucket_Name" - ghe-config secrets.actions.storage.s3.service-url "_S3_Service_URL_" - ghe-config secrets.actions.storage.s3.access-key-id "_S3_Access_Key_ID_" - ghe-config secrets.actions.storage.s3.access-secret "_S3_Access_Secret_" - ``` - - （可选）要启用 S3 强制路径样式，请输入以下命令： - ```shell - ghe-config secrets.actions.storage.s3.force-path-style true - ``` - +However, not all the data for {% data variables.product.prodname_actions %} is included in these backups. {% data reusables.actions.enterprise-storage-ha-backups %} -1. 在替换设备上启用 {% data variables.product.prodname_actions %}。 这将把替换设备连接到 {% data variables.product.prodname_actions %} 的相同外部存储。 +## Restoring a backup of {% data variables.product.product_name %} when {% data variables.product.prodname_actions %} is enabled - ```shell - ghe-config app.actions.enabled true - ghe-config-apply - ``` +To restore a backup of {% data variables.product.product_location %} with {% data variables.product.prodname_actions %}, you must manually configure network settings and external storage on the destination instance before you restore your backup from {% data variables.product.prodname_enterprise_backup_utilities %}. -1. 配置并启用 {% data variables.product.prodname_actions %} 后，使用 `ghe-restore` 命令从备份中还原其余数据。 有关详细信息，请参阅“[还原备份](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)”。 -1. 在替换设备上重新注册自托管运行器。 有关详细信息，请参阅[添加自托管运行器](/actions/hosting-your-own-runners/adding-self-hosted-runners)。 +1. Confirm that the source instance is offline. +1. Manually configure network settings on the replacement {% data variables.product.prodname_ghe_server %} instance. Network settings are excluded from the backup snapshot, and are not overwritten by `ghe-restore`. For more information, see "[Configuring network settings](/admin/configuration/configuring-network-settings)." +1. SSH into the destination instance. For more information, see "[Accessing the administrative shell (SSH)](/admin/configuration/accessing-the-administrative-shell-ssh)." -有关备份和还原 {% data variables.product.prodname_ghe_server %} 的详细信息，请参阅“[在设备上配置备份](/admin/configuration/configuring-backups-on-your-appliance)”。 + ```shell{:copy} + $ ssh -p 122 admin@HOSTNAME + ``` +1. Configure the destination instance to use the same external storage service for {% data variables.product.prodname_actions %} as the source instance by entering one of the following commands. +{% indented_data_reference reusables.actions.configure-storage-provider-platform-commands spaces=3 %} +{% data reusables.actions.configure-storage-provider %} +1. To prepare to enable {% data variables.product.prodname_actions %} on the destination instance, enter the following command. + + ```shell{:copy} + ghe-config app.actions.enabled true + ``` +{% data reusables.actions.apply-configuration-and-enable %} +1. After {% data variables.product.prodname_actions %} is configured and enabled, to restore the rest of the data from the backup, use the `ghe-restore` command. For more information, see "[Restoring a backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)." +1. Re-register your self-hosted runners on the destination instance. For more information, see "[Adding self-hosted runners](/actions/hosting-your-own-runners/adding-self-hosted-runners)." diff --git a/translations/zh-CN/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md b/translations/zh-CN/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md index de72d92184..6fa069a0f2 100644 --- a/translations/zh-CN/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md +++ b/translations/zh-CN/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md @@ -1,53 +1,157 @@ --- -title: 设置暂存实例 -intro: '可在单独的隔离环境中设置 {% data variables.product.product_name %} 实例，并使用该实例来验证和测试更改。' +title: Setting up a staging instance +intro: 'You can set up a {% data variables.product.product_name %} instance in a separate, isolated environment, and use the instance to validate and test changes.' redirect_from: - /enterprise/admin/installation/setting-up-a-staging-instance - /admin/installation/setting-up-a-staging-instance versions: - ghes: '*' + ghes: "*" type: how_to topics: - Enterprise - Infrastructure - Upgrades shortTitle: Set up a staging instance -ms.openlocfilehash: 86006b3dd1fcdd7a7139f35934cafce1f208c8bb -ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 -ms.translationtype: HT -ms.contentlocale: zh-CN -ms.lasthandoff: 09/05/2022 -ms.locfileid: '147065360' +miniTocMaxHeadingLevel: 3 --- -## 关于暂存实例 -{% data variables.product.company_short %} 建议将单独的环境设置为测试对 {% data variables.product.product_location %} 的配置的备份、更新或更改。 此环境应与生产系统隔离，称为过渡环境。 +## About staging instances -例如，为了防止数据丢失，可以定期验证生产实例的备份。 可以定期在过渡环境中将生产数据的备份还原到单独的 {% data variables.product.product_name %} 实例。 在此暂存实例上，还可以测试是否升级到 {% data variables.product.product_name %} 的最新功能版。 +{% data variables.product.company_short %} recommends that you set up a separate environment to test backups, updates, or changes to the configuration for {% data variables.product.product_location %}. This environment, which you should isolate from your production systems, is called a staging environment. + +For example, to protect against loss of data, you can regularly validate the backup of your production instance. You can regularly restore the backup of your production data to a separate {% data variables.product.product_name %} instance in a staging environment. On this staging instance, you could also test the upgrade to the latest feature release of {% data variables.product.product_name %}. {% tip %} -提示：只要暂存实例未用于生产容量，便可以重复使用现有 {% data variables.product.prodname_enterprise %} 许可证文件。 +**Tip:** You may reuse your existing {% data variables.product.prodname_enterprise %} license file as long as the staging instance is not used in a production capacity. {% endtip %} -## 过渡环境的注意事项 +## Considerations for a staging environment -若要完全测试 {% data variables.product.product_name %} 并尽可能重新创建与生产环境类似的环境，请考虑与实例交互的外部系统。 例如，你可能想要在过渡环境中测试以下内容。 +To thoroughly test {% data variables.product.product_name %} and recreate an environment that's as similar to your production environment as possible, consider the external systems that interact with your instance. For example, you may want to test the following in your staging environment. -- 身份验证，特别是在使用外部身份验证提供程序（如 SAML）的情况下 -- 与外部事件单记录系统的集成 -- 与持续集成服务器的集成 -- 使用 {% data variables.product.prodname_enterprise_api %} 的外部脚本或软件 -- 用于发送电子邮件通知的外部 SMTP 服务器 +- Authentication, especially if you use an external authentication provider like SAML +- Integration with an external ticketing system +- Integration with a continuous integration server +- External scripts or software that use the {% data variables.product.prodname_enterprise_api %} +- External SMTP server for email notifications -## 设置暂存实例 +## Setting up a staging instance -1. 使用 {% data variables.product.prodname_enterprise_backup_utilities %} 执行生产实例备份。 有关详细信息，请参阅“[在设备上配置备份](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance#about-github-enterprise-server-backup-utilities)”的“关于 {% data variables.product.prodname_enterprise_backup_utilities %}”部分。 -2. 设置新实例作为暂存环境。 配置和安装暂存实例的方法与生产实例所用方法相同。 有关详细信息，请参阅“[设置 {% data variables.product.prodname_ghe_server %} 实例](/enterprise/admin/guides/installation/setting-up-a-github-enterprise-server-instance/)”。 -3. （可选）如果计划在测试环境中测试 {% data variables.product.prodname_actions %} 功能，请查看日志和存储的注意事项。 有关详细信息，请参阅“[使用过渡环境](/admin/github-actions/advanced-configuration-and-troubleshooting/using-a-staging-environment)”。 -4. 在暂存实例上还原备份。 有关详细信息，请参阅“[在设备上配置备份](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance#restoring-a-backup)”的“还原备份”部分。 +You can set up a staging instance from scratch and configure the instance however you like. For more information, see "[Setting up a {% data variables.product.product_name %} instance](/admin/installation/setting-up-a-github-enterprise-server-instance)" and "[Configuring your enterprise](/admin/configuration/configuring-your-enterprise)." -## 延伸阅读 +Alternatively, you can create a staging instance that reflects your production configuration by restoring a backup of your production instance to the staging instance. -- “[关于升级到新版本](/admin/overview/about-upgrades-to-new-releases)” +1. [Back up your production instance](#1-back-up-your-production-instance). +2. [Set up a staging instance](#2-set-up-a-staging-instance). +3. [Configure {% data variables.product.prodname_actions %}](#3-configure-github-actions). +4. [Configure {% data variables.product.prodname_registry %}](#4-configure-github-packages). +5. [Restore your production backup](#5-restore-your-production-backup). +6. [Review the instance's configuration](#6-review-the-instances-configuration). +7. [Apply the instance's configuration](#7-apply-the-instances-configuration). + +### 1. Back up your production instance + +If you want to test changes on an instance that contains the same data and configuration as your production instance, back up the data and configuration from the production instance using {% data variables.product.prodname_enterprise_backup_utilities %}. For more information, see "[Configuring backups on your appliance](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance)." + +{% warning %} + +**Warning**: If you use {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} in production, your backup will include your production configuration for external storage. To avoid potential loss of data by writing to your production storage from your staging instance, you must configure each feature in steps 3 and 4 before you restore your backup. + +{% endwarning %} + +### 2. Set up a staging instance + +Set up a new instance to act as your staging environment. You can use the same guides for provisioning and installing your staging instance as you did for your production instance. For more information, see "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise/admin/guides/installation/setting-up-a-github-enterprise-server-instance/)." + +If you plan to restore a backup of your production instance, continue to the next step. Alternatively, you can configure the instance manually and skip the following steps. + +### 3. Configure {% data variables.product.prodname_actions %} + +Optionally, if you use {% data variables.product.prodname_actions %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_actions %}, skip to "[4. Configure {% data variables.product.prodname_registry %}](#4-configure-github-packages)." + +{% warning %} + +**Warning**: If you don't configure {% data variables.product.prodname_actions %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance. For more information, see "[Using a staging environment](/admin/github-actions/advanced-configuration-and-troubleshooting/using-a-staging-environment)." + +{% endwarning %} + +{% data reusables.enterprise_installation.ssh-into-staging-instance %} +1. To configure the staging instance to use an external storage provider for {% data variables.product.prodname_actions %}, enter one of the following commands. +{% indented_data_reference reusables.actions.configure-storage-provider-platform-commands spaces=3 %} +{% data reusables.actions.configure-storage-provider %} +1. To prepare to enable {% data variables.product.prodname_actions %} on the staging instance, enter the following command. + + ```shell{:copy} + ghe-config app.actions.enabled true + ``` + +### 4. Configure {% data variables.product.prodname_registry %} + +Optionally, if you use {% data variables.product.prodname_registry %} on your production instance, configure the feature on the staging instance before restoring your production backup. If you don't use {% data variables.product.prodname_registry %}, skip to "[5. Restore your production backup](#5-restore-your-production-backup)." + +{% warning %} + +**Warning**: If you don't configure {% data variables.product.prodname_actions %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance. + +{% endwarning %} + +1. Review the backup you will restore to the staging instance. + - If you took the backup with {% data variables.product.prodname_enterprise_backup_utilities %} 3.5 or later, the backup includes the configuration for {% data variables.product.prodname_registry %}. Continue to the next step. + - If you took the backup with {% data variables.product.prodname_enterprise_backup_utilities %} 3.4 or earlier, configure {% data variables.product.prodname_registry %} on the staging instance. For more information, see "[Getting started with {% data variables.product.prodname_registry %} for your enterprise](/admin/packages/getting-started-with-github-packages-for-your-enterprise)." +{% data reusables.enterprise_installation.ssh-into-staging-instance %} +1. Configure the external storage connection by entering the following commands, replacing the placeholder values with actual values for your connection. + - Azure Blob Storage: + + ```shell{:copy} + ghe-config secrets.packages.blob-storage-type "azure" + ghe-config secrets.packages.azure-container-name "AZURE CONTAINER NAME" + ghe-config secrets.packages.azure-connection-string "CONNECTION STRING" + ``` + - Amazon S3: + + ```shell{:copy} + ghe-config secrets.packages.blob-storage-type "s3" + ghe-config secrets.packages.service-url "S3 SERVICE URL" + ghe-config secrets.packages.s3-bucket "S3 BUCKET NAME" + ghe-config secrets.packages.aws-access-key "S3 ACCESS KEY ID" + ghe-config secrets.packages.aws-secret-key "S3 ACCESS SECRET" + ``` +1. To prepare to enable {% data variables.product.prodname_registry %} on the staging instance, enter the following command. + + ```shell{:copy} + ghe-config app.packages.enabled true + ``` + +### 5. Restore your production backup + +Use the `ghe-restore` command to restore the rest of the data from the backup. For more information, see "[Restoring a backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)." + +If the staging instance is already configured and you're about to overwrite settings, certificate, and license data, add the `-c` option to the command. For more information about the option, see [Using the backup and restore commands](https://github.com/github/backup-utils/blob/master/docs/usage.md#restoring-settings-tls-certificate-and-license) in the {% data variables.product.prodname_enterprise_backup_utilities %} documentation. + +### 6. Review the instance's configuration + +To access the staging instance using the same hostname, update your local hosts file to resolve the staging instance's hostname by IP address by editing the `/etc/hosts` file in macOS or Linux, or the `C:\Windows\system32\drivers\etc` file in Windows. + +{% note %} + +**Note**: Your staging instance must be accessible from the same hostname as your production instance. Changing the hostname for {% data variables.product.product_location %} is not supported. For more information, see "[Configuring a hostname](/admin/configuration/configuring-network-settings/configuring-a-hostname)." + +{% endnote %} + +Then, review the staging instance's configuration in the {% data variables.enterprise.management_console %}. For more information, see "[Accessing the {% data variables.enterprise.management_console %}](/admin/configuration/configuring-your-enterprise/accessing-the-management-console)." + +{% warning %} + +**Warning**: If you configured {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} for the staging instance, to avoid overwriting production data, ensure that the external storage configuration in the {% data variables.enterprise.management_console %} does not match your production instance. + +{% endwarning %} + +### 7. Apply the instance's configuration + +To apply the configuration from the {% data variables.enterprise.management_console %}, click **Save settings**. + +## Further reading + +- "[About upgrades to new releases](/admin/overview/about-upgrades-to-new-releases)" diff --git a/translations/zh-CN/content/get-started/using-github/keyboard-shortcuts.md b/translations/zh-CN/content/get-started/using-github/keyboard-shortcuts.md index f0ef5e37da..63db7352b5 100644 --- a/translations/zh-CN/content/get-started/using-github/keyboard-shortcuts.md +++ b/translations/zh-CN/content/get-started/using-github/keyboard-shortcuts.md @@ -150,7 +150,7 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr | Keyboard shortcut | Description |-----------|------------ -|⌘+f (Mac) or Ctrl+f (Windows/Linux) | Focus filter field +|Command+f (Mac) or Ctrl+f (Windows/Linux) | Focus filter field |← | Move cell focus to the left |→ | Move cell focus to the right |↑ | Move cell focus up @@ -162,7 +162,7 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr |-----------|------------ |Enter | Toggle edit mode for the focused cell |Escape | Cancel editing for the focused cell -|⌘+Shift+\ (Mac) or Ctrl+Shift+\ (Windows/Linux) | Open row actions menu +|Command+Shift+\ (Mac) or Ctrl+Shift+\ (Windows/Linux) | Open row actions menu |Shift+Space | Select item |Space | Open selected item |e | Archive selected items diff --git a/translations/zh-CN/content/index.md b/translations/zh-CN/content/index.md index 3898dc2001..edff84a4ad 100644 --- a/translations/zh-CN/content/index.md +++ b/translations/zh-CN/content/index.md @@ -75,6 +75,10 @@ childGroups: octicon: ShieldLockIcon children: - code-security + - code-security/supply-chain-security + - code-security/dependabot + - code-security/code-scanning + - code-security/secret-scanning - name: Client apps octicon: DeviceMobileIcon children: diff --git a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md index c951f17082..58f47d8e9d 100644 --- a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md +++ b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md @@ -1,6 +1,6 @@ --- -title: 管理组织的安全和分析设置 -intro: '您可以控制功能以保护组织在 {% data variables.product.prodname_dotcom %} 上项目的安全并分析其中的代码。' +title: Managing security and analysis settings for your organization +intro: 'You can control features that secure and analyze the code in your organization''s projects on {% data variables.product.prodname_dotcom %}.' permissions: Organization owners can manage security and analysis settings for repositories in the organization. redirect_from: - /github/setting-up-and-managing-organizations-and-teams/managing-secret-scanning-for-your-organization @@ -15,115 +15,156 @@ topics: - Organizations - Teams shortTitle: Manage security & analysis -ms.openlocfilehash: 83104f606266279a239c5173e838c9241832fb84 -ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 -ms.translationtype: HT -ms.contentlocale: zh-CN -ms.lasthandoff: 09/05/2022 -ms.locfileid: '147063208' --- -## 关于安全性和分析设置的管理 -{% data variables.product.prodname_dotcom %} 可帮助保护组织中的仓库。 您可以管理成员在组织中创建的所有现有或新仓库的安全性和分析功能。 {% ifversion ghec %}如果你拥有 {% data variables.product.prodname_GH_advanced_security %} 许可证，则还可以管理对这些功能的访问。 {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion fpt %}使用 {% data variables.product.prodname_ghe_cloud %} 并拥有 {% data variables.product.prodname_GH_advanced_security %} 许可证的组织也可以管理对这些功能的访问。 有关详细信息，请参阅 [{% data variables.product.prodname_ghe_cloud %} 文档](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)。{% endif %} +## About management of security and analysis settings -{% data reusables.security.some-security-and-analysis-features-are-enabled-by-default %} {% data reusables.security.security-and-analysis-features-enable-read-only %} +{% data variables.product.prodname_dotcom %} can help secure the repositories in your organization. You can manage the security and analysis features for all existing or new repositories that members create in your organization. {% ifversion ghec %}If you have a license for {% data variables.product.prodname_GH_advanced_security %} then you can also manage access to these features. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% ifversion fpt %}Organizations that use {% data variables.product.prodname_ghe_cloud %} with a license for {% data variables.product.prodname_GH_advanced_security %} can also manage access to these features. For more information, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization).{% endif %} -## 显示安全和分析设置 +{% data reusables.security.some-security-and-analysis-features-are-enabled-by-default %} +{% data reusables.security.security-and-analysis-features-enable-read-only %} -{% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.security-and-analysis %} +## Displaying the security and analysis settings -显示的页面允许您为组织中的仓库启用或禁用所有安全和分析功能。 +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} +{% data reusables.organizations.security-and-analysis %} -{% ifversion ghec %}如果你的组织属于具有 {% data variables.product.prodname_GH_advanced_security %} 许可证的企业，则该页面还会包含启用和禁用 {% data variables.product.prodname_advanced_security %} 功能的选项。 使用 {% data variables.product.prodname_GH_advanced_security %} 的任何仓库都列在页面底部。{% endif %} +The page that's displayed allows you to enable or disable all security and analysis features for the repositories in your organization. -{% ifversion ghes %}如果你的组织拥有 {% data variables.product.prodname_GH_advanced_security %} 许可证，则该页面还会包含启用和禁用 {% data variables.product.prodname_advanced_security %} 功能的选项。 使用 {% data variables.product.prodname_GH_advanced_security %} 的任何仓库都列在页面底部。{% endif %} +{% ifversion ghec %}If your organization belongs to an enterprise with a license for {% data variables.product.prodname_GH_advanced_security %}, the page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %} -{% ifversion ghae %}该页面还会包含启用和禁用 {% data variables.product.prodname_advanced_security %} 功能的选项。 使用 {% data variables.product.prodname_GH_advanced_security %} 的任何仓库都列在页面底部。{% endif %} +{% ifversion ghes %}If you have a license for {% data variables.product.prodname_GH_advanced_security %}, the page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %} -## 为所有现有存储库启用或禁用某项功能 +{% ifversion ghae %}The page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %} -您可以启用或禁用所有仓库的功能。 {% ifversion fpt or ghec %}您的更改对组织中仓库的影响取决于其可见性： +## Enabling or disabling a feature for all existing repositories -- **依赖项关系图** - 所做的更改仅影响专用存储库，因为该功能对公共存储库始终启用。 -- **{% data variables.product.prodname_dependabot_alerts %}** - 所做的更改会影响所有存储库。 -- **{% data variables.product.prodname_dependabot_security_updates %}** - 所做的更改会影响所有存储库。 +You can enable or disable features for all repositories. +{% ifversion fpt or ghec %}The impact of your changes on repositories in your organization is determined by their visibility: + +- **Dependency graph** - Your changes affect only private repositories because the feature is always enabled for public repositories. +- **{% data variables.product.prodname_dependabot_alerts %}** - Your changes affect all repositories. +- **{% data variables.product.prodname_dependabot_security_updates %}** - Your changes affect all repositories. {%- ifversion ghec %} -- **{% data variables.product.prodname_GH_advanced_security %}** - 所做的更改仅影响专用存储库，因为 {% data variables.product.prodname_GH_advanced_security %} 和相关功能对公共存储库始终启用。 -- **{% data variables.product.prodname_secret_scanning_caps %}** - 所做的更改会影响同时启用了 {% data variables.product.prodname_GH_advanced_security %} 的存储库。 此选项控制是否启用 {% data variables.product.prodname_secret_scanning_GHAS %}。 {% data variables.product.prodname_secret_scanning_partner_caps %} 始终在所有公共存储库上运行。 +- **{% data variables.product.prodname_GH_advanced_security %}** - Your changes affect only private repositories because {% data variables.product.prodname_GH_advanced_security %} and the related features are always enabled for public repositories. +- **{% data variables.product.prodname_secret_scanning_caps %}** - Your changes affect repositories where {% data variables.product.prodname_GH_advanced_security %} is also enabled. This option controls whether or not {% data variables.product.prodname_secret_scanning_GHAS %} is enabled. {% data variables.product.prodname_secret_scanning_partner_caps %} always runs on all public repositories. {% endif %} {% endif %} {% data reusables.advanced-security.note-org-enable-uses-seats %} -1. 转到组织的安全和分析设置。 有关详细信息，请参阅“[显示安全和分析设置](#displaying-the-security-and-analysis-settings)”。 -2. 在“代码安全和分析”下，单击功能右侧的“全部禁用”或“全部启用” 。 {% ifversion ghes or ghec %}如果 {% data variables.product.prodname_GH_advanced_security %} 许可证中没有可用席位，则会禁用“{% data variables.product.prodname_GH_advanced_security %}”的控件。{% endif %} {% ifversion fpt %} ![“配置安全和分析”功能的“全部启用”或“全部禁用”按钮](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-fpt.png) {% endif %} {% ifversion ghec %} ![“配置安全和分析”功能的“全部启用”和“全部禁用”按钮](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-ghas-ghec.png) {% endif %} {% ifversion ghes > 3.2 %} ![“配置安全和分析”功能的“全部启用”或“全部禁用”按钮](/assets/images/enterprise/3.3/organizations/security-and-analysis-disable-or-enable-all-ghas.png) {% endif %} {% ifversion ghes = 3.2 %} ![“配置安全和分析”功能的“全部启用”或“全部禁用”按钮](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-disable-or-enable-all-ghas.png) {% endif %} +{% ifversion ghes or ghec or ghae %} +{% note %} + +**Note:** If you encounter an error that reads "GitHub Advanced Security cannot be enabled because of a policy setting for the organization," contact your enterprise admin and ask them to change the GitHub Advanced Security policy for your enterprise. For more information, see "[Enforcing policies for Advanced Security in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise)." +{% endnote %} +{% endif %} + +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +2. Under "Code security and analysis", to the right of the feature, click **Disable all** or **Enable all**. {% ifversion ghes or ghec %}The control for "{% data variables.product.prodname_GH_advanced_security %}" is disabled if you have no available seats in your {% data variables.product.prodname_GH_advanced_security %} license.{% endif %} + {% ifversion fpt %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-fpt.png) + {% endif %} + {% ifversion ghec %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-ghas-ghec.png) + {% endif %} + {% ifversion ghes > 3.2 %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/enterprise/3.3/organizations/security-and-analysis-disable-or-enable-all-ghas.png) + {% endif %} + {% ifversion ghes = 3.2 %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-disable-or-enable-all-ghas.png) + {% endif %} - {% ifversion ghae %} ![“配置安全和分析”功能的“全部启用”或“全部禁用”按钮](/assets/images/enterprise/github-ae/organizations/security-and-analysis-disable-or-enable-all-ghae.png) {% endif %} {% ifversion fpt or ghec %} -3. （可选）为组织中的新仓库默认启用该功能。 - {% ifversion fpt or ghec %} ![针对新存储库的“默认启用”选项](/assets/images/help/organizations/security-and-analysis-enable-by-default-in-modal.png) {% endif %} + {% ifversion ghae %} + !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/enterprise/github-ae/organizations/security-and-analysis-disable-or-enable-all-ghae.png) + {% endif %} + {% ifversion fpt or ghec %} +3. Optionally, enable the feature by default for new repositories in your organization. + {% ifversion fpt or ghec %} + !["Enable by default" option for new repositories](/assets/images/help/organizations/security-and-analysis-enable-by-default-in-modal.png) + {% endif %} - {% endif %} {% ifversion fpt or ghec %} -4. 单击“禁用功能”或“启用功能”，为组织中所有存储库禁用或启用该功能 。 - {% ifversion fpt or ghec %} ![用于禁用或启用功能的按钮](/assets/images/help/organizations/security-and-analysis-enable-dependency-graph.png) {% endif %} + {% endif %} + {% ifversion fpt or ghec %} +4. Click **Disable FEATURE** or **Enable FEATURE** to disable or enable the feature for all the repositories in your organization. + {% ifversion fpt or ghec %} + ![Button to disable or enable feature](/assets/images/help/organizations/security-and-analysis-enable-dependency-graph.png) + {% endif %} - {% endif %} {% ifversion ghae or ghes %} -3. 单击“全部启用/禁用”或“为符合条件的存储库启用/禁用”以确认更改 。 - ![用于为组织中所有符合条件的存储库启用功能的按钮](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-secret-scanning-existing-repos-ghae.png) {% endif %} + {% endif %} + {% ifversion ghae or ghes %} +5. Click **Enable/Disable all** or **Enable/Disable for eligible repositories** to confirm the change. + ![Button to enable feature for all the eligible repositories in the organization](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-secret-scanning-existing-repos-ghae.png) + {% endif %} {% data reusables.security.displayed-information %} -## 添加新仓库时自动启用或禁用功能 +## Enabling or disabling a feature automatically when new repositories are added -1. 转到组织的安全和分析设置。 有关详细信息，请参阅“[显示安全和分析设置](#displaying-the-security-and-analysis-settings)”。 -2. 在功能右边的“代码安全和分析”下，默认为组织中的新存储库{% ifversion fpt or ghec %}或所有新的专用存储库{% endif %}启用或禁用该功能。 - {% ifversion fpt or ghec %} ![用于为新存储库启用某项功能的复选框的屏幕截图](/assets/images/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) {% endif %} {% ifversion ghes > 3.2 %} ![用于为新存储库启用某项功能的复选框的屏幕截图](/assets/images/enterprise/3.3/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) {% endif %} {% ifversion ghes = 3.2 %} ![用于为新存储库启用某项功能的复选框的屏幕截图](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) {% endif %} {% ifversion ghae %} ![用于为新存储库启用某项功能的复选框的屏幕截图](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-or-disable-secret-scanning-checkbox-ghae.png) {% endif %} +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +2. Under "Code security and analysis", to the right of the feature, enable or disable the feature by default for new repositories{% ifversion fpt or ghec %}, or all new private repositories,{% endif %} in your organization. + {% ifversion fpt or ghec %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) + {% endif %} + {% ifversion ghes > 3.2 %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/enterprise/3.3/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) + {% endif %} + {% ifversion ghes = 3.2 %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/enterprise/3.1/help/organizations/security-and-analysis-enable-or-disable-feature-checkbox.png) + {% endif %} + {% ifversion ghae %} + ![Screenshot of a checkbox for enabling a feature for new repositories](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-or-disable-secret-scanning-checkbox-ghae.png) + {% endif %} {% ifversion fpt or ghec or ghes > 3.2 %} -## 允许 {% data variables.product.prodname_dependabot %} 访问私有依赖项 +## Allowing {% data variables.product.prodname_dependabot %} to access private dependencies -{% data variables.product.prodname_dependabot %} 可以检查项目中过时的依赖项引用，并自动生成拉取请求来更新它们。 为此，{% data variables.product.prodname_dependabot %} 必须有权访问所有目标依赖项文件。 通常，如果一个或多个依赖项无法访问，版本更新将失败。 有关详细信息，请参阅“[关于 {% data variables.product.prodname_dependabot %} 版本更新](/github/administering-a-repository/about-dependabot-version-updates)”。 +{% data variables.product.prodname_dependabot %} can check for outdated dependency references in a project and automatically generate a pull request to update them. To do this, {% data variables.product.prodname_dependabot %} must have access to all of the targeted dependency files. Typically, version updates will fail if one or more dependencies are inaccessible. For more information, see "[About {% data variables.product.prodname_dependabot %} version updates](/github/administering-a-repository/about-dependabot-version-updates)." -默认情况下，{% data variables.product.prodname_dependabot %} 无法更新位于私有仓库或私有仓库注册表中的依赖项。 但是，如果依赖项位于与使用该依赖项之项目相同的组织内的私有 {% data variables.product.prodname_dotcom %} 仓库中，则可以通过授予对主机仓库的访问权限来允许 {% data variables.product.prodname_dependabot %} 成功更新版本。 +By default, {% data variables.product.prodname_dependabot %} can't update dependencies that are located in private repositories or private package registries. However, if a dependency is in a private {% data variables.product.prodname_dotcom %} repository within the same organization as the project that uses that dependency, you can allow {% data variables.product.prodname_dependabot %} to update the version successfully by giving it access to the host repository. -如果您的代码依赖于私有注册表中的软件包，您可以在仓库级别进行配置，允许 {% data variables.product.prodname_dependabot %} 更新这些依赖项的版本。 可通过将身份验证详细信息添加到存储库的 dependabot.yml 文件来完成此操作。 有关详细信息，请参阅[dependabot.yml 文件的配置选项](/github/administering-a-repository/configuration-options-for-dependency-updates#configuration-options-for-private-registries)。 +If your code depends on packages in a private registry, you can allow {% data variables.product.prodname_dependabot %} to update the versions of these dependencies by configuring this at the repository level. You do this by adding authentication details to the _dependabot.yml_ file for the repository. For more information, see "[Configuration options for the dependabot.yml file](/github/administering-a-repository/configuration-options-for-dependency-updates#configuration-options-for-private-registries)." -要允许 {% data variables.product.prodname_dependabot %} 访问私有 {% data variables.product.prodname_dotcom %} 仓库： +To allow {% data variables.product.prodname_dependabot %} to access a private {% data variables.product.prodname_dotcom %} repository: -1. 转到组织的安全和分析设置。 有关详细信息，请参阅“[显示安全和分析设置](#displaying-the-security-and-analysis-settings)”。 -1. 在“{% data variables.product.prodname_dependabot %} 专用存储库访问权限”下，单击“添加专用存储库”或“添加内部和专用存储库” 。 - ![添加存储库按钮](/assets/images/help/organizations/dependabot-private-repository-access.png) -1. 开始键入要允许的存储库的名称。 - ![带有筛选条件下拉列表的存储库搜索字段](/assets/images/help/organizations/dependabot-private-repo-choose.png) -1. 单击要允许的存储库。 +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +1. Under "{% data variables.product.prodname_dependabot %} private repository access", click **Add private repositories** or **Add internal and private repositories**. + ![Add repositories button](/assets/images/help/organizations/dependabot-private-repository-access.png) +1. Start typing the name of the repository you want to allow. + ![Repository search field with filtered dropdown](/assets/images/help/organizations/dependabot-private-repo-choose.png) +1. Click the repository you want to allow. -1. （可选）要从列表中删除仓库，在仓库右侧单击 {% octicon "x" aria-label="The X icon" %}。 - ![用于删除存储库的“X”按钮](/assets/images/help/organizations/dependabot-private-repository-list.png) {% endif %} +1. Optionally, to remove a repository from the list, to the right of the repository, click {% octicon "x" aria-label="The X icon" %}. + !["X" button to remove a repository](/assets/images/help/organizations/dependabot-private-repository-list.png) +{% endif %} {% ifversion ghes or ghec %} -## 从组织中的个别仓库中移除对 {% data variables.product.prodname_GH_advanced_security %} 的访问权限 +## Removing access to {% data variables.product.prodname_GH_advanced_security %} from individual repositories in an organization -可以通过存储库的“设置”选项卡管理对存储库的 {% data variables.product.prodname_GH_advanced_security %} 功能的访问。有关详细信息，请参阅“[管理存储库的安全和分析设置](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)”。 但您也可以从“Settings（设置）”选项卡对仓库禁用 {% data variables.product.prodname_GH_advanced_security %} 功能。 +You can manage access to {% data variables.product.prodname_GH_advanced_security %} features for a repository from its "Settings" tab. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." However, you can also disable {% data variables.product.prodname_GH_advanced_security %} features for a repository from the "Settings" tab for the organization. -1. 转到组织的安全和分析设置。 有关详细信息，请参阅“[显示安全和分析设置](#displaying-the-security-and-analysis-settings)”。 -1. 要查看您组织中启用 {% data variables.product.prodname_GH_advanced_security %} 的所有仓库的列表，请滚动到“{% data variables.product.prodname_GH_advanced_security %} 仓库”部分。 - ![{% data variables.product.prodname_GH_advanced_security %} 存储库部分](/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png) 此表列出了每个存储库的唯一提交者数量。 这是您可以通过移除 {% data variables.product.prodname_GH_advanced_security %} 访问权限释放的席位数。 有关详细信息，请参阅“[关于 {% data variables.product.prodname_GH_advanced_security %} 计费](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)。” -1. 要从仓库删除对 {% data variables.product.prodname_GH_advanced_security %} 的访问，并释放任何提交者使用的对仓库唯一的席位，请单击相邻的 {% octicon "x" aria-label="X symbol" %}。 -1. 在确认对话框中，单击“删除存储库”以删除对 {% data variables.product.prodname_GH_advanced_security %} 功能的访问权限。 +1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." +1. To see a list of all the repositories in your organization with {% data variables.product.prodname_GH_advanced_security %} enabled, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section. + ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png) + The table lists the number of unique committers for each repository. This is the number of seats you could free up on your license by removing access to {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." +1. To remove access to {% data variables.product.prodname_GH_advanced_security %} from a repository and free up seats used by any committers that are unique to the repository, click the adjacent {% octicon "x" aria-label="X symbol" %}. +1. In the confirmation dialog, click **Remove repository** to remove access to the features of {% data variables.product.prodname_GH_advanced_security %}. {% note %} -注意：如果删除对存储库中 {% data variables.product.prodname_GH_advanced_security %} 的访问权限，则应与受影响的开发团队沟通，以便他们了解此更改是有意的。 这确保他们不会浪费时间调试运行失败的代码扫描。 +**Note:** If you remove access to {% data variables.product.prodname_GH_advanced_security %} for a repository, you should communicate with the affected development team so that they know that the change was intended. This ensures that they don't waste time debugging failed runs of code scanning. {% endnote %} {% endif %} -## 延伸阅读 +## Further reading -- [保护存储库](/code-security/getting-started/securing-your-repository){% ifversion not fpt %} -- [关于机密扫描](/github/administering-a-repository/about-secret-scanning){% endif %}{% ifversion not ghae %} -- [关于依赖项关系图](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph){% endif %} -- [关于供应链安全性](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security) +- "[Securing your repository](/code-security/getting-started/securing-your-repository)"{% ifversion not fpt %} +- "[About secret scanning](/github/administering-a-repository/about-secret-scanning)"{% endif %}{% ifversion not ghae %} +- "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)"{% endif %} +- "[About supply chain security](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security)" diff --git a/translations/zh-CN/content/repositories/creating-and-managing-repositories/transferring-a-repository.md b/translations/zh-CN/content/repositories/creating-and-managing-repositories/transferring-a-repository.md index 92900222ad..dff4c98d4d 100644 --- a/translations/zh-CN/content/repositories/creating-and-managing-repositories/transferring-a-repository.md +++ b/translations/zh-CN/content/repositories/creating-and-managing-repositories/transferring-a-repository.md @@ -30,7 +30,7 @@ Prerequisites for repository transfers: - When you transfer a repository that you own to another personal account, the new owner will receive a confirmation email.{% ifversion fpt or ghec %} The confirmation email includes instructions for accepting the transfer. If the new owner doesn't accept the transfer within one day, the invitation will expire.{% endif %} - To transfer a repository that you own to an organization, you must have permission to create a repository in the target organization. - The target account must not have a repository with the same name, or a fork in the same network. -- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghes < 3.7 %} +- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghes < 3.7 or ghae %} - Internal repositories can't be transferred.{% endif %} - Private forks can't be transferred.