summaryrefslogtreecommitdiff
path: root/spec/javascripts/merge_request_spec.js
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-25 00:06:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-25 00:06:14 +0000
commit6d43720a1a86ccca9618417a6d0415e7d522fa49 (patch)
treeceab63f6374252b8afe4913b949bae39a027366f /spec/javascripts/merge_request_spec.js
parent46bfa73d93786bc2a832be7e42e2119712a0bafb (diff)
downloadgitlab-ce-6d43720a1a86ccca9618417a6d0415e7d522fa49.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/merge_request_spec.js')
-rw-r--r--spec/javascripts/merge_request_spec.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js
index 72d6e832aca..998637ef595 100644
--- a/spec/javascripts/merge_request_spec.js
+++ b/spec/javascripts/merge_request_spec.js
@@ -70,7 +70,8 @@ describe('MergeRequest', function() {
});
});
- it('shows an error notification when tasklist update failed', done => {
+ // eslint-disable-next-line jasmine/no-disabled-tests
+ xit('shows an error notification when tasklist update failed', done => {
mock
.onPatch(`${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/merge_requests/1.json`)
.reply(409, {});