diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-20 15:33:24 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-20 15:33:24 +0000 |
| commit | 088d03bfdbe336549dc449e03443a35cef620ffa (patch) | |
| tree | 718e6150e20a85c24e83255ad5248cdebea31a25 | |
| parent | 07fc0ea756af640aab38c7b00c10e3bc68c90d89 (diff) | |
| parent | 6ceb2cb3c0f84bd78161c01ed97efae079c8a3ba (diff) | |
| download | gitlab-ce-088d03bfdbe336549dc449e03443a35cef620ffa.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')); + }); } } |