diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-09-20 12:37:53 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:34 -0500 |
| commit | 12ca16080b86b2b0cee8037800952347c2dcd8c4 (patch) | |
| tree | e6436b3dee31c7bfe316075c96362e1fb14e1350 | |
| parent | 0402a18367a7a08d3f40f8b63b961a0e1abb345a (diff) | |
| download | gitlab-ce-12ca16080b86b2b0cee8037800952347c2dcd8c4.tar.gz | |
check if files is set before counting
| -rw-r--r-- | app/assets/javascripts/merge_conflict_data_provider.js.es6 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_conflict_data_provider.js.es6 b/app/assets/javascripts/merge_conflict_data_provider.js.es6 index bfed78ff99c..6d1d3f36b33 100644 --- 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; |