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/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/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/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 index f04bbfacf2..82f0fd4a10 100644 Binary files a/assets/images/help/codespaces/prebuilds-triggers.png 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/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({