diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 13:45:18 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 15:36:53 +0100 |
| commit | 571d219bb917cefcca7419a0ad4e3889689d5f6a (patch) | |
| tree | 6ab91adcb2c164fd027708e58f5fb96c52474007 /Gemfile.lock | |
| parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
| parent | 66436d08959998be20c6c6bf631177d8c1f3e0d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 99db89693..35a41c6a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -142,7 +142,7 @@ GEM elasticsearch (>= 2.0.0) elasticsearch-dsl chunky_png (1.3.10) - cld3 (3.2.2) + cld3 (3.2.3) ffi (>= 1.1.0, < 1.10.0) climate_control (0.2.0) cocaine (0.5.8) @@ -631,7 +631,7 @@ GEM uniform_notifier (1.12.1) warden (1.2.7) rack (>= 1.0) - webmock (3.4.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -672,7 +672,7 @@ DEPENDENCIES capybara (~> 3.12) charlock_holmes (~> 0.7.6) chewy (~> 5.0) - cld3 (~> 3.2.0) + cld3 (~> 3.2.3) climate_control (~> 0.2) derailed_benchmarks devise (~> 4.5) @@ -766,7 +766,7 @@ DEPENDENCIES tty-prompt (~> 0.18) twitter-text (~> 1.14) tzinfo-data (~> 1.2018) - webmock (~> 3.4) + webmock (~> 3.5) webpacker (~> 3.5) webpush |