Merge branch 'fix-diff-flash' into 'master'

only show error if there is an error See merge request gitlab-org/gitlab-ce!17228

Merge branch 'fix-diff-flash' into 'master'
f995621f · Clement Ho · Ian Baum · 962c7d4a · f995621f
Commit f995621f authored Feb 20, 2018 by Clement Ho Committed by Ian Baum Feb 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

single_file_diff.js app/assets/javascripts/single_file_diff.js +3 -1

No files found.
--- 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'));
+      });
  }
 }