Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

This commit is contained in:
Anthony Dresser
2019-09-24 21:36:17 -07:00
committed by GitHub
parent a29ae4d3b9
commit 6a6048d40f
541 changed files with 7045 additions and 7287 deletions

View File

@@ -42,7 +42,7 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
return Promise.reject(new Error('No settings sync store url configured.'));
}
const url = joinPath(URI.parse(this.productService.settingsSyncStoreUrl!), key).toString();
const url = joinPath(URI.parse(this.productService.settingsSyncStoreUrl!), 'resource', key, 'latest').toString();
const headers: IHeaders = {};
if (oldValue) {
headers['If-None-Match'] = oldValue.ref;
@@ -68,7 +68,7 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
return Promise.reject(new Error('No settings sync store url configured.'));
}
const url = joinPath(URI.parse(this.productService.settingsSyncStoreUrl!), key).toString();
const url = joinPath(URI.parse(this.productService.settingsSyncStoreUrl!), 'resource', key).toString();
const headers: IHeaders = { 'Content-Type': 'text/plain' };
if (ref) {
headers['If-Match'] = ref;