kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use .some instead of .find for phantomjs compatibility

This commit is contained in:
Alfredo Sumaran 2016-10-04 03:24:44 -05:00
parent f947972ded
commit 4f76ff0ecd
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
View File

@ -428,15 +428,7 @@
},
fileTextTypePresent() {
let found = false;
this.state.conflictsData.files.find((f) => {
if (f.type === CONFLICT_TYPES.TEXT) {
return found = true;
}
});
return found;
return this.state.conflictsData.files.some(f => f.type === CONFLICT_TYPES.TEXT);
}
};