Skip to content

[Gitflow] Merge develop into master - #7549

Merged
mydea merged 4 commits into
masterfrom
fn/fix-master
Mar 21, 2023
Merged

[Gitflow] Merge develop into master#7549
mydea merged 4 commits into
masterfrom
fn/fix-master

Conversation

@mydea

@mydeamydea commented Mar 21, 2023

Copy link
Copy Markdown
Member

As we have a merge conflict, need to resolve this here first.

github-actionsBotand others added 4 commits March 20, 2023 17:46
@github-actions
Merge pull request#7534from getsentry/master
4434d60
[Gitflow] Merge master into develop
@AbhiPrasad
chore: Remove duplicate hiring message from README (#7535)
dcb31fe
@Lms24
feat(sveltekit): Automatically addBrowserTracingintegration (#7528)
8b8bb47
With this patch, the `BrowserTracing` integration is automatically added to the client SvelteKit SDK initialization. As in NextJS, tree-shaking will still work by replacing the `__SENTRY_TRACING__` flag with `false` when bundling.
@mydea
Merge branch 'develop' into fn/fix-master
7afb368
@mydea
mydea requested review from AbhiPrasad and Lms24March 21, 2023 11:01
@mydeamydea self-assigned this Mar 21, 2023
@AbhiPrasad

AbhiPrasad commented Mar 21, 2023

Copy link
Copy Markdown
Contributor

Do we want #7528 to go into master?

AbhiPrasad
AbhiPrasad approved these changes Mar 21, 2023
View reviewed changes

@AbhiPrasadAbhiPrasad left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving to unblock

@mydea

mydea commented Mar 21, 2023

Copy link
Copy Markdown
MemberAuthor

Do we want #7528 to go into master?

We need this in order to be able to merge master back into develop. it is not actually released, so not ideal, but should unblock us 😬

@github-actions

github-actionsBot commented Mar 21, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser - ES5 CDN Bundle (gzipped + minified)20.5 KB (-0.14% 🔽)
@sentry/browser - ES5 CDN Bundle (minified)63.83 KB (-0.04% 🔽)
@sentry/browser - ES6 CDN Bundle (gzipped + minified)19.19 KB (-0.02% 🔽)
@sentry/browser - ES6 CDN Bundle (minified)56.92 KB (0%)
@sentry/browser - Webpack (gzipped + minified)21.66 KB (0%)
@sentry/browser - Webpack (minified)72.12 KB (0%)
@sentry/react - Webpack (gzipped + minified)21.7 KB (0%)
@sentry/nextjs Client - Webpack (gzipped + minified)52.05 KB (0%)
@sentry/browser + @sentry/tracing - ES5 CDN Bundle (gzipped + minified)27.81 KB (-17.64% 🔽)
@sentry/browser + @sentry/tracing - ES6 CDN Bundle (gzipped + minified)26.13 KB (-0.01% 🔽)
@sentry/replay ES6 CDN Bundle (gzipped + minified)44.23 KB (-0.01% 🔽)
@sentry/replay - Webpack (gzipped + minified)38.28 KB (0%)
@sentry/browser + @sentry/tracing + @sentry/replay - ES6 CDN Bundle (gzipped + minified)62.44 KB (-0.01% 🔽)
@sentry/browser + @sentry/replay - ES6 CDN Bundle (gzipped + minified)55.99 KB (-0.01% 🔽)

@mydea
mydea merged commit bbb4e2e into masterMar 21, 2023
@mydea
mydea deleted the fn/fix-master branch March 21, 2023 12:34
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Lms24Lms24Awaiting requested review from Lms24
1 more reviewer
@AbhiPrasadAbhiPrasadAbhiPrasad approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@mydeamydea

Labels

Dev: Gitflow

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mydea@AbhiPrasad@Lms24