diff options
| author | Alban Peignier | 2018-05-16 14:57:55 +0200 |
|---|---|---|
| committer | Alban Peignier | 2018-05-16 14:57:55 +0200 |
| commit | 6f4d2a1954fa3b127785127e30f757f654fe20c7 (patch) | |
| tree | 1478c78e35208847ccfd9f299a028500516ef8e7 | |
| parent | 4178796e67cfad492436769603f1b05d81242e2b (diff) | |
| download | chouette-core-6f4d2a1954fa3b127785127e30f757f654fe20c7.tar.bz2 | |
Update sawyer and faraday. Refs #7032
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | Gemfile.lock | 22 |
2 files changed, 15 insertions, 13 deletions
@@ -52,9 +52,9 @@ gem 'seedbank' # gem 'debugger', group: [:development, :test] # API Rest -gem 'sawyer', '~> 0.6.0' -gem 'faraday_middleware', '~> 0.9.1' -gem 'faraday', '~> 0.9.1' +gem 'sawyer', '~> 0.8.1' +gem 'faraday_middleware' +gem 'faraday', '~> 0.11' platforms :ruby do gem 'therubyracer', '~> 0.12' diff --git a/Gemfile.lock b/Gemfile.lock index 51a72bb32..ed4490340 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,7 +90,8 @@ GEM activerecord (>= 3.0) acts_as_tree (2.1.0) activerecord (>= 3.0.0) - addressable (2.3.8) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) apartment (1.0.2) activerecord (>= 3.1.2, < 5.0) rack (>= 1.3.6) @@ -227,10 +228,10 @@ GEM faker (1.7.3) i18n (~> 0.5) fakeweb (1.3.0) - faraday (0.9.2) + faraday (0.15.1) multipart-post (>= 1.2, < 3) - faraday_middleware (0.9.2) - faraday (>= 0.7.4, < 0.10) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) ffaker (2.1.0) ffi (1.9.18) ffi-geos (1.2.0) @@ -364,6 +365,7 @@ GEM pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) + public_suffix (3.0.2) puma (3.10.0) pundit (1.1.0) activesupport (>= 3.0.0) @@ -485,9 +487,9 @@ GEM sass (~> 3.2.2) sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) - sawyer (0.6.0) - addressable (~> 2.3.5) - faraday (~> 0.8, < 0.10) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) @@ -630,8 +632,8 @@ DEPENDENCIES factory_girl_rails (~> 4.0) faker fakeweb - faraday (~> 0.9.1) - faraday_middleware (~> 0.9.1) + faraday (~> 0.11) + faraday_middleware ffaker (~> 2.1.0) flag-icons-rails font-awesome-sass (~> 4.7) @@ -691,7 +693,7 @@ DEPENDENCIES rspec-snapshot rubyzip sass-rails (~> 4.0.3) - sawyer (~> 0.6.0) + sawyer (~> 0.8.1) sdoc (~> 0.4.0) seedbank select2-rails (~> 4.0, >= 4.0.3) |
