diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 00:17:17 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 00:17:17 +0000 |
| commit | 447d7e612753d69f043e08ebb228b21e411c8b4a (patch) | |
| tree | 80caebcff2b131898f620f89ad0858d44530d30f /Gemfile.lock | |
| parent | 43a9a781a443a6b9296431fbcc4285b3ca6a1a57 (diff) | |
| parent | ff44b2e92d496c6027b20157fea6ebd885906bea (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f0ad8ab55..693773d36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,3 @@ -GIT - remote: https://github.com/toptal/chewy.git - revision: a7d21eb4b0bd7415533ef134bb6d31b2df309701 - specs: - chewy (0.10.1) - activesupport (>= 4.0) - elasticsearch (>= 2.0.0) - elasticsearch-dsl - GEM remote: https://rubygems.org/ specs: @@ -118,6 +109,10 @@ GEM case_transform (0.2) activesupport charlock_holmes (0.7.5) + chewy (5.0.0) + activesupport (>= 4.0) + elasticsearch (>= 2.0.0) + elasticsearch-dsl chunky_png (1.3.8) cld3 (3.2.2) ffi (>= 1.1.0, < 1.10.0) @@ -634,7 +629,7 @@ DEPENDENCIES capistrano-yarn (~> 2.0) capybara (~> 2.15) charlock_holmes (~> 0.7.5) - chewy (~> 0.10)! + chewy (~> 5.0) cld3 (~> 3.2.0) climate_control (~> 0.2) devise (~> 4.4) |