Skip to content

Commit 85ed4cb

Browse files
authored
Merge branch 'main' into patch-2
2 parents 3b70102 + 99283fa commit 85ed4cb

File tree

353 files changed

+2717
-459207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

353 files changed

+2717
-459207
lines changed

.github/actions-scripts/enterprise-server-issue-templates/deprecation-issue.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,5 @@ In your `docs-internal` checkout:
7878
- [ ] In `github/github`, edit the release's config file in `app/api/description/config/releases/`, and change `deprecated: false` to `deprecated: true`.
7979
- [ ] Open a new PR, and get the required code owner approvals. A docs-content team member can approve it for the docs team.
8080
- [ ] When the PR is approved, [deploy the `github/github` PR](https://thehub.github.com/engineering/devops/deployment/deploying-dotcom/). If you haven't deployed a `github/github` PR before, work with someone that has -- the process isn't too involved depending on how you deploy, but there are a lot of details that can potentially be confusing as you can see from the documentation.
81+
82+
**Note**: you can do this step independently of the other steps after a GHES version is deprecated since it should no longer get updates in github/github. You should plan to get this PR merged as soon as possible, otherwise if you wait too long our OpenAPI automation may re-add the static files that you removed in step 5.

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,3 @@ updates:
2626
schedule:
2727
interval: weekly
2828
day: thursday
29-
ignore:
30-
- dependency-name: '*'
31-
update-types:
32-
['version-update:semver-patch', 'version-update:semver-minor']

.github/workflows/azure-preview-env-destroy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
# This will fail if the IMAGE_REPO doesn't exist, but we don't care
6262
- name: 'Untag all docker images for this PR'
6363
run: |
64-
az acr repository delete -n ${{ secrets.NONPROD_REGISTRY_NAME }} --repository ${{ env.IMAGE_REPO }} -y || true
64+
az acr repository delete -n ${{ secrets.NONPROD_REGISTRY_SERVER }} --repository ${{ env.IMAGE_REPO }} -y || true
6565
6666
# Remove all GitHub deployments from this environment and remove the environment
6767
- uses: strumwolf/delete-deployment-environment@45c821e46baa405e25410700fe2e9643929706a0

.pa11yci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"http://localhost:4001/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account",
1010
"http://localhost:4001/en/github/authenticating-to-github/creating-a-strong-password",
1111
"http://localhost:4001/en/github",
12-
"http://localhost:4001/en/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line",
12+
"http://localhost:4001/en/github/importing-your-projects-to-github/adding-locally-hosted-code-to-github",
1313
"http://localhost:4001/en/actions",
1414
"http://localhost:4001/en/github/authenticating-to-github/creating-a-personal-access-token",
1515
"http://localhost:4001/en/github/authenticating-to-github/checking-for-existing-ssh-keys",
47.8 KB
Loading
16.8 KB
Loading
35.4 KB
Loading

components/playground/content/actions/guides/building-and-testing-nodejs-or-python/python.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ const article: PlaygroundArticleT = {
225225
runs-on: ubuntu-latest
226226
strategy:
227227
matrix:
228-
python-version: [3.6, 3.7, 3.8, 3.9]
228+
python-version: ["3.6", "3.7", "3.8", "3.9"]
229229
230230
steps:
231231
- uses: actions/checkout@v2
@@ -265,7 +265,7 @@ const article: PlaygroundArticleT = {
265265
# You can use PyPy versions in python-version.
266266
# For example, pypy2 and pypy3
267267
matrix:
268-
python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
268+
python-version: ["2.7", "3.6", "3.7", "3.8", "3.9"]
269269
270270
steps:
271271
- uses: actions/checkout@v2
@@ -320,12 +320,12 @@ const article: PlaygroundArticleT = {
320320
strategy:
321321
matrix:
322322
os: [ubuntu-latest, macos-latest, windows-latest]
323-
python-version: [3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
323+
python-version: ["3.6", "3.7", "3.8", "3.9", pypy2, pypy3]
324324
exclude:
325325
- os: macos-latest
326-
python-version: 3.6
326+
python-version: "3.6"
327327
- os: windows-latest
328-
python-version: 3.6
328+
python-version: "3.6"
329329
`,
330330
},
331331
'4': {
@@ -468,7 +468,7 @@ const article: PlaygroundArticleT = {
468468
runs-on: ubuntu-latest
469469
strategy:
470470
matrix:
471-
python: [3.7, 3.8, 3.9]
471+
python: ["3.7", "3.8", "3.9"]
472472
473473
steps:
474474
- uses: actions/checkout@v2
@@ -490,15 +490,15 @@ const article: PlaygroundArticleT = {
490490
name: Python package
491491
492492
on: [push]
493-
493+
494494
jobs:
495495
build:
496-
496+
497497
runs-on: ubuntu-latest
498498
strategy:
499499
matrix:
500-
python-version: [3.6, 3.7, 3.8, 3.9]
501-
500+
python-version: ["3.6", "3.7", "3.8", "3.9"]
501+
502502
steps:
503503
- uses: actions/checkout@v2
504504
- name: Setup Python # Set Python version

components/rest/RestCodeSamples.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { xCodeSample } from './types'
22
import { useTranslation } from 'components/hooks/useTranslation'
33
import { CodeBlock } from './CodeBlock'
4+
import { Fragment } from 'react'
45

56
type Props = {
67
slug: string
@@ -11,7 +12,7 @@ export function RestCodeSamples({ slug, xCodeSamples }: Props) {
1112
const { t } = useTranslation('products')
1213

1314
return (
14-
<>
15+
<Fragment key={xCodeSamples + slug}>
1516
<h4 id={`${slug}--code-samples`}>
1617
<a href={`#${slug}--code-samples`}>{`${t('rest.reference.code_samples')}`}</a>
1718
</h4>
@@ -29,6 +30,6 @@ export function RestCodeSamples({ slug, xCodeSamples }: Props) {
2930
}
3031
return sampleElements
3132
})}
32-
</>
33+
</Fragment>
3334
)
3435
}

components/sidebar/SidebarProduct.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { Link } from 'components/Link'
88
import { ProductTreeNode, useMainContext } from 'components/context/MainContext'
99
import { AllProductsLink } from 'components/sidebar/AllProductsLink'
1010
import { EventType, sendEvent } from 'components/lib/events'
11-
1211
import styles from './SidebarProduct.module.scss'
1312

1413
export const SidebarProduct = () => {
@@ -154,7 +153,7 @@ const CollapsibleSection = (props: SectionProps) => {
154153
<details open={defaultOpen} onToggle={onToggle} className="details-reset">
155154
<summary className="outline-none">
156155
<div className="d-flex flex-justify-between">
157-
<div className="pl-4 pr-1 py-2 f6 text-uppercase d-block flex-auto mr-3 color-fg-default no-underline text-bold">
156+
<div className="pl-4 pr-1 py-2 f5 d-block flex-auto mr-3 color-fg-default no-underline text-bold">
158157
{title}
159158
</div>
160159
<span style={{ marginTop: 7 }} className="flex-shrink-0 pr-3">

0 commit comments

Comments
 (0)