Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump searchkick, elasticsearch #3602

Merged
merged 7 commits into from
Jan 26, 2024
Merged

Bump searchkick, elasticsearch #3602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fa0e831
Bump searchkick
CloCkWeRX Jan 26, 2024
ee1fb7f
Merge branch 'dev' into searchkick
CloCkWeRX Jan 26, 2024
28aebbd
Bump to 7.0.0
CloCkWeRX Jan 26, 2024
d13ac84
Merge branch 'searchkick' of https://github.com/Growstuff/growstuff i…
CloCkWeRX Jan 26, 2024
9a272f4
Merge branch 'dev' into searchkick
CloCkWeRX Jan 26, 2024
3713824
Fix
CloCkWeRX Jan 26, 2024
ae9fa48
Fix crop search
CloCkWeRX Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
21 changes: 10 additions & 11 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -706,7 +705,7 @@ DEPENDENCIES
devise
discard (>= 1.2)
dotenv-rails
elasticsearch (< 7.0.0)
elasticsearch (~> 7.0.0)
factory_bot_rails
faker
faraday
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/crops_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def search
@crops = CropSearchService.search(@term,
page: params[:page],
per_page: Crop.per_page,
current_member:)
current_member:).to_a
respond_with @crops
end

Expand Down