Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge develop into v11 #7893

Merged
merged 25 commits into from
Mar 8, 2024
Merged

Conversation

BeksOmega
Copy link
Collaborator

The basics

The details

Resolves

Fixes N/A

Proposed Changes + reasons

Fixes problems with CI on the v11 branch.

BeksOmega and others added 25 commits February 2, 2024 14:48
Bumps [prettier](https://github.com/prettier/prettier) from 3.1.1 to 3.2.5.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.1.1...3.2.5)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Merge pull request google#7858 from google/rc/v10.4.0
fix: connection previewer disposing too early
fix: connection previewer disposing too early
(cherry picked from commit da3ec25)
Merge pull request google#7860 from google/rc/v10.4.1
chore: merge master into develop following v10.4.1
fix: typo in Click event class docs
Bumps [undici](https://github.com/nodejs/undici) from 5.26.3 to 5.28.3.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](nodejs/undici@v5.26.3...v5.28.3)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix: insertion marker drag scaling

* chore: added docs for other params
@github-actions github-actions bot added the PR: chore General chores (dependencies, typos, etc) label Feb 26, 2024
@BeksOmega BeksOmega changed the base branch from develop to rc/v11.0.0 February 26, 2024 22:47
@github-actions github-actions bot added PR: chore General chores (dependencies, typos, etc) and removed PR: chore General chores (dependencies, typos, etc) labels Feb 26, 2024
@BeksOmega BeksOmega marked this pull request as ready for review February 26, 2024 22:52
@BeksOmega BeksOmega requested a review from a team as a code owner February 26, 2024 22:52
@BeksOmega BeksOmega requested a review from NeilFraser February 26, 2024 22:52
@BeksOmega BeksOmega merged commit 48228e4 into google:rc/v11.0.0 Mar 8, 2024
11 checks passed
Copy link
Contributor

@NeilFraser NeilFraser left a comment

Choose a reason for hiding this comment

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

There are some issues with the translation strings, but nothing that's user-visible. I'm addressing these upstream. This is fine for release.

@BeksOmega BeksOmega deleted the merge-dev-v11 branch March 12, 2024 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: chore General chores (dependencies, typos, etc)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants