logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: e9e475a29d7b5039c8ce14de4cef7e4f54fb7b0e
parent: 20d1be18af8c10b6f1bc5597643b85ac6dbae9f2
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Tue,  6 Mar 2018 14:14:26 +0900

Upgrade chewy to version 5.0.0 (#6649)


Diffstat:

MGemfile2+-
MGemfile.lock15+++++----------
2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile @@ -27,7 +27,7 @@ gem 'bootsnap' gem 'browser' gem 'charlock_holmes', '~> 0.7.5' gem 'iso-639' -gem 'chewy', '~> 0.10', git: 'https://github.com/toptal/chewy.git' +gem 'chewy', '~> 5.0' gem 'cld3', '~> 3.2.0' gem 'devise', '~> 4.4' gem 'devise-two-factor', '~> 3.0' diff --git 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) @@ -631,7 +626,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)