diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-16 10:06:39 +0300 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-16 10:06:39 +0300 |
| commit | 446f37872f6b493f1f27055f26abb66fcf8d435a (patch) | |
| tree | 2271275f1ad2c20534261fcc96a9fc5b4575f2bc /app | |
| parent | c676e79e6f5344e8a45d9cd262055729939a54b9 (diff) | |
| parent | 132be812d1c4ecf185f8839432f6bcafa13880e5 (diff) | |
Merge branch 'karma-headless-chrome-redux' into 'master'
Replace PhantomJS with Chrome in Karma test runner (2nd attempt)
Closes #33633
See merge request !12144
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/api.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 6680834a8d1..56fa0d71a9a 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -77,7 +77,7 @@ const Api = { dataType: 'json', }) .done(label => callback(label)) - .error(message => callback(message.responseJSON)); + .fail(message => callback(message.responseJSON)); }, // Return group projects list. Filtered by query @@ -134,7 +134,7 @@ const Api = { dataType: 'json', }) .done(file => callback(null, file)) - .error(callback); + .fail(callback); }, users(query, options) { |