Skip to content

Commit 4ab00f3

Browse files
RomanNikitenkoRomanNikitenko
committed
Merge remote-tracking branch 'eclipse/main'
2 parents be203ba + 16b01fa commit 4ab00f3

1,464 files changed

Lines changed: 60748 additions & 36813 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/image-publish.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,5 @@ jobs:
198198
run: |
199199
SHORT_SHA1=$(git rev-parse --short=7 HEAD)
200200
docker buildx build --platform linux/amd64 -f build/dockerfiles/dev.Dockerfile --push -t quay.io/che-incubator/che-code-dev:insiders -t quay.io/che-incubator/che-code-dev:next -t quay.io/che-incubator/che-code-dev:insiders-${SHORT_SHA1} .
201+
docker buildx build --platform linux/amd64 -f build/dockerfiles/dev.sshd.Dockerfile --push -t quay.io/che-incubator/che-code-sshd:insiders -t quay.io/che-incubator/che-code-sshd:next -t quay.io/che-incubator/che-code-sshd:insiders-${SHORT_SHA1} .
201202

‎.rebase/CHANGELOG.md‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,41 @@
22

33
The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
44

5+
#### @RomanNikitenko
6+
https://github.com/che-incubator/che-code/pull/559
7+
8+
- code/src/vs/workbench/contrib/webview/browser/pre/index.html
9+
- code/src/vs/platform/extensionManagement/common/extensionManagement.ts
10+
- code/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
11+
-
12+
---
13+
14+
#### @sbouchet
15+
https://github.com/che-incubator/che-code/pull/572
16+
17+
- code/package.json
18+
- code/build/package.json
19+
- code/remote/package.json
20+
---
21+
22+
#### @sbouchet
23+
https://github.com/che-incubator/che-code/pull/563
24+
25+
- code/package.json
26+
---
27+
28+
#### @sbouchet
29+
https://github.com/che-incubator/che-code/pull/566
30+
31+
- code/remote/package.json
32+
---
33+
34+
#### @sbouchet
35+
https://github.com/che-incubator/che-code/pull/561
36+
37+
- code/build/package.json
38+
---
39+
540
#### @RomanNikitenko
641
https://github.com/che-incubator/che-code/pull/539
742

@@ -48,7 +83,6 @@ https://github.com/che-incubator/che-code/pull/528
4883
https://github.com/che-incubator/che-code/pull/526
4984

5085
- code/package.json
51-
- code/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
5286
---
5387

5488
#### @svor
@@ -188,7 +222,6 @@ https://github.com/che-incubator/che-code/commit/eed0a5213ba1b29b810d53f6365aaa2
188222
#### @vitaliy-guliy
189223
https://github.com/che-incubator/che-code/pull/211
190224

191-
- code/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
192225
- code/src/vs/workbench/contrib/webview/browser/pre/index.html
193226
---
194227

‎.rebase/add/code/build/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"overrides": {
33
"prebuild-install": {
4-
"tar-fs": "2.1.3"
4+
"tar-fs": "2.1.4"
55
}
66
}
77
}

‎.rebase/add/code/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"nanoid": "3.3.8"
1919
},
2020
"@vscode/test-web": {
21-
"tar-fs": "3.0.9"
21+
"tar-fs": "3.1.1"
2222
},
2323
"prebuild-install": {
24-
"tar-fs": "2.1.3"
24+
"tar-fs": "2.1.4"
2525
}
2626
}
2727
}

‎.rebase/add/code/remote/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
},
77
"overrides": {
88
"prebuild-install": {
9-
"tar-fs": "2.1.3"
9+
"tar-fs": "2.1.4"
10+
},
11+
"request": {
12+
"form-data": "2.5.5"
1013
}
1114
}
1215
}

‎.rebase/override/code/build/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"devDependencies": {
3-
"@vscode/ripgrep": "^1.15.11"
3+
"@vscode/ripgrep": "^1.15.11",
4+
"@types/minimatch": "^3.0.5"
45
}
56
}

‎.rebase/override/code/package.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
{
22
"name": "che-code",
33
"bin": "out/vs/server/main.js",
4-
"dependencies": {
5-
"node-pty": "1.1.0-beta22"
6-
},
74
"devDependencies": {
85
"@vscode/l10n-dev": "0.0.18",
9-
"electron": "30.5.1"
6+
"@vscode/gulp-electron": "^1.38.2"
107
}
118
}

‎.rebase/override/code/remote/package.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.rebase/replace/code/src/vs/platform/extensionManagement/common/extensionGalleryService.ts.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[
2+
{
3+
"from": "const resourceApi = await this.getResourceApi(extensionGalleryManifest, !!options.updateCheck);",
4+
"by": "const resourceApi = options.preferResourceApi ? await this.getResourceApi(extensionGalleryManifest, !!options.updateCheck) : undefined;"
5+
}
6+
]

‎.rebase/replace/code/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts.json‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)