Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 21:45:43 +01:00
Code Issues Packages Projects Releases Activity

Merged in feature/merge_conflictResolution (pull request #126)

Browse Source 
Feature/merge conflictResolution
This commit is contained in:
Sebastian Sdorra
2018-12-11 09:00:26 +00:00
parent caa3d3b62d 8807c8f7b3
commit ee3e3d4ecc
4 changed files with 75 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scm-ui-components/packages/ui-components/src/apiclient.js
View File

@@ -16,30 +16,19 @@ function handleStatusCode(response: Response) {
if (!response.ok) {
switch (response.status) {
case 401:
return throwError(response, UNAUTHORIZED_ERROR);
throw UNAUTHORIZED_ERROR;
case 404:
return throwError(response, NOT_FOUND_ERROR);
throw NOT_FOUND_ERROR;
case 409:
return throwError(response, CONFLICT_ERROR);
throw CONFLICT_ERROR;
default:
return throwError(response, new Error("server returned status code " + response.status));
throw new Error("server returned status code " + response.status);
}
}
return response;
}
function throwError(response: Response, err: Error) {
return response.json().then(
json => {
throw Error(json.message);
},
() => {
throw err;
}
);
}
export function createUrl(url: string) {
if (url.includes("://")) {
return url;