From 26b247bf98c673c77156d21d40c34e22f08d4c92 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Wed, 3 Jul 2019 02:34:43 +0200
Subject: [PATCH] Bump webmock
---
Gemfile | 2 +-
Gemfile.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index 8e579fab95..91c18c44d7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -294,7 +294,7 @@ group :test do
gem "factory_girl_rails", "4.8.0"
gem "shoulda-matchers", "4.0.1"
gem "timecop", "0.9.1"
- gem "webmock", "3.5.1", require: false
+ gem "webmock", "3.6.0", require: false
gem "diaspora_federation-test", "0.2.6"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d93a1864f..e9d7484032 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -306,7 +306,7 @@ GEM
execjs (~> 2.0)
sprockets (>= 2.0.0)
tilt (>= 1.2)
- hashdiff (0.3.8)
+ hashdiff (0.4.0)
hashie (3.6.0)
http (3.3.0)
addressable (~> 2.3)
@@ -764,10 +764,10 @@ GEM
webfinger (1.1.0)
activesupport
httpclient (>= 2.4)
- webmock (3.5.1)
+ webmock (3.6.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
- hashdiff
+ hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
@@ -920,7 +920,7 @@ DEPENDENCIES
unicorn-worker-killer (= 0.4.4)
uuid (= 2.3.9)
versionist (= 2.0.0)
- webmock (= 3.5.1)
+ webmock (= 3.6.0)
will_paginate (= 3.1.7)
BUNDLED WITH
--
GitLab