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.

Sign up for GitHub

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

Jump to bottom

chore: sync with main 02 09 #803

Merged
merged 12 commits into from
Sep 2, 2024
Merged

chore: sync with main 02 09 #803

merged 12 commits into from
Sep 2, 2024

Conversation

alenakhineika
Copy link
Contributor

@alenakhineika alenakhineika commented Sep 2, 2024 •
edited
Loading

Description

Sync the feature ranch with main.

Checklist

Motivation and Context

  • Bugfix
  • New feature
  • Dependency update
  • Misc

Types of changes

  • Backport Needed
  • Patch (non-breaking change which fixes an issue)
  • Minor (non-breaking change which adds functionality)
  • Major (fix or feature that would cause existing functionality to change)

Anemy and others added 12 commits August 21, 2024 07:30
@Anemy
chore(testing): use source map support, improve test cleanup error ha…
a29b4e2 
…ndling VSCODE-593 (#784)
@paula-stacho @Anemy
feat: show survey VSCODE-562 (#780)
d97770b 
---------

Co-authored-by: Rhys <[email protected]>
Co-authored-by: Rhys Howell <[email protected]>
@paula-stacho
fix: add telemetry events for survey VSCODE-595 (#787)
ee6132b
@Anemy
fix(editors): don't show connect code lens on regular js files VSCODE…
0af1e45 
…-538 (#789)
@addaleax
fix(deps): bump shell and data-service deps VSCODE-564 (#794)
a142d80
@alenakhineika
fix: clean-up webpack config VSCODE-597 (#795)
99258ac
@github-actions @mcasimir
Update changelog (#796)
d3619f0 
Co-authored-by: mcasimir <[email protected]>
@github-actions @alenakhineika
Update changelog (#797)
025f61b 
Co-authored-by: alenakhineika <[email protected]>
@alenakhineika
fix: cannot find module electron VSCODE-598 (#799)
e4d0a32
@github-actions @mcasimir
Update changelog (#801)
36642fe 
Co-authored-by: mcasimir <[email protected]>
@github-actions @alenakhineika
Update changelog (#802)
0372f6e 
Co-authored-by: alenakhineika <[email protected]>
@alenakhineika
Merge remote-tracking branch 'origin/main' into sync-with-main-02-09
6f0993f 
# Conflicts:
#	package-lock.json
#	src/editors/playgroundController.ts
@alenakhineika alenakhineika merged commit d8f49bd into VSCODE-528-mongodb-copilot Sep 2, 2024
3 checks passed
@alenakhineika alenakhineika deleted the sync-with-main-02-09 branch September 2, 2024 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@alenakhineika @Anemy @paula-stacho @addaleax