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 #72

Merged
merged 65 commits into from
Jul 20, 2022
Merged

Fix an automatic rebase against the upstream #72

merged 65 commits into from
Jul 20, 2022

Conversation

azatsarynnyy
Copy link
Member

sandy081 and others added 30 commits July 11, 2022 15:03
@sandy081
use request service from main
d90edae
@sandy081
use setting to switch between main and browser request service
226911c
@Tyriar
Shell integration CLI progress
e0e5339
@Tyriar
Support bash and zsh paths too
f3399f6
@Tyriar
Use common path instead of node path
6763f2a
@Tyriar
Add shell integration to options category
053d35b
@Tyriar
Support --shell-integration in server cli
2ced901
@Tyriar
Revert code-cli.bat changes
b497c1c
@Tyriar
Use TERM_PROGRAM conditional to activate
1baeb71
@meganrogge
disable decorations (#154430)
ff31a8c
@lramos15
Fix #153860 (#155086)
9bed873
@joyceerhl
Add telemetry tracking edit session feature usage (#155084)
b5ffc79
@sandy081
Merge pull request #154822 from microsoft/sandy081/shared-process-req…
2f5b562 
…uest-service

Shared process - Delegate requests to main
@meganrogge
allow more args in run task (#154854)
6ce1ad6
@sandy081
Fix #154950 (#155089)
6a900fc
@rchiodo
Double check IW is the notebook changing when handling scroll events …
06443bc 
…(#155095)

* Fix 155092

* Review feedback
@mjbvz
Move md path completions and document links to language server (#155100)
bec36ce
@mjbvz
Finalize drop into editor api (#155102)
50056f3 
Fixes #142990
Fixes #149779
@Tyriar
Add configure decorations ctx menu entry
63c044b 
Fixes #155118
Add button separator color token (#155103)
f9bad09 
* Add button separator color token

* Fix compilation errors
@Tyriar
Merge pull request #155119 from microsoft/tyriar/155118
23f95b1 
Add configure decorations ctx menu entry
@meganrogge
support watch task reconnection (#155120)
e0a65a9
@bpasero
editors - clarify view state resource (#155136)
f947fab
@mjbvz
Remove references to finalized drop api (#155128)
867acc3
@bpasero
Forking from the extension host fails when running tests (fix #154549…
f992a90 
…) (#155139)
@mjbvz
Move MD references, rename, and definition support to md LS (#155127)
9ee8961
@lramos15
Throw error on legacy walkthrough (#155104)
461f869 
Remove old walkthrough format
@lszomoru
Git - Use cloud icon for remote branches (#155140)
f6332bd 
Use cloud icon for remote branches
@sandy081
add application to restricted settings (#155143)
9ce7776
@bpasero
electron - drop support for disable-color-correct-rendering (#155150)
c0e9fca
rebornix and others added 15 commits July 14, 2022 10:21
@rebornix
Re #154948. No MenuItemAction in notebook (#155096)
39c38c8
@roblourens
Don't ask debug adapter for initial configs when opening launch.json …
0d9db9f 
…to add a dynamic config (#155215)

Fixes #153388
@joyceerhl
Fix: do not delete partially applied edit sessions (#155218)
442f0be
@alexdima
Add try-catch around call that throws in ctor (#155224)
ef09cb0 
Add try-catch around call that throws in ctor (#151147)
@joyceerhl
Disable chunking to prevent importScripts calls in web (#155226)
a0c9ebe
@Tyriar
Merge pull request #155184 from microsoft/tyriar/155065
29e6da6 
Fix link regex groups
@roblourens
Fix unhandled promise rejections for debug commands (#155220)
4b6b842 
Fixes #154763
@TylerLeonhardt
concat arrays instead of replace because we want all items in the arr…
c1956b8 
…ay (#155228)
@meganrogge
remove terminal data when terminal is disposed of for reconnected ter…
29a4da1 
…minals (#155233)
@sbatten
Allow menubar to convert into hamburger below threshold (#155223)
c41b1ca 
fixes #152906
Increase contrast for diff inserted bg (#154969)
3b03ea7
@meganrogge
fix command not found warning (#155250)
171537f 
fix command not found part of #155163
@mjbvz
Fix md document links for untitled files (#155248)
394eaa9
@meganrogge
make sure execute in terminal is reached (#155254)
1cd90cc
@azatsarynnyy
Rebase against the upstream 1cd90cc
6d9a4c5 
vscode-upstream-sha1: 1cd90cc
@azatsarynnyy
investigating the tests failure
80278bc 
Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
@azatsarynnyy azatsarynnyy marked this pull request as draft July 19, 2022 15:29
@azatsarynnyy azatsarynnyy changed the title Fix an automatic rebase against the upstream [WIP] Fix an automatic rebase against the upstream Jul 19, 2022
@azatsarynnyy
investigating the tests failure
e54a8d9 
Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
@azatsarynnyy
Skip the recently added upstream tests, as they are failed for Che-Code
44f9d1a 
Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
@azatsarynnyy
Return back the RemoteTerminalMachineExecChannel
b7b45cb 
Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
@github-actions
Copy link

Pull Request images published ✨
image: quay.io/che-incubator-pull-requests/che-code:pr-72-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-72-dev-amd64

@azatsarynnyy azatsarynnyy marked this pull request as ready for review July 20, 2022 11:08
@azatsarynnyy azatsarynnyy changed the title [WIP] Fix an automatic rebase against the upstream Fix an automatic rebase against the upstream Jul 20, 2022
@azatsarynnyy azatsarynnyy merged commit 6bce000 into main Jul 20, 2022
@che-bot che-bot added this to the 7.50 milestone Jul 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vzhukovs vzhukovs vzhukovs approved these changes

@RomanNikitenko RomanNikitenko Awaiting requested review from RomanNikitenko RomanNikitenko is a code owner

@benoitf benoitf Awaiting requested review from benoitf

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

Successfully merging this pull request may close these issues.

Che-Code automatic rebase against upstream VS Code is failed