diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-04-07 20:31:32 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-04-07 20:31:32 +0300 |
| commit | fd16c892556a345d43a5ffc1c7bbc28b63b0a49c (patch) | |
| tree | 29f1fd22a0cb216e532bc62389628e2e23e8ed3d /app | |
| parent | 8631779b1a012bdb5bd9d8de18d6faff49a5821b (diff) | |
| parent | ac35566403652fc5cea0c42b273169584e5c9ce2 (diff) | |
Merge branch 'karma-failure-fix' into 'master'
Fixed duplicate jQuery AJAX spyon
See merge request !10531
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 8528e0800ae..7f6c74ce39a 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -102,10 +102,10 @@ import './flash'; destroyPipelinesView() { if (this.commitPipelinesTable) { - document.querySelector('#commit-pipeline-table-view') - .removeChild(this.commitPipelinesTable.$el); - this.commitPipelinesTable.$destroy(); + this.commitPipelinesTable = null; + + document.querySelector('#commit-pipeline-table-view').innerHTML = ''; } } |