diff --git a/.github/actions-scripts/enterprise-server-issue-templates/release-issue.md b/.github/actions-scripts/enterprise-server-issue-templates/release-issue.md index b2e0325f8c..a68b6811d4 100644 --- a/.github/actions-scripts/enterprise-server-issue-templates/release-issue.md +++ b/.github/actions-scripts/enterprise-server-issue-templates/release-issue.md @@ -18,11 +18,8 @@ If you aren't comfortable going through the steps alone, sync up with a docs eng ``` script/update-enterprise-dates.js ``` -- [ ] Create REST files based on previous version. For example `script/enterprise-server-releases/create-rest-files.js --oldVersion enterprise-server@3.2 --newVersion enterprise-server@3.3`: +- [ ] Create REST files based on previous version. Copy the latest GHES version of the dereferenced file from `lib/rest/static/dereferenced` to a new file in the same directory for the new GHES release. Ex, `cp lib/rest/static/dereferenced/ghes-3.4.deref.json lib/rest/static/dereferenced/ghes-3.5.deref.json`. Then run `script/rest/updated-files.js --decorate-only` and check in the resulting files. - ``` - script/enterprise-server-releases/create-rest-files.js --oldVersion --newVersion - ``` - [ ] Create GraphQL files based on previous version: ``` diff --git a/.github/workflows/azure-preview-env-deploy.yml b/.github/workflows/azure-preview-env-deploy.yml index f3c838dcdb..892e0ebbc6 100644 --- a/.github/workflows/azure-preview-env-deploy.yml +++ b/.github/workflows/azure-preview-env-deploy.yml @@ -59,6 +59,7 @@ jobs: IS_INTERNAL_BUILD: ${{ github.repository == 'github/docs-internal' }} # This may also run in forked repositories, not just 'github/docs' IS_PUBLIC_BUILD: ${{ github.repository != 'github/docs-internal' }} + NONPROD_REGISTRY_USERNAME: ${{ fromJSON('["ghdocs", "ghdocsinternal"]')[github.repository == 'github/docs-internal'] }} steps: - name: 'Az CLI login' @@ -70,7 +71,7 @@ jobs: uses: azure/docker-login@81744f9799e7eaa418697cb168452a2882ae844a with: login-server: ${{ secrets.NONPROD_REGISTRY_SERVER }} - username: ${{ secrets.NONPROD_REGISTRY_USERNAME }} + username: ${{ env.NONPROD_REGISTRY_USERNAME }} password: ${{ secrets.NONPROD_REGISTRY_PASSWORD }} - name: Set up Docker Buildx @@ -205,7 +206,7 @@ jobs: parameters: appName="${{ env.APP_NAME }}" containerImage="${{ env.DOCKER_IMAGE }}" dockerRegistryUrl="${{ secrets.NONPROD_REGISTRY_SERVER }}" - dockerRegistryUsername="${{ secrets.NONPROD_REGISTRY_USERNAME }}" + dockerRegistryUsername="${{ env.NONPROD_REGISTRY_USERNAME }}" dockerRegistryPassword="${{ secrets.NONPROD_REGISTRY_PASSWORD }}" # 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 diff --git a/.github/workflows/main-preview-docker-cache.yml b/.github/workflows/main-preview-docker-cache.yml index 2e41036ffe..1522e9a415 100644 --- a/.github/workflows/main-preview-docker-cache.yml +++ b/.github/workflows/main-preview-docker-cache.yml @@ -26,6 +26,7 @@ jobs: env: ENABLE_EARLY_ACCESS: ${{ github.repository == 'github/docs-internal' }} DOCKER_IMAGE_CACHE_REF: ${{ secrets.NONPROD_REGISTRY_SERVER }}/${{ github.repository }}:main-preview + NONPROD_REGISTRY_USERNAME: ${{ fromJSON('["ghdocs", "ghdocsinternal"]')[github.repository == 'github/docs-internal'] }} steps: - name: 'Az CLI login' @@ -37,7 +38,7 @@ jobs: uses: azure/docker-login@81744f9799e7eaa418697cb168452a2882ae844a with: login-server: ${{ secrets.NONPROD_REGISTRY_SERVER }} - username: ${{ secrets.NONPROD_REGISTRY_USERNAME }} + username: ${{ env.NONPROD_REGISTRY_USERNAME }} password: ${{ secrets.NONPROD_REGISTRY_PASSWORD }} - name: Set up Docker Buildx diff --git a/.github/workflows/needs-sme-stale-check.yaml b/.github/workflows/needs-sme-stale-check.yaml index f4faca3e40..b76eac8271 100644 --- a/.github/workflows/needs-sme-stale-check.yaml +++ b/.github/workflows/needs-sme-stale-check.yaml @@ -14,7 +14,7 @@ permissions: jobs: stale_needs-sme: - if: ${{ github.repository == 'github/docs'' }} + if: ${{ github.repository == 'github/docs' }} runs-on: ubuntu-latest steps: diff --git a/.github/workflows/needs-sme-workflow.yml b/.github/workflows/needs-sme-workflow.yml index a4aa7cb2d6..6a1f061b92 100644 --- a/.github/workflows/needs-sme-workflow.yml +++ b/.github/workflows/needs-sme-workflow.yml @@ -15,7 +15,7 @@ permissions: pull-requests: write jobs: - add-comment: + add-issue-comment: if: ${{ github.repository == 'github/docs' && (github.event.label.name == 'needs SME' && github.event_name == 'issues' || github.event_name == 'pull_request_target') }} runs-on: ubuntu-latest steps: @@ -24,8 +24,13 @@ jobs: issue-number: ${{ github.event.issue.number }} body: | Thanks for opening an issue! We've triaged this issue for technical review by a subject matter expert :eyes: + + add-pr-comment: + if: ${{ github.repository == 'github/docs' && github.event.label.name == 'needs SME' }} + runs-on: ubuntu-latest + steps: - uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae with: - issue-number: ${{ github.event.pull_request_target.number }} + issue-number: ${{ github.event.pull_request.number }} body: | Thanks for opening a pull request! We've triaged this issue for technical review by a subject matter expert :eyes: diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index a3f975f356..50ff2272ec 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -120,7 +120,7 @@ jobs: github_token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} - name: Create pull request - uses: repo-sync/pull-request@65194d8015be7624d231796ddee1cd52a5023cb3 + uses: repo-sync/pull-request@9152b1c4aeeab247ba2ce12c5d7e693d287bf1b9 env: GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} with: diff --git a/.github/workflows/triage-unallowed-internal-changes.yml b/.github/workflows/triage-unallowed-internal-changes.yml index 00299d1ca8..6908831f81 100644 --- a/.github/workflows/triage-unallowed-internal-changes.yml +++ b/.github/workflows/triage-unallowed-internal-changes.yml @@ -74,7 +74,7 @@ jobs: run: $GITHUB_WORKSPACE/.github/actions-scripts/enterprise-search-label.js - name: Fail if unallowed changes were made outside of the Search Sync label added - if: false == steps.labelExists.outputs.versionToSync && false == contains(github.event.pull_request.labels.*.name, 'deprecate-lunr-index') + if: false == steps.labelExists.outputs.versionToSync && false == contains(github.event.pull_request.labels.*.name, 'deprecate-lunr-index') && !contains(github.event.pull_request.labels.*.name, 'skip-index-check') run: | echo "Search indices are updated automatically every 4 hours. Please revert any changes you have made to the search indexes before you merge this PR. If you need to update the search indices directly after you merge your PR, you can manually run the search sync workflow: Sync search indexes. See the docs/contributing/search.md for more details. If you have any other questions, please ping us in #docs-engineering." exit 1 diff --git a/.gitignore b/.gitignore index 0a4285c2a2..8b780e4e2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .search-cache .DS_Store .env +.vscode/settings.json /node_modules/ npm-debug.log coverage/ diff --git a/assets/images/enterprise/3.2/repository/code-security-and-analysis-enable-ghas-3.2.png b/assets/images/enterprise/3.2/repository/code-security-and-analysis-enable-ghas-3.2.png new file mode 100644 index 0000000000..0692fb613f Binary files /dev/null and b/assets/images/enterprise/3.2/repository/code-security-and-analysis-enable-ghas-3.2.png differ diff --git a/assets/images/enterprise/3.4/repository/code-security-and-analysis-enable-ghas-3.4.png b/assets/images/enterprise/3.4/repository/code-security-and-analysis-enable-ghas-3.4.png new file mode 100644 index 0000000000..ce9708e168 Binary files /dev/null and b/assets/images/enterprise/3.4/repository/code-security-and-analysis-enable-ghas-3.4.png differ diff --git a/assets/images/help/branches/confirm-deleting-branch.png b/assets/images/help/branches/confirm-deleting-branch.png new file mode 100644 index 0000000000..930730ff33 Binary files /dev/null and b/assets/images/help/branches/confirm-deleting-branch.png differ diff --git a/assets/images/help/business-accounts/repository-forking-policy-settings.png b/assets/images/help/business-accounts/repository-forking-policy-settings.png new file mode 100644 index 0000000000..8421685aec Binary files /dev/null and b/assets/images/help/business-accounts/repository-forking-policy-settings.png differ diff --git a/assets/images/help/classroom/reuse-assignment-button.png b/assets/images/help/classroom/reuse-assignment-button.png new file mode 100644 index 0000000000..c4e23cbcc5 Binary files /dev/null and b/assets/images/help/classroom/reuse-assignment-button.png differ diff --git a/assets/images/help/classroom/reuse-assignment-completed-message.png b/assets/images/help/classroom/reuse-assignment-completed-message.png new file mode 100644 index 0000000000..0aedc5f252 Binary files /dev/null and b/assets/images/help/classroom/reuse-assignment-completed-message.png differ diff --git a/assets/images/help/classroom/reuse-assignment-modal.png b/assets/images/help/classroom/reuse-assignment-modal.png new file mode 100644 index 0000000000..f7eefd12a1 Binary files /dev/null and b/assets/images/help/classroom/reuse-assignment-modal.png differ diff --git a/assets/images/help/codespaces/advanced-options.png b/assets/images/help/codespaces/advanced-options.png new file mode 100644 index 0000000000..db443b5510 Binary files /dev/null and b/assets/images/help/codespaces/advanced-options.png differ diff --git a/assets/images/help/codespaces/choose-branch-vscode.png b/assets/images/help/codespaces/choose-branch-vscode.png index 8e5fcca08f..b2ceb86dc1 100644 Binary files a/assets/images/help/codespaces/choose-branch-vscode.png and b/assets/images/help/codespaces/choose-branch-vscode.png differ diff --git a/assets/images/help/codespaces/choose-custom-machine-type.png b/assets/images/help/codespaces/choose-custom-machine-type.png index a3a6ca352d..f9468b6be7 100644 Binary files a/assets/images/help/codespaces/choose-custom-machine-type.png and b/assets/images/help/codespaces/choose-custom-machine-type.png differ diff --git a/assets/images/help/codespaces/choose-repository-vscode.png b/assets/images/help/codespaces/choose-repository-vscode.png index cc5bb7cd6e..ca067ef7fb 100644 Binary files a/assets/images/help/codespaces/choose-repository-vscode.png and b/assets/images/help/codespaces/choose-repository-vscode.png differ diff --git a/assets/images/help/codespaces/choose-sku-vscode.png b/assets/images/help/codespaces/choose-sku-vscode.png index d509d5d2c0..d1dcd7fa69 100644 Binary files a/assets/images/help/codespaces/choose-sku-vscode.png and b/assets/images/help/codespaces/choose-sku-vscode.png differ diff --git a/assets/images/help/codespaces/codespaces-accept-permissions.png b/assets/images/help/codespaces/codespaces-accept-permissions.png new file mode 100644 index 0000000000..09ddc1c0bb Binary files /dev/null and b/assets/images/help/codespaces/codespaces-accept-permissions.png differ diff --git a/assets/images/help/codespaces/configuration-file-choice-default.png b/assets/images/help/codespaces/configuration-file-choice-default.png new file mode 100644 index 0000000000..73dede287a Binary files /dev/null and b/assets/images/help/codespaces/configuration-file-choice-default.png differ diff --git a/assets/images/help/codespaces/configuration-file-choice.png b/assets/images/help/codespaces/configuration-file-choice.png new file mode 100644 index 0000000000..24dcfc8829 Binary files /dev/null and b/assets/images/help/codespaces/configuration-file-choice.png differ diff --git a/assets/images/help/codespaces/default-machine-type.png b/assets/images/help/codespaces/default-machine-type.png new file mode 100644 index 0000000000..109aa337f4 Binary files /dev/null and b/assets/images/help/codespaces/default-machine-type.png differ diff --git a/assets/images/help/codespaces/machine-types-limited-choice.png b/assets/images/help/codespaces/machine-types-limited-choice.png index afc6bb817d..45135ea868 100644 Binary files a/assets/images/help/codespaces/machine-types-limited-choice.png and b/assets/images/help/codespaces/machine-types-limited-choice.png differ diff --git a/assets/images/help/codespaces/new-codespace-button.png b/assets/images/help/codespaces/new-codespace-button.png index 26a8d5938c..2d54a453e6 100644 Binary files a/assets/images/help/codespaces/new-codespace-button.png and b/assets/images/help/codespaces/new-codespace-button.png differ diff --git a/assets/images/help/codespaces/open-with-codespaces-pr.png b/assets/images/help/codespaces/open-with-codespaces-pr.png index 4e055c7121..f732a6176e 100644 Binary files a/assets/images/help/codespaces/open-with-codespaces-pr.png and b/assets/images/help/codespaces/open-with-codespaces-pr.png differ diff --git a/assets/images/help/codespaces/prebuilds-triggers.png b/assets/images/help/codespaces/prebuilds-triggers.png new file mode 100644 index 0000000000..82f0fd4a10 Binary files /dev/null and b/assets/images/help/codespaces/prebuilds-triggers.png differ diff --git a/assets/images/help/codespaces/prebuilt-codespace-found.png b/assets/images/help/codespaces/prebuilt-codespace-found.png new file mode 100644 index 0000000000..9886f6d4ea Binary files /dev/null and b/assets/images/help/codespaces/prebuilt-codespace-found.png differ diff --git a/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-all.png b/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-all.png new file mode 100644 index 0000000000..b6dcb7a00a Binary files /dev/null and b/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-all.png differ diff --git a/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-fpt-private.png b/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-fpt-private.png new file mode 100644 index 0000000000..b1e587984b Binary files /dev/null and b/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-fpt-private.png differ diff --git a/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-fpt-public-repositories.png b/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-fpt-public-repositories.png new file mode 100644 index 0000000000..43ddf8e482 Binary files /dev/null and b/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-fpt-public-repositories.png differ diff --git a/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-fpt.png b/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-fpt.png new file mode 100644 index 0000000000..18b129f4a3 Binary files /dev/null and b/assets/images/help/dependabot/dependabot-alerts-disable-or-enable-fpt.png differ diff --git a/assets/images/help/dependabot/dependabot-alerts-enable-by-default-organizations.png b/assets/images/help/dependabot/dependabot-alerts-enable-by-default-organizations.png new file mode 100644 index 0000000000..8a284a66ca Binary files /dev/null and b/assets/images/help/dependabot/dependabot-alerts-enable-by-default-organizations.png differ diff --git a/assets/images/help/dependabot/dependabot-alerts-enable-by-default.png b/assets/images/help/dependabot/dependabot-alerts-enable-by-default.png new file mode 100644 index 0000000000..3fd1234ce3 Binary files /dev/null and b/assets/images/help/dependabot/dependabot-alerts-enable-by-default.png differ diff --git a/assets/images/help/dependabot/dependabot-alerts-enable-dependabot-alerts-organizations.png b/assets/images/help/dependabot/dependabot-alerts-enable-dependabot-alerts-organizations.png new file mode 100644 index 0000000000..38febb860c Binary files /dev/null and b/assets/images/help/dependabot/dependabot-alerts-enable-dependabot-alerts-organizations.png differ diff --git a/assets/images/help/dependabot/dependabot-alerts-enable-dependabot-alerts.png b/assets/images/help/dependabot/dependabot-alerts-enable-dependabot-alerts.png new file mode 100644 index 0000000000..e61a767f0b Binary files /dev/null and b/assets/images/help/dependabot/dependabot-alerts-enable-dependabot-alerts.png differ diff --git a/assets/images/help/dependabot/dependabot-alerts-enable-for-all-new-repositories.png b/assets/images/help/dependabot/dependabot-alerts-enable-for-all-new-repositories.png new file mode 100644 index 0000000000..45c449d780 Binary files /dev/null and b/assets/images/help/dependabot/dependabot-alerts-enable-for-all-new-repositories.png differ diff --git a/assets/images/help/discussions/enable-org-discussions.png b/assets/images/help/discussions/enable-org-discussions.png new file mode 100644 index 0000000000..5c1d86d2ad Binary files /dev/null and b/assets/images/help/discussions/enable-org-discussions.png differ diff --git a/assets/images/help/discussions/hero.png b/assets/images/help/discussions/hero.png index bca400f11b..d9089bacc4 100644 Binary files a/assets/images/help/discussions/hero.png and b/assets/images/help/discussions/hero.png differ diff --git a/assets/images/help/discussions/new-poll-add-option.png b/assets/images/help/discussions/new-poll-add-option.png new file mode 100644 index 0000000000..64eaf225fa Binary files /dev/null and b/assets/images/help/discussions/new-poll-add-option.png differ diff --git a/assets/images/help/discussions/new-poll-options.png b/assets/images/help/discussions/new-poll-options.png new file mode 100644 index 0000000000..429f6c7efd Binary files /dev/null and b/assets/images/help/discussions/new-poll-options.png differ diff --git a/assets/images/help/discussions/new-poll-question.png b/assets/images/help/discussions/new-poll-question.png new file mode 100644 index 0000000000..f5ad8321de Binary files /dev/null and b/assets/images/help/discussions/new-poll-question.png differ diff --git a/assets/images/help/discussions/new-poll-start-poll-button.png b/assets/images/help/discussions/new-poll-start-poll-button.png new file mode 100644 index 0000000000..ae5361f391 Binary files /dev/null and b/assets/images/help/discussions/new-poll-start-poll-button.png differ diff --git a/assets/images/help/discussions/new-poll-title-and-body-fields.png b/assets/images/help/discussions/new-poll-title-and-body-fields.png new file mode 100644 index 0000000000..f817bfd7f9 Binary files /dev/null and b/assets/images/help/discussions/new-poll-title-and-body-fields.png differ diff --git a/assets/images/help/discussions/org-settings.png b/assets/images/help/discussions/org-settings.png new file mode 100644 index 0000000000..2f5488d12b Binary files /dev/null and b/assets/images/help/discussions/org-settings.png differ diff --git a/assets/images/help/discussions/poll-category.png b/assets/images/help/discussions/poll-category.png new file mode 100644 index 0000000000..63f03f3c77 Binary files /dev/null and b/assets/images/help/discussions/poll-category.png differ diff --git a/assets/images/help/discussions/start-poll-button.png b/assets/images/help/discussions/start-poll-button.png new file mode 100644 index 0000000000..8c5ca72d01 Binary files /dev/null and b/assets/images/help/discussions/start-poll-button.png differ diff --git a/assets/images/help/organizations/github-pages-creation-checkboxes-fpt.png b/assets/images/help/organizations/github-pages-creation-checkboxes-fpt.png new file mode 100644 index 0000000000..ea837b4c2a Binary files /dev/null and b/assets/images/help/organizations/github-pages-creation-checkboxes-fpt.png differ diff --git a/assets/images/help/security/enable-ghas-private-repo.png b/assets/images/help/security/enable-ghas-private-repo.png new file mode 100644 index 0000000000..d560c1e6e9 Binary files /dev/null and b/assets/images/help/security/enable-ghas-private-repo.png differ diff --git a/assets/images/help/settings/codespaces-org-access-and-security-radio-buttons.png b/assets/images/help/settings/codespaces-org-access-and-security-radio-buttons.png index 18e30e00b7..669b72249f 100644 Binary files a/assets/images/help/settings/codespaces-org-access-and-security-radio-buttons.png and b/assets/images/help/settings/codespaces-org-access-and-security-radio-buttons.png differ diff --git a/components/Search.tsx b/components/Search.tsx index 072dcfe35f..30ccfcd79f 100644 --- a/components/Search.tsx +++ b/components/Search.tsx @@ -218,7 +218,11 @@ export function Search({