From 28dbfd5c4c7793be4147ba217e7d9e162905088b Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 17 Oct 2016 12:43:17 -0500
Subject: Provide better error message to the user

---
 .../javascripts/merge_conflicts/components/diff_file_editor.js.es6      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts/merge_conflicts/components')

diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
index 3379414343f..5012bdfe997 100644
--- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
+++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
@@ -62,7 +62,7 @@
             this.saveDiffResolution();
           })
           .fail(() => {
-            console.log('error');
+            new Flash('Failed to load the file, please try again.');
           })
           .always(() => {
             this.loading = false;
-- 
cgit v1.2.3