diff --git a/Gemfile b/Gemfile index 997d5dd72df0edd74c793e66c829f62243a3e6e1..7f744b8c7fa2eab73ab2843eb20d7008b915990d 100644 --- a/Gemfile +++ b/Gemfile @@ -294,7 +294,7 @@ group :test do gem "factory_girl_rails", "4.9.0" gem "shoulda-matchers", "4.0.1" gem "timecop", "0.9.1" - gem "webmock", "3.6.0", require: false + gem "webmock", "3.8.3", require: false gem "diaspora_federation-test", "0.2.6" diff --git a/Gemfile.lock b/Gemfile.lock index 55931365a15cb0b85faba8b52a39a926bdf42ce3..d86212daff9d71a160cf1d57951c9902daf5c897 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -772,7 +772,7 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.6.0) + webmock (3.8.3) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -928,7 +928,7 @@ DEPENDENCIES unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) versionist (= 2.0.0) - webmock (= 3.6.0) + webmock (= 3.8.3) will_paginate (= 3.1.7) BUNDLED WITH