mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-18 13:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bump searchkick, elasticsearch (#3602)

Browse Source 
* Bump searchkick

* Bump to 7.0.0

* Fix

* Fix crop search
This commit is contained in:
Daniel O'Connor
2024-01-26 23:01:39 +10:30
committed by GitHub
parent 49cd657916
commit 140fe7a087
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

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

21
Gemfile.lock
View File

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

2
app/controllers/crops_controller.rb
View File

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