Skip to content

[Gitflow] Manual sync master into develop - #21298

Merged
logaretm merged 5 commits into
developfrom
manual-develop-sync-10.56.0
Jun 2, 2026
Merged

logaretm merged 5 commits into
developfrom
manual-develop-sync-10.56.0

Conversation

@logaretm

@logaretm logaretm commented Jun 2, 2026 •

Copy link
Copy Markdown
Member

Manually sync master back into develop after the 10.56.0 release as there was a CHANGELOG.md conflict.

Lms24 and others added 5 commits June 2, 2026 15:02
Co-Authored-By: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
meta(changelog): Update changelog for 10.56.0
@logaretm
logaretm requested review from a team as code owners June 2, 2026 18:15
@logaretm
logaretm requested review from JPeer264, Lms24, andreiborza, mydea, nicohrubec and s1gr1d and removed request for a team June 2, 2026 18:15
@logaretm
logaretm enabled auto-merge June 2, 2026 18:15

@Lms24 Lms24 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks!

@logaretm
logaretm merged commit f8e5c8a into develop Jun 2, 2026
270 of 271 checks passed
@logaretm
logaretm deleted the manual-develop-sync-10.56.0 branch June 2, 2026 18:32
nicohrubec added a commit that referenced this pull request Nov 17, 2026
## What

Merge `master` into `develop` after the 11.13.0 release, with the
`CHANGELOG.md` conflict resolved. Supersedes
#26429.

## Why

#25918 landed on `develop` during the 11.13.0
release and added its entry to the old "Unreleased" block, which became
`## 11.13.0` on `master`. #25918 isn't in 11.13.0, so its entry moves
under `## Unreleased` and the 11.13.0 section stays as released (same
resolution as #21298). Merge this with
"Create a merge commit", not squash, then close #26429.

<!-- junior-request-attribution:start -->
via **Nicolas Hrubec**.
<!-- junior-request-attribution:end -->

<!-- junior-session-footer:start -->
<!-- junior-conversation-id:slack%3AD0CEC49NJUD%3A1794902389.499919 -->

--

[View
Session](https://junior-prod.sentry.dev/conversations/slack%3AD0CEC49NJUD%3A1794902389.499919)
[[Sentry]](https://sentry.sentry.io/explore/conversations/slack%3AD0CEC49NJUD%3A1794902389.499919/?project=4510944073809921)

<!-- junior-session-footer:end -->

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Andrei Borza <andrei.borza@sentry.io>
Co-authored-by: Andrei <168741329+andreiborza@users.noreply.github.com>
Co-authored-by: Nicolas Hrubec <nicolas.hrubec@outlook.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
Co-authored-by: Charly Gomez <charly.gomez1310@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
Co-authored-by: Francesco Gringl-Novy <francesco.novy@sentry.io>
Co-authored-by: Martin Sonnberger <martin.sonnberger@sentry.io>
Co-authored-by: BYK <126780+BYK@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Miguel Betegon <miguel.betegon@sentry.io>
Co-authored-by: bete <28983162+betegon@users.noreply.github.com>
Co-authored-by: Rola Abuhasna <rola.abuhasna@sentry.io>
Co-authored-by: Tim Fish <tim@timfish.uk>
Co-authored-by: Abdelrahman Awad <abdelrahman.awad@sentry.io>
Co-authored-by: Miguel Betegón <miguelbetegongarcia@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: whatever_kunaal <143793407+kunal649@users.noreply.github.com>
Co-authored-by: javascript-sdk-gitflow[bot] <255134079+javascript-sdk-gitflow[bot]@users.noreply.github.com>
Co-authored-by: s1gr1d <32902192+s1gr1d@users.noreply.github.com>
Co-authored-by: isaacs <i@izs.me>
Co-authored-by: Isaac Schlueter <isaac.schlueter@sentry.io>
Co-authored-by: Jan Peer Stöcklmair <jan.peer@sentry.io>
Co-authored-by: Francesco Gringl-Novy <2411343+mydea@users.noreply.github.com>
Co-authored-by: bardrop <mradulsingh524.ms@gmail.com>
Co-authored-by: msonnb <26038247+msonnb@users.noreply.github.com>
Co-authored-by: David Cramer <23610+dcramer@users.noreply.github.com>
Co-authored-by: Matt Van Horn <mvanhorn@users.noreply.github.com>
Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
Co-authored-by: Vivek Singh <72497717+Vivek1898@users.noreply.github.com>
Co-authored-by: alexcastgonz <82875882+pcbeingused333@users.noreply.github.com>
Co-authored-by: sentry-release-bot[bot] <180476844+sentry-release-bot[bot]@users.noreply.github.com>
Co-authored-by: Nicolas Hrubec <nico.hrubec@sentry.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants