diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-20 15:33:24 +0000 |
|---|---|---|
| committer | Ian Baum <ibaum@gitlab.com> | 2018-02-23 14:04:27 -0600 |
| commit | f995621fdfeb94a43a4fe9595ce1d2d87c631a69 (patch) | |
| tree | 393be6b27d229a4dc179a79ff903eac724ba3fb9 | |
| parent | 962c7d4a7fa0914f27594a364aaa1ddf186d6947 (diff) | |
| download | gitlab-ce-f995621fdfeb94a43a4fe9595ce1d2d87c631a69.tar.gz | |
Merge branch 'fix-diff-flash' into 'master'
only show error if there is an error
See merge request gitlab-org/gitlab-ce!17228
| -rw-r--r-- | app/assets/javascripts/single_file_diff.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/single_file_diff.js b/app/assets/javascripts/single_file_diff.js index 48dd91bdf06..0cd6e69811a 100644 --- a/app/assets/javascripts/single_file_diff.js +++ b/app/assets/javascripts/single_file_diff.js @@ -88,6 +88,8 @@ export default class SingleFileDiff { if (cb) cb(); }) - .catch(createFlash(__('An error occurred while retrieving diff'))); + .catch(() => { + createFlash(__('An error occurred while retrieving diff')); + }); } } |