Skip to content

[Gitflow] Merge master into develop#19331

Merged
andreiborza merged 8 commits intodevelopfrom
manual-develop-sync
Feb 16, 2026
Merged

[Gitflow] Merge master into develop#19331
andreiborza merged 8 commits intodevelopfrom
manual-develop-sync

Conversation

@andreiborza
Copy link
Member

@andreiborza andreiborza commented Feb 16, 2026

Manual sync of #19329

Closes #19332 (added automatically)

Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

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

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix is OFF. To automatically fix reported issues with Cloud Agents, enable Autofix in the Cursor dashboard.

"eslint": "8.57.0",
"jsdom": "^21.1.2",
"lerna": "9.0.3",
"lerna": "8.2.4",
Copy link

Choose a reason for hiding this comment

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

Lerna downgraded from v9 to v8 during merge

Medium Severity

The lerna dependency is being downgraded from 9.0.3 to 8.2.4, despite the CHANGELOG for this very release (10.39.0) listing "chore(deps): Bump Lerna to v9" as an internal change. This appears to be a merge conflict resolution error where the master branch's older lerna version overwrote develop's upgraded version during the gitflow merge.

Fix in Cursor Fix in Web

Copy link
Member Author

Choose a reason for hiding this comment

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

Yea, we forgot to update the changelog when we downgraded again.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 16, 2026

Codecov Results 📊


Generated by Codecov Action

@andreiborza andreiborza merged commit 4763ff1 into develop Feb 16, 2026
222 checks passed
@andreiborza andreiborza deleted the manual-develop-sync branch February 16, 2026 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Gitflow] Merge master into develop

3 participants

Comments