diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-23 07:01:11 +0000 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2017-10-24 12:27:13 +0000 |
commit | 39e605c59fa442b352d34d44c53cccad68201d8c (patch) | |
tree | 217d5b3c0510a0fd293951126582b66da84d685f | |
parent | d147103e2250b3ab4afb8dba5c36072b253a49af (diff) | |
download | gitlab-ce-39e605c59fa442b352d34d44c53cccad68201d8c.tar.gz |
Merge branch 'sh-fix-container-registry-destroy' into 'master'
Fix deletion of container registry or images returning an error
Closes #39354
See merge request gitlab-org/gitlab-ce!14992
(cherry picked from commit 4cc91b4f19204417f05fba50697d40beb6a94e62)
3e81c500 Fix deletion of container registry or images returning an error
-rw-r--r-- | app/assets/javascripts/registry/stores/actions.js | 6 | ||||
-rw-r--r-- | changelogs/unreleased/sh-fix-container-registry-destroy.yml | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/registry/stores/actions.js b/app/assets/javascripts/registry/stores/actions.js index 34ed40b8b65..795b39bb3dc 100644 --- a/app/assets/javascripts/registry/stores/actions.js +++ b/app/assets/javascripts/registry/stores/actions.js @@ -29,11 +29,9 @@ export const fetchList = ({ commit }, { repo, page }) => { }); }; -export const deleteRepo = ({ commit }, repo) => Vue.http.delete(repo.destroyPath) - .then(res => res.json()); +export const deleteRepo = ({ commit }, repo) => Vue.http.delete(repo.destroyPath); -export const deleteRegistry = ({ commit }, image) => Vue.http.delete(image.destroyPath) - .then(res => res.json()); +export const deleteRegistry = ({ commit }, image) => Vue.http.delete(image.destroyPath); export const setMainEndpoint = ({ commit }, data) => commit(types.SET_MAIN_ENDPOINT, data); export const toggleLoading = ({ commit }) => commit(types.TOGGLE_MAIN_LOADING); diff --git a/changelogs/unreleased/sh-fix-container-registry-destroy.yml b/changelogs/unreleased/sh-fix-container-registry-destroy.yml new file mode 100644 index 00000000000..21a463da62a --- /dev/null +++ b/changelogs/unreleased/sh-fix-container-registry-destroy.yml @@ -0,0 +1,5 @@ +--- +title: Fix deletion of container registry or images returning an error +merge_request: +author: +type: fixed |