Commit 2bde5b8d authored by Eric Eastwood's avatar Eric Eastwood

Fix rebase status check throwing flash message

Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4473
parent 328e5e2e
......@@ -57,7 +57,7 @@
},
checkRebaseStatus(continuePolling, stopPolling) {
this.service.poll()
.then(res => res.json())
.then(res => res.data)
.then((res) => {
if (res.rebase_in_progress) {
continuePolling();
......
......@@ -88,11 +88,9 @@ describe('Merge request widget rebase component', () => {
},
poll() {
return Promise.resolve({
json() {
return {
rebase_in_progress: false,
merge_error: null,
};
data: {
rebase_in_progress: false,
merge_error: null,
},
});
},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment