Skip to content

Commit 727ada9

Browse files
ramyaparimiramyaparimi
authored
Merge branch 'main' into patch-2
2 parents 85ed4cb + 777371d commit 727ada9

File tree

391 files changed

+224306
-212262
lines changed

Some content is hidden

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

391 files changed

+224306
-212262
lines changed

‎.github/workflows/azure-preview-env-deploy.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ on:
2727
description: 'The commit SHA to build'
2828
type: string
2929
required: true
30+
push:
31+
branches:
32+
- gh-readonly-queue/main/**
3033

3134
permissions:
3235
contents: read

‎.github/workflows/link-check-all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
push:
1010
branches:
1111
- main
12+
- gh-readonly-queue/main/**
1213
pull_request:
1314

1415
permissions:

‎.github/workflows/openapi-decorate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
uses: EndBug/add-and-commit@756d9ea820f11931e591eaf57f25e0f5b903d5b2
5858
with:
5959
# The arguments for the `git add` command
60-
add: 'lib/rest/static/decorated'
60+
add: '["lib/rest/static/apps", "lib/rest/static/decorated"]'
6161

6262
# The message for the commit
6363
message: 'Add decorated OpenAPI schema files'

‎.github/workflows/orphaned-assets-check.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ name: 'Orphaned assets check'
66

77
on:
88
pull_request:
9+
push:
10+
branches:
11+
- gh-readonly-queue/main/**
912

1013
permissions:
1114
contents: read

‎.github/workflows/repo-freeze-check.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ on:
1515
- unlocked
1616
branches:
1717
- main
18+
push:
19+
branches:
20+
- gh-readonly-queue/main/**
1821

1922
permissions:
2023
contents: none

‎.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ name: Node.js Tests
77
on:
88
workflow_dispatch:
99
pull_request:
10+
push:
11+
branches:
12+
- gh-readonly-queue/main/**
1013

1114
permissions:
1215
contents: read

‎.github/workflows/triage-unallowed-internal-changes.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
- opened
1313
- reopened
1414
- synchronize
15+
push:
16+
branches:
17+
- gh-readonly-queue/main/**
1518

1619
permissions:
1720
# This is needed by dorny/paths-filter

‎components/DefaultLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export const DefaultLayout = (props: Props) => {
9393
style={{ height: '100vh' }}
9494
>
9595
<Header />
96-
<main id="main-content">
96+
<main id="main-content" style={{ scrollMarginTop: '5rem' }}>
9797
<DeprecationBanner />
9898
<RestBanner />
9999

‎components/GenericError.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ import Link from 'next/link'
33
import { useRouter } from 'next/router'
44

55
import { MarkGithubIcon, CommentDiscussionIcon } from '@primer/octicons-react'
6-
import { useVersion } from 'components/hooks/useVersion'
76
import { Lead } from 'components/ui/Lead'
87

98
export function GenericError() {
10-
const { isEnterprise } = useVersion()
11-
129
return (
1310
<div className="min-h-screen d-flex flex-column">
1411
<Head>
@@ -28,11 +25,7 @@ export function GenericError() {
2825
</p>
2926
<a
3027
id="contact-us"
31-
href={
32-
isEnterprise
33-
? 'https://enterprise.github.com/support'
34-
: 'https://support.github.com/contact'
35-
}
28+
href="https://support.github.com/contact"
3629
className="btn btn-outline mt-2"
3730
>
3831
<CommentDiscussionIcon size="small" className="octicon mr-1" />

‎components/page-footer/Support.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import { PeopleIcon, CommentDiscussionIcon } from '@primer/octicons-react'
22

33
import { useTranslation } from 'components/hooks/useTranslation'
4-
import { useVersion } from 'components/hooks/useVersion'
54
import { useMainContext } from 'components/context/MainContext'
65

76
export const Support = () => {
8-
const { isEnterprise } = useVersion()
97
const { t } = useTranslation('support')
108
const { communityRedirect } = useMainContext()
119

@@ -25,11 +23,7 @@ export const Support = () => {
2523
<div>
2624
<a
2725
id="contact-us"
28-
href={
29-
isEnterprise
30-
? 'https://enterprise.github.com/support'
31-
: 'https://support.github.com/contact'
32-
}
26+
href="https://support.github.com/contact"
3327
className="Link—secondary text-bold"
3428
>
3529
<CommentDiscussionIcon size="small" className="octicon mr-1" />

0 commit comments

Comments
 (0)