diff --git a/.rebase/CHANGELOG.md b/.rebase/CHANGELOG.md index 282efd1610c..9dc23edc9c7 100644 --- a/.rebase/CHANGELOG.md +++ b/.rebase/CHANGELOG.md @@ -2,6 +2,12 @@ The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts. +#### @sbouchet +https://github.com/che-incubator/che-code/pull/770 + +- code/package.json +--- + #### @sbouchet https://github.com/che-incubator/che-code/pull/750 diff --git a/.rebase/add/code/package.json b/.rebase/add/code/package.json index e52a30139b6..b4914879f94 100644 --- a/.rebase/add/code/package.json +++ b/.rebase/add/code/package.json @@ -27,6 +27,9 @@ }, "form-data@3": "^3.0.5", "form-data@4": "^4.0.6", + "@microsoft/dev-tunnels-management": { + "axios": "1.15.2" + }, "axios": { "form-data": "^4.0.6" }, diff --git a/code/package-lock.json b/code/package-lock.json index 361c5afc7a4..cc4c1dc3d1b 100644 --- a/code/package-lock.json +++ b/code/package-lock.json @@ -5505,9 +5505,9 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz", - "integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz", + "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.11", diff --git a/code/package.json b/code/package.json index 8c70c74d308..1c66741dc67 100644 --- a/code/package.json +++ b/code/package.json @@ -282,6 +282,9 @@ }, "form-data@3": "^3.0.5", "form-data@4": "^4.0.6", + "@microsoft/dev-tunnels-management": { + "axios": "1.15.2" + }, "axios": { "form-data": "^4.0.6" },