mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-12 01:36:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into plantings-show

Browse Source
This commit is contained in:
Brenda Wallace
2019-04-20 09:46:14 +12:00
committed by GitHub
parent 91b7f58e9d a8009c49e8
commit 9da4ccd6de
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Gemfile.lock
View File

@@ -142,17 +142,17 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.1.5)
elasticsearch (6.2.0)
elasticsearch-api (= 6.2.0)
elasticsearch-transport (= 6.2.0)
elasticsearch-api (6.2.0)
elasticsearch (6.3.0)
elasticsearch-api (= 6.3.0)
elasticsearch-transport (= 6.3.0)
elasticsearch-api (6.3.0)
multi_json
elasticsearch-model (6.0.0)
activesupport (> 3)
elasticsearch (> 1)
hashie
elasticsearch-rails (6.0.0)
elasticsearch-transport (6.2.0)
elasticsearch-transport (6.3.0)
faraday
multi_json
erubi (1.8.0)
@@ -456,9 +456,9 @@ GEM
sprockets-rails
tilt
scout_apm (2.4.24)
searchkick (3.1.2)
activemodel (>= 4.2)
elasticsearch (>= 5)
searchkick (4.0.0)
activemodel (>= 5)
elasticsearch (>= 6)
hashie
selenium-webdriver (3.141.0)
childprocess (~> 0.5)