diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-04 03:24:44 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:35 -0500 |
| commit | 4f76ff0ecd0d3b278f9722042b66d1767078ddd0 (patch) | |
| tree | ee76d0fb112c63ccc97f8890f34c6badaa618bac | |
| parent | f947972dede2f8d68215555e4b4fd6e90a6bc437 (diff) | |
| download | gitlab-ce-4f76ff0ecd0d3b278f9722042b66d1767078ddd0.tar.gz | |
Use .some instead of .find for phantomjs compatibility
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 index e31cac49d44..bdd6753f66a 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 @@ -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); } }; |