diff --git a/.github/workflows/triage-unallowed-contributions.yml b/.github/workflows/triage-unallowed-contributions.yml index ac7887a8f0..8ef98fbb46 100644 --- a/.github/workflows/triage-unallowed-contributions.yml +++ b/.github/workflows/triage-unallowed-contributions.yml @@ -18,6 +18,9 @@ on: - 'lib/webhooks/**' - 'scripts/**' - 'translations/**' + - 'package*.json' + - 'app.json' + - 'Procfile' jobs: triage: @@ -76,6 +79,9 @@ jobs: - 'lib/webhooks/**' - 'scripts/**' - 'translations/**' + - 'package*.json' + - 'app.json' + - 'Procfile' # When there are changes to files we can't accept # and no review exists,leave a REQUEST_CHANGES review @@ -97,7 +103,10 @@ jobs: 'lib/rest/**', 'lib/webhooks/**', 'scripts/**', - 'translations/**' + 'translations/**', + 'package*.json', + 'app.json', + 'Procfile' ] const badFiles = badFilesArr.join('\n') diff --git a/Dockerfile b/Dockerfile index da9e42e479..0dd8574072 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,10 +50,7 @@ COPY webpack.config.js ./webpack.config.js COPY next.config.js ./next.config.js COPY tsconfig.json ./tsconfig.json -RUN npx tsc - -# We need to copy data in order to do the build -COPY --chown=node:node data ./data +RUN npx tsc --noEmit RUN npm run build @@ -88,6 +85,7 @@ ENV AIRGAP true # Copy only what's needed to run the server COPY --chown=node:node assets ./assets COPY --chown=node:node content ./content +COPY --chown=node:node data ./data COPY --chown=node:node includes ./includes COPY --chown=node:node layouts ./layouts COPY --chown=node:node lib ./lib @@ -96,6 +94,7 @@ COPY --chown=node:node translations ./translations COPY --chown=node:node server.mjs ./server.mjs COPY --chown=node:node package*.json ./ COPY --chown=node:node feature-flags.json ./ +COPY --chown=node:node next.config.js ./ EXPOSE 80 EXPOSE 443 diff --git a/assets/images/help/organizations/organization-account-transformation-warning.png b/assets/images/help/organizations/organization-account-transformation-warning.png index fe831e8ad1..ba7f0dfec9 100644 Binary files a/assets/images/help/organizations/organization-account-transformation-warning.png and b/assets/images/help/organizations/organization-account-transformation-warning.png differ diff --git a/content/admin/enterprise-management/configuring-clustering/evacuating-a-cluster-node.md b/content/admin/enterprise-management/configuring-clustering/evacuating-a-cluster-node.md index bf76f3c87c..048ad3e7e2 100644 --- a/content/admin/enterprise-management/configuring-clustering/evacuating-a-cluster-node.md +++ b/content/admin/enterprise-management/configuring-clustering/evacuating-a-cluster-node.md @@ -18,8 +18,8 @@ If you're taking a node offline that has any data services (like git, pages, or 1. Find the `uuid` of the node in with the `ghe-config`command. - ``` - $ ghe-config cluster._hostname_.uuid + ```shell + $ ghe-config cluster.HOSTNAME.uuid ``` 2. You'll need to monitor the status of your node while the data is being copied. Ideally, the node shouldn't be taken offline until the copying is complete. To monitor the status of your node, run any of the following commands: @@ -29,11 +29,11 @@ If you're taking a node offline that has any data services (like git, pages, or ghe-spokes evac-status ``` For {% data variables.product.prodname_pages %} - {% raw %} + + ```shell + echo "select count(*) from pages_replicas where host = 'pages-server-UUID'" | ghe-dbconsole -y ``` - echo "select count(*) from pages_replicas where host = 'pages-server-'" | ghe-dbconsole -y - ``` - {% endraw %} + For storage ``` ghe-storage evacuation-status @@ -42,26 +42,25 @@ If you're taking a node offline that has any data services (like git, pages, or 3. After the copying is complete, you can evacuate the storage service. Run any of the following commands: For Git - {% raw %} + + ```shell + ghe-spokes server evacuate git-server-UUID \'REASON FOR EVACUATION\' ``` - ghe-spokes server evacuate git-server- - ``` - {% endraw %} + For {% data variables.product.prodname_pages %} - {% raw %} + + ```shell + ghe-dpages evacuate pages-server-UUID ``` - ghe-dpages evacuate pages-server- - ``` - {% endraw %} + For storage, take the node offline - {% raw %} + + ```shell + ghe-storage offline storage-server-UUID ``` - ghe-storage offline storage-server- - ``` - {% endraw %} + then evacuate - {% raw %} + + ```shell + ghe-storage evacuate storage-server-UUID ``` - ghe-storage evacuate storage-server- - ``` - {% endraw %} diff --git a/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/converting-a-user-into-an-organization.md b/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/converting-a-user-into-an-organization.md index e276b137e8..f984abbe90 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/converting-a-user-into-an-organization.md +++ b/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/converting-a-user-into-an-organization.md @@ -22,6 +22,7 @@ shortTitle: User into an organization - An organization **cannot** be converted back to a user. - The SSH keys, OAuth tokens, job profile, reactions, and associated user information, **will not** be transferred to the organization. This is only true for the user account that's being converted, not any of the user account's collaborators. - Any commits made with the converted user account **will no longer be linked** to that account. The commits themselves **will** remain intact. + - Any forks of private repositories made with the converted user account will be deleted. {% endwarning %} diff --git a/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-the-default-branch-name-for-your-repositories.md b/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-the-default-branch-name-for-your-repositories.md index a3b8a57f48..88bf82dc6d 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-the-default-branch-name-for-your-repositories.md +++ b/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-the-default-branch-name-for-your-repositories.md @@ -1,6 +1,6 @@ --- title: Managing the default branch name for your repositories -intro: 'You can set the default branch name new repositories that you create on {% data variables.product.product_location %}.' +intro: 'You can set the default branch name for new repositories that you create on {% data variables.product.product_location %}.' versions: fpt: '*' ghes: '>=3.0' diff --git a/lib/render-content/create-processor.js b/lib/render-content/create-processor.js index 26454f9fd7..89084a72ed 100644 --- a/lib/render-content/create-processor.js +++ b/lib/render-content/create-processor.js @@ -21,7 +21,7 @@ export default function createProcessor(context) { .use(markdown) .use(remarkCodeExtra, { transform: codeHeader }) .use(emoji) - .use(remark2rehype, { allowDangerousHTML: true }) + .use(remark2rehype, { allowDangerousHtml: true }) .use(slug) .use(useEnglishHeadings, context) .use(autolinkHeadings, { behavior: 'wrap' })