diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d19f215e62..8f1fdb3f04 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,6 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: // https://github.com/microsoft/vscode-dev-containers/tree/v0.177.0/containers/javascript-node +// - { "name": "docs.github.com", "build": { diff --git a/.github/actions-scripts/content-changes-table-comment.js b/.github/actions-scripts/content-changes-table-comment.js index 91a62cb95f..bb7258b957 100755 --- a/.github/actions-scripts/content-changes-table-comment.js +++ b/.github/actions-scripts/content-changes-table-comment.js @@ -36,7 +36,7 @@ for (const file of articleFiles) { const sourceUrl = file.blob_url const fileName = file.filename.slice(pathPrefix.length) const fileUrl = fileName.slice(0, fileName.lastIndexOf('.')) - const previewLink = `https://${APP_URL}/${fileUrl}` + const previewLink = `${APP_URL}/${fileUrl}` const productionLink = `https://docs.github.com/${fileUrl}` let markdownLine = '' diff --git a/.github/actions-scripts/get-preview-app-info.sh b/.github/actions-scripts/get-preview-app-info.sh index e7f9f87366..f48c25ff10 100755 --- a/.github/actions-scripts/get-preview-app-info.sh +++ b/.github/actions-scripts/get-preview-app-info.sh @@ -10,9 +10,10 @@ [[ -z $GITHUB_REPOSITORY ]] && { echo "Missing GITHUB_REPOSITORY. Exiting."; exit 1; } [[ -z $PR_NUMBER ]] && { echo "Missing PR_NUMBER. Exiting."; exit 1; } [[ -z $GITHUB_ENV ]] && { echo "Missing GITHUB_ENV. Exiting."; exit 1; } +[[ -z $APP_NAME_SEED ]] && { echo "Missing APP_NAME_SEED. Exiting."; exit 1; } -# Number of resource groups that we use to split preview envs across -PREVIEW_ENV_RESOURCE_GROUPS=4 +PREVIEW_ENV_LOCATION="eastus" +echo "PREVIEW_ENV_LOCATION=${PREVIEW_ENV_LOCATION}" >> $GITHUB_ENV REPO_NAME="${GITHUB_REPOSITORY#*\/}" echo "REPO_NAME=${REPO_NAME}" >> $GITHUB_ENV @@ -20,22 +21,17 @@ echo "REPO_NAME=${REPO_NAME}" >> $GITHUB_ENV DEPLOYMENT_NAME="${REPO_NAME}-pr-${PR_NUMBER}" echo "DEPLOYMENT_NAME=${DEPLOYMENT_NAME}" >> $GITHUB_ENV -RESOURCE_GROUP="preview-env-${REPO_NAME}-$((${PR_NUMBER} % ${PREVIEW_ENV_RESOURCE_GROUPS}))" -echo "RESOURCE_GROUP=${RESOURCE_GROUP}" >> $GITHUB_ENV +APP_NAME_BASE="${REPO_NAME}-preview-${PR_NUMBER}" +echo "APP_NAME_BASE=${APP_NAME_BASE}" >> $GITHUB_ENV -APP_NAME_SHORT="${REPO_NAME}-preview-${PR_NUMBER}" -echo "APP_NAME_SHORT=${APP_NAME_SHORT}" >> $GITHUB_ENV +# pseudo random string so guessing a preview env URL is more difficult +APP_SHA=$(echo -n "${APP_NAME_SEED}-${APP_NAME_BASE}" | sha1sum | cut -c1-6) + +APP_NAME="${APP_NAME_BASE}-${APP_SHA}" +echo "APP_NAME=${APP_NAME}" >> $GITHUB_ENV + +APP_URL="https://${APP_NAME}.${PREVIEW_ENV_LOCATION}.azurecontainer.io" +echo "APP_URL=${APP_URL}" >> $GITHUB_ENV IMAGE_REPO="${GITHUB_REPOSITORY}/pr-${PR_NUMBER}" echo "IMAGE_REPO=${IMAGE_REPO}" >> $GITHUB_ENV - -# Since this incurs a network request and can be slow, we make it optional -if [ $FULL_APP_INFO ]; then - APP_INFO=$(az webapp list -g ${RESOURCE_GROUP} --query "[?tags.DocsAppName == '${APP_NAME_SHORT}'].{defaultHostName:defaultHostName, name:name} | [0]") - - APP_URL=$(echo $APP_INFO | jq '.defaultHostName' | tr -d '"') - echo "APP_URL=${APP_URL}" >> $GITHUB_ENV - - APP_NAME_FULL=$(echo $APP_INFO | jq '.name' | tr -d '"') - echo "APP_NAME_FULL=${APP_NAME_FULL}" >> $GITHUB_ENV -fi diff --git a/.github/workflows/azure-preview-env-deploy.yml b/.github/workflows/azure-preview-env-deploy.yml index 2a54474359..a102730e06 100644 --- a/.github/workflows/azure-preview-env-deploy.yml +++ b/.github/workflows/azure-preview-env-deploy.yml @@ -40,11 +40,13 @@ jobs: timeout-minutes: 15 environment: name: preview-env-${{ github.event.number }} - url: ${{ steps.deploy.outputs.defaultHostName }} + # The environment variable is computer later in this job in + # the "Get preview app info" step. + # That script sets environment variables which is used by Actions + # to link a PR to a list of environments later. + url: ${{ env.APP_URL }} env: PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER }} - NONPROD_REGISTRY_USERNAME: ghdocs - APP_LOCATION: eastus ENABLE_EARLY_ACCESS: ${{ github.repository == 'github/docs-internal' }} steps: @@ -57,7 +59,7 @@ jobs: uses: azure/docker-login@81744f9799e7eaa418697cb168452a2882ae844a with: login-server: ${{ secrets.NONPROD_REGISTRY_SERVER }} - username: ${{ env.NONPROD_REGISTRY_USERNAME }} + username: ${{ secrets.NONPROD_REGISTRY_USERNAME }} password: ${{ secrets.NONPROD_REGISTRY_PASSWORD }} - name: Set up Docker Buildx @@ -75,6 +77,8 @@ jobs: run: git lfs checkout - name: Get preview app info + env: + APP_NAME_SEED: ${{ secrets.PREVIEW_ENV_NAME_SEED }} run: .github/actions-scripts/get-preview-app-info.sh - name: 'Set env vars' @@ -144,7 +148,7 @@ jobs: # Succeed despite any non-zero exit code (e.g. if there is no deployment to cancel) - name: 'Cancel any existing deployments for this PR' run: | - az deployment group cancel --name ${{ env.DEPLOYMENT_NAME }} -g ${{ env.RESOURCE_GROUP }} || true + az deployment group cancel --name ${{ env.DEPLOYMENT_NAME }} -g ${{ secrets.PREVIEW_ENV_RESOURCE_GROUP }} || true # Deploy ARM template is idempotent # Note: once the resources exist the image tag must change for a new deployment to occur (the image tag includes workflow run number, run attempt, as well as sha) @@ -152,15 +156,16 @@ jobs: id: deploy uses: azure/arm-deploy@841b12551939c88af8f6df767c24c38a5620fd0d with: - resourceGroupName: ${{ env.RESOURCE_GROUP }} + resourceGroupName: ${{ secrets.PREVIEW_ENV_RESOURCE_GROUP }} subscriptionId: ${{ secrets.NONPROD_SUBSCRIPTION_ID }} template: ./azure-preview-env-template.json deploymentName: ${{ env.DEPLOYMENT_NAME }} - parameters: appName="${{ env.APP_NAME_SHORT }}" - location="${{ env.APP_LOCATION }}" - linuxFxVersion="DOCKER|${{ env.DOCKER_IMAGE }}" - dockerRegistryUrl="https://${{ secrets.NONPROD_REGISTRY_SERVER }}" - dockerRegistryUsername="${{ env.NONPROD_REGISTRY_USERNAME }}" + parameters: appName="${{ env.APP_NAME }}" + location="${{ env.PREVIEW_ENV_LOCATION }}" + containerImage="${{ env.DOCKER_IMAGE }}" + dockerRegistryUrl="${{ secrets.NONPROD_REGISTRY_SERVER }}" + dockerRegistryUsername="${{ secrets.NONPROD_REGISTRY_USERNAME }}" dockerRegistryPassword="${{ secrets.NONPROD_REGISTRY_PASSWORD }}" - - - run: echo ${{ steps.deploy.outputs.defaultHostName }} + # this shows warnings in the github actions console, because the flag is passed through a validation run, + # but it *is* functional during the actual execution + additionalArguments: --no-wait diff --git a/.github/workflows/azure-preview-env-destroy.yml b/.github/workflows/azure-preview-env-destroy.yml index d9fe2c5a5a..f26a4be14d 100644 --- a/.github/workflows/azure-preview-env-destroy.yml +++ b/.github/workflows/azure-preview-env-destroy.yml @@ -24,7 +24,6 @@ jobs: timeout-minutes: 5 env: PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER }} - NONPROD_REGISTRY_NAME: ghdocs steps: - name: 'Az CLI login' @@ -37,25 +36,25 @@ jobs: - name: Get preview app info env: - FULL_APP_INFO: 1 + APP_NAME_SEED: ${{ secrets.PREVIEW_ENV_NAME_SEED }} run: .github/actions-scripts/get-preview-app-info.sh # Succeed despite any non-zero exit code (e.g. if there is no deployment to cancel) - name: 'Cancel any in progress deployments' run: | - az deployment group cancel --name ${{ env.DEPLOYMENT_NAME }} -g ${{ env.RESOURCE_GROUP }} || true + az deployment group cancel --name ${{ env.DEPLOYMENT_NAME }} -g ${{ secrets.PREVIEW_ENV_RESOURCE_GROUP }} || true # Delete web app (which will also delete the App Service plan) # This will succeed even if the app doesn't exist / has already been deleted - name: 'Delete App Service App (which will also delete the App Service plan)' run: | - az webapp delete -n ${{ env.APP_NAME_FULL }} -g ${{ env.RESOURCE_GROUP }} + az container delete -n ${{ env.APP_NAME }} -g ${{ secrets.PREVIEW_ENV_RESOURCE_GROUP }} -y # Untag all images under this PR's container registry repo - the container registry will automatically remove untagged images. # This will fail if the IMAGE_REPO doesn't exist, but we don't care - name: 'Untag all docker images for this PR' run: | - az acr repository delete -n ${{ env.NONPROD_REGISTRY_NAME }} --repository ${{ env.IMAGE_REPO }} -y || true + az acr repository delete -n ${{ secrets.NONPROD_REGISTRY_NAME }} --repository ${{ env.IMAGE_REPO }} -y || true # Remove all GitHub deployments from this environment and remove the environment - uses: strumwolf/delete-deployment-environment@45c821e46baa405e25410700fe2e9643929706a0 diff --git a/.github/workflows/content-changes-table-comment.yml b/.github/workflows/content-changes-table-comment.yml index 8b9127dec9..798fe8a0da 100644 --- a/.github/workflows/content-changes-table-comment.yml +++ b/.github/workflows/content-changes-table-comment.yml @@ -48,17 +48,12 @@ jobs: env: PR_NUMBER: ${{ github.event.pull_request.number }} steps: - - name: 'Az CLI login' - uses: azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf - with: - creds: ${{ secrets.NONPROD_AZURE_CREDENTIALS }} - - name: check out repo content uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 - name: Get preview app info env: - FULL_APP_INFO: 1 + APP_NAME_SEED: ${{ secrets.PREVIEW_ENV_NAME_SEED }} run: .github/actions-scripts/get-preview-app-info.sh - name: Setup Node diff --git a/.github/workflows/prod-build-deploy-azure.yml b/.github/workflows/prod-build-deploy-azure.yml index 805cb6a6e6..eb53eb61bd 100644 --- a/.github/workflows/prod-build-deploy-azure.yml +++ b/.github/workflows/prod-build-deploy-azure.yml @@ -90,12 +90,12 @@ jobs: run: | sed 's|#{IMAGE}#|${{ env.DOCKER_IMAGE }}|g' docker-compose.prod.tmpl.yaml > docker-compose.prod.yaml - - name: 'Apply updated docker-compose.prod.yaml config to preview slot' + - name: 'Apply updated docker-compose.prod.yaml config to staging slot' run: | - az webapp config container set --multicontainer-config-type COMPOSE --multicontainer-config-file docker-compose.prod.yaml --slot preview -n ghdocs-prod -g docs-prod + az webapp config container set --multicontainer-config-type COMPOSE --multicontainer-config-file docker-compose.prod.yaml --slot staging -n ghdocs-prod -g docs-prod - # Watch preview slot instances to see when all the instances are ready - - name: Check that preview slot is ready + # Watch staging slot instances to see when all the instances are ready + - name: Check that staging slot is ready uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d env: CHECK_INTERVAL: 10000 @@ -115,7 +115,7 @@ jobs: let hasStopped = false const waitDuration = parseInt(process.env.CHECK_INTERVAL, 10) || 10000 async function doCheck() { - const states = getStatesForSlot('preview') + const states = getStatesForSlot('staging') console.log(`Instance states:`, states) // We must wait until at-least 1 instance has STOPPED to know we're looking at the "next" deployment and not the "previous" one @@ -136,10 +136,10 @@ jobs: doCheck() - # TODO - make a request to verify the preview app version aligns with *this* github action workflow commit sha - - name: 'Swap preview slot to production' + # TODO - make a request to verify the staging app version aligns with *this* github action workflow commit sha + - name: 'Swap staging slot to production' run: | - az webapp deployment slot swap --slot preview --target-slot production -n ghdocs-prod -g docs-prod + az webapp deployment slot swap --slot staging --target-slot production -n ghdocs-prod -g docs-prod - name: Purge Fastly edge cache env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87a8347b79..b080e73df7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,6 +51,53 @@ jobs: # Enables cloning the Early Access repo later with the relevant PAT persist-credentials: 'false' + - name: Figure out which docs-early-access branch to checkout, if internal repo + if: ${{ github.repository == 'github/docs-internal' }} + id: check-early-access + uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d + env: + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + with: + github-token: ${{ secrets.DOCUBOT_REPO_PAT }} + result-encoding: string + script: | + // If being run from a PR, this becomes 'my-cool-branch'. + // If run on main, with the `workflow_dispatch` action for + // example, the value becomes 'main'. + const { BRANCH_NAME } = process.env + try { + const response = await github.repos.getBranch({ + owner: 'github', + repo: 'docs-early-access', + BRANCH_NAME, + }) + console.log(`Using docs-early-access branch called '${BRANCH_NAME}'.`) + return BRANCH_NAME + } catch (err) { + if (err.status === 404) { + console.log(`There is no docs-early-access branch called '${BRANCH_NAME}' so checking out 'main' instead.`) + return 'main' + } + throw err + } + + - name: Check out docs-early-access too, if internal repo + if: ${{ github.repository == 'github/docs-internal' }} + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + with: + repository: github/docs-early-access + token: ${{ secrets.DOCUBOT_REPO_PAT }} + path: docs-early-access + ref: ${{ steps.check-early-access.outputs.result }} + + - name: Merge docs-early-access repo's folders + if: ${{ github.repository == 'github/docs-internal' }} + run: | + mv docs-early-access/assets assets/images/early-access + mv docs-early-access/content content/early-access + mv docs-early-access/data data/early-access + rm -r docs-early-access + - name: Checkout LFS objects run: git lfs checkout @@ -78,13 +125,6 @@ jobs: - name: Install dependencies run: npm ci - - name: Clone early access - if: ${{ github.repository == 'github/docs-internal' }} - run: script/early-access/clone-for-build.js - env: - DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }} - GIT_BRANCH: ${{ github.head_ref || github.ref }} - - name: Cache nextjs build uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed with: diff --git a/README.md b/README.md index fadb39c8de..715c2d4fda 100644 --- a/README.md +++ b/README.md @@ -60,4 +60,4 @@ When using the GitHub logos, be sure to follow the [GitHub logo guidelines](http ## Thanks :purple_heart: -Thanks for all your contributions and efforts towards improving the GitHub documentation. We thank you being part of our :sparkles: community :sparkles: ! +Thanks for all your contributions and efforts towards improving the GitHub documentation. We thank you being part of our :sparkles: community :sparkles:! diff --git a/assets/images/help/2fa/2fa-password-reset.png b/assets/images/help/2fa/2fa-password-reset.png index 6cfa78f40d..397fa4e296 100644 Binary files a/assets/images/help/2fa/2fa-password-reset.png and b/assets/images/help/2fa/2fa-password-reset.png differ diff --git a/assets/images/help/dependabot/dependabot-alert-pr-link.png b/assets/images/help/dependabot/dependabot-alert-pr-link.png index 9028b6cf8e..4e1f857b0d 100644 Binary files a/assets/images/help/dependabot/dependabot-alert-pr-link.png and b/assets/images/help/dependabot/dependabot-alert-pr-link.png differ diff --git a/assets/images/help/dependabot/dependabot-security-update-error.png b/assets/images/help/dependabot/dependabot-security-update-error.png deleted file mode 100644 index 09b33196ba..0000000000 Binary files a/assets/images/help/dependabot/dependabot-security-update-error.png and /dev/null differ diff --git a/assets/images/help/graphs/click-alert-in-alerts-list-ungrouped.png b/assets/images/help/graphs/click-alert-in-alerts-list-ungrouped.png new file mode 100644 index 0000000000..078dab35da Binary files /dev/null and b/assets/images/help/graphs/click-alert-in-alerts-list-ungrouped.png differ diff --git a/assets/images/help/graphs/dependabot-alerts-filters.png b/assets/images/help/graphs/dependabot-alerts-filters.png new file mode 100644 index 0000000000..876b494e06 Binary files /dev/null and b/assets/images/help/graphs/dependabot-alerts-filters.png differ diff --git a/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png b/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png index 4d1a369f23..4147d54d16 100644 Binary files a/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png and b/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png differ diff --git a/assets/images/help/repository/create-dependabot-security-update-button-ungrouped.png b/assets/images/help/repository/create-dependabot-security-update-button-ungrouped.png new file mode 100644 index 0000000000..be29a07ae9 Binary files /dev/null and b/assets/images/help/repository/create-dependabot-security-update-button-ungrouped.png differ diff --git a/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png b/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png new file mode 100644 index 0000000000..de77c4b109 Binary files /dev/null and b/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png differ diff --git a/assets/images/help/repository/dependabot-alerts-view.png b/assets/images/help/repository/dependabot-alerts-view.png index 5392ee6c2c..b8c20c500e 100644 Binary files a/assets/images/help/repository/dependabot-alerts-view.png and b/assets/images/help/repository/dependabot-alerts-view.png differ diff --git a/assets/images/help/repository/dependabot-vulnerabilities-number.png b/assets/images/help/repository/dependabot-vulnerabilities-number.png deleted file mode 100644 index 7b5b0a4a7b..0000000000 Binary files a/assets/images/help/repository/dependabot-vulnerabilities-number.png and /dev/null differ diff --git a/assets/images/help/repository/legacy-dependabot-alerts-view.png b/assets/images/help/repository/legacy-dependabot-alerts-view.png new file mode 100644 index 0000000000..110991e20d Binary files /dev/null and b/assets/images/help/repository/legacy-dependabot-alerts-view.png differ diff --git a/assets/images/help/settings/theme-choose-a-day-and-night-theme-to-sync-highcontrast.png b/assets/images/help/settings/theme-choose-a-day-and-night-theme-to-sync-highcontrast.png index b996e80656..88817f8a6d 100644 Binary files a/assets/images/help/settings/theme-choose-a-day-and-night-theme-to-sync-highcontrast.png and b/assets/images/help/settings/theme-choose-a-day-and-night-theme-to-sync-highcontrast.png differ diff --git a/assets/images/help/settings/theme-choose-a-single-theme-highcontrast.png b/assets/images/help/settings/theme-choose-a-single-theme-highcontrast.png index 6ebd1ebb82..ce39e05a05 100644 Binary files a/assets/images/help/settings/theme-choose-a-single-theme-highcontrast.png and b/assets/images/help/settings/theme-choose-a-single-theme-highcontrast.png differ diff --git a/azure-preview-env-template.json b/azure-preview-env-template.json index 911a103d15..ca9eb90a56 100644 --- a/azure-preview-env-template.json +++ b/azure-preview-env-template.json @@ -2,109 +2,168 @@ "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { - "appName": { - "type": "String" - }, - "location": { - "type": "String" - }, - "linuxFxVersion": { - "type": "String" - }, - "dockerRegistryUrl": { - "type": "String" - }, - "dockerRegistryUsername": { - "type": "String" - }, - "dockerRegistryPassword": { - "type": "SecureString" + "appName": { + "defaultValue": null, + "type": "string", + "minLength": 5, + "maxLength": 63, + "metadata": { + "description": "A unique name for the app" } - }, - "variables": { - "appServicePlanName": "[concat('ASP-', parameters('appName'))]", - "dnsName": "[concat(parameters('appName'), '-', take(uniqueString(subscription().subscriptionId, resourceGroup().id, deployment().name), 6))]" + }, + "location": { + "type": "String" + }, + "containerImage": { + "type": "string", + "defaultValue": null, + "metadata": { + "description": "Container image to deploy" + } + }, + "dockerRegistryUrl": { + "type": "String", + "metadata": { + "description": "Should be a valid host name without protocol" + } + }, + "dockerRegistryUsername": { + "type": "String" + }, + "dockerRegistryPassword": { + "type": "SecureString" + } }, "resources": [ - { - - "type": "Microsoft.Web/serverfarms", - "apiVersion": "2021-02-01", - "name": "[variables('appServicePlanName')]", - "location": "[parameters('location')]", - "sku": { - "name": "B2" + { + "type": "Microsoft.ContainerInstance/containerGroups", + "name": "[parameters('appName')]", + "apiVersion": "2021-07-01", + "location": "[resourceGroup().location]", + "properties": { + "containers": [ + { + "name": "app", + "properties": { + "image": "[parameters('containerImage')]", + "ports": [ + { + "protocol": "TCP", + "port": 4000 + } + ], + "environmentVariables": [ + { + "name": "PORT", + "value": "4000" + }, + { + "name": "NODE_ENV", + "value": "production" + }, + { + "name": "WEB_CONCURRENCY", + "value": "1" + }, + { + "name": "ENABLED_LANGUAGES", + "value": "en" + } + ], + "resources": { + "requests": { + "memoryInGB": 4, + "cpu": 1 + } + } + } }, - "kind": "linux", - "properties": { - "reserved": true - } - }, - { - "type": "Microsoft.Web/sites", - "apiVersion": "2018-11-01", - "name": "[variables('dnsName')]", - "location": "[parameters('location')]", - "dependsOn": [ - "[resourceId('Microsoft.Web/serverfarms', variables('appServicePlanName'))]" - ], - "tags": { - "DocsAppName": "[parameters('appName')]" - }, - "properties": { - "name": "[variables('dnsName')]", - "siteConfig": { - "appSettings": [ - { - "name": "DOCKER_REGISTRY_SERVER_URL", - "value": "[parameters('dockerRegistryUrl')]" - }, - { - "name": "DOCKER_REGISTRY_SERVER_USERNAME", - "value": "[parameters('dockerRegistryUsername')]" - }, - { - "name": "DOCKER_REGISTRY_SERVER_PASSWORD", - "value": "[parameters('dockerRegistryPassword')]" - }, - { - "name": "WEBSITES_ENABLE_APP_SERVICE_STORAGE", - "value": "false" - }, - { - "name": "NODE_ENV", - "value": "production" - }, - { - "name": "PORT", - "value": "4000" - }, - { - "name": "DEPLOYMENT_ENV", - "value": "azure" - }, - { - "name": "ENABLED_LANGUAGES", - "value": "en" - } - ], - "linuxFxVersion": "[parameters('linuxFxVersion')]", - "appCommandLine": "", - "alwaysOn": false, - "numberOfWorkers": 1, - "healthCheckPath": "/healthz", - "httpLoggingEnabled": true, - "logsDirectorySizeLimit": 35 + { + "name": "caddy-ssl-server", + "properties": { + "image": "caddy:2.4.6", + "command": [ + "caddy", + "reverse-proxy", + "--from", + "[concat(parameters('appName'), '.', parameters('location'), '.azurecontainer.io')]", + "--to", + "localhost:4000" + ], + "ports": [ + { + "protocol": "TCP", + "port": 443 + }, + { + "protocol": "TCP", + "port": 80 + } + ], + "environmentVariables": [], + "resources": { + "requests": { + "memoryInGB": 1, + "cpu": 1 + } }, - "serverFarmId": "[concat('/subscriptions/', subscription().id, '/resourcegroups/', resourceGroup().name, '/providers/Microsoft.Web/serverfarms/', variables('appServicePlanName'))]", - "clientAffinityEnabled": false + "volumeMounts": [ + { + "name": "data", + "mountPath": "/data" + }, + { + "name": "config", + "mountPath": "/config" + } + ] + } } + ], + "volumes": [ + { + "name": "data", + "emptyDir": {} + }, + { + "name": "config", + "emptyDir": {} + } + ], + "imageRegistryCredentials": [ + { + "server": "[parameters('dockerRegistryUrl')]", + "username": "[parameters('dockerRegistryUsername')]", + "password": "[parameters('dockerRegistryPassword')]" + } + ], + "restartPolicy": "Always", + "ipAddress": { + "ports": [ + { + "protocol": "TCP", + "port": 443 + }, + { + "protocol": "TCP", + "port": 4000 + }, + { + "protocol": "TCP", + "port": 80 + } + ], + "type": "Public", + "dnsNameLabel": "[parameters('appName')]" + }, + "osType": "Linux" } + } ], "outputs": { - "defaultHostName": { - "type": "string", - "value": "[concat('https://', variables('dnsName'), '.azurewebsites.net')]" - } + "defaultHostName": { + "value": "[reference(resourceId('Microsoft.ContainerInstance/containerGroups', parameters('appName'))).ipAddress.fqdn]", + "type": "string" + } } } diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md index 6b8b438787..e529d774e8 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md @@ -37,7 +37,7 @@ If you're a member of an {% data variables.product.prodname_emu_enterprise %}, y 1. Ask for the username of the person you're inviting as a collaborator.{% ifversion fpt or ghec %} If they don't have a username yet, they can sign up for {% data variables.product.prodname_dotcom %} For more information, see "[Signing up for a new {% data variables.product.prodname_dotcom %} account](/articles/signing-up-for-a-new-github-account)".{% endif %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658%} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658%} {% data reusables.repositories.click-collaborators-teams %} 1. Click **Invite a collaborator**. !["Invite a collaborator" button](/assets/images/help/repository/invite-a-collaborator-button.png) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository.md index 423f53ac6b..46a1815b00 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository.md @@ -29,7 +29,7 @@ While forks of private repositories are deleted when a collaborator is removed, {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} {% data reusables.repositories.click-collaborators-teams %} 4. To the right of the collaborator you want to remove, click {% octicon "trash" aria-label="The trash icon" %}. ![Button to remove collaborator](/assets/images/help/repository/collaborator-remove.png) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md index d0aef51457..9083c088b7 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md @@ -20,7 +20,7 @@ topics: shortTitle: Remove yourself --- {% data reusables.user_settings.access_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 2. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "repo" aria-label="The repo icon" %} Repositories**. {% else %} 2. In the left sidebar, click **Repositories**. diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings.md index d8335fc89f..5c314444e4 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings.md @@ -22,7 +22,7 @@ You may want to use a dark theme to reduce power consumption on certain devices, {% note %} -**Note:** The colorblind themes and light high contrast theme are currently in public beta. For more information on enabling features in public beta, see "[Exploring early access releases with feature preview](/get-started/using-github/exploring-early-access-releases-with-feature-preview)." +**Note:** The colorblind themes are currently in public beta. For more information on enabling features in public beta, see "[Exploring early access releases with feature preview](/get-started/using-github/exploring-early-access-releases-with-feature-preview)." {% endnote %} diff --git a/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md b/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md index b1bd8075ff..52cc87e50c 100644 --- a/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md @@ -37,19 +37,18 @@ For more information, see "[About self-hosted runners](/github/automating-your-w You can add self-hosted runners to a single repository. To add a self-hosted runner to a user repository, you must be the repository owner. For an organization repository, you must be an organization owner or have admin access to the repository. For information about how to add a self-hosted runner with the REST API, see "[Self-hosted runners](/rest/reference/actions#self-hosted-runners)." -{% ifversion fpt or ghec %} +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.github-actions.settings-sidebar-actions %} {% data reusables.github-actions.settings-sidebar-actions-runners-updated %} 1. Click **New self-hosted runner**. {% data reusables.github-actions.self-hosted-runner-configure %} -{% endif %} -{% ifversion ghae or ghes %} +{% elsif ghae or ghes < 3.4 %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.github-actions.settings-sidebar-actions-runners %} -1. Under {% ifversion fpt or ghes > 3.1 or ghae or ghec %}"Runners"{% else %}"Self-hosted runners"{% endif %}, click **Add runner**. +1. Under {% ifversion ghes > 3.1 or ghae or ghec %}"Runners"{% else %}"Self-hosted runners"{% endif %}, click **Add runner**. {% data reusables.github-actions.self-hosted-runner-configure %} {% endif %} {% data reusables.github-actions.self-hosted-runner-check-installation-success %} @@ -58,19 +57,18 @@ You can add self-hosted runners to a single repository. To add a self-hosted run You can add self-hosted runners at the organization level, where they can be used to process jobs for multiple repositories in an organization. To add a self-hosted runner to an organization, you must be an organization owner. For information about how to add a self-hosted runner with the REST API, see "[Self-hosted runners](/rest/reference/actions#self-hosted-runners)." -{% ifversion fpt or ghec %} +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.github-actions.settings-sidebar-actions %} {% data reusables.github-actions.settings-sidebar-actions-runners-updated %} 1. Click **New runner**. {% data reusables.github-actions.self-hosted-runner-configure %} -{% endif %} -{% ifversion ghae or ghes %} +{% elsif ghae or ghes < 3.4 %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.github-actions.settings-sidebar-actions-runners %} -1. Under {% ifversion fpt or ghes > 3.1 or ghae or ghec %}"Runners"{% else %}"Self-hosted runners"{% endif %}, click **Add runner**. +1. Under {% ifversion ghes > 3.1 or ghae %}"Runners", click **Add new**, then click **New runner**.{% elsif ghes < 3.2 %}"Self-hosted runners", click **Add runner**."{% endif %} {% data reusables.github-actions.self-hosted-runner-configure %} {% endif %} @@ -86,7 +84,7 @@ You can add self-hosted runners at the organization level, where they can be use New runners are assigned to the default group. You can modify the runner's group after you've registered the runner. For more information, see "[Managing access to self-hosted runners](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group)." -{% ifversion ghec %} +{% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %} To add a self-hosted runner to an enterprise account, you must be an enterprise owner. For information about how to add a self-hosted runner with the REST API, see the [Enterprise Administration GitHub Actions APIs](/rest/reference/enterprise-admin#github-actions). {% data reusables.enterprise-accounts.access-enterprise %} @@ -95,8 +93,7 @@ To add a self-hosted runner to an enterprise account, you must be an enterprise {% data reusables.enterprise-accounts.actions-runners-tab %} 1. Click **New runner**. {% data reusables.github-actions.self-hosted-runner-configure %} -{% endif %} -{% ifversion ghae or ghes %} +{% elsif ghae or ghes < 3.4 %} To add a self-hosted runner at the enterprise level of {% data variables.product.product_location %}, you must be a site administrator. {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} @@ -105,11 +102,9 @@ To add a self-hosted runner at the enterprise level of {% data variables.product 1. Click **Add new**, then click **New runner**. {% data reusables.github-actions.self-hosted-runner-configure %} {% endif %} -{% ifversion ghec or ghae or ghes %} {% data reusables.github-actions.self-hosted-runner-check-installation-success %} {% data reusables.github-actions.self-hosted-runner-public-repo-access %} -{% endif %} ### Making enterprise runners available to repositories diff --git a/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index a0afa6e963..a77a01a315 100644 --- a/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -45,7 +45,7 @@ Self-hosted runners are automatically assigned to the default group when created When creating a group, you must choose a policy that defines which repositories have access to the runner group. -{% ifversion ghec %} +{% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.github-actions.settings-sidebar-actions-runner-groups %} @@ -60,12 +60,11 @@ When creating a group, you must choose a policy that defines which repositories {% endwarning %} {% data reusables.github-actions.self-hosted-runner-create-group %} -{% endif %} -{% ifversion ghae or ghes %} +{% elsif ghae or ghes < 3.4 %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.github-actions.settings-sidebar-actions-runners %} -1. In the "Self-hosted runners" section, click **Add new**, and then **New group**. +1. Under {% ifversion ghes > 3.1 or ghae %}"Runners"{% elsif ghes < 3.2 %}"Self-hosted runners"{% endif %}, click **Add new**, and then **New group**. ![Add runner group](/assets/images/help/settings/actions-org-add-runner-group.png) 1. Enter a name for your runner group, and assign a policy for repository access. @@ -94,7 +93,7 @@ Self-hosted runners are automatically assigned to the default group when created When creating a group, you must choose a policy that defines which organizations have access to the runner group. -{% ifversion ghec %} +{% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} {% data reusables.enterprise-accounts.actions-tab %} @@ -112,8 +111,7 @@ When creating a group, you must choose a policy that defines which organizations {% endwarning %} {% data reusables.github-actions.self-hosted-runner-create-group %} -{% endif %} -{% ifversion ghae or ghes %} +{% elsif ghae or ghes < 3.4 %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} {% data reusables.enterprise-accounts.actions-tab %} @@ -143,7 +141,7 @@ When creating a group, you must choose a policy that defines which organizations ## Changing the access policy of a self-hosted runner group You can update the access policy of a runner group, or rename a runner group. -{% ifversion fpt or ghec %} +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.github-actions.self-hosted-runner-groups-navigate-to-repo-org-enterprise %} {% data reusables.github-actions.settings-sidebar-actions-runner-groups-selection %} 1. Modify the access options, or change the runner group name. @@ -157,8 +155,7 @@ You can update the access policy of a runner group, or rename a runner group. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories)." {% endwarning %} -{% endif %} -{% ifversion ghae or ghes %} +{% elsif ghae or ghes < 3.4 %} {% data reusables.github-actions.self-hosted-runner-configure-runner-group-access %} {% endif %} @@ -180,20 +177,21 @@ Could not find any self-hosted runner group named "rg-runnergroup". ## Moving a self-hosted runner to a group If you don't specify a runner group during the registration process, your new self-hosted runners are automatically assigned to the default group, and can then be moved to another group. -{% ifversion ghec or ghes > 3.1 or ghae %} + {% data reusables.github-actions.self-hosted-runner-navigate-to-org-enterprise %} +{% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %} 1. In the "Runners" list, click the runner that you want to configure. 2. Select the Runner group dropdown menu. 3. In "Move runner to group", choose a destination group for the runner. -{% endif %} -{% ifversion ghes < 3.2 or ghae %} -1. In the "Self-hosted runners" section of the settings page, locate the current group of the runner you want to move and expand the list of group members. +{% elsif ghae or ghes < 3.4 %} +1. In the {% ifversion ghes > 3.1 or ghae %}"Runner groups"{% elsif ghes < 3.2 %}"Self-hosted runners"{% endif %} section of the settings page, locate the current group of the runner you want to move and expand the list of group members. ![View runner group members](/assets/images/help/settings/actions-org-runner-group-members.png) 2. Select the checkbox next to the self-hosted runner, and then click **Move to group** to see the available destinations. ![Runner group member move](/assets/images/help/settings/actions-org-runner-group-member-move.png) 3. To move the runner, click on the destination group. ![Runner group member move](/assets/images/help/settings/actions-org-runner-group-member-move-destination.png) {% endif %} + ## Removing a self-hosted runner group Self-hosted runners are automatically returned to the default group when their group is removed. @@ -203,8 +201,7 @@ Self-hosted runners are automatically returned to the default group when their g 1. In the list of groups, to the right of the group you want to delete, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}. 2. To remove the group, click **Remove group**. 3. Review the confirmation prompts, and click **Remove this runner group**. -{% endif %} -{% ifversion ghes < 3.2 or ghae %} +{% elsif ghes < 3.2 %} 1. In the "Self-hosted runners" section of the settings page, locate the group you want to delete, and click the {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} button. ![View runner group settings](/assets/images/help/settings/actions-org-runner-group-kebab.png) diff --git a/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md b/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md index 49a1a6d3d0..759f3c3332 100644 --- a/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md @@ -30,20 +30,20 @@ shortTitle: Remove self-hosted runners To remove a self-hosted runner from a user repository you must be the repository owner. For an organization repository, you must be an organization owner or have admin access to the repository. We recommend that you also have access to the self-hosted runner machine. For information about how to remove a self-hosted runner with the REST API, see "[Self-hosted runners](/rest/reference/actions#self-hosted-runners)." {% data reusables.github-actions.self-hosted-runner-reusing %} -{% ifversion fpt or ghec %} +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.github-actions.settings-sidebar-actions %} {% data reusables.github-actions.settings-sidebar-actions-runners-updated %} {% data reusables.github-actions.settings-sidebar-actions-runner-selection %} {% data reusables.github-actions.self-hosted-runner-removing-a-runner-updated %} -{% endif %} -{% ifversion ghae or ghes %} +{% elsif ghae or ghes < 3.4 %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.github-actions.settings-sidebar-actions-runners %} {% data reusables.github-actions.self-hosted-runner-removing-a-runner %} {% endif %} + ## Removing a runner from an organization {% note %} @@ -57,19 +57,20 @@ To remove a self-hosted runner from a user repository you must be the repository To remove a self-hosted runner from an organization, you must be an organization owner. We recommend that you also have access to the self-hosted runner machine. For information about how to remove a self-hosted runner with the REST API, see "[Self-hosted runners](/rest/reference/actions#self-hosted-runners)." {% data reusables.github-actions.self-hosted-runner-reusing %} -{% ifversion fpt or ghes > 3.1 or ghae or ghec %} +{% ifversion fpt or ghes > 3.3 or ghec %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.github-actions.settings-sidebar-actions %} {% data reusables.github-actions.settings-sidebar-actions-runners-updated %} {% data reusables.github-actions.settings-sidebar-actions-runner-selection %} {% data reusables.github-actions.self-hosted-runner-removing-a-runner-updated %} -{% else %} +{% elsif ghes < 3.4 or ghae %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.github-actions.settings-sidebar-actions-runners %} {% data reusables.github-actions.self-hosted-runner-removing-a-runner %} {% endif %} + ## Removing a runner from an enterprise {% ifversion fpt %} @@ -84,18 +85,17 @@ If you use {% data variables.product.prodname_ghe_cloud %}, you can also remove {% endnote %} -{% data reusables.github-actions.self-hosted-runner-reusing %} +To remove a self-hosted runner from an enterprise, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine. For information about how to remove a self-hosted runner with the REST API, see the [Enterprise Administration GitHub Actions APIs](/rest/reference/enterprise-admin#github-actions). -{% ifversion ghec %} -To remove a self-hosted runner from an enterprise account, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine. For information about how to add a self-hosted runner with the REST API, see the [Enterprise Administration GitHub Actions APIs](/rest/reference/enterprise-admin#github-actions). +{% data reusables.github-actions.self-hosted-runner-reusing %} +{% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} {% data reusables.enterprise-accounts.actions-tab %} {% data reusables.enterprise-accounts.actions-runners-tab %} {% data reusables.github-actions.settings-sidebar-actions-runner-selection %} {% data reusables.github-actions.self-hosted-runner-removing-a-runner-updated %} -{% elsif ghae or ghes %} -To remove a self-hosted runner at the enterprise level of {% data variables.product.product_location %}, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine. +{% elsif ghae or ghes < 3.4 %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} {% data reusables.enterprise-accounts.actions-tab %} diff --git a/content/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners.md b/content/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners.md index 42ac880513..4b4b6edb5b 100644 --- a/content/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners.md @@ -19,14 +19,14 @@ For information on how to use labels to route jobs to specific types of self-hos {% data reusables.github-actions.self-hosted-runner-management-permissions-required %} ## Creating a custom label -{% ifversion fpt or ghec %} + +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.github-actions.self-hosted-runner-navigate-to-repo-org-enterprise %} {% data reusables.github-actions.settings-sidebar-actions-runner-selection %} 1. In the "Labels" section, click {% octicon "gear" aria-label="The Gear icon" %}. 1. In the "Find or create a label" field, type the name of your new label and click **Create new label**. The custom label is created and assigned to the self-hosted runner. Custom labels can be removed from self-hosted runners, but they currently can't be manually deleted. {% data reusables.github-actions.actions-unused-labels %} -{% endif %} -{% ifversion ghae or ghes %} +{% elsif ghae or ghes < 3.4 %} {% data reusables.github-actions.self-hosted-runner-navigate-to-repo-org-enterprise %} {% data reusables.github-actions.self-hosted-runner-list %} {% data reusables.github-actions.self-hosted-runner-list-group %} @@ -36,34 +36,37 @@ For information on how to use labels to route jobs to specific types of self-hos The custom label is created and assigned to the self-hosted runner. Custom labels can be removed from self-hosted runners, but they currently can't be manually deleted. {% data reusables.github-actions.actions-unused-labels %} {% endif %} + ## Assigning a label to a self-hosted runner -{% ifversion fpt or ghec %} + +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.github-actions.self-hosted-runner-navigate-to-repo-org-enterprise %} {% data reusables.github-actions.settings-sidebar-actions-runner-selection %} {% data reusables.github-actions.runner-label-settings %} 1. To assign a label to your self-hosted runner, in the "Find or create a label" field, click the label. -{% endif %} -{% ifversion ghae or ghes %} +{% elsif ghae or ghes < 3.4 %} {% data reusables.github-actions.self-hosted-runner-navigate-to-repo-org-enterprise %} {% data reusables.github-actions.self-hosted-runner-list %} {% data reusables.github-actions.self-hosted-runner-list-group %} {% data reusables.github-actions.self-hosted-runner-labels-view-assigned-labels %} 1. Click on a label to assign it to your self-hosted runner. {% endif %} + ## Removing a custom label from a self-hosted runner -{% ifversion fpt or ghec %} + +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.github-actions.self-hosted-runner-navigate-to-repo-org-enterprise %} {% data reusables.github-actions.settings-sidebar-actions-runner-selection %} {% data reusables.github-actions.runner-label-settings %} 1. In the "Find or create a label" field, assigned labels are marked with the {% octicon "check" aria-label="The Check icon" %} icon. Click on a marked label to unassign it from your self-hosted runner. -{% endif %} -{% ifversion ghae or ghes %} +{% elsif ghae or ghes < 3.4 %} {% data reusables.github-actions.self-hosted-runner-navigate-to-repo-org-enterprise %} {% data reusables.github-actions.self-hosted-runner-list %} {% data reusables.github-actions.self-hosted-runner-list-group %} {% data reusables.github-actions.self-hosted-runner-labels-view-assigned-labels %} 1. Click on the assigned label to remove it from your self-hosted runner. {% data reusables.github-actions.actions-unused-labels %} {% endif %} + ## Using the configuration script to create and assign labels You can use the configuration script on the self-hosted runner to create and assign custom labels. For example, this command assigns a label named `gpu` to the self-hosted runner. diff --git a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md index 7fef226524..ebba929003 100644 --- a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md +++ b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md @@ -17,7 +17,7 @@ shortTitle: Deploy keys --- {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 3. In the "Security" section of the sidebar, click **{% octicon "key" aria-label="The key icon" %} Deploy keys**. {% else %} 3. In the left sidebar, click **Deploy keys**. diff --git a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md index 7c4aa867d4..03a5ca35b7 100644 --- a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md +++ b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md @@ -21,7 +21,7 @@ shortTitle: Security log The security log lists all actions performed within the last 90 days. {% data reusables.user_settings.access_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Archives" section of the sidebar, click **{% octicon "log" aria-label="The log icon" %} Security log**. {% else %} 1. In the user settings sidebar, click **Security log**. diff --git a/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md b/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md index 8ca974ea4b..fe97513d90 100644 --- a/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md +++ b/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md @@ -24,7 +24,7 @@ shortTitle: Update access credentials 2. Enter the email address associated with your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, then click **Send password reset email.** The email will be sent to the backup email address if you have one configured. ![Password reset email request dialog](/assets/images/help/settings/password-recovery-email-request.png) 3. We'll email you a link that will allow you to reset your password. You must click on this link within 3 hours of receiving the email. If you didn't receive an email from us, make sure to check your spam folder. -4. If you have enabled two-factor authentication, you will be prompted for your 2FA credentials. Type your 2FA credentials or one of your 2FA recovery codes and click **Verify**. +4. If you have enabled two-factor authentication, you will be prompted for your 2FA credentials. Type your authentication code or one of your recovery codes and click **Verify**. If you have added a security key to your account, you can insert the key and click **Use security key** instead of typing an authentication code. ![Two-factor authentication prompt](/assets/images/help/2fa/2fa-password-reset.png) 5. Type a new password, confirm your new password, and click **Change password**. For help creating a strong password, see "[Creating a strong password](/articles/creating-a-strong-password)." {% ifversion fpt or ghec %}![Password recovery box](/assets/images/help/settings/password-recovery-page.png){% else %} diff --git a/content/code-security/getting-started/securing-your-organization.md b/content/code-security/getting-started/securing-your-organization.md index 25412c70df..d27d4e08ce 100644 --- a/content/code-security/getting-started/securing-your-organization.md +++ b/content/code-security/getting-started/securing-your-organization.md @@ -36,7 +36,7 @@ You can create a default security policy that will display in any of your organi {% ifversion fpt or ghes > 2.22 or ghae-issue-4864 or ghec %} ## Managing {% data variables.product.prodname_dependabot_alerts %} and the dependency graph -{% ifversion fpt or ghec %}By default, {% data variables.product.prodname_dotcom %} detects vulnerabilities in public repositories and generates {% data variables.product.prodname_dependabot_alerts %} and a dependency graph. You can enable or disable {% data variables.product.prodname_dependabot_alerts %} and the dependency graph for all private repositories owned by your organization. +{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %} detects vulnerabilities in public repositories and displays the dependency graph. You can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all public repositories owned by your organization. You can enable or disable {% data variables.product.prodname_dependabot_alerts %} and the dependency graph for all private repositories owned by your organization. 1. Click your profile photo, then click **Organizations**. 2. Click **Settings** next to your organization. diff --git a/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions.md b/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions.md index a4c299c3dd..9b97e577a9 100644 --- a/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions.md +++ b/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions.md @@ -30,11 +30,17 @@ shortTitle: Use Dependabot with Actions {% data variables.product.prodname_dependabot %} is able to trigger {% data variables.product.prodname_actions %} workflows on its pull requests and comments; however, certain events are treated differently. -For workflows initiated by {% data variables.product.prodname_dependabot %} (`github.actor == "dependabot[bot]"`) using the `pull_request`, `pull_request_review`, `pull_request_review_comment`, and `push` events, the following restrictions apply: +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5792 %} +For workflows initiated by {% data variables.product.prodname_dependabot %} (`github.actor == "dependabot[bot]"`) using the `pull_request`, `pull_request_review`, `pull_request_review_comment`, `push`, `create`, `deployment`, and `deployment_status` events, the following restrictions apply: +{% endif %} - {% ifversion ghes = 3.3 %}`GITHUB_TOKEN` has read-only permissions, unless your administrator has removed restrictions.{% else %}`GITHUB_TOKEN` has read-only permissions by default.{% endif %} - {% ifversion ghes = 3.3 %}Secrets are inaccessible, unless your administrator has removed restrictions.{% else %}Secrets are populated from {% data variables.product.prodname_dependabot %} secrets. {% data variables.product.prodname_actions %} secrets are not available.{% endif %} +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5792 %} +For workflows initiated by {% data variables.product.prodname_dependabot %} (`github.actor == "dependabot[bot]"`) using the `pull_request_target` event, if the base ref of the pull request was created by {% data variables.product.prodname_dependabot %} (`github.actor == "dependabot[bot]"`), the `GITHUB_TOKEN` will be read-only and secrets are not available. +{% endif %} + For more information, see ["Keeping your GitHub Actions and workflows secure: Preventing pwn requests"](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/). {% ifversion fpt or ghec or ghes > 3.3 %} diff --git a/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies.md b/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies.md index 8b835ed644..9a41ccbd2a 100644 --- a/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies.md +++ b/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies.md @@ -58,7 +58,7 @@ For a list of the ecosystems that {% data variables.product.product_name %} can {% data reusables.repositories.enable-security-alerts %} -{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %} detects vulnerable dependencies in _public_ repositories and generates {% data variables.product.prodname_dependabot_alerts %} by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories. +{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %} detects vulnerable dependencies in _public_ repositories and displays the dependency graph, but does not generate {% data variables.product.prodname_dependabot_alerts %} by default. Repository owners or people with admin access can enable {% data variables.product.prodname_dependabot_alerts %} for public repositories. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories. You can also enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." diff --git a/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors.md b/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors.md index 6d2de3a534..f0e5dc57aa 100644 --- a/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors.md +++ b/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors.md @@ -46,8 +46,6 @@ There are three reasons why an alert may have no pull request link: If an error blocked {% data variables.product.prodname_dependabot %} from creating a pull request, you can display details of the error by clicking the alert. -![{% data variables.product.prodname_dependabot %} alert showing the error that blocked the creation of a pull request](/assets/images/help/dependabot/dependabot-security-update-error.png) - ## Investigating errors with {% data variables.product.prodname_dependabot_version_updates %} When {% data variables.product.prodname_dependabot %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot %} are listed on the {% data variables.product.prodname_dependabot %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot %}** tab. diff --git a/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies.md b/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies.md index 2e0ad140d1..4a967cf2fb 100644 --- a/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies.md +++ b/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies.md @@ -103,17 +103,17 @@ Since {% data variables.product.prodname_dependabot %} uses curated data in the {% ifversion fpt or ghec %} ## Does each dependency vulnerability generate a separate alert? -When a dependency has multiple vulnerabilities, only one aggregated alert is generated for that dependency, instead of one alert per vulnerability. +When a dependency has multiple vulnerabilities, an alert is generated for each vulnerability at the level of advisory plus manifest. -The {% data variables.product.prodname_dependabot_alerts %} count in {% data variables.product.prodname_dotcom %} shows a total for the number of alerts, that is, the number of dependencies with vulnerabilities, not the number of vulnerabilities. +![Screenshot of the {% data variables.product.prodname_dependabot_alerts %} tab showing two alerts from the same package with different manifests.](/assets/images/help/repository/dependabot-alerts-view.png) -![{% data variables.product.prodname_dependabot_alerts %} view](/assets/images/help/repository/dependabot-alerts-view.png) +Legacy {% data variables.product.prodname_dependabot_alerts %} were grouped into a single aggregated alert with all the vulnerabilities for the same dependency. If you navigate to a link to a legacy {% data variables.product.prodname_dependabot %} alert, you will be redirected to the {% data variables.product.prodname_dependabot_alerts %} tab filtered to display vulnerabilities for that dependent package and manifest. -When you click to display the alert details, you can see how many vulnerabilities are included in the alert. +![Screenshot of the {% data variables.product.prodname_dependabot_alerts %} tab showing the filtered alerts from navigating to a legacy {% data variables.product.prodname_dependabot %} alert.](/assets/images/help/repository/legacy-dependabot-alerts-view.png) -![Multiple vulnerabilities for a {% data variables.product.prodname_dependabot %} alert](/assets/images/help/repository/dependabot-vulnerabilities-number.png) +The {% data variables.product.prodname_dependabot_alerts %} count in {% data variables.product.prodname_dotcom %} shows a total for the number of alerts, which is the number of vulnerabilities, not the number of dependencies. -**Check**: If there is a discrepancy in the totals you are seeing, check that you are not comparing alert numbers with vulnerability numbers. +**Check**: If there is a discrepancy in the totals you are seeing, check that you are not comparing alert numbers with dependency numbers. Also check that you are viewing all alerts and not a subset of filtered alerts. {% endif %} ## Further reading diff --git a/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index c2a6b0c128..4029faa7f6 100644 --- a/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -25,7 +25,7 @@ topics: {% data reusables.dependabot.beta-security-and-version-updates %} {% data reusables.dependabot.enterprise-enable-dependabot %} -Your repository's {% data variables.product.prodname_dependabot_alerts %} tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %}{% ifversion fpt or ghec or ghes > 3.2 %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}{% endif %}. You can sort the list of alerts by selecting the drop-down menu, and you can click into specific alerts for more details. For more information, see "[About alerts for vulnerable dependencies](/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies)." +Your repository's {% data variables.product.prodname_dependabot_alerts %} tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %}{% ifversion fpt or ghec or ghes > 3.2 %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}{% endif %}. You can{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5638 %} filter alerts by package, ecosystem, or manifest. You can also{% endif %} sort the list of alerts, and you can click into specific alerts for more details. For more information, see "[About alerts for vulnerable dependencies](/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies)." {% ifversion fpt or ghec or ghes > 3.2 %} You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates)." @@ -37,11 +37,30 @@ You can enable automatic security updates for any repository that uses {% data v ## About updates for vulnerable dependencies in your repository {% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect that your codebase is using dependencies with known vulnerabilities. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency in the default branch, {% data variables.product.prodname_dependabot %} creates a pull request to fix it. The pull request will upgrade the dependency to the minimum possible secure version needed to avoid the vulnerability. + +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5638 %}You can sort and filter {% data variables.product.prodname_dependabot_alerts %} with the dropdown menus in the {% data variables.product.prodname_dependabot_alerts %} tab or by typing filters as `key:value` pairs into the search bar. The available filters are repository (for example, `repo:my-repository`), package (for example, `package:django`), ecosystem (for example, `ecosystem:npm`), manifest (for example, `manifest:webwolf/pom.xml`), state (for example, `is:open`), and whether an advisory has a patch (for example, `has: patch`). + +Each {% data variables.product.prodname_dependabot %} alert has a unique numeric identifier and the {% data variables.product.prodname_dependabot_alerts %} tab lists an alert for every detected vulnerability. Legacy {% data variables.product.prodname_dependabot_alerts %} grouped vulnerabilities by dependency and generated a single alert per dependency. If you navigate to a legacy {% data variables.product.prodname_dependabot %} alert, you will be redirected to a {% data variables.product.prodname_dependabot_alerts %} tab filtered for that package. {% endif %} {% endif %} ## Viewing and updating vulnerable dependencies -{% ifversion fpt or ghec or ghes > 3.2 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5638 %} +{% data reusables.repositories.navigate-to-repo %} +{% data reusables.repositories.sidebar-security %} +{% data reusables.repositories.sidebar-dependabot-alerts %} +1. Optionally, to filter alerts, select the **Repository**, **Package**, **Ecosystem**, or **Manifest** dropdown menu then click the filter that you would like to apply. You can also type filters into the search bar. For example, `ecosystem:npm` or `has:patch`. To sort alerts, select the **Sort** dropdown menu then click the option that you would like to sort by. + ![Screenshot of the filter and sort menus in the {% data variables.product.prodname_dependabot_alerts %} tab](/assets/images/help/graphs/dependabot-alerts-filters.png) +1. Click the alert that you would like to view. + ![Alert selected in list of alerts](/assets/images/help/graphs/click-alert-in-alerts-list-ungrouped.png) +1. Review the details of the vulnerability and, if available, the pull request containing the automated security update. +1. Optionally, if there isn't already a {% data variables.product.prodname_dependabot_security_updates %} update for the alert, to create a pull request to resolve the vulnerability, click **Create {% data variables.product.prodname_dependabot %} security update**. + ![Create {% data variables.product.prodname_dependabot %} security update button](/assets/images/help/repository/create-dependabot-security-update-button-ungrouped.png) +1. When you're ready to update your dependency and resolve the vulnerability, merge the pull request. Each pull request raised by {% data variables.product.prodname_dependabot %} includes information on commands you can use to control {% data variables.product.prodname_dependabot %}. For more information, see "[Managing pull requests for dependency updates](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands)." +1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, select the "Dismiss" drop-down, and click a reason for dismissing the alert. + ![Choosing reason for dismissing the alert via the "Dismiss" drop-down](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png) + +{% elsif ghes = 3.3 %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-dependabot-alerts %} @@ -54,7 +73,7 @@ You can enable automatic security updates for any repository that uses {% data v 1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, select the "Dismiss" drop-down, and click a reason for dismissing the alert. ![Choosing reason for dismissing the alert via the "Dismiss" drop-down](/assets/images/help/repository/dependabot-alert-dismiss-drop-down.png) -{% elsif ghes > 3.0 or ghae-issue-4864 %} +{% elsif ghes = 3.1 or ghes = 3.2 or ghae-issue-4864 %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-dependabot-alerts %} diff --git a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md index 9dfc90486b..0956aede41 100644 --- a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md +++ b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md @@ -88,7 +88,7 @@ The recommended formats explicitly define which versions are used for all direct | Maven | Java, Scala | `pom.xml` | `pom.xml` | | npm | JavaScript | `package-lock.json` | `package-lock.json`, `package.json`| | Python PIP | Python | `requirements.txt`, `pipfile.lock` | `requirements.txt`, `pipfile`, `pipfile.lock`, `setup.py`{% if github-actions-in-dependency-graph %}[2]{% else %}[1]{% endif %} | -{%- ifversion fpt or ghes > 3.3 %} +{%- ifversion fpt or ghec or ghes > 3.3 or ghae-issue-4752 %} | Python Poetry | Python | `poetry.lock` | `poetry.lock`, `pyproject.toml` |{% endif %} | RubyGems | Ruby | `Gemfile.lock` | `Gemfile.lock`, `Gemfile`, `*.gemspec` | | Yarn | JavaScript | `yarn.lock` | `package.json`, `yarn.lock` | diff --git a/content/get-started/customizing-your-github-workflow/exploring-integrations/github-extensions-and-integrations.md b/content/get-started/customizing-your-github-workflow/exploring-integrations/github-extensions-and-integrations.md index 086fc51c68..e477a3f6a3 100644 --- a/content/get-started/customizing-your-github-workflow/exploring-integrations/github-extensions-and-integrations.md +++ b/content/get-started/customizing-your-github-workflow/exploring-integrations/github-extensions-and-integrations.md @@ -45,10 +45,10 @@ You can integrate your personal or organization account on {% data variables.pro ### Slack and {% data variables.product.product_name %} integration -You can subscribe to your repositories or organizations and get realtime updates about issues, pull requests, commits, releases, deployment reviews and deployment statuses. You can also perform activities like close or open issues, and provide rich references to issues and pull requests without leaving Slack. +You can subscribe to your repositories or organizations and get realtime updates about issues, pull requests, commits, discussions, releases, deployment reviews and deployment statuses. You can also perform activities like close or open issues, and provide rich references to issues and pull requests without leaving Slack. The {% data variables.product.prodname_dotcom %} app is also compatible with [Slack Enterprise Grid](https://slack.com/intl/en-in/help/articles/360000281563-Manage-apps-on-Enterprise-Grid). For more information, visit the [Slack integration app](https://github.com/marketplace/slack-github) in the marketplace. ### Microsoft Teams and {% data variables.product.product_name %} integration -You can subscribe to your repositories or organizations and get realtime updates about issues, pull requests, commits, deployment reviews and deployment statuses. You can also perform activities like close or open issues, comment on your issues and pull requests, and provide rich references to issues and pull requests without leaving Microsoft Teams. For more information, visit the [Microsoft Teams integration app](https://appsource.microsoft.com/en-us/product/office/WA200002077) in Microsoft AppSource. +You can subscribe to your repositories or organizations and get realtime updates about issues, pull requests, commits, discussions, releases, deployment reviews and deployment statuses. You can also perform activities like close or open issues, comment on your issues and pull requests, and provide rich references to issues and pull requests without leaving Microsoft Teams. For more information, visit the [Microsoft Teams integration app](https://appsource.microsoft.com/en-us/product/office/WA200002077) in Microsoft AppSource. diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md index ad7be37a60..72722f6626 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md @@ -19,9 +19,9 @@ shortTitle: Review installed integrations {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Integrations" section of the sidebar, click **{% octicon "apps" aria-label="The apps icon" %} {% data variables.product.prodname_github_apps %}**. -{% elsif ghae or ghes < 3.4 %} +{% else %} 1. In the left sidebar, click **Installed {% data variables.product.prodname_github_apps %}**. ![Installed {% data variables.product.prodname_github_apps %} tab in the organization settings sidebar](/assets/images/help/organizations/org-settings-installed-github-apps.png) {% endif %} diff --git a/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md index 172b741d51..e08fcb498f 100644 --- a/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md @@ -40,7 +40,7 @@ To further support your team's collaboration abilities, you can upgrade to {% da {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} {% data reusables.repositories.click-collaborators-teams %} {% data reusables.organizations.invite-teams-or-people %} 5. In the search field, start typing the name of person you want to invite, then click a name in the list of matches. diff --git a/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md index dca2061c91..175582a2d2 100644 --- a/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md @@ -28,9 +28,9 @@ When you remove a collaborator from a repository in your organization, the colla {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} {% data reusables.repositories.click-collaborators-teams %} -{% elsif ghes < 3.4 or ghae %} +{% else %} {% data reusables.repositories.navigate-to-manage-access %} {% endif %} {% data reusables.organizations.invite-teams-or-people %} diff --git a/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md b/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md index 69be8ae11c..c83355b58f 100644 --- a/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md +++ b/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md @@ -23,7 +23,7 @@ When you disable project boards, you will no longer see project board informatio {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "table" aria-label="The table icon" %} Projects**. {% endif %} 1. Decide whether to disable organization-wide project boards, disable repository project boards in the organization, or both. Then, under "Projects": diff --git a/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md index 4d62131020..9a7937c0b6 100644 --- a/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md +++ b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md @@ -9,13 +9,13 @@ versions: ghae: '*' shortTitle: Integrate Jira --- -{% ifversion ghes > 3.3 or ghae-issue-5658 %} +{% ifversion ghes > 3.4 or ghae-issue-5658 %} {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} 1. In the left sidebar, select **{% octicon "code" aria-label="The code icon" %} Developer settings**, then click **OAuth Apps**. ![OAuth applications tab in the left sidebar](/assets/images/help/organizations/org-oauth-applications-ghe.png) 1. Click **New OAuth App**. -{% elsif ghes < 3.4 or ghae %} +{% else %} {% data reusables.user_settings.access_settings %} 1. In the left sidebar under **Organization settings**, click the name of your organization. ![Sidebar organization name](/assets/images/help/settings/organization-settings-from-sidebar.png) diff --git a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index 7f1c181bd9..e64b4978fc 100644 --- a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -15,11 +15,15 @@ topics: shortTitle: Restrict repository creation --- -You can choose whether members can create repositories in your organization. If you allow members to create repositories, you can choose which types of repositories members can create.{% ifversion fpt or ghec %} To allow members to create private repositories only, your organization must use {% data variables.product.prodname_ghe_cloud %}.{% endif %}{% ifversion fpt %} For more information, see "[About repositories](/enterprise-cloud@latest/repositories/creating-and-managing-repositories/about-repositories)" in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. +You can choose whether members can create repositories in your organization. {% ifversion ghec or ghes or ghae %}If you allow members to create repositories, you can choose which types of repositories members can create.{% elsif fpt %}If you allow members to create repositories, you can choose whether members can create both public and private repositories or public repositories only.{% endif %} Organization owners can always create any type of repository. + +{% ifversion fpt %} +Organizations using {% data variables.product.prodname_ghe_cloud %} can also restrict members to creating private repositories only. For more information, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization). +{% endif %} -Organization owners can always create any type of repository. {% ifversion ghec or ghae or ghes %} -{% ifversion ghec or ghae %}Enterprise owners{% elsif ghes %}Site administrators{% endif %} can restrict the options you have available for your organization's repository creation policy.{% ifversion ghec or ghes or ghae %} For more information, see "[Restricting repository creation in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#setting-a-policy-for-repository-creation)."{% endif %}{% endif %} +Enterprise owners can restrict the options you have available for your organization's repository creation policy. For more information, see "[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-for-repository-creation)." +{% endif %} {% warning %} @@ -36,5 +40,12 @@ Organization owners can always create any type of repository. ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png) {%- elsif fpt %} ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png) + + {% note %} + + **Note:** To restrict members to creating private repositories only, your organization must use {% data variables.product.prodname_ghe_cloud %}. + + {% endnote %} {%- endif %} + 6. Click **Save**. diff --git a/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md b/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md index 8cb00329e2..4e14267508 100644 --- a/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md +++ b/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md @@ -57,7 +57,7 @@ Any team members that have set their status to "Busy" will not be selected for r {% data reusables.user_settings.access_org %} {% data reusables.organizations.specific_team %} {% data reusables.organizations.team_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, click **{% octicon "code-review" aria-label="The code-review icon" %} Code review**. {% else %} 1. In the left sidebar, click **Code review** @@ -73,7 +73,7 @@ Any team members that have set their status to "Busy" will not be selected for r {% data reusables.user_settings.access_org %} {% data reusables.organizations.specific_team %} {% data reusables.organizations.team_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, click **{% octicon "code-review" aria-label="The code-review icon" %} Code review**. {% else %} 1. In the left sidebar, click **Code review** diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md index 374e9a889b..1ba761c11c 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md @@ -21,7 +21,7 @@ If you use Zendesk to track user-reported tickets, for example, you can referenc {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Integrations" section of the sidebar, click **{% octicon "cross-reference" aria-label="The cross-reference icon" %} Autolink references**. {% else %} 1. In the left sidebar, click **Autolink references**. diff --git a/content/rest/reference/billing.md b/content/rest/reference/billing.md index 8876b25d3f..fe0cf42be4 100644 --- a/content/rest/reference/billing.md +++ b/content/rest/reference/billing.md @@ -4,6 +4,7 @@ intro: 'With the Billing API, you can monitor the charges and usage {% data vari versions: fpt: '*' ghec: '*' + ghes: '>=3.4' topics: - API miniTocMaxHeadingLevel: 3 diff --git a/content/rest/reference/enterprise-admin.md b/content/rest/reference/enterprise-admin.md index 006d78ee79..230e3f76b5 100644 --- a/content/rest/reference/enterprise-admin.md +++ b/content/rest/reference/enterprise-admin.md @@ -78,7 +78,7 @@ You can also read the current version by calling the [meta endpoint](/rest/refer {% endif %} -{% ifversion fpt or ghec %} +{% ifversion fpt or ghec or ghes > 3.3 %} ## Billing {% for operation in currentRestOperations %} diff --git a/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md b/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md index d8ec9ca1bb..6cc2c183fd 100644 --- a/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md +++ b/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Archives" section of the sidebar, click **{% octicon "log" aria-label="The log icon" %} Security log**. {% else %} 1. In the Settings sidebar, click **Audit log**. diff --git a/data/reusables/audit_log/audit_log_sidebar_for_site_admins.md b/data/reusables/audit_log/audit_log_sidebar_for_site_admins.md index a717da6991..a6e00e1dc8 100644 --- a/data/reusables/audit_log/audit_log_sidebar_for_site_admins.md +++ b/data/reusables/audit_log/audit_log_sidebar_for_site_admins.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 3. In the "Archives" section of the sidebar, click **{% octicon "log" aria-label="The log icon" %} Security log**. {% else %} 3. In the left sidebar, click **Audit log**. diff --git a/data/reusables/dependabot/dependabot-secrets-button.md b/data/reusables/dependabot/dependabot-secrets-button.md index 72625bc19f..cb57bb6485 100644 --- a/data/reusables/dependabot/dependabot-secrets-button.md +++ b/data/reusables/dependabot/dependabot-secrets-button.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**, then click **{% data variables.product.prodname_dependabot %}**. -{% elsif ghes > 3.2%} +{% else %} 1. In the sidebar, click **{% data variables.product.prodname_dependabot %}**. ![{% data variables.product.prodname_dependabot %} secrets sidebar option](/assets/images/enterprise/3.3/dependabot/dependabot-secrets.png) {% endif %} diff --git a/data/reusables/github-actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md b/data/reusables/github-actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md index 2efea4d2c3..39720ea972 100644 --- a/data/reusables/github-actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md +++ b/data/reusables/github-actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md @@ -12,6 +12,6 @@ 2. In the left sidebar, click **Enterprise overview**. 3. In the enterprise sidebar, click {% octicon "law" aria-label="The law icon" %} **Policies**.{% endif %} 2. Navigate to the "Runner groups" settings: - * **In an organization**: Click **Actions** in the left sidebar{% ifversion fpt or ghec %}, then click **Runner groups** below it{% endif %}.{% ifversion ghec or ghes or ghae %} - * {% ifversion ghec %}**If using an enterprise account**:{% elsif ghes or ghae %}**If using an enterprise-level runner**:{% endif %} Click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies"{% ifversion ghec %}, then click the **Runners groups** tab{% endif %}.{% endif %} + * **In an organization**: Click **Actions** in the left sidebar, then click {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %}**Runner groups**{% elsif ghae or ghes < 3.4 %}**Runners**{% endif %} below it.{% ifversion ghec or ghes or ghae %} + * {% ifversion ghec %}**If using an enterprise account**:{% elsif ghes or ghae %}**If using an enterprise-level runner**:{% endif %} Click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies", then click the {% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %}**Runners groups**{% elsif ghae or ghes < 3.4 %}**Runners**{% endif %} tab.{% endif %} {% endif %} diff --git a/data/reusables/github-actions/sidebar-secret.md b/data/reusables/github-actions/sidebar-secret.md index f5c22b01b3..896d920ff4 100644 --- a/data/reusables/github-actions/sidebar-secret.md +++ b/data/reusables/github-actions/sidebar-secret.md @@ -1,5 +1,5 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, click **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **Secrets**. {% endif %} diff --git a/data/reusables/organizations/billing_plans.md b/data/reusables/organizations/billing_plans.md index 0d48d771db..35dc04461a 100644 --- a/data/reusables/organizations/billing_plans.md +++ b/data/reusables/organizations/billing_plans.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="The credit card icon" %} Billing and plans**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In your organization's Settings sidebar, click **Billing & plans**. ![Billing settings](/assets/images/help/billing/settings_organization_billing_plans_tab.png) {% endif %} diff --git a/data/reusables/organizations/github-apps-settings-sidebar.md b/data/reusables/organizations/github-apps-settings-sidebar.md index e130e6b624..1e835a9141 100644 --- a/data/reusables/organizations/github-apps-settings-sidebar.md +++ b/data/reusables/organizations/github-apps-settings-sidebar.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, select **{% octicon "code" aria-label="The code icon" %} Developer settings** then click **{% data variables.product.prodname_github_apps %}**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **{% data variables.product.prodname_github_apps %}**. ![{% data variables.product.prodname_github_apps %} settings](/assets/images/help/organizations/github-apps-settings-sidebar.png) {% endif %} diff --git a/data/reusables/organizations/member-privileges.md b/data/reusables/organizations/member-privileges.md index 96da580be3..66589d5bad 100644 --- a/data/reusables/organizations/member-privileges.md +++ b/data/reusables/organizations/member-privileges.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "people" aria-label="The people icon" %} Member privileges**. -{% elsif ghae or ghes < 3.4 %} +{% else %} 4. In the left sidebar, click **Member privileges**. ![Member privileges option in org settings](/assets/images/help/organizations/org-settings-member-privileges.png) {% endif %} diff --git a/data/reusables/organizations/repository-defaults.md b/data/reusables/organizations/repository-defaults.md index 05d921fb76..0356b367d1 100644 --- a/data/reusables/organizations/repository-defaults.md +++ b/data/reusables/organizations/repository-defaults.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Code, planning, and automation" section of the sidebar, select **{% octicon "repo" aria-label="The repo icon" %} Repository**, then click **Repository defaults**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **Repository defaults**. ![Repository defaults tab](/assets/images/help/organizations/repo-defaults-tab.png) {% endif %} diff --git a/data/reusables/organizations/security-and-analysis.md b/data/reusables/organizations/security-and-analysis.md index 9ab6f7bfe5..a641b5b0fd 100644 --- a/data/reusables/organizations/security-and-analysis.md +++ b/data/reusables/organizations/security-and-analysis.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, click **{% octicon "codescan" aria-label="The codescan icon" %} Code security and analysis**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **Security & analysis**. !["Security & analysis" tab in organization settings](/assets/images/help/organizations/org-settings-security-and-analysis.png) {% endif %} diff --git a/data/reusables/organizations/security.md b/data/reusables/organizations/security.md index 049c20a7b9..31ea8e9ce9 100644 --- a/data/reusables/organizations/security.md +++ b/data/reusables/organizations/security.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Authentication security**. {% else %} 1. In the left sidebar, click **Organization security**. diff --git a/data/reusables/organizations/teams_sidebar.md b/data/reusables/organizations/teams_sidebar.md index 338fe6bc8e..812304b4bc 100644 --- a/data/reusables/organizations/teams_sidebar.md +++ b/data/reusables/organizations/teams_sidebar.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "comment-discussion" aria-label="The comment-discussion icon" %} Team discussions**. {% else %} 1. In the Settings sidebar, click **Teams**. diff --git a/data/reusables/organizations/verified-domains.md b/data/reusables/organizations/verified-domains.md index 83b44b4715..079ac23d2d 100644 --- a/data/reusables/organizations/verified-domains.md +++ b/data/reusables/organizations/verified-domains.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, click **{% octicon "verified" aria-label="The verified icon" %} Verified and approved domains**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **Verified & approved domains**. !["Verified & approved domains" tab](/assets/images/help/organizations/verified-domains-button.png) {% endif %} diff --git a/data/reusables/pages/sidebar-pages.md b/data/reusables/pages/sidebar-pages.md index 03ae79d84f..61e7afdbb2 100644 --- a/data/reusables/pages/sidebar-pages.md +++ b/data/reusables/pages/sidebar-pages.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghes > 3.3 or ghec or ghae-issue-5658 %} +{% ifversion fpt or ghes > 3.4 or ghec or ghae-issue-5658 %} 1. In the "Code & operations" section of the sidebar, click **{% octicon "browser" aria-label="The browser icon" %} Pages**. {% else %} 1. In the left sidebar, click **Pages**. diff --git a/data/reusables/repositories/navigate-to-security-and-analysis.md b/data/reusables/repositories/navigate-to-security-and-analysis.md index 2407a1cd4f..79b226c3b5 100644 --- a/data/reusables/repositories/navigate-to-security-and-analysis.md +++ b/data/reusables/repositories/navigate-to-security-and-analysis.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Security & analysis**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **Security & analysis**. !["Security & analysis" tab in repository settings](/assets/images/help/repository/security-and-analysis-tab.png) {% endif %} diff --git a/data/reusables/repositories/repository-branches.md b/data/reusables/repositories/repository-branches.md index a004e202d0..c51576f4ff 100644 --- a/data/reusables/repositories/repository-branches.md +++ b/data/reusables/repositories/repository-branches.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Code & operations" section of the sidebar, click **{% octicon "git-branch" aria-label="The git-branch icon" %} Branches**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left menu, click **Branches**. ![Repository options sub-menu](/assets/images/help/repository/repository-options-branch.png) {% endif %} diff --git a/data/reusables/repositories/sidebar-notifications.md b/data/reusables/repositories/sidebar-notifications.md index 1a5edf0d3d..ab2fd8d2be 100644 --- a/data/reusables/repositories/sidebar-notifications.md +++ b/data/reusables/repositories/sidebar-notifications.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Integrations" section of the sidebar, click **{% octicon "mail" aria-label="The mail icon" %} Email notifications**. {% else %} 1. Click **Notifications**. diff --git a/data/reusables/user_settings/access_applications.md b/data/reusables/user_settings/access_applications.md index efc6abe024..812666b807 100644 --- a/data/reusables/user_settings/access_applications.md +++ b/data/reusables/user_settings/access_applications.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Integrations" section of the sidebar, click **{% octicon "apps" aria-label="The apps icon" %} Applications**. {% else %} 1. In the left sidebar, click **Applications**. diff --git a/data/reusables/user_settings/account_settings.md b/data/reusables/user_settings/account_settings.md index 7edd6e2f14..10074924fe 100644 --- a/data/reusables/user_settings/account_settings.md +++ b/data/reusables/user_settings/account_settings.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-next %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-next %} 1. In the left sidebar, click **{% octicon "gear" aria-label="The gear icon" %} Account**. {% else %} 1. In the left sidebar, click **Account**. diff --git a/data/reusables/user_settings/appearance-settings.md b/data/reusables/user_settings/appearance-settings.md index d201a2de59..f7f2c3d0c8 100644 --- a/data/reusables/user_settings/appearance-settings.md +++ b/data/reusables/user_settings/appearance-settings.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, click **{% octicon "paintbrush" aria-label="The paintbrush icon" %} Appearance**. {% else %} 1. In the user settings sidebar, click **Appearance**. diff --git a/data/reusables/user_settings/developer_settings.md b/data/reusables/user_settings/developer_settings.md index f8fc22316f..8b13c1d91d 100644 --- a/data/reusables/user_settings/developer_settings.md +++ b/data/reusables/user_settings/developer_settings.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, click **{% octicon "code" aria-label="The code icon" %} Developer settings**. {% else %} 1. In the left sidebar, click **Developer settings**. diff --git a/data/reusables/user_settings/emails.md b/data/reusables/user_settings/emails.md index dd47cf76a9..e19a8634fd 100644 --- a/data/reusables/user_settings/emails.md +++ b/data/reusables/user_settings/emails.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "mail" aria-label="The mail icon" %} Emails**. {% else %} 1. In the left sidebar, click **Emails**. diff --git a/data/reusables/user_settings/organizations.md b/data/reusables/user_settings/organizations.md index cf4c3cf6c5..519e8f0a96 100644 --- a/data/reusables/user_settings/organizations.md +++ b/data/reusables/user_settings/organizations.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "organization" aria-label="The organization icon" %} Organizations**. {% else %} 1. In your user settings sidebar, click **Organizations**. diff --git a/data/reusables/user_settings/repo-tab.md b/data/reusables/user_settings/repo-tab.md index be39213129..8a8cd80c04 100644 --- a/data/reusables/user_settings/repo-tab.md +++ b/data/reusables/user_settings/repo-tab.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "repo" aria-label="The repo icon" %} Repositories**. {% else %} 1. In the left sidebar, click **Repositories**. diff --git a/data/reusables/user_settings/saved_replies.md b/data/reusables/user_settings/saved_replies.md index 0d007727eb..51c59de438 100644 --- a/data/reusables/user_settings/saved_replies.md +++ b/data/reusables/user_settings/saved_replies.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "reply" aria-label="The reply icon" %} Saved replies**. {% else %} 1. In the left sidebar, click **Saved replies**. diff --git a/data/reusables/user_settings/security-analysis.md b/data/reusables/user_settings/security-analysis.md index 0f79b730ae..d525a3d6ed 100644 --- a/data/reusables/user_settings/security-analysis.md +++ b/data/reusables/user_settings/security-analysis.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Code security and analysis**. {% else %} 1. In the left sidebar, click **Security & analysis**. diff --git a/data/reusables/user_settings/security.md b/data/reusables/user_settings/security.md index 56cc87e20a..9e83e2c052 100644 --- a/data/reusables/user_settings/security.md +++ b/data/reusables/user_settings/security.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Password and authentication**. {% else %} 1. In the left sidebar, click **Account security**. diff --git a/data/reusables/user_settings/ssh.md b/data/reusables/user_settings/ssh.md index 08e50ade35..b2c942ca79 100644 --- a/data/reusables/user_settings/ssh.md +++ b/data/reusables/user_settings/ssh.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "key" aria-label="The key icon" %} SSH and GPG keys**. {% else %} 1. In the user settings sidebar, click **SSH and GPG keys**. diff --git a/lib/excluded-links.js b/lib/excluded-links.js index 44ed1073e7..3452045cac 100644 --- a/lib/excluded-links.js +++ b/lib/excluded-links.js @@ -31,4 +31,5 @@ export default [ 'https://www.vmware.com/products/esxi-and-esx.html', 'https://www.ecfr.gov/cgi-bin/text-idx?SID=ad384e1f1e017076f8c0136f322f0a4c&mc=true&node=pt15.2.744&rgn=div5', 'https://wiki.oasis-open.org/security', + 'https://www.techrepublic.com/article/establish-a-patch-management-policy-87756/', ] diff --git a/lib/rest/static/decorated/api.github.com.json b/lib/rest/static/decorated/api.github.com.json index 16403520cd..4d06ffca3a 100644 --- a/lib/rest/static/decorated/api.github.com.json +++ b/lib/rest/static/decorated/api.github.com.json @@ -53541,7 +53541,7 @@ } ], "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -53561,7 +53561,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must have push access to the repository in order to list collaborators.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "200", @@ -53622,7 +53622,7 @@ } ], "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -53642,7 +53642,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "204", diff --git a/lib/rest/static/decorated/ghes-3.0.json b/lib/rest/static/decorated/ghes-3.0.json index 66025d6593..a37ce471e1 100644 --- a/lib/rest/static/decorated/ghes-3.0.json +++ b/lib/rest/static/decorated/ghes-3.0.json @@ -46874,7 +46874,7 @@ } ], "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -46894,7 +46894,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must have push access to the repository in order to list collaborators.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "200", @@ -46955,7 +46955,7 @@ } ], "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -46975,7 +46975,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "204", diff --git a/lib/rest/static/decorated/ghes-3.1.json b/lib/rest/static/decorated/ghes-3.1.json index 71638a9512..364498a915 100644 --- a/lib/rest/static/decorated/ghes-3.1.json +++ b/lib/rest/static/decorated/ghes-3.1.json @@ -47419,7 +47419,7 @@ } ], "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -47439,7 +47439,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must have push access to the repository in order to list collaborators.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "200", @@ -47500,7 +47500,7 @@ } ], "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -47520,7 +47520,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "204", diff --git a/lib/rest/static/decorated/ghes-3.2.json b/lib/rest/static/decorated/ghes-3.2.json index b471b6efe7..69c5891e4c 100644 --- a/lib/rest/static/decorated/ghes-3.2.json +++ b/lib/rest/static/decorated/ghes-3.2.json @@ -48669,7 +48669,7 @@ } ], "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -48689,7 +48689,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must have push access to the repository in order to list collaborators.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "200", @@ -48750,7 +48750,7 @@ } ], "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -48770,7 +48770,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "204", diff --git a/lib/rest/static/decorated/ghes-3.3.json b/lib/rest/static/decorated/ghes-3.3.json index 96bfec43e2..b62f1214ac 100644 --- a/lib/rest/static/decorated/ghes-3.3.json +++ b/lib/rest/static/decorated/ghes-3.3.json @@ -48945,7 +48945,7 @@ } ], "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -48965,7 +48965,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must have push access to the repository in order to list collaborators.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "200", @@ -49026,7 +49026,7 @@ } ], "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -49046,7 +49046,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "204", diff --git a/lib/rest/static/decorated/github.ae.json b/lib/rest/static/decorated/github.ae.json index 939569c1c6..27a665ca7d 100644 --- a/lib/rest/static/decorated/github.ae.json +++ b/lib/rest/static/decorated/github.ae.json @@ -42294,7 +42294,7 @@ } ], "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -42314,7 +42314,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must have push access to the repository in order to list collaborators.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "200", @@ -42375,7 +42375,7 @@ } ], "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -42395,7 +42395,7 @@ "categoryLabel": "Collaborators", "notes": [], "bodyParameters": [], - "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

", + "descriptionHTML": "

For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.

\n

Team members will include the members of child teams.

\n

You must authenticate using an access token with the read:org and repo scopes with push access to use this\nendpoint. GitHub Apps must have the members organization permission and metadata repository permission to use this\nendpoint.

", "responses": [ { "httpStatusCode": "204", diff --git a/lib/rest/static/dereferenced/api.github.com.deref.json b/lib/rest/static/dereferenced/api.github.com.deref.json index 2de5b76484..e16b22260e 100644 --- a/lib/rest/static/dereferenced/api.github.com.deref.json +++ b/lib/rest/static/dereferenced/api.github.com.deref.json @@ -202423,7 +202423,7 @@ "/repos/{owner}/{repo}/collaborators": { "get": { "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -202719,7 +202719,7 @@ "/repos/{owner}/{repo}/collaborators/{username}": { "get": { "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], diff --git a/lib/rest/static/dereferenced/ghes-3.0.deref.json b/lib/rest/static/dereferenced/ghes-3.0.deref.json index 233d9bd41e..dae9441c63 100644 --- a/lib/rest/static/dereferenced/ghes-3.0.deref.json +++ b/lib/rest/static/dereferenced/ghes-3.0.deref.json @@ -157046,7 +157046,7 @@ "/repos/{owner}/{repo}/collaborators": { "get": { "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -157334,7 +157334,7 @@ "/repos/{owner}/{repo}/collaborators/{username}": { "get": { "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], diff --git a/lib/rest/static/dereferenced/ghes-3.1.deref.json b/lib/rest/static/dereferenced/ghes-3.1.deref.json index d462630812..8b10243d0c 100644 --- a/lib/rest/static/dereferenced/ghes-3.1.deref.json +++ b/lib/rest/static/dereferenced/ghes-3.1.deref.json @@ -159592,7 +159592,7 @@ "/repos/{owner}/{repo}/collaborators": { "get": { "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -159880,7 +159880,7 @@ "/repos/{owner}/{repo}/collaborators/{username}": { "get": { "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], diff --git a/lib/rest/static/dereferenced/ghes-3.2.deref.json b/lib/rest/static/dereferenced/ghes-3.2.deref.json index 36586c388d..2fb60686a2 100644 --- a/lib/rest/static/dereferenced/ghes-3.2.deref.json +++ b/lib/rest/static/dereferenced/ghes-3.2.deref.json @@ -163283,7 +163283,7 @@ "/repos/{owner}/{repo}/collaborators": { "get": { "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -163571,7 +163571,7 @@ "/repos/{owner}/{repo}/collaborators/{username}": { "get": { "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], diff --git a/lib/rest/static/dereferenced/ghes-3.3.deref.json b/lib/rest/static/dereferenced/ghes-3.3.deref.json index 0ac4c551aa..6ebd91fe71 100644 --- a/lib/rest/static/dereferenced/ghes-3.3.deref.json +++ b/lib/rest/static/dereferenced/ghes-3.3.deref.json @@ -166286,7 +166286,7 @@ "/repos/{owner}/{repo}/collaborators": { "get": { "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -166574,7 +166574,7 @@ "/repos/{owner}/{repo}/collaborators/{username}": { "get": { "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], diff --git a/lib/rest/static/dereferenced/github.ae.deref.json b/lib/rest/static/dereferenced/github.ae.deref.json index b9a72632a6..444ed971b9 100644 --- a/lib/rest/static/dereferenced/github.ae.deref.json +++ b/lib/rest/static/dereferenced/github.ae.deref.json @@ -139761,7 +139761,7 @@ "/repos/{owner}/{repo}/collaborators": { "get": { "summary": "List repository collaborators", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must have push access to the repository in order to list collaborators.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], @@ -140049,7 +140049,7 @@ "/repos/{owner}/{repo}/collaborators/{username}": { "get": { "summary": "Check if a user is a repository collaborator", - "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.", + "description": "For organization-owned repositories, the list of collaborators includes outside collaborators, organization members that are direct collaborators, organization members with access through team memberships, organization members with access through default organization permissions, and organization owners.\n\nTeam members will include the members of child teams.\n\nYou must authenticate using an access token with the `read:org` and `repo` scopes with push access to use this\nendpoint. GitHub Apps must have the `members` organization permission and `metadata` repository permission to use this\nendpoint.", "tags": [ "repos" ], diff --git a/lib/search/indexes/github-docs-3.0-cn-records.json.br b/lib/search/indexes/github-docs-3.0-cn-records.json.br index 9a797cb1f2..f255c00c24 100644 --- a/lib/search/indexes/github-docs-3.0-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.0-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e043d2de01f8cbaf85cd4875d1daaa7eeb69af1f5d065ff3e528263f3a77df97 -size 654500 +oid sha256:063f7225e47241479627592fad21614912c6cb6a93580b62a65983cf1c911e28 +size 661650 diff --git a/lib/search/indexes/github-docs-3.0-cn.json.br b/lib/search/indexes/github-docs-3.0-cn.json.br index 181fe60b0e..da1bb8a8f1 100644 --- a/lib/search/indexes/github-docs-3.0-cn.json.br +++ b/lib/search/indexes/github-docs-3.0-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22a36605b3b94e16e0cc3eae30f4e56164db0a146318441d482f7033375b01ce -size 1358397 +oid sha256:b51b7b1908c383e752f94632fbcd45f28892e185a090d3a2cf0c32c68ef6c612 +size 1377128 diff --git a/lib/search/indexes/github-docs-3.0-en-records.json.br b/lib/search/indexes/github-docs-3.0-en-records.json.br index 8fefffe4c4..6f05925b90 100644 --- a/lib/search/indexes/github-docs-3.0-en-records.json.br +++ b/lib/search/indexes/github-docs-3.0-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35e52e83b2ff9f6255c192373b2834e5cbbc47832526ebdd6528d16aa62a47e3 -size 981510 +oid sha256:e19ddd234db28a8ab2ec87fb01150eefb0e9fa4d67685d4a92cdcfdfbac7a74b +size 981416 diff --git a/lib/search/indexes/github-docs-3.0-en.json.br b/lib/search/indexes/github-docs-3.0-en.json.br index 93f6525f93..b218302da2 100644 --- a/lib/search/indexes/github-docs-3.0-en.json.br +++ b/lib/search/indexes/github-docs-3.0-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcdb85427dfa7b81d3292371e06f85238c1d6fc1107726380fb7296a93ca121f -size 3987849 +oid sha256:6e5b0eaa180149afb148610c48afba96fbbc1cb808c5113d1f2da30cc6510284 +size 3990962 diff --git a/lib/search/indexes/github-docs-3.0-es-records.json.br b/lib/search/indexes/github-docs-3.0-es-records.json.br index 7b63de3223..3c63920251 100644 --- a/lib/search/indexes/github-docs-3.0-es-records.json.br +++ b/lib/search/indexes/github-docs-3.0-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4e90ee51fa30c07862b02e2bee076ce3929f80bde660e1759cc435faf66818b -size 615457 +oid sha256:5854acc2f339e98f223bfa18caef377b256f0c45245ce7da8995738fe46084b3 +size 614937 diff --git a/lib/search/indexes/github-docs-3.0-es.json.br b/lib/search/indexes/github-docs-3.0-es.json.br index aacde69e35..bc7a587145 100644 --- a/lib/search/indexes/github-docs-3.0-es.json.br +++ b/lib/search/indexes/github-docs-3.0-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f7ca8420920a0a277aa7ec6e9542387e0003329dae174475795592aa59dae77 -size 2573818 +oid sha256:fdfa43aa365869bdedd0e1556909f01ca49ee14ae0960215e3b160e78d671bbf +size 2573569 diff --git a/lib/search/indexes/github-docs-3.0-ja-records.json.br b/lib/search/indexes/github-docs-3.0-ja-records.json.br index 2006d83a74..def7bc76ac 100644 --- a/lib/search/indexes/github-docs-3.0-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.0-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:754691231d729ea4ca1029ad9cb15e0621da7af196b7e8698d2fb63bfafe1eb1 -size 674596 +oid sha256:accab771ba2cf0df5aa770d5bbe799dbf6f37baded176b87d65ec757a206c07f +size 680125 diff --git a/lib/search/indexes/github-docs-3.0-ja.json.br b/lib/search/indexes/github-docs-3.0-ja.json.br index a3dc129b02..09614c154e 100644 --- a/lib/search/indexes/github-docs-3.0-ja.json.br +++ b/lib/search/indexes/github-docs-3.0-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1827fe284936e9e0eeee3d13ba692899949d8633a1019b8ebe0d11616728722 -size 3555600 +oid sha256:ac193e67941f8a6658996b51414ac5ae9f24bcec56381466261c88a25b2a4a98 +size 3601080 diff --git a/lib/search/indexes/github-docs-3.0-pt-records.json.br b/lib/search/indexes/github-docs-3.0-pt-records.json.br index 7ccc52c328..0b06c6f6e4 100644 --- a/lib/search/indexes/github-docs-3.0-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.0-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90971a65f48a252017da39c793393f99c307427478179ebcc263ae1acad0ba47 -size 605206 +oid sha256:0b4cb441491bf22eda0911d348f0e05c5e59a146632327675f4639193aee8afa +size 605835 diff --git a/lib/search/indexes/github-docs-3.0-pt.json.br b/lib/search/indexes/github-docs-3.0-pt.json.br index 34ce397ca2..e56ff16adb 100644 --- a/lib/search/indexes/github-docs-3.0-pt.json.br +++ b/lib/search/indexes/github-docs-3.0-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41cc0b5478ce86ca451bb5882701dc0a6e9fbb5e204bc33062f4f370538954cd -size 2469446 +oid sha256:8f589246c92c91eed9784c74023d3a4ae2795ced8aafd339453e2a36d7ac52d7 +size 2469260 diff --git a/lib/search/indexes/github-docs-3.1-cn-records.json.br b/lib/search/indexes/github-docs-3.1-cn-records.json.br index bd1019dae5..7ad196b4ca 100644 --- a/lib/search/indexes/github-docs-3.1-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.1-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4b9746fa14d4a454dbcd684ef780c5d3bbb08c2d42d671b997dbe98b96cc351 -size 667833 +oid sha256:0c86ba3a978e9b6dfbce07883fbd5b1e09b55c01990e5ebc1dff379d9d3f2f2c +size 676639 diff --git a/lib/search/indexes/github-docs-3.1-cn.json.br b/lib/search/indexes/github-docs-3.1-cn.json.br index 795e4661cd..b94a168338 100644 --- a/lib/search/indexes/github-docs-3.1-cn.json.br +++ b/lib/search/indexes/github-docs-3.1-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3269bb665a7f5d5cd7b22297077b4077a29691295fc655412b50e56fd02381de -size 1394511 +oid sha256:339c34a46e18b3ddc58b0d603c1c187ebd5c7de99786bdb28fa92df64c1b5a2e +size 1415605 diff --git a/lib/search/indexes/github-docs-3.1-en-records.json.br b/lib/search/indexes/github-docs-3.1-en-records.json.br index 74209d60cc..51eb527e3b 100644 --- a/lib/search/indexes/github-docs-3.1-en-records.json.br +++ b/lib/search/indexes/github-docs-3.1-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42a291044aefd9d56975ca3917bc65e64efb6b7e3477ae9495bf7fa589de43da -size 1006168 +oid sha256:c571cee0686d060ee3d8cbd0d70ec8fb4f31e2a1eda72898fade84ce176f7610 +size 1004248 diff --git a/lib/search/indexes/github-docs-3.1-en.json.br b/lib/search/indexes/github-docs-3.1-en.json.br index cd3a4cc0f7..c9662e3ddb 100644 --- a/lib/search/indexes/github-docs-3.1-en.json.br +++ b/lib/search/indexes/github-docs-3.1-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25abbf58246dceeee05ea48049a8d3b30dcdd44266b4fafc4616952ec3148f8b -size 4079287 +oid sha256:92814fab924ab81dff770d3ac42dd50cdf446510df67e63ac616992e1e514814 +size 4077985 diff --git a/lib/search/indexes/github-docs-3.1-es-records.json.br b/lib/search/indexes/github-docs-3.1-es-records.json.br index a280ccdee8..116026f46a 100644 --- a/lib/search/indexes/github-docs-3.1-es-records.json.br +++ b/lib/search/indexes/github-docs-3.1-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea5e2f8d7e9ab35399a62a4fdd2040be5371ce2461c3fd913264e030b7b6ad85 -size 626818 +oid sha256:44bfa9e9f6864a6382d06b25e0cc3a82edf34e504d2c59259f968947916481b4 +size 626440 diff --git a/lib/search/indexes/github-docs-3.1-es.json.br b/lib/search/indexes/github-docs-3.1-es.json.br index 5851fb8d4b..9254057a2d 100644 --- a/lib/search/indexes/github-docs-3.1-es.json.br +++ b/lib/search/indexes/github-docs-3.1-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99d4c44764ec050890aaf7a8ab60198e2834f0d489815827a9af721ceff254d2 -size 2633490 +oid sha256:9e242942f23286f4bf9557f3921359596cb288b9b361be16f22b2b51079dd934 +size 2632816 diff --git a/lib/search/indexes/github-docs-3.1-ja-records.json.br b/lib/search/indexes/github-docs-3.1-ja-records.json.br index 85ad352cda..e144d9fbb6 100644 --- a/lib/search/indexes/github-docs-3.1-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.1-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bb341570d90b1073dfb1b2e70bbe8defb3195bd53e86a4a8c241e89eb398874 -size 688198 +oid sha256:69e130f489764130fd0397dc502beae8b9116249c3d23b2b469bb32165f9f442 +size 693881 diff --git a/lib/search/indexes/github-docs-3.1-ja.json.br b/lib/search/indexes/github-docs-3.1-ja.json.br index 3645d4e8ec..15e0068657 100644 --- a/lib/search/indexes/github-docs-3.1-ja.json.br +++ b/lib/search/indexes/github-docs-3.1-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f06b5ae2995795b9737732e9a076cb5ea190a4a7d5eaefd31560ed4e20a53f3 -size 3633513 +oid sha256:e5380db02c2ce7c70bd74ac1e31c8c3e980f2097290bdcf8e2c0981e276843eb +size 3681418 diff --git a/lib/search/indexes/github-docs-3.1-pt-records.json.br b/lib/search/indexes/github-docs-3.1-pt-records.json.br index feebfa0a3b..ede1b9ee60 100644 --- a/lib/search/indexes/github-docs-3.1-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.1-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:621c830760ced127ffcd8d229804623fd99462539fd1f365f7b8fd4f1d471c18 -size 617462 +oid sha256:da9b02d29fb209f3a52734c4fa86a0476dc7b664c1744e380d8fbf80adb746db +size 617522 diff --git a/lib/search/indexes/github-docs-3.1-pt.json.br b/lib/search/indexes/github-docs-3.1-pt.json.br index 89e68c5e34..7cfbd90326 100644 --- a/lib/search/indexes/github-docs-3.1-pt.json.br +++ b/lib/search/indexes/github-docs-3.1-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0aa3287747e093e84ac731467d96a1012f265b24a6b0137ee2cf1efd4f7eef66 -size 2519970 +oid sha256:68a4ad9b16e5c05e46fed3bb541795609ea617ca70f7d106710dddcd4aa15705 +size 2520889 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 4bceb2b8a3..c3188f41eb 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:9c31b1748512bc639933cb014ef4b76cc5c8b287021ee7ad1705e9d3857f6d66 -size 684155 +oid sha256:d8b40064f265f59277b600bd7d33480cadd14e26f84a2489bc941c6d2ebad77f +size 691367 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 09bca1f48f..1a3fbacb20 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:f19b3303626c8c8f603571fe4f52f12f9556c9e7d096d40f12828089f5c4a69b -size 1426591 +oid sha256:eef768f3039621ea7dfd5173536f5e716a35160085310c0a1adafddc91436baf +size 1446953 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 05de556984..3c4240df0a 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:2829deefc251cbea348e6e2bd0cf1b0bd43a8cf15d850592176c4bbbb69011ef -size 1038423 +oid sha256:e4153274d1f0a2c040b02a9f7ee139bf7c4ad45f0f975d284b4e384cf11bedc9 +size 1039416 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 7e38abee47..54541b4933 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:3fc064fd4e4c5cce31bd8024d2d8c9e0a750397551f920738d10e2b5ad4052ee -size 4213925 +oid sha256:b78940697c423ead2ce1fd225a1df129191fec7106c8911fa8bb3a0372fe98f7 +size 4214580 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 bbfbbf696c..5bd0580162 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:a46908a7c0da6629d96e21463117ae29d71b5e158b182f6598a6459b6c7c41e3 -size 641557 +oid sha256:08873de6636c976e1f8183d9e01b91b1865e07ed6da6dc8d8ffe3061f7f8ae07 +size 640901 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 5fdb0b6bc4..2d9246288d 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:75b0607cabfa90444ca8663e9ddac71d9cd6e66181b1d9c8ce74605bd8b4ef56 -size 2696999 +oid sha256:44c4856b0ab8210a5f19ef1e614014d6a124772efb10be9e7dadfd6d44c4ca4e +size 2695337 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 fc72c7c6a9..96d45651bd 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:acf7d09a4d1b53c53b98c127c7e767922f53200556a7a96d992c982e619c4381 -size 700579 +oid sha256:dea803b7c54a3921a92c36edbb9948c5fb14f402213e9a8b2414ecd8d043b674 +size 709057 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 4fbafd7c88..64746b0f19 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:d9422294539a9cb22995b6f0ff0e1428fdee4ed29173278ef7c8da6235f7f289 -size 3709590 +oid sha256:1bdeee3dcaedbef1b74fe0c51c9f02288d71d9d9a58a40e02740f0bd17c10767 +size 3765680 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 5998908719..77b27298a9 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:7751bdfe77e6972dfbda6257f4401699d439506763df66f1cbf94988f9783b78 -size 632113 +oid sha256:1cfddb51a29a8d58a9bda23b36bac9f2d4cd9d8319379635621116a866e57c25 +size 631798 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 500a34ad18..d221170b79 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:3d22f82ae074a4ea68a0ef89dede7d5f2eb6313c545a74fdc968a821f22178c3 -size 2581272 +oid sha256:2e9fb114931cca7a202bc3ce98a2b34141f55e6b5895592bbc14518f1957dd1e +size 2578838 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 1f8fdafc8f..2aff9171e2 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:50b9d51de10f5c619184f9dc96176a970c63fccb4cd06358c8695198c2de713d -size 706530 +oid sha256:24056458c447000ce844c900004eb7eb2e79e36090d923234cdac6f16d81fda8 +size 713256 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 bfc9cb4195..ce05919a12 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:d2e17631650865d3b5f781a808b663bd9edd97ab184843969849da97e7a4cf60 -size 1485351 +oid sha256:4b3ec18a3ca74e2f3064a6f0ac9b39688c7cd79bb575499b95e2134def53a8ce +size 1505206 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 35518521a7..1dae6724a5 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:d684511cef46b30418448bb63017bbf76b1592a88b9294689f4ae00c052acdee -size 1078847 +oid sha256:16377f645f7e688f4fb0aba12bae30d557cd8c15fd721fd1c682c0e946466743 +size 1078486 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 303b6f977c..15d65e5b00 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:1c51e02956166c1ec757dc8f9c3d958f2206db1264687557c7f007208f515d71 -size 4317198 +oid sha256:4c20167f1449aff95841cf03dbbfa083723dc1e646dcb7584e0a6b29e653dd43 +size 4315760 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 5d934cfbab..088696108e 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:07dc9e22522628c606e143421f9d2abcc1a5ec17e27cf379e6576d4fe39b32fa -size 661097 +oid sha256:4c6226fbef192918da8bd9a83b9a64f6ea2f396a9ad785021384b953d992249d +size 662170 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 15d04128b4..7e4fb41c2c 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:d21ac842bc650004783951ab7476675369e371cb1cf4cfc4cec4df6cf3ea9070 -size 2798003 +oid sha256:d47737e2b4947c449a5d510aab1249147eab1d2f2d426bb22703e81639aae153 +size 2798821 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 3858bb0360..b49c57eee1 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:de1c04154efefa917f52662187816d5c05903197a081916b1dc90e2283b1c909 -size 724584 +oid sha256:0182cb4859073047018b05b0dcca32bc73d35bb7e414a17fdadde11c66f10f1a +size 732097 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 0ab92b423d..c30f4315a5 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:9269687e110469f3e4b7f6a3cd1ef6f800b8eb9073a1003f8e8e9e6a7c5fa361 -size 3838064 +oid sha256:d3590f2b854d94afe81c68730c20569b75c7363a70da9141c2fe6b4f4fdda790 +size 3889644 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 63f9e3b91c..bda96d6d07 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:6e83fc69ff7491601e7dc7b002e9e10c853470b973584ea462e35af68eb36d22 -size 651954 +oid sha256:a5796862b4512e55c641374022e09a7071ebd1314ab5043da85adfc933cbb8ea +size 651278 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 a7f4b51de5..1383a9445f 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:0484642b862cc0659fcb696c41ea5f2f4efe60296ee06b06e5432c81e34ec2d5 -size 2662297 +oid sha256:a41c0341759037040edc229a5b286d4fccb0ae4a8f71aba981edf85abb4a63be +size 2661792 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 750ee34502..8dba229d3d 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:c1513134bf409a43f84f0119cab3501981a87a9ec2404ac96364d2aea2432423 -size 900209 +oid sha256:1a6a412d49effe80a0ad72b87725b1acfcf0dbb92c73cec124c06b43cc09a934 +size 914597 diff --git a/lib/search/indexes/github-docs-dotcom-cn.json.br b/lib/search/indexes/github-docs-dotcom-cn.json.br index 546ed01d81..e910ef75b3 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:5fc3e26004f666bd4b71ff45b2d5ed2d70640f0590ec6e27880a3ab56bf151d6 -size 1634852 +oid sha256:5e7a6f89d73c1a440f8e6ea143780b2d6af8164b57ba126d4bba11d1520101f2 +size 1681027 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 f39f213b23..3b0e5e307e 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:5bf3cbf7114cfea61aeda75eb15aa4667e98869ad8ec5d4f8091afea3686063e -size 1365222 +oid sha256:5acc529d273fa0f44e6cb517142204a27aff37fd0ff22b399afc04ac0c101b09 +size 1364673 diff --git a/lib/search/indexes/github-docs-dotcom-en.json.br b/lib/search/indexes/github-docs-dotcom-en.json.br index 571ac0be1e..5e0edc784c 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:50aa2fc1b23a00bebb4f143fc04d596f2c4007f7b54f2f61ea2aafdb26b62ecf -size 5201905 +oid sha256:905fb9fb59633d601d5d0c12f42e6808fb32daf61c81c4829bc0b6c0c1cab3f3 +size 5202118 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 fbd7e15488..ace52a5ed8 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:ec45cb7d4ca4af66d7ae2381c7893a15965e73c5a2b98db0615140a46e452344 -size 830958 +oid sha256:763520a1e3f2399434359c98c68e3a0f2e6fa1f33616f88a25c52dfd6c45f4d7 +size 830833 diff --git a/lib/search/indexes/github-docs-dotcom-es.json.br b/lib/search/indexes/github-docs-dotcom-es.json.br index 695d64a561..9655ae796d 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:b3da95473cdf8ed9081e50af9eb2506855e6f54047be3d227bd3b354db00f985 -size 3350610 +oid sha256:a7b767f9941b71c387af9493a0ed78454f86b9191857df19af9bdcd8e82bec68 +size 3350557 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 3e8673a813..baaffe33e4 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:ae27ce57bbab4e7945a3c1c1763a94ab08afa75f3d16da81059d2e169f0aa0bd -size 919437 +oid sha256:66780bfb736522c9ac02eb3d652c4db6f741c342211e1d9e93172c49d00e2230 +size 932084 diff --git a/lib/search/indexes/github-docs-dotcom-ja.json.br b/lib/search/indexes/github-docs-dotcom-ja.json.br index 4cdbcd98bf..a764e144a6 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:7d1f90fc3a91a18331b79b80cf6dc513357efc5b2cef18724181e849b83b24db -size 4649822 +oid sha256:1e75260a6b7b379d2230d93d3e2795e2b392c6a0ecf23290bf511e752a905345 +size 4746807 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 139a67bae6..fb95faeb12 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:b71d4d7bb3598768c220bb88627d34e2258984a11ca1d6de7faffec481e47aa5 -size 819268 +oid sha256:e53dfaa0034e0ff4bf27b73248a4476a356132887264585b91a2f7025840e2d7 +size 819146 diff --git a/lib/search/indexes/github-docs-dotcom-pt.json.br b/lib/search/indexes/github-docs-dotcom-pt.json.br index e92a03b9f2..e10a8754a6 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:3137fe9897e07e7bfa17293235ba4ae6b58730d96b53dada5f19afd986043c62 -size 3196984 +oid sha256:91dd8b610a2bb817356b9b2d2f2cfa8737e9b0943420118c14a9596ad807172a +size 3195041 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 e298ba66fb..80c0c0035c 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:eedf7dc1a59d7705a3bec60f35907156dd0c984e1ff2feb8e75621bf831c3b78 -size 551979 +oid sha256:f064cc8b7b8a87b95eca380b3016034b05d0ede5ee0805e24b2912b7ebcb70df +size 558492 diff --git a/lib/search/indexes/github-docs-ghae-cn.json.br b/lib/search/indexes/github-docs-ghae-cn.json.br index 741160ab44..34669e0342 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:95ece6fd3641eb50e29af7b37f94a6d3accab400f7b6e227ef84320cf75fd612 -size 1106037 +oid sha256:f9614bc51cc0dbde325301537e5b37d8e6e806eabd11001a88d2172bc197e3f5 +size 1127118 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 49af6516c0..9896afdd2d 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:791a86f1489ff0b2ba07021a6b39b5cf05c78ed827d6e16e82a6334cc4cf42c1 -size 858165 +oid sha256:2a42b1390728dc4acb962c38c2dfe6010ff04a3ec836c4969432c0d82e3a1222 +size 857966 diff --git a/lib/search/indexes/github-docs-ghae-en.json.br b/lib/search/indexes/github-docs-ghae-en.json.br index 60af654651..93d58fee8c 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:0009bf318573e9e40e5a181550f99fa0273cbd019286e8050a4b4facf4e087bd -size 3434265 +oid sha256:297274dccac65c80379a4e021ad480239cd864103d24f087b95228794357752f +size 3434998 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 84f1a82996..bd47ff127e 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:1578d8ff941cff5586331b9bfa09347803bf64d02678660500b3905e023c0a12 -size 520121 +oid sha256:c8e2812391724e789af684e7ad44e90516fe843fd8bd9a33d338661d91316db1 +size 520521 diff --git a/lib/search/indexes/github-docs-ghae-es.json.br b/lib/search/indexes/github-docs-ghae-es.json.br index 27a471b130..26ffa345d6 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:e042e07c6abf4209f2ff9decdd790f58817a2b96bb086e2814514f76738d0b43 -size 2116559 +oid sha256:943dd4c148f93d0f6010b8fb983f4c221f61ecf7e3764eea6788eed49675b068 +size 2118196 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 148431db06..a4142a9754 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:8d2ea877e08a426787a6e4ab99e48b67c1dfcd714f7ca96a8511cd280926f42a -size 564989 +oid sha256:5cdf67ff2faae331dc2d8150f23dba8672c1a66c639b97f87e17bd459ab8f7ec +size 572016 diff --git a/lib/search/indexes/github-docs-ghae-ja.json.br b/lib/search/indexes/github-docs-ghae-ja.json.br index 091a930f94..b71f11c2d0 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:820678d5d615c7a6857b3135ec05f1c3f0ac46b8d8209602bc6db546a95f0e19 -size 2880363 +oid sha256:4b34b2b5d13605cd52f043868178efa20cc3f8098820fdef60fd9f77aa5e8cf4 +size 2933274 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 63dcba24b7..6e55a8f035 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:4aa0400388c746f7bcd1a19db09d57a41d9cd2110bcef0efefd1518f25727642 -size 512684 +oid sha256:24f924a3e94c316d216d0dfeb2bc950533b568cfc34335cb7bb63cf4c4e46c62 +size 513121 diff --git a/lib/search/indexes/github-docs-ghae-pt.json.br b/lib/search/indexes/github-docs-ghae-pt.json.br index bc4d498824..e16d2fa45c 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:b70cb8e96055600d8b9eaef4f05b9c1565de0a1f192a088211be09ac3ac13486 -size 2009300 +oid sha256:305342e4f07ff55d0e2d771b162f6602c4efe66a7e5d965350dd15733f211280 +size 2009755 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 2a16ea9bba..39f661aa5c 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:0f4d10e2289c90e2a91e56e2013acbc00a69971feba536b1256e6a20f1ef874f -size 822972 +oid sha256:3e52ec6caa6ca0413575395068a72089eec47188de46c1ffdc89bbdd76ebe233 +size 840858 diff --git a/lib/search/indexes/github-docs-ghec-cn.json.br b/lib/search/indexes/github-docs-ghec-cn.json.br index 6400518ba5..5fa7f3d751 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:9caa96f3ddbb12fa25965a3b163cea719b5419a143f24e6c6cd5ccf16ad02a39 -size 1693122 +oid sha256:c352641c47548d31ea28bfde4925757f1a096885a5bf9577e724d0c1edec7907 +size 1749130 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 69a9cfef01..b6784f588a 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:7eea31028134076b9042940e4b8aa2d91ab0eb215b880a258ab41ab766057b58 -size 1239491 +oid sha256:fdf7325147ae6ba2d4146436263e6a84a7a509ec191f8b14a0e8b41c18860f92 +size 1241452 diff --git a/lib/search/indexes/github-docs-ghec-en.json.br b/lib/search/indexes/github-docs-ghec-en.json.br index 0e3450c783..5b46816ff7 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:06b4611651b627f852523ac4bb98d41a6afcbb58f307e1f605fadde832e4f186 -size 4986833 +oid sha256:5c93d3f97648b55a8dbec7e114df7011e3705f705c1a7e411eb73d2ce7719fa2 +size 4986729 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 4d847a1a76..7b356f421b 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:94826df99a41604294aef65505950358db1a2e07e2707fdfba8e248e5b1db619 -size 789572 +oid sha256:986508c74154a7e3e0e0deb7231604baa6b24af5a03c481c5792bc2bf6134122 +size 789960 diff --git a/lib/search/indexes/github-docs-ghec-es.json.br b/lib/search/indexes/github-docs-ghec-es.json.br index 243d3aa9a9..e0d2b5b850 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:fcb3a65be4e0c52006b323980ca703dd54c2701e014e37bc8556def441265639 -size 3338892 +oid sha256:f3a4f56fbade49619dbe80b4165ca0b5276be3abe398581b1e98e1bc18c1d782 +size 3341723 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 224b6f3c0a..e069d222c0 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:e3a375679c9eb7f76dde4463e5fd631d66aeb96ef614d9138be80cb9cd4d9759 -size 845992 +oid sha256:087302c9d88acc67b3d718b2d603fe36c74b57642f68a52aecf5ec348be61ad5 +size 862321 diff --git a/lib/search/indexes/github-docs-ghec-ja.json.br b/lib/search/indexes/github-docs-ghec-ja.json.br index aee8757961..a21744b02a 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:f151b6e2629c39cc2448becee4409bb8b6211933ebe37a9a0252caf0c22f172d -size 4501553 +oid sha256:3f09439beb9144b2c93b3ae2d81f25aab7265a219ffc49e373278c51773f69d8 +size 4619223 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 670bc8e0c0..6fb47e7674 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:4a6226ab00debd80ae8d6297d4a8c596bf9c9f70f4cd52c9eb2338ccacc76871 -size 776866 +oid sha256:817638d669c108bbbdb9b814f3bf8d83e72358e43833ee47e95d50a97c638059 +size 778706 diff --git a/lib/search/indexes/github-docs-ghec-pt.json.br b/lib/search/indexes/github-docs-ghec-pt.json.br index 9228cdb7e2..4858c9e520 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:6a40a3f121297d5ebdb768576caab6b3a907216fcfe2702d98f384f902d490f2 -size 3171254 +oid sha256:8c0b089a8fc4a93c67b129f9a7d87b1b626aa77c0015f95df0f2b1e8c542f7c3 +size 3178688 diff --git a/middleware/handle-errors.js b/middleware/handle-errors.js index a6fbc6f2c5..e6fd42e904 100644 --- a/middleware/handle-errors.js +++ b/middleware/handle-errors.js @@ -1,5 +1,4 @@ import FailBot from '../lib/failbot.js' -import loadSiteData from '../lib/site-data.js' import { nextApp } from './next.js' function shouldLogException(error) { @@ -33,7 +32,10 @@ export default async function handleError(error, req, res, next) { // anywhere. So this is why we log it additionally. // Note, not using console.error() because it's arguably handled. // Some tests might actually expect a 500 error. - if (process.env.NODE_ENV === 'test') { + if ( + process.env.NODE_ENV === 'test' && + !(req.path.startsWith('/assets') || req.path.startsWith('/_next/static')) + ) { console.warn('An error occurrred in some middleware handler', error) } @@ -47,14 +49,11 @@ export default async function handleError(error, req, res, next) { return next(error) } - // if the error is thrown before req.context is created (say, in the Page class), - // set req.context.site here so we can pass data/ui.yml text to the 500 layout if (!req.context) { - const site = await loadSiteData() - req.context = { site: site[req.language || 'en'].site } + req.context = {} } // display error on the page in development and staging, but not in production - if (req.context && process.env.HEROKU_PRODUCTION_APP !== 'true') { + if (process.env.HEROKU_PRODUCTION_APP !== 'true') { req.context.error = error } diff --git a/middleware/index.js b/middleware/index.js index 4a3951c374..82e9c200b0 100644 --- a/middleware/index.js +++ b/middleware/index.js @@ -1,3 +1,6 @@ +import fs from 'fs' +import path from 'path' + import express from 'express' import instrument from '../lib/instrument-middleware.js' import haltOnDroppedConnection from './halt-on-dropped-connection.js' @@ -138,6 +141,11 @@ export default function (app) { // Can be aggressive because images inside the content get unique // URLs with a cache busting prefix. maxAge: '7 days', + immutable: process.env.NODE_ENV !== 'development', + // This means, that if you request a file that starts with /assets/ + // any file doesn't exist, don't bother (NextJS) rendering a + // pretty HTML error page. + fallthrough: false, }) ) app.use( @@ -146,9 +154,33 @@ export default function (app) { index: false, etag: false, maxAge: '7 days', // A bit longer since releases are more sparse + // See note about about use of 'fallthrough' + fallthrough: false, }) ) + // In development, let NextJS on-the-fly serve the static assets. + // But in production, don't let NextJS handle any static assets + // because they are costly to generate (the 404 HTML page) + // and it also means that a CSRF cookie has to be generated. + if (process.env.NODE_ENV !== 'development') { + const assetDir = path.join('.next', 'static') + if (!fs.existsSync(assetDir)) + throw new Error(`${assetDir} directory has not been generated. Run 'npm run build' first.`) + + app.use( + '/_next/static/', + express.static(assetDir, { + index: false, + etag: false, + maxAge: '365 days', + immutable: true, + // See note about about use of 'fallthrough' + fallthrough: false, + }) + ) + } + // *** Early exits *** // Don't use the proxy's IP, use the requester's for rate limiting // See https://expressjs.com/en/guide/behind-proxies.html diff --git a/package-lock.json b/package-lock.json index 7f02ab473f..979de9c3bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -172,7 +172,6 @@ }, "optionalDependencies": { "bottleneck": "^2.19.5", - "csv-parse": "^4.16.3", "esm": "^3.2.25", "image-size": "^1.0.0", "jest-puppeteer": "^5.0.4", @@ -7531,12 +7530,6 @@ "node": ">= 0.8.0" } }, - "node_modules/csv-parse": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.3.tgz", - "integrity": "sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==", - "optional": true - }, "node_modules/cwd": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz", @@ -28449,12 +28442,6 @@ "http-errors": "~1.7.3" } }, - "csv-parse": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.3.tgz", - "integrity": "sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==", - "optional": true - }, "cwd": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz", diff --git a/package.json b/package.json index 3bb926b7f4..76b8d417d6 100644 --- a/package.json +++ b/package.json @@ -177,7 +177,6 @@ "name": "docs.github.com", "optionalDependencies": { "bottleneck": "^2.19.5", - "csv-parse": "^4.16.3", "esm": "^3.2.25", "image-size": "^1.0.0", "jest-puppeteer": "^5.0.4", diff --git a/script/content-migrations/update-short-titles-from-csv.js b/script/content-migrations/update-short-titles-from-csv.js deleted file mode 100755 index 8fe838acc5..0000000000 --- a/script/content-migrations/update-short-titles-from-csv.js +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env node -import fs from 'fs/promises' -import path from 'path' -import { exit } from 'process' - -import csv from 'csv-parse' -// NOTE: If you get this error: -// -// Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'csv-parse' ... -// -// it's because you haven't installed all the *optional* dependencies. -// To do that, run: -// -// npm install --include=optional -// -import readFrontmatter from '../../lib/read-frontmatter.js' - -main() - -async function main() { - let fileCounter = 0 - let csvHeader = [] - const csvFileName = 'shortTitles.csv' - const filePath = path.join(process.cwd(), csvFileName) - const reader = fs.createReadStream(filePath) - - // Parse each row of the csv - reader - .pipe(csv()) - .on('data', (csvData) => { - if (csvHeader.length === 0) { - csvHeader = verifyHeader(csvData) - } else { - if (csvData[3] && csvData[4]) { - updateFrontmatter(csvData) - fileCounter++ - } - } - }) - .on('end', () => { - console.log( - `⭐ Completed updating the shortTitle frontmatter.\nUpdated ${fileCounter} files.` - ) - }) -} - -async function updateFrontmatter(csvData) { - const filePath = path.join(process.cwd(), csvData[4]) - const fileContent = await fs.readFile(filePath, 'utf8') - const { content, data } = readFrontmatter(fileContent) - data.shortTitle = csvData[3] - const newContents = readFrontmatter.stringify(content, data, { lineWidth: 10000 }) - await fs.writeFile(filePath, newContents) -} - -// Ensure the columns being read out are in the location expected -async function verifyHeader(csvData) { - const csvHeader = [] - - csvData.forEach((element) => { - csvHeader.push(element) - }) - - if (csvHeader[3] !== 'Short title') { - console.log( - `The CSV headers are malformed. Expected to see column 3 contain the header 'Short title'` - ) - exit(1) - } - if (csvHeader[4] !== 'Relative path') { - console.log( - `The CSV headers are malformed. Expected to see column 4 contain the header 'Relative path'` - ) - exit(1) - } - - return csvHeader -} diff --git a/tests/rendering/breadcrumbs.js b/tests/rendering/breadcrumbs.js index 1f8da57935..9f1680fd9a 100644 --- a/tests/rendering/breadcrumbs.js +++ b/tests/rendering/breadcrumbs.js @@ -1,6 +1,7 @@ import { getDOM, getJSON } from '../helpers/supertest.js' import { jest } from '@jest/globals' +// TODO: Use `describeViaActionsOnly` instead. See tests/rendering/server.js const describeInternalOnly = process.env.GITHUB_REPOSITORY === 'github/docs-internal' ? describe : describe.skip // Breadcrumbs were moved to the Header and in the Menu for mobile, so there are now double the Breadcrumbs diff --git a/tests/rendering/static-assets.js b/tests/rendering/static-assets.js new file mode 100644 index 0000000000..5a176a6890 --- /dev/null +++ b/tests/rendering/static-assets.js @@ -0,0 +1,66 @@ +import fs from 'fs' +import path from 'path' + +import { expect } from '@jest/globals' + +import { SURROGATE_ENUMS } from '../../middleware/set-fastly-surrogate-key.js' +import { get } from '../helpers/supertest.js' + +function getNextStaticAsset(directory) { + const root = path.join('.next', 'static', directory) + const files = fs.readdirSync(root) + if (!files.length) throw new Error(`Can't find any files in ${root}`) + return path.join(root, files[0]) +} + +function checkCachingHeaders(res, defaultSurrogateKey = false) { + expect(res.headers['set-cookie']).toBeUndefined() + expect(res.headers['cache-control']).toContain('public') + const maxAgeSeconds = parseInt(res.header['cache-control'].match(/max-age=(\d+)/)[1], 10) + // Let's not be too specific in the tests, just as long as it's testing + // that it's a reasonably large number of seconds. + expect(maxAgeSeconds).toBeGreaterThanOrEqual(60 * 60) + // Because it doesn't have have a unique URL + expect(res.headers['surrogate-key']).toBe( + defaultSurrogateKey ? SURROGATE_ENUMS.DEFAULT : SURROGATE_ENUMS.MANUAL + ) +} +describe('static assets', () => { + it('should serve /assets/cb-* with optimal headers', async () => { + const res = await get('/assets/cb-1234/images/site/logo.png') + expect(res.statusCode).toBe(200) + checkCachingHeaders(res) + }) + + it('should serve /assets/ with optimal headers', async () => { + const res = await get('/assets/images/site/logo.png') + expect(res.statusCode).toBe(200) + checkCachingHeaders(res, true) + }) + + it('should serve /_next/static/ with optimal headers', async () => { + // This picks the first one found. We just need it to be anything + // that actually resolves. + const filePath = getNextStaticAsset('css') + const asURL = '/' + filePath.replace('.next', '_next').split(path.sep).join('/') + const res = await get(asURL) + expect(res.statusCode).toBe(200) + checkCachingHeaders(res) + }) + + it('should 404 on /assets/cb-* with plain text', async () => { + const res = await get('/assets/cb-1234/never/heard/of.png') + expect(res.statusCode).toBe(404) + expect(res.header['content-type']).toContain('text/plain') + }) + it('should 404 on /assets/ with plain text', async () => { + const res = await get('/assets/never/heard/of.png') + expect(res.statusCode).toBe(404) + expect(res.header['content-type']).toContain('text/plain') + }) + it('should 404 on /_next/static/ with plain text', async () => { + const res = await get('/_next/static/never/heard/of.css') + expect(res.statusCode).toBe(404) + expect(res.header['content-type']).toContain('text/plain') + }) +}) diff --git a/translations/ja-JP/content/actions/learn-github-actions/expressions.md b/translations/ja-JP/content/actions/learn-github-actions/expressions.md index af3deef92d..f014d3147a 100644 --- a/translations/ja-JP/content/actions/learn-github-actions/expressions.md +++ b/translations/ja-JP/content/actions/learn-github-actions/expressions.md @@ -50,12 +50,12 @@ env: 式の一部として、`boolean`、`null`、`number`、または`string`のデータ型を使用できます。 -| データ型 | リテラル値 | -| --------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `boolean` | `true` または `false` | -| `null` | `null` | -| `number` | JSONでサポートされている任意の数値書式。 | -| `string` | You don't need to enclose strings in {% raw %}${{{% endraw %} and {% raw %}}}{% endraw %}. However, if you do, you must use single quotes around the string and escape literal single quotes with an additional single quote. | +| データ型 | リテラル値 | +| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `boolean` | `true` または `false` | +| `null` | `null` | +| `number` | JSONでサポートされている任意の数値書式。 | +| `string` | You don't need to enclose strings in `{% raw %}${{{% endraw %}` and `{% raw %}}}{% endraw %}`. However, if you do, you must use single quotes (`'`) around the string. To use a literal single quote, escape the literal single quote using an additional single quote (`''`). Wrapping with double quotes (`"`) will throw an error. | #### サンプル diff --git a/translations/ja-JP/content/actions/using-workflows/events-that-trigger-workflows.md b/translations/ja-JP/content/actions/using-workflows/events-that-trigger-workflows.md index 53797cc901..2b9b9f0cfe 100644 --- a/translations/ja-JP/content/actions/using-workflows/events-that-trigger-workflows.md +++ b/translations/ja-JP/content/actions/using-workflows/events-that-trigger-workflows.md @@ -917,8 +917,6 @@ on: ```yaml on: push: - types: - - opened branches: - 'releases/**' paths: @@ -960,8 +958,6 @@ on: ```yaml on: push: - types: - - opened branches: - 'releases/**' paths: @@ -996,9 +992,9 @@ on: ### `リリース` -| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | -| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ | ------------ | -| [`リリース`](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads/#release) | - `published`
- `unpublished`
- `created`
- `edited`
- `deleted`
- `prereleased`
- `released` | リリースのタグが付いた直近のコミット | リリースのタグ | +| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | +| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ | ----------------------------------------------- | +| [`リリース`](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads/#release) | - `published`
- `unpublished`
- `created`
- `edited`
- `deleted`
- `prereleased`
- `released` | リリースのタグが付いた直近のコミット | Tag ref of release `refs/tags/` | {% note %} diff --git a/translations/ja-JP/content/actions/using-workflows/workflow-syntax-for-github-actions.md b/translations/ja-JP/content/actions/using-workflows/workflow-syntax-for-github-actions.md index 54f330213b..e47d9c88ba 100644 --- a/translations/ja-JP/content/actions/using-workflows/workflow-syntax-for-github-actions.md +++ b/translations/ja-JP/content/actions/using-workflows/workflow-syntax-for-github-actions.md @@ -830,7 +830,7 @@ services: image: ghcr.io/owner/myservice1 credentials: username: ${{ github.actor }} - password: ${{ secrets.ghcr_token }} + password: ${{ secrets.github_token }} myservice2: image: dockerhub_org/myservice2 credentials: diff --git a/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/differences-between-clustering-and-high-availability-ha.md b/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/differences-between-clustering-and-high-availability-ha.md index f0c603431c..872ff199c7 100644 --- a/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/differences-between-clustering-and-high-availability-ha.md +++ b/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/differences-between-clustering-and-high-availability-ha.md @@ -35,7 +35,7 @@ High Availability (HA) とクラスタリングはどちらも、障害の原因 ## バックアップとシステム災害復旧 -HAもクラスタリングも、定期的なバックアップに代わるものと考えるべきではありません。 詳しくは、"[ アプライアンスでのバックアップの設定](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)。"を参照してください。 +Neither HA nor Clustering should be considered a replacement for regular backups. 詳しくは、"[ アプライアンスでのバックアップの設定](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)。"を参照してください。 ## モニタリング diff --git a/translations/ja-JP/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md b/translations/ja-JP/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md index 29f7fa70f6..70e03b1efa 100644 --- a/translations/ja-JP/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md +++ b/translations/ja-JP/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md @@ -20,7 +20,10 @@ shortTitle: Recover an account with 2FA {% warning %} -**警告**: {% data reusables.two_fa.support-may-not-help %} +**警告**: + +- {% data reusables.two_fa.support-may-not-help %} +- {% data reusables.accounts.you-must-know-your-password %} {% endwarning %} @@ -28,12 +31,21 @@ shortTitle: Recover an account with 2FA ## 2 要素認証リカバリコードを使用する -リカバリコードのうち 1 つを使用して、アカウントへのエントリを自動で再取得します。 リカバリコード は、多くの場合、パスワードマネージャまたはご使用のコンピュータのダウンロードフォルダに保存されています。 リカバリコードのデフォルトのファイル名は `github-recovery-codes.txt` です。 リカバリコードの詳しい情報については「[2 要素認証リカバリ方法を設定する](/articles/configuring-two-factor-authentication-recovery-methods#downloading-your-two-factor-authentication-recovery-codes)」を参照してください。 +リカバリコードのうち 1 つを使用して、アカウントへのエントリを自動で再取得します。 リカバリコード は、多くの場合、パスワードマネージャまたはご使用のコンピュータのダウンロードフォルダに保存されています。 リカバリコードのデフォルトのファイル名は `github-recovery-codes.txt` です。 リカバリコードの詳しい情報については「[2 要素認証リカバリ方法を設定する](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods#downloading-your-two-factor-authentication-recovery-codes)」を参照してください。 -{% data reusables.two_fa.username-password %}{% ifversion fpt or ghec %} -2. [Having Problems?] の下で、[**Enter a two-factor recovery code**] をクリックします。 ![Link to use a recovery code](/assets/images/help/2fa/2fa-recovery-code-link.png){% else %} -2. [2FA] ページで、[Don't have your phone?] の下にある [**Enter a two-factor recovery code**] をクリックします。 ![Link to use a recovery code](/assets/images/help/2fa/2fa_recovery_dialog_box.png){% endif %} -3. リカバリコードを 1 つ入力して、[**Verify**] をクリックします。 ![リカバリコードを入力するフィールドおよび [Verify] ボタン](/assets/images/help/2fa/2fa-type-verify-recovery-code.png) +{% data reusables.two_fa.username-password %} + +{% ifversion fpt or ghec %} +1. Under "Having problems?", click **Use a recovery code or request a reset**. + + ![Screenshot of link to use a recovery code](/assets/images/help/2fa/2fa-recovery-code-link.png) +{%- else %} +1. [2FA] ページで、[Don't have your phone?] の下にある [**Enter a two-factor recovery code**] をクリックします。 + + ![Screenshot of link to use a recovery code](/assets/images/help/2fa/2fa_recovery_dialog_box.png){% endif %} +1. リカバリコードを 1 つ入力して、[**Verify**] をクリックします。 + + ![リカバリコードを入力するフィールドおよび [Verify] ボタン](/assets/images/help/2fa/2fa-type-verify-recovery-code.png) {% ifversion fpt or ghec %} ## フォールバック番号による認証 @@ -43,38 +55,52 @@ shortTitle: Recover an account with 2FA ## セキュリティキーによる認証 -セキュリティキーを使用して 2 要素認証を設定した場合は、セキュリティキーをセカンダリ認証方式として使用すると、アカウントへのアクセスを自動で再取得できます。 詳しい情報については、「[2 要素認証を設定する](/articles/configuring-two-factor-authentication#configuring-two-factor-authentication-using-a-security-key)」を参照してください。 +セキュリティキーを使用して 2 要素認証を設定した場合は、セキュリティキーをセカンダリ認証方式として使用すると、アカウントへのアクセスを自動で再取得できます。 詳しい情報については、「[2 要素認証を設定する](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication#configuring-two-factor-authentication-using-a-security-key)」を参照してください。 {% ifversion fpt or ghec %} ## 検証済みのデバイス、SSHトークン、または個人アクセストークンを使用した認証 -If you know your {% data variables.product.product_name %} password but don't have the two-factor authentication credentials or your two-factor authentication recovery codes, you can have a one-time password sent to your verified email address to begin the verification process and regain access to your account. +If you know your password for {% data variables.product.product_location %} but don't have the two-factor authentication credentials or your two-factor authentication recovery codes, you can have a one-time password sent to your verified email address to begin the verification process and regain access to your account. {% note %} -**注釈**: セキュリティ上の理由から、ワンタイムパスワードで認証してアカウントへのアクセスを回復するには、3〜5 営業日かかる場合があります。 この間に送信された追加のリクエストはレビューされません。 +**注釈**: セキュリティ上の理由から、ワンタイムパスワードで認証してアカウントへのアクセスを回復するには、1〜3 営業日かかる場合があります。 {% data variables.product.company_short %} will not review additional requests submitted during this time. {% endnote %} 2要素認証の認証情報または 2 要素認証のリカバリコードを使用して、3〜5 日間の待機期間中にいつでもアカウントへのアクセスを回復できます。 -1. 認証を求めるためにユーザ名とパスワードを入力してください。 If you do not know your {% data variables.product.product_name %} password, you will not be able to generate a one-time password. -2. [Having Problems?] の下で、[**Can't access your two factor device or valid recovery codes?**] をクリックします。 ![2fa デバイスまたはリカバリコードがない場合のリンク](/assets/images/help/2fa/no-access-link.png) -3. [**I understand, get started**] をクリックして、認証設定のリセットをリクエストします。 ![認証設定のリセットボタン](/assets/images/help/2fa/reset-auth-settings.png) -4. [**Send one-time password**] をクリックして、アカウントに関連付けられているすべてのメールアドレスにワンタイムパスワードを送信します。 ![ワンタイムパスワードの送信ボタン](/assets/images/help/2fa/send-one-time-password.png) -5. Under "One-time password", type the temporary password from the recovery email {% data variables.product.prodname_dotcom %} sent. ![ワンタイムパスワードフィールド](/assets/images/help/2fa/one-time-password-field.png) -6. [**Verify email address**] をクリックします。 -7. 別の検証要素を選択します。 +1. 認証を求めるためにユーザ名とパスワードを入力してください。 + + {% warning %} + + **Warning**: {% data reusables.accounts.you-must-know-your-password %} + + {% endwarning %} +1. Under "Having problems?", click **Use a recovery code or request a reset**. + + ![Screenshot of link if you don't have your 2fa device or recovery codes](/assets/images/help/2fa/no-access-link.png) +1. To the right of "Locked out?", click **Try recovering your account**. + + ![Screenshot of link to try recovering your account](/assets/images/help/2fa/try-recovering-your-account-link.png) +1. [**I understand, get started**] をクリックして、認証設定のリセットをリクエストします。 + + ![Screenshot of button to start reset of authentication settings](/assets/images/help/2fa/reset-auth-settings.png) +1. Click **Send one-time password** to send a one-time password to all eligible addresses associated with your account. Only verified emails are eligible for account recovery. If you've restricted password resets to your primary and/or backup addresses, these addresses are the only addresses eligible for account recovery. + + ![Screenshot of button to send one-time password](/assets/images/help/2fa/send-one-time-password.png) +1. Under "One-time password", type the temporary password from the recovery email {% data variables.product.prodname_dotcom %} sent. + + ![Screenshot of field to type one-time password](/assets/images/help/2fa/one-time-password-field.png) +1. [**Verify email address**] をクリックします。 + + ![Screenshot of button to verify email address](/assets/images/help/2fa/verify-email-address.png) +1. 別の検証要素を選択します。 - 以前に現在のデバイスを使用してこのアカウントにログインしたことがあり、検証にそのデバイスを使用する場合は、[**Verify with this device**] をクリックします。 - - 以前にこのアカウントで SSH キーを設定しており、検証にその SSH キーを使用する場合は、[** SSH key**] をクリックします。 - - 以前に個人アクセストークンを設定しており、検証にその個人アクセストークンを使用する場合は、[**Personal access token**] をクリックします。 ![代替検証ボタン](/assets/images/help/2fa/alt-verifications.png) -8. {% data variables.contact.github_support %}のメンバーがリクエストをレビューし、3〜5 営業日以内にメールでお知らせします。 リクエストが承認されると、アカウントリカバリプロセスを完了するためのリンクが送信されます。 リクエストが拒否された場合、追加の質問がある場合のサポートへの問い合わせ方法がメールに記載されます。 + - If you've previously set up an SSH key on this account and would like to use the SSH key for verification, click **SSH key**. + - If you've previously set up a personal access token and would like to use the personal access token for verification, click **Personal access token**. + + ![Screenshot of buttons for alternative verification](/assets/images/help/2fa/alt-verifications.png) +1. {% data variables.contact.github_support %}のメンバーがリクエストをレビューし、1〜3 営業日以内にメールでお知らせします。 リクエストが承認されると、アカウントリカバリプロセスを完了するためのリンクが送信されます。 リクエストが拒否された場合、追加の質問がある場合のサポートへの問い合わせ方法がメールに記載されます。 {% endif %} - -## 参考リンク - -- [2 要素認証について](/articles/about-two-factor-authentication) -- [2 要素認証の設定](/articles/configuring-two-factor-authentication) -- [2 要素認証のリカバリ方法の設定](/articles/configuring-two-factor-authentication-recovery-methods) -- [2 要素認証を使用して {% data variables.product.prodname_dotcom %} にアクセスする](/articles/accessing-github-using-two-factor-authentication) diff --git a/translations/ja-JP/content/code-security/getting-started/github-security-features.md b/translations/ja-JP/content/code-security/getting-started/github-security-features.md index 20286894cf..cb381c3d6c 100644 --- a/translations/ja-JP/content/code-security/getting-started/github-security-features.md +++ b/translations/ja-JP/content/code-security/getting-started/github-security-features.md @@ -83,6 +83,12 @@ Automatically detect tokens or credentials that have been checked into a reposit Pull Requestをマージする前に、依存関係に対する変更の影響を詳細に示し、脆弱なバージョンがあればその詳細を確認できます。 詳しい情報については「[依存関係のレビュー](/code-security/supply-chain-security/about-dependency-review)」を参照してください。 {% endif %} +{% ifversion ghec or ghes > 3.1 %} +### セキュリティの概要 + +Review the security configuration and alerts for your organization and identify the repositories at greatest risk. For more information, see "[About the security overview](/code-security/security-overview/about-the-security-overview)." +{% endif %} + ## 参考リンク - "[{% data variables.product.prodname_dotcom %}の製品](/github/getting-started-with-github/githubs-products)" - 「[{% data variables.product.prodname_dotcom %}言語サポート](/github/getting-started-with-github/github-language-support)」 diff --git a/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/managing-project-boards/closing-a-project-board.md b/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/managing-project-boards/closing-a-project-board.md index 7f2a1cc9fa..8b1419f01e 100644 --- a/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/managing-project-boards/closing-a-project-board.md +++ b/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/managing-project-boards/closing-a-project-board.md @@ -21,7 +21,7 @@ topics: プロジェクトボードを再びオープンする場合、自動化を*同期*するよう設定することができます。それにより、ボードに設定されている自動化設定に従ってボード上のカードのポジションが更新されます。 詳しい情報については、「[クローズされたプロジェクトボードを再びオープンする](/articles/reopening-a-closed-project-board)」や「[プロジェクトボードの自動化について](/articles/about-automation-for-project-boards)」を参照してください。 -1. Navigate to the list of project boards in your repository or organization, or owned by your user account. +1. リポジトリまたは Organization中にある、あるいはあなたのユーザアカウントが所有するプロジェクトボードの一覧に移動します。 2. プロジェクトリストで、クローズしたいプロジェクトボードの隣にある {% octicon "chevron-down" aria-label="The chevron icon" %}をクリックします。 ![プロジェクトボードの名前の右にある、V 字型のアイコン](/assets/images/help/projects/project-list-action-chevron.png) 3. [**Close**] をクリックします。 ![プロジェクトボードのドロップダウンメニューにある [Close] アイテム](/assets/images/help/projects/close-project.png) diff --git a/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/managing-project-boards/reopening-a-closed-project-board.md b/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/managing-project-boards/reopening-a-closed-project-board.md index 732a02e29d..852951aca0 100644 --- a/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/managing-project-boards/reopening-a-closed-project-board.md +++ b/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/managing-project-boards/reopening-a-closed-project-board.md @@ -1,6 +1,6 @@ --- title: クローズされたプロジェクトボードを再びオープンする -intro: You can reopen a closed project board and restart any workflow automation that was configured for the project board. +intro: クローズされたプロジェクトボードを再びオープンして、プロジェクトボードに設定されているワークフローの自動化を再開できます。 redirect_from: - /github/managing-your-work-on-github/managing-project-boards/reopening-a-closed-project-board - /articles/reopening-a-closed-project-board diff --git a/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/archiving-cards-on-a-project-board.md b/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/archiving-cards-on-a-project-board.md index ffcfc22e6f..e0091d01e0 100644 --- a/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/archiving-cards-on-a-project-board.md +++ b/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/archiving-cards-on-a-project-board.md @@ -21,7 +21,7 @@ shortTitle: ボード上のカードのアーカイブ ## プロジェクトボード上のカードのアーカイブ -1. In a project board, find the card you want to archive, then click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}. ![プロジェクトボードカードの編集オプションのリスト](/assets/images/help/projects/select-archiving-options-project-board-card.png) +1. プロジェクトボードで、アーカイブしたいカードを見つけて {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} をクリックします。 ![プロジェクトボードカードの編集オプションのリスト](/assets/images/help/projects/select-archiving-options-project-board-card.png) 2. [**Archive**] をクリックします。 ![メニューからのアーカイブオプションの選択](/assets/images/help/projects/archive-project-board-card.png) ## サイドバーからのプロジェクトボード上のカードのリストア diff --git a/translations/ja-JP/content/issues/tracking-your-work-with-issues/about-issues.md b/translations/ja-JP/content/issues/tracking-your-work-with-issues/about-issues.md index 6d3e4db01e..2eda1a1f87 100644 --- a/translations/ja-JP/content/issues/tracking-your-work-with-issues/about-issues.md +++ b/translations/ja-JP/content/issues/tracking-your-work-with-issues/about-issues.md @@ -49,7 +49,7 @@ Issueの最新のコメントの情報を得ておきたい場合には、Issue ## Issueとディスカッションの比較 -Some conversations are more suitable for {% data variables.product.prodname_discussions %}. {% data reusables.discussions.you-can-use-discussions %} Issueあるいはディスカッションを使う場合のガイダンスについては「[GitHubでのコミュニケーション](/github/getting-started-with-github/quickstart/communicating-on-github)」を参照してください。 +会話の中には、{% data variables.product.prodname_discussions %}に適しているものもあります。 {% data reusables.discussions.you-can-use-discussions %} Issueあるいはディスカッションを使う場合のガイダンスについては「[GitHubでのコミュニケーション](/github/getting-started-with-github/quickstart/communicating-on-github)」を参照してください。 Issue内での会話にディスカッションの方が適している場合は、Issueをディスカッションに変換できます。 {% endif %} diff --git a/translations/ja-JP/content/issues/tracking-your-work-with-issues/about-task-lists.md b/translations/ja-JP/content/issues/tracking-your-work-with-issues/about-task-lists.md index 56955693ee..96feb7ad51 100644 --- a/translations/ja-JP/content/issues/tracking-your-work-with-issues/about-task-lists.md +++ b/translations/ja-JP/content/issues/tracking-your-work-with-issues/about-task-lists.md @@ -53,7 +53,7 @@ topics: {% tip %} -**Tip:** You cannot create task list items within closed issues or issues with linked pull requests. +**参考:** クローズされたIssueや、リンクされたPull Requestを持つIssue内では、タスクリストのアイテムを作成することはできません。 {% endtip %} @@ -76,5 +76,5 @@ topics: ## 参考リンク -* "[Basic writing and formatting syntax](/articles/basic-writing-and-formatting-syntax)"{% if code-scanning-task-lists %} -* "[Tracking {% data variables.product.prodname_code_scanning %} alerts in issues using task lists](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/tracking-code-scanning-alerts-in-issues-using-task-lists)"{% endif %} +* 「[基本的な執筆とフォーマットの構文](/articles/basic-writing-and-formatting-syntax)」{% if code-scanning-task-lists %} +* 「タスクリストを使ったIssue内の[{% data variables.product.prodname_code_scanning %} アラートの追跡](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/tracking-code-scanning-alerts-in-issues-using-task-lists)」{% endif %} diff --git a/translations/ja-JP/content/issues/tracking-your-work-with-issues/creating-an-issue.md b/translations/ja-JP/content/issues/tracking-your-work-with-issues/creating-an-issue.md index cb8a2f6192..975595ca7d 100644 --- a/translations/ja-JP/content/issues/tracking-your-work-with-issues/creating-an-issue.md +++ b/translations/ja-JP/content/issues/tracking-your-work-with-issues/creating-an-issue.md @@ -45,17 +45,17 @@ Issue は、バグ、拡張、その他リクエストの追跡に使用でき {% data reusables.repositories.assign-an-issue-as-project-maintainer %} {% data reusables.repositories.submit-new-issue %} -## Creating an issue with {% data variables.product.prodname_cli %} +## {% data variables.product.prodname_cli %}でのIssueの作成 -{% data reusables.cli.about-cli %} To learn more about {% data variables.product.prodname_cli %}, see "[About {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)." +{% data reusables.cli.about-cli %} {% data variables.product.prodname_cli %}について学ぶには、「[{% data variables.product.prodname_cli %}について](/github-cli/github-cli/about-github-cli)」を参照してください。 -To create an issue, use the `gh issue create` subcommand. To skip the interactive prompts, include the `--body` and the `--title` flags. +Issueを作成するには、`gh issue create`サブコマンドを使ってください。 対話的なプロンプトをスキップするには、`--body`及び`--title`フラグを含めてください。 ```shell gh issue create --title "My new issue" --body "Here are more details." ``` -You can also specify assignees, labels, milestones, and projects. +アサインされる人、ラベル、マイルストーン、プロジェクトを指定することもできます。 ```shell gh issue create --title "My new issue" --body "Here are more details." --assignee @me,monalisa --label "bug,help wanted" --project onboarding --milestone "learning codebase" @@ -83,7 +83,7 @@ IssueもしくはPull Requestのコメントから、新しいIssueをオープ {% data reusables.repositories.navigate-to-repo %} 1. Issue で参照したいコードを探します。 - ファイルのコードに関する Issue を開くには、そのファイルに移動します。 - - プルリクエストのコードに関する Issue を開くには、そのプルリクエストに移動し、{% octicon "diff" aria-label="The file diff icon" %}[**Files changed**] をクリックします。 Then, browse to the file that contains the code you want included in your comment, and click **View**. + - プルリクエストのコードに関する Issue を開くには、そのプルリクエストに移動し、{% octicon "diff" aria-label="The file diff icon" %}[**Files changed**] をクリックします。 そして、コメントに含めたいコードを持つファイルを探し、** View（ビュー）**をクリックしてください。 {% data reusables.repositories.choose-line-or-range %} 4. コード範囲の左で、{% octicon "kebab-horizontal" aria-label="The horizontal kebab octicon" %} をクリックします。 ドロップダウンメニューで、[**Reference in new issue**] をクリックします。 ![選択した行から新しいIssueを開くオプションのある三点メニュー](/assets/images/help/repository/open-new-issue-specific-line.png) {% data reusables.repositories.type-issue-title-and-description %} @@ -92,15 +92,15 @@ IssueもしくはPull Requestのコメントから、新しいIssueをオープ {% ifversion fpt or ghec %} -## Creating an issue from discussion +## ディスカッションからのIssueの作成 -People with triage permission to a repository can create an issue from a discussion. +リポジトリへのTriage権限を持つユーザは、ディスカッションからIssueを作成できます。 -When you create an issue from a discussion, the contents of the discussion post will be automatically included in the issue body, and any labels will be retained. Creating an issue from a discussion does not convert the discussion to an issue or delete the existing discussion. For more information about {% data variables.product.prodname_discussions %}, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)." +ディスカッションからIssueを作成する場合、ディスカッションの投稿の内容は自動的にIssueの本文に含められ、ラベルがあればそのまま残されます。 ディスカッションからIssueを作成しても、そのディスカッションがIssueに変換されたり、既存のディスカッションが削除されたりすることはありません。 {% data variables.product.prodname_discussions %}に関する詳しい情報については、「[ディスカッションについて](/discussions/collaborating-with-your-community-using-discussions/about-discussions)」を参照してください。 {% data reusables.discussions.discussions-tab %} {% data reusables.discussions.click-discussion-in-list %} -1. In the right sidebar, click {% octicon "issue-opened" aria-label="The issues icon" %} **Create issue from discussion**. ![Button to create issue from discussion](/assets/images/help/discussions/create-issue-from-discussion.jpg) +1. 右のサイドバーで、{% octicon "issue-opened" aria-label="The issues icon" %} **Create issue from discussion（ディスカッションからIssueを作成）**をクリックします。 ![Button to create issue from discussion](/assets/images/help/discussions/create-issue-from-discussion.jpg) {% data reusables.repositories.type-issue-title-and-description %} {% data reusables.repositories.assign-an-issue-as-project-maintainer %} {% data reusables.repositories.submit-new-issue %} @@ -129,7 +129,7 @@ Issueをオープンするのにクエリパラメータを利用できます。 {% endtip %} -クエリパラメータを使うには、同等のアクションを行うための適切な権限を持っていなければなりません。 たとえばクエリパラメータの`labels`を使うには、Issueにラベルを追加する権限を持っていなければなりません。 For more information, see "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)." +クエリパラメータを使うには、同等のアクションを行うための適切な権限を持っていなければなりません。 たとえばクエリパラメータの`labels`を使うには、Issueにラベルを追加する権限を持っていなければなりません。 詳しい情報については「[Organizationのためのリポジトリロール](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)」を参照してください。 クエリパラメータを使うのに不正なURLを作成したり、適切な権限を持っていなかったりした場合には、そのURLに対して`404 Not Found`エラーページが返されます。 サーバーの限度を超えるURLを作成すると、そのURLは`414 URI Too Long`エラーページを返します。 diff --git a/translations/ja-JP/content/rest/reference/enterprise-admin.md b/translations/ja-JP/content/rest/reference/enterprise-admin.md index d903396303..006d78ee79 100644 --- a/translations/ja-JP/content/rest/reference/enterprise-admin.md +++ b/translations/ja-JP/content/rest/reference/enterprise-admin.md @@ -68,7 +68,7 @@ You can also read the current version by calling the [meta endpoint](/rest/refer {% endif %} -{% ifversion fpt or ghec or ghes > 3.2 %} +{% ifversion fpt or ghec or ghes > 3.2 or ghae-issue-5528 %} ## Audit log diff --git a/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md b/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md index fca0ead997..4fdd204aef 100644 --- a/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md +++ b/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md @@ -921,6 +921,9 @@ _Team_ {% ifversion fpt or ghes > 3.0 or ghae -%} - [`GET /repos/:owner/:repo/code-scanning/sarifs/:sarif_id`](/rest/reference/code-scanning#get-information-about-a-sarif-upload) (:read) {% endif -%} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5435 -%} +- [`GET /orgs/:org/code-scanning/alerts`](/rest/reference/code-scanning#list-code-scanning-alerts-by-organization) (:read) +{% endif -%} {% ifversion fpt or ghes or ghec %} ### "self-hosted runners"に対する権限 diff --git a/translations/ja-JP/data/reusables/accounts/you-must-know-your-password.md b/translations/ja-JP/data/reusables/accounts/you-must-know-your-password.md new file mode 100644 index 0000000000..f4795c3909 --- /dev/null +++ b/translations/ja-JP/data/reusables/accounts/you-must-know-your-password.md @@ -0,0 +1 @@ +If you protect your personal account with two-factor authentication but do not know your password, you will not be able to generate a one-time password to recover your account. {% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see "[Updating your {% data variables.product.prodname_dotcom %} access credentials](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password)." diff --git a/translations/ja-JP/data/reusables/actions/jobs/section-running-jobs-in-a-container-credentials.md b/translations/ja-JP/data/reusables/actions/jobs/section-running-jobs-in-a-container-credentials.md index d697ff8f8c..d645231024 100644 --- a/translations/ja-JP/data/reusables/actions/jobs/section-running-jobs-in-a-container-credentials.md +++ b/translations/ja-JP/data/reusables/actions/jobs/section-running-jobs-in-a-container-credentials.md @@ -8,6 +8,6 @@ container: image: ghcr.io/owner/image credentials: username: ${{ github.actor }} - password: ${{ secrets.ghcr_token }} + password: ${{ secrets.github_token }} ``` {% endraw %} diff --git a/translations/ja-JP/data/reusables/repositories/actions-scheduled-workflow-example.md b/translations/ja-JP/data/reusables/repositories/actions-scheduled-workflow-example.md index 08c318e42e..8f1d35ce55 100644 --- a/translations/ja-JP/data/reusables/repositories/actions-scheduled-workflow-example.md +++ b/translations/ja-JP/data/reusables/repositories/actions-scheduled-workflow-example.md @@ -1,4 +1,4 @@ -[POSIX クーロン構文](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07)を使用して、特定の UTC 時間にワークフローを実行できるようスケジュール設定できます。 スケジュールしたワークフローは、デフォルトまたはベースブランチの直近のコミットで実行されます。 スケジュールされたワークフローを実行できる最短の間隔は、15 分ごとに 1 回です。 +[POSIX クーロン構文](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07)を使用して、特定の UTC 時間にワークフローを実行できるようスケジュール設定できます。 スケジュールしたワークフローは、デフォルトまたはベースブランチの直近のコミットで実行されます。 スケジュールされたワークフローを実行できる最短の間隔は、5 分ごとに 1 回です。 この例では、ワークフローは毎日UTCの5:30と17:30にトリガーされます。