summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-10-17 12:43:17 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-10-17 12:43:17 -0500
commit28dbfd5c4c7793be4147ba217e7d9e162905088b (patch)
treea3aee9ca751feb5f556c1e290f3f517b1f4c935d /app/assets/javascripts/merge_conflicts
parenta975e4cb34349fb04305d6fb50756adf289ff633 (diff)
downloadgitlab-ce-28dbfd5c4c7793be4147ba217e7d9e162905088b.tar.gz
Provide better error message to the usermerge-conflicts-editor-2
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
-rw-r--r--app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es62
1 files changed, 1 insertions, 1 deletions
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;