diff --git a/Gemfile b/Gemfile index 099d95644798d260d2669bce8cddd95e26028153..678c2def65e98e5fadee9d1eec195b8f3e24444d 100644 --- a/Gemfile +++ b/Gemfile @@ -293,7 +293,7 @@ group :test do gem "factory_girl_rails", "4.8.0" gem "shoulda-matchers", "3.1.2" gem "timecop", "0.9.1" - gem "webmock", "3.0.1", require: false + gem "webmock", "3.3.0", require: false gem "diaspora_federation-test", "0.2.4" diff --git a/Gemfile.lock b/Gemfile.lock index a11df047f5945cf37171c23dc8ebc2fc280b6d97..be7d9245a0adeba34b4d70fb360802e022a83cec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -289,7 +289,7 @@ GEM execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) - hashdiff (0.3.6) + hashdiff (0.3.7) hashie (3.5.7) hitimes (1.2.6) http (3.0.0) @@ -749,7 +749,7 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.0.1) + webmock (3.3.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -904,7 +904,7 @@ DEPENDENCIES unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) versionist (= 1.7.0) - webmock (= 3.0.1) + webmock (= 3.3.0) will_paginate (= 3.1.6) BUNDLED WITH