From 4f76ff0ecd0d3b278f9722042b66d1767078ddd0 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 4 Oct 2016 03:24:44 -0500
Subject: Use .some instead of .find for phantomjs compatibility

---
 .../javascripts/merge_conflicts/merge_conflict_store.js.es6    | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'app/assets')

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);
     }
   };
 
-- 
cgit v1.2.1