Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6411666
Merge branch 'main' into repo-sync
Octomerger Dec 14, 2021
1a97bb3
Merge pull request #23722 from github/repo-sync
Octomerger Dec 14, 2021
5ff7bf2
Capitalize and comma outside link (#23723)
rsese Dec 14, 2021
526b5bd
Add nextjs caching into all workflows with builds (#23654)
JamesMGreene Dec 14, 2021
2e9128b
shared .next/cache in staging-build workflow (#23700)
Dec 15, 2021
dc756b9
Adjust internal staging build/deploy job name (#23725)
JamesMGreene Dec 15, 2021
297b6b8
New translation batch for pt (#23726)
docubot Dec 15, 2021
c546874
update search indexes
actions-user Dec 15, 2021
a03bcbc
New translation batch for pt (#23733)
docubot Dec 15, 2021
11be210
New translation batch for cn (#23735)
docubot Dec 15, 2021
f3ce35f
cleaning up trailing slash redirects (part 7) (#23699)
Dec 15, 2021
1c9c531
update search indexes
actions-user Dec 15, 2021
2d336bb
New translation batch for pt (#23740)
docubot Dec 15, 2021
c60c01d
Update OpenAPI Descriptions (#23705)
github-openapi-bot Dec 15, 2021
d2855f9
Add GHES release note for GitHub Connect features change (#23531)
lildude Dec 15, 2021
e34ad14
Update GitHub Connect connection data (#23562)
vgrl Dec 15, 2021
10ca315
Static assets should set ETag and Last-Modified (#23459)
Dec 15, 2021
0e9c08f
Unlock before approving in repo sync (#23730)
rsese Dec 15, 2021
a736b53
Only run browser tests on pull request (#23704)
Dec 15, 2021
b96f16e
too often we don't know the path of 503'ing requests (#23744)
Dec 15, 2021
0faa5ce
remove unused file (#23748)
mikesurowiec Dec 15, 2021
bf5c735
eslint check the .github/actions-scripts/* files too (#23698)
Dec 15, 2021
c3f4985
update search indexes
actions-user Dec 15, 2021
dc4ca1c
Merge branch 'main' into repo-sync
rsese Dec 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {
babelOptions: { configFile: './.babelrc' },
sourceType: 'module',
},
ignorePatterns: ['tmp/*'],
ignorePatterns: ['tmp/*', '!/.*', '/.next/'],
rules: {
'import/no-extraneous-dependencies': ['error', { packageDir: '.' }],
},
Expand Down
4 changes: 2 additions & 2 deletions .github/actions-scripts/fr-add-docs-reviewers-requests.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ async function run() {
// Exclude existing items going forward.
// Until we have a way to check from a PR whether the PR is in a project,
// this is how we (roughly) avoid overwriting PRs that are already on the board
let newItemIDs = []
let newItemAuthors = []
const newItemIDs = []
const newItemAuthors = []
itemIDs.forEach((id, index) => {
if (!existingItemIDs.includes(id)) {
newItemIDs.push(id)
Expand Down
4 changes: 2 additions & 2 deletions .github/actions-scripts/ready-for-docs-review.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ async function run() {
// - affected docs sets (not considering changes to data/assets)
let numFiles = 0
let numChanges = 0
let features = new Set([])
const files = data.item.files.nodes.forEach((node) => {
const features = new Set([])
data.item.files.nodes.forEach((node) => {
numFiles += 1
numChanges += node.additions
numChanges += node.deletions
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/browser-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ name: Browser Tests

on:
workflow_dispatch:
push:
branches:
- main
pull_request:
paths:
- '**.js'
Expand Down Expand Up @@ -56,7 +53,7 @@ jobs:
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}-${{ hashFiles('.github/workflows/browser-test.yml') }}
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- name: Cache lib/redirects/.redirects-cache_en_ja.json
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/check-all-english-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ jobs:
cache: npm
- name: npm ci
run: npm ci
- name: Cache nextjs build
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}
- name: npm run build
run: npm run build
- name: Run script
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/code-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
- '**.yaml'
- '**.yml'
- '**.scss'
- .eslintrc.js
# In case something like eslint or tsc or prettier upgrades
- 'package-lock.json'
# Ultimately, for debugging this workflow itself
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/enterprise-release-sync-search-index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ jobs:
id: getVersion
run: $GITHUB_WORKSPACE/.github/actions-scripts/enterprise-search-label.js

- name: Cache nextjs build
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- name: Generate the search index files
if: ${{ steps.getVersion.outputs.versionToSync }}
env:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/link-check-dotcom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ jobs:
- name: Install
run: npm ci

- name: Cache nextjs build
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- name: Build
run: npm run build

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/link-check-ghae.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ jobs:
- name: Install
run: npm ci

- name: Cache nextjs build
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- name: Build
run: npm run build

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/link-check-ghec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ jobs:
- name: Install
run: npm ci

- name: Cache nextjs build
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- name: Build
run: npm run build

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/link-check-ghes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ jobs:
- name: Install
run: npm ci

- name: Cache nextjs build
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- name: Build
run: npm run build

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/pa11y.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ jobs:
- name: Install dependencies
run: npm ci --include=optional

- name: Cache nextjs build
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- name: Run build scripts
run: npm run build

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ping-staging-apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,5 @@ jobs:
cache: npm
- name: npm ci
run: npm ci
- name: npm run build
run: npm run build
- name: Run script
run: script/ping-staging-apps.js
2 changes: 1 addition & 1 deletion .github/workflows/repo-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
- cron: '10,40 * * * *' # every 30 minutes

permissions:
contents: read
contents: write
pull-requests: write

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging-build-and-deploy-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ concurrency:
cancel-in-progress: true

jobs:
build-and-deploy:
build-and-deploy-pr:
# Important. This whole file is only supposed to run in the PRIVATE repo.
if: ${{ github.repository == 'github/docs-internal' }}

Expand Down
16 changes: 1 addition & 15 deletions .github/workflows/staging-build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,6 @@ on:
- reopened
- synchronize

# This is necessary so that the cached things can be reused between
# pull requests.
# If we don't let the workflow run on `main` the caching will only
# help between multiple runs of the same workflow. By letting
# it build on pushes to main too, the cache will be reusable
# in other people's PRs too.
push:
branches:
- main

permissions:
contents: read

Expand Down Expand Up @@ -97,7 +87,7 @@ jobs:
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}-${{ hashFiles('.github/workflows/staging-build-pr.yml') }}
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- name: Build
run: npm run build
Expand All @@ -112,8 +102,6 @@ jobs:
run: npm set-script heroku-postbuild "echo 'Application was pre-built!'"

- name: Create an archive
# Only bother if this is actually a pull request
if: ${{ github.event.pull_request.number }}
run: |
tar -c --file=app.tar \
node_modules/ \
Expand Down Expand Up @@ -143,8 +131,6 @@ jobs:
# We are not willing to trust the rest (e.g. script/) for the remainder
# of the deployment process.
- name: Upload build artifact
# Only bother if this is actually a pull request
if: ${{ github.event.pull_request.number }}
uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074
with:
name: pr_build
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/sync-search-indices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ jobs:
- name: Install dependencies
run: npm ci

- name: Cache nextjs build
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- name: Run build scripts
run: npm run build

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/sync-search-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ jobs:
- name: Install dependencies
run: npm ci

- name: Cache nextjs build
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- name: Build
run: npm run build

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ jobs:
- name: Install dependencies
run: npm ci

- name: Cache nextjs build
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

- if: ${{ github.repository == 'github/docs-internal' }}
name: Clone early access
run: npm run heroku-postbuild
Expand Down
10 changes: 6 additions & 4 deletions components/page-header/RestRepoBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const restRepoCategoryExceptionsTitles = {
collaborators: 'Collaborators',
commits: 'Commits',
deployments: 'Deployments',
pages: 'Github Pages',
pages: 'GitHub Pages',
releases: 'Releases',
'repository-metrics': 'Repository metrics',
webhooks: 'Webhooks',
Expand All @@ -35,10 +35,12 @@ export const RestRepoBanner = () => {
keyof typeof restRepoCategoryExceptionsTitles
>
const newRestPagesText = pages.map((page, i) => [
<Link href={`/${router.locale}/rest/reference/${page}`}>
{restRepoCategoryExceptionsTitles[page]}
<>
<Link href={`/${router.locale}/rest/reference/${page}`}>
{restRepoCategoryExceptionsTitles[page]}
</Link>
{i < pages.length - 1 && ', '}
</Link>,
</>,
])

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,19 @@ To configure a connection, your proxy configuration must allow connectivity to `

After enabling {% data variables.product.prodname_github_connect %}, you will be able to enable features such as unified search and unified contributions. For more information about all of the features available, see "[Managing connections between your enterprise accounts](/admin/configuration/managing-connections-between-your-enterprise-accounts)."

When you connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %}, a record on {% data variables.product.prodname_dotcom_the_website %} stores information about the connection:
When you connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %}, or enable {% data variables.product.prodname_github_connect %} features, a record on {% data variables.product.prodname_dotcom_the_website %} stores information about the connection:
{% ifversion ghes %}
- The public key portion of your {% data variables.product.prodname_ghe_server %} license
- A hash of your {% data variables.product.prodname_ghe_server %} license
- The customer name on your {% data variables.product.prodname_ghe_server %} license
- The version of {% data variables.product.product_location_enterprise %}{% endif %}
- The hostname of your {% data variables.product.product_name %} instance
- The hostname of {% data variables.product.product_location %}
- The organization or enterprise account on {% data variables.product.prodname_dotcom_the_website %} that's connected to {% data variables.product.product_location %}
- The authentication token that's used by {% data variables.product.product_location %} to make requests to {% data variables.product.prodname_dotcom_the_website %}
- If Transport Layer Security (TLS) is enabled and configured on {% data variables.product.product_location %}{% ifversion ghes %}
- The {% data variables.product.prodname_github_connect %} features that are enabled on {% data variables.product.product_location %}, and the date and time of enablement{% endif %}

{% data variables.product.prodname_github_connect %} syncs the above connection data between {% data variables.product.product_location %} and {% data variables.product.prodname_ghe_cloud %} weekly, from the day and approximate time that {% data variables.product.prodname_github_connect %} was enabled.

Enabling {% data variables.product.prodname_github_connect %} also creates a {% data variables.product.prodname_github_app %} owned by your {% data variables.product.prodname_ghe_cloud %} organization or enterprise account. {% data variables.product.product_name %} uses the {% data variables.product.prodname_github_app %}'s credentials to make requests to {% data variables.product.prodname_dotcom_the_website %}.
{% ifversion ghes %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ intro: '{% data variables.product.prodname_ghe_server %} clustering allows servi
redirect_from:
- /enterprise/admin/clustering/overview
- /enterprise/admin/clustering/about-clustering
- /enterprise/admin/clustering/clustering-overview/
- /enterprise/admin/clustering/clustering-overview
- /enterprise/admin/enterprise-management/about-clustering
- /admin/enterprise-management/about-clustering
versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ intro: Learn about clustering and differences with high availability.
redirect_from:
- /enterprise/admin/clustering/setting-up-the-cluster-instances
- /enterprise/admin/clustering/managing-a-github-enterprise-server-cluster
- /enterprise/admin/guides/clustering/managing-a-github-enterprise-cluster/
- /enterprise/admin/guides/clustering/managing-a-github-enterprise-cluster
- /enterprise/admin/enterprise-management/configuring-clustering
versions:
ghes: '*'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
title: Configuring high availability
redirect_from:
- /enterprise/admin/installation/configuring-github-enterprise-server-for-high-availability
- /enterprise/admin/guides/installation/high-availability-cluster-configuration/
- /enterprise/admin/guides/installation/high-availability-configuration/
- /enterprise/admin/guides/installation/configuring-github-enterprise-for-high-availability/
- /enterprise/admin/guides/installation/high-availability-cluster-configuration
- /enterprise/admin/guides/installation/high-availability-configuration
- /enterprise/admin/guides/installation/configuring-github-enterprise-for-high-availability
- /enterprise/admin/enterprise-management/configuring-high-availability
intro: '{% data variables.product.prodname_ghe_server %} supports a high availability mode of operation designed to minimize service disruption in the event of hardware failure or major network outage affecting the primary appliance.'
versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Configuring collectd
intro: '{% data variables.product.prodname_enterprise %} can gather data with `collectd` and send it to an external `collectd` server. Among other metrics, we gather a standard set of data such as CPU utilization, memory and disk consumption, network interface traffic and errors, and the VM''s overall load.'
redirect_from:
- /enterprise/admin/installation/configuring-collectd
- /enterprise/admin/articles/configuring-collectd/
- /enterprise/admin/articles/configuring-collectd
- /enterprise/admin/enterprise-management/configuring-collectd
- /admin/enterprise-management/configuring-collectd
versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
title: Monitoring your appliance
intro: 'As use of {% data variables.product.product_location %} increases over time, the utilization of system resources, like CPU, memory, and storage will also increase. You can configure monitoring and alerting so that you''re aware of potential issues before they become critical enough to negatively impact application performance or availability.'
redirect_from:
- /enterprise/admin/guides/installation/system-resource-monitoring-and-alerting/
- /enterprise/admin/guides/installation/monitoring-your-github-enterprise-appliance/
- /enterprise/admin/guides/installation/system-resource-monitoring-and-alerting
- /enterprise/admin/guides/installation/monitoring-your-github-enterprise-appliance
- /enterprise/admin/installation/monitoring-your-github-enterprise-server-appliance
- /enterprise/admin/enterprise-management/monitoring-your-appliance
versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Monitoring using SNMP
intro: '{% data variables.product.prodname_enterprise %} provides data on disk usage, CPU utilization, memory usage, and more over SNMP.'
redirect_from:
- /enterprise/admin/installation/monitoring-using-snmp
- /enterprise/admin/articles/monitoring-using-snmp/
- /enterprise/admin/articles/monitoring-using-snmp
- /enterprise/admin/enterprise-management/monitoring-using-snmp
- /admin/enterprise-management/monitoring-using-snmp
versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Recommended alert thresholds
intro: 'You can configure an alert to notify you of system resource issues before they affect your {% data variables.product.prodname_ghe_server %} appliance''s performance.'
redirect_from:
- /enterprise/admin/guides/installation/about-recommended-alert-thresholds/
- /enterprise/admin/guides/installation/about-recommended-alert-thresholds
- /enterprise/admin/installation/about-recommended-alert-thresholds
- /enterprise/admin/installation/recommended-alert-thresholds
- /enterprise/admin/enterprise-management/recommended-alert-thresholds
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
title: Updating the virtual machine and physical resources
intro: 'Upgrading the virtual software and virtual hardware requires some downtime for your instance, so be sure to plan your upgrade in advance.'
redirect_from:
- '/enterprise/{{ currentVersion }}/admin/guides/installation/upgrading-the-vm/'
- '/enterprise/{{ currentVersion }}/admin/guides/installation/upgrading-physical-resources/'
- '/enterprise/{{ currentVersion }}/admin/guides/installation/upgrading-the-vm'
- '/enterprise/{{ currentVersion }}/admin/guides/installation/upgrading-physical-resources'
- /enterprise/admin/installation/updating-the-virtual-machine-and-physical-resources
- /enterprise/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources
versions:
Expand Down
Loading