Skip to content

Commit e2cb24b

Browse files
committed
Merge branch 'master' into analytics-scroll-depth
2 parents 4b82d07 + 47a010b commit e2cb24b

File tree

391 files changed

+4274
-1681
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

+4274
-1681
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@
5151
# /src/platforms/javascript/common/session-replay/ @getsentry/replay @getsentry/replay-sdk-web
5252
# /src/wizard/javascript/replay-onboarding/ @getsentry/replay @getsentry/replay-sdk-web
5353

54+
# /src/docs/product/dev-toolbar/ @getsentry/replay
55+
5456
# ###### End Replays #######

.github/workflows/bump-api-schema-sha.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,19 @@ jobs:
1212
name: 'Bump API Schema SHA'
1313
steps:
1414
- uses: actions/[email protected]
15+
- name: Get auth token
16+
id: token
17+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
18+
with:
19+
app-id: ${{ vars.SENTRY_INTERNAL_APP_ID }}
20+
private-key: ${{ secrets.SENTRY_INTERNAL_APP_PRIVATE_KEY }}
1521
- name: 'Bump API Schema SHA'
1622
shell: bash
1723
env:
1824
# An elevated token is necessary because with plain github.token
1925
# GitHub does not recursively call workflows, which means CI does not
2026
# kick off for the PR we're about to create.
21-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
27+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
2228
run: |
2329
set -euo pipefail
2430

.github/workflows/lint-404s.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- 'platform-includes/**'
2626
dev-docs:
2727
- 'develop-docs/**'
28-
- uses: oven-sh/setup-bun@v1
28+
- uses: oven-sh/setup-bun@v2
2929
with:
3030
bun-version: latest
3131

.github/workflows/prepare-release.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,20 @@ jobs:
1313
runs-on: ubuntu-latest
1414
name: "Release a new version"
1515
steps:
16+
- name: Get auth token
17+
id: token
18+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
19+
with:
20+
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
21+
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
1622
- uses: actions/[email protected]
1723
with:
18-
token: ${{ secrets.GH_RELEASE_PAT }}
24+
token: ${{ steps.token.outputs.token }}
1925
fetch-depth: 0
2026
- name: Prepare release
2127
uses: getsentry/action-prepare-release@v1
2228
env:
23-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
29+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
2430
with:
2531
version: ${{ github.event.inputs.version }}
2632
force: ${{ github.event.inputs.force }}

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
- id: detect-private-key
1414
exclude: |
1515
(?x)^(
16-
develop-docs/api-server/config.mdx|
16+
develop-docs/backend/config.mdx|
1717
develop-docs/integrations/github.mdx|
1818
develop-docs/self-hosted/sso.mdx
1919
)$

CONTRIBUTING.md

Lines changed: 5 additions & 0 deletions

app/layout.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {Rubik} from 'next/font/google';
66
import PlausibleProvider from 'next-plausible';
77

88
import {ThemeProvider} from 'sentry-docs/components/theme-provider';
9+
import Script from 'next/script';
910

1011
const rubik = Rubik({
1112
weight: ['400', '500', '700'],
@@ -45,6 +46,19 @@ export default function RootLayout({children}: {children: React.ReactNode}) {
4546
{children}
4647
</Theme>
4748
</ThemeProvider>
49+
<Script
50+
async
51+
src="https://widget.kapa.ai/kapa-widget.bundle.js"
52+
data-website-id="cac7cc70-969e-4bc1-a968-55534a839be4"
53+
data-button-hide // do not render kapa ai button
54+
data-modal-override-open-class="kapa-ai-class" // all elements with this class will open the kapa ai modal
55+
data-project-name="Sentry"
56+
data-project-color="#6A5FC1"
57+
data-project-logo="https://avatars.githubusercontent.com/u/1396951?s=280&v=4"
58+
data-font-family="var(--font-rubik)"
59+
data-modal-disclaimer="Disclaimer: Welcome to our knowledge search bot! While we'd love to be able to answer all your questions, please remember this is a tool for searching our publicly available sources and not a support forum. Don't include any sensitive or personal information in your queries. For more on how Sentry handles your data, see our [Privacy Policy](https://sentry.io/privacy/). This form is protected by reCAPTCHA. Google's Privacy Policy and Google's Terms of Service apply."
60+
data-modal-example-questions="How to set up Sentry for Next.js?,What are tracePropagationTargets?"
61+
/>
4862
</body>
4963
</html>
5064
);

apps/changelog/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"seed": "node prisma/seed/seed.mjs"
1919
},
2020
"dependencies": {
21-
"@auth/prisma-adapter": "^1.2.0",
21+
"@auth/prisma-adapter": "^2.7.4",
2222
"@google-cloud/storage": "^7.7.0",
2323
"@prisma/client": "^5.8.1",
2424
"@radix-ui/react-icons": "^1.3.2",
2525
"@radix-ui/react-toolbar": "^1.1.0",
2626
"@radix-ui/themes": "^3.1.3",
2727
"@sentry/nextjs": "8.36.0",
2828
"@spotlightjs/spotlight": "^2.1.1",
29-
"next": "15.0.3",
29+
"next": "15.1.2",
3030
"next-auth": "^4.24.5",
3131
"next-mdx-remote": "^4.4.1",
3232
"nextjs-toploader": "^1.6.6",

apps/changelog/src/server/actions/changelog.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ export async function createChangelog(
7676
if (!session) {
7777
return unauthorizedPayload;
7878
}
79-
console.log({formData});
8079
const categories = formData.getAll('categories');
8180
await prismaClient.category.createMany({
8281
data: categories.map(category => ({name: category as string})),

develop-docs/api-server/index.mdx

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)