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

Fix an automatic rebase against the upstream #121

Merged
merged 121 commits into from
Sep 29, 2022
Merged

Fix an automatic rebase against the upstream #121

merged 121 commits into from
Sep 29, 2022

Conversation

azatsarynnyy
Copy link
Member

matthewjamesadam and others added 30 commits August 25, 2022 11:24
@matthewjamesadam
Test
797fb52
@matthewjamesadam
Cleanup
78851b5
@matthewjamesadam
Remove
8533550
@thernstig
Update Groovy extension language contribution
00414a3 
Change `filenamePatterns` to `Jenkinsfile.*` to `Jenkinsfile*` to capture files starting with Jenkinsfile, not necessarily having a period as a delimiter.
@alexdima
Merge branch 'main' into matthewjamesadam/LeftAlignTooltipToBeforeCon…
1643a42 
…tent
@sandy081
fix turn on sync
d0c5e38 
- sync remote profiles that do not exist locally
@Tyriar
Include applicationName in zsh shell integration folder name
816cd66 
Fixes #159182
@Tyriar
Merge branch 'main' into tyriar/159182
8cd272d
@benibenj
Push action required extensions to the top and allow to ignore update…
0b1c344 
…s (#161577)

* Ignore updates

* smal fixes

* Dropdown for editor

* fixes

* Test fixes

* debounce
@mjbvz
Fix markdown preview refresh from disk (#161800)
b8a7485 
Fixes #149974
@sandy081
Merge pull request #161705 from microsoft/sandy081/arrogant-starfish
60a3df4 
fix turn on sync
@jrieken
tweak name to reset all menu hiding (#161801)
b42e424
@sandy081
show the profiles menu like other menus (#161803)
811fbff
@Tyriar
Merge pull request #161783 from microsoft/tyriar/159182
9c618ec 
Include applicationName in zsh shell integration folder name
@sandy081
show the current short name in the input (#161812)
2b0d08b
@meganrogge
skip test on windows (#161794)
cfe0125 
fix #161793
@sandy081
enable syncing profiles (#161814)
d23eed7 
- remove settings flag
@TylerLeonhardt
rev vscode-nls to version that doesn't ask for vscode-nls-web-data (#…
29e985e 
…161819)

ref #161297
@sandy081
add create temp profile action to create picker (#161810)
ed48c7b
@jsjoeio @rzhao271
fix: propagate log level to client
ff9e92c
@andreamah
fix search unit tests using FileMatch createInstance (#161817)
e2207cb 
fix search unit test createInstance
@Tyriar
Allow free port to run on any command (single char+)
1a76ad9
@meganrogge
update initialText in reused terminal before showing it (#161818)
ed1f954
@meganrogge
contextual action -> quick fix (#161638)
6bbdabb
@meganrogge
don't try shell integration for winpty (#161821)
9ccd1be 
fix #160419
@Tyriar
Merge remote-tracking branch 'origin/main' into tyriar/any_command
04bb72a
@TylerLeonhardt
Fixes #161725 (#161826)
045bed8
@rebornix
Fix NotebookEditorModel#isResolved. Fix #161049. (#161829)
bcbf0d8
@hediet
Improves merge editor code-lens (#161830)
34d8743 
* Disable diff projection

* Improves merge editor code-lens
@lramos15
Make some more services lazy (#161827)
5183e9b 
* Lazy service instantiation

* Make resolver eager
sandy081 and others added 23 commits September 28, 2022 01:34
@sandy081
fix #161961 (#162136)
0445715 
* fix #161961

* remove comment
@sandy081
Fix #162134 (#162140)
3527824
@JamieMagee @aeschli
Add $schema to cgmanifest.json (#159779)
8044546 
Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>
@lszomoru
Git protocol handler improvements (#162144)
7559012
Changing the z-index of the find options widget so it appears above t…
f8a2968 
…he sticky scroll widget
@hediet
Fixes #162111
0e23403
@sandy081
Fix #161868 (#162148)
b3434bf
@sandy081
Fix #161862 (#162156)
bc07a5d
@sandy081
fix #161791 (#162158)
d3f8375
Merge pull request #162146 from microsoft/aiday/issue160627
3393acc 
Changing the z-index of the find options widget (Fixes #160627)
@hediet
Fixes #162005 (#162161)
b0f88c1
@hediet
Fixes conflict block rendering bug. (#162162)
a1e8a52
Making the stash visible by changing the CSS parameters
8efbe80
@hediet
Fixes #161967 (#162165)
55a5e84
Merge pull request #162167 from microsoft/aiday/issue160271
e59d1e2 
Making the stash visible by changing the CSS parameters (Fixes #160271)
@benibenj
Install all outdated extensions action (#162170)
df0a857 
Install all outdated extensions
@hediet
Merge pull request #162150 from microsoft/hediet/additional-shark
dfca1cc 
Fixes #162111
@jrieken
fix #161618 (#162171)
2428297 
fixes microsoft/vscode#161618
@joaomoreno
stop shipping build-only dependencies (#162172)
582aa29
@jrieken
check basename, not separator and name (#162174)
d31d71d 
fixes microsoft/vscode#162141
@azatsarynnyy
Fix the replace commands when rebasing
66f8b2c
@azatsarynnyy
Update the replacing rules when rebasing
2b35831
@azatsarynnyy
Rebase against the upstream d31d71d
9c65e2a 
vscode-upstream-sha1: d31d71d
@azatsarynnyy azatsarynnyy marked this pull request as ready for review September 28, 2022 15:28
@azatsarynnyy azatsarynnyy merged commit d64e7a6 into main Sep 29, 2022
@azatsarynnyy azatsarynnyy deleted the fix-rebase branch September 29, 2022 07:11
@che-bot che-bot added this to the 7.55 milestone Sep 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RomanNikitenko RomanNikitenko RomanNikitenko approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
7.55
Development

Successfully merging this pull request may close these issues.

Che-Code automatic rebase against upstream VS Code is failed