check if files is set before counting

12ca1608 · Alfredo Sumaran · 0402a183 · 12ca1608
Commit 12ca1608 authored Sep 20, 2016 by Alfredo Sumaran
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

merge_conflict_data_provider.js.es6 app/assets/javascripts/merge_conflict_data_provider.js.es6 +4 -0

No files found.
--- a/app/assets/javascripts/merge_conflict_data_provider.js.es6
+++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6
@@ -268,6 +268,10 @@ class MergeConflictDataProvider {


  getConflictsCount() {
+    if (!this.vueInstance.conflictsData.files) {
+      return 0;
+    }
+
    const files = this.vueInstance.conflictsData.files;
    let count = 0;