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

Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Brenda Wallace
2019-06-25 09:08:42 +12:00
parent 3e0f6c476f f7406de7dc
commit 0171e67b7e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

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

13
Gemfile.lock
View File

@@ -147,17 +147,17 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.1.5)
elasticsearch (7.1.0)
elasticsearch-api (= 7.1.0)
elasticsearch-transport (= 7.1.0)
elasticsearch-api (7.1.0)
elasticsearch (6.8.0)
elasticsearch-api (= 6.8.0)
elasticsearch-transport (= 6.8.0)
elasticsearch-api (6.8.0)
multi_json
elasticsearch-model (6.0.0)
activesupport (> 3)
elasticsearch (> 1)
hashie
elasticsearch-rails (6.0.0)
elasticsearch-transport (7.1.0)
elasticsearch-transport (6.8.0)
faraday
multi_json
erubi (1.8.0)
@@ -461,7 +461,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
scout_apm (2.4.24)
scout_apm (2.5.0)
searchkick (4.0.2)
activemodel (>= 5)
elasticsearch (>= 6)
@@ -558,6 +558,7 @@ DEPENDENCIES
dalli
database_cleaner
devise
elasticsearch (< 7.0.0)
factory_bot_rails
faker
figaro