Bump searchkick, elasticsearch (#3602)

* Bump searchkick

* Bump to 7.0.0

* Fix

* Fix crop search

Gemfile

@@ -100,7 +100,7 @@ gem 'omniauth-twitter'
 gem "chartkick"
 
 # clever elastic search
-gem 'elasticsearch', '< 7.0.0'
+gem 'elasticsearch', '~> 7.0.0'
 gem 'searchkick'
 
 gem "hashie", ">= 3.5.3"

Gemfile.lock

@@ -227,18 +227,18 @@ GEM
       dotenv (= 2.8.1)
       railties (>= 3.2)
     dumb_delegator (1.0.0)
-    elasticsearch (6.8.3)
-      elasticsearch-api (= 6.8.3)
-      elasticsearch-transport (= 6.8.3)
-    elasticsearch-api (6.8.3)
+    elasticsearch (7.0.0)
+      elasticsearch-api (= 7.0.0)
+      elasticsearch-transport (= 7.0.0)
+    elasticsearch-api (7.0.0)
       multi_json
     elasticsearch-model (7.1.1)
       activesupport (> 3)
       elasticsearch (> 1)
       hashie
     elasticsearch-rails (7.1.0)
-    elasticsearch-transport (6.8.3)
-      faraday (~> 1)
+    elasticsearch-transport (7.0.0)
+      faraday
       multi_json
     erubi (1.12.0)
     erubis (2.7.0)
@@ -396,7 +396,7 @@ GEM
     moneta (1.0.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     net-imap (0.3.7)
       date
       net-protocol
@@ -598,9 +598,8 @@ GEM
       tilt
     scout_apm (5.3.5)
       parser
-    searchkick (4.6.3)
-      activemodel (>= 5)
-      elasticsearch (>= 6, < 7.14)
+    searchkick (5.3.1)
+      activemodel (>= 6.1)
       hashie
     selenium-webdriver (4.17.0)
       base64 (~> 0.2)
@@ -706,7 +705,7 @@ DEPENDENCIES
   devise
   discard (>= 1.2)
   dotenv-rails
-  elasticsearch (< 7.0.0)
+  elasticsearch (~> 7.0.0)
   factory_bot_rails
   faker
   faraday

app/controllers/crops_controller.rb

@@ -63,7 +63,7 @@ class CropsController < ApplicationController
     @crops = CropSearchService.search(@term,
                                       page:           params[:page],
                                       per_page:       Crop.per_page,
-                                      current_member:)
+                                      current_member:).to_a
     respond_with @crops
   end