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

Merge main into release-1.12 #6216

Merged
merged 11 commits into from
Dec 15, 2023
Merged

Merge main into release-1.12 #6216

merged 11 commits into from
Dec 15, 2023

Conversation

jandubois
Copy link
Member

No description provided.

ericpromislow and others added 11 commits December 12, 2023 11:02
If the 'settings-update' event is handled before settings are loaded, `pathManager`
could be null.

Also, extract initializing `pathManager` into a function.

- This happens from both changing a pref (any pref) in the
  first-run window, as well as during normal settings loading.

Note that from first-run we're calling `pathManager.enforce()`,
while from standard startup we're calling `integrationManager.enforce()`
If there's a problem here, it should be covered in a separate issue and PR.

Signed-off-by: Eric Promislow <epromislow@suse.com>
- Use dotAll flag on the RE to find end of certificates
- Emit any extra data at the end of the cert list (even though it is likely
  to be empty)

Signed-off-by: Mark Yen <mark.yen@suse.com>
This makes us base the RDX content area on the actual bounds of the UI,
instead of a single point.  This resolves issues with the status bar being
clipped by the extension browser, and pushes the relevant sizing to the UI
where it has better knowledge of the layout.

Signed-off-by: Mark Yen <mark.yen@suse.com>
On mac, the user can use cmd+numpad plus to zoom; the previous code did not
consider that and caused the zoom to not be adjusted in that case.

Signed-off-by: Mark Yen <mark.yen@suse.com>
UI: Adjust how we calculate window size when showing extension browser
win-ca: Fix importing CAs from system
Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
…-3.13.3

rddepman: bump helm from 3.13.2 to 3.13.3
Signed-off-by: Jan Dubois <jan.dubois@suse.com>
Copy link
Contributor

@mook-as mook-as left a comment

Choose a reason for hiding this comment

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

The list of commits look okay.

@mook-as mook-as merged commit 6c3d1c5 into release-1.12 Dec 15, 2023
20 checks passed
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.

3 participants