summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2017-06-14 19:58:02 -0700
committerhttp://jneen.net/ <jneen@jneen.net>2017-06-26 18:00:00 -0700
commitc8dfdfcda353d438f5cbdef0acc2e7898ef9a136 (patch)
tree6fca45d105c005d7166ee969422b5e49dc3fdce6 /Gemfile.lock
parent57f0677ad854b7b17bd57e1e3b0ef542ce322b56 (diff)
downloadgitlab-ce-c8dfdfcda353d438f5cbdef0acc2e7898ef9a136.tar.gz
ruby 2.4 compat: update to webmock 2.3.2
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 817a1fd6aa3..f6966457271 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -366,7 +366,7 @@ GEM
temple (~> 0.7.6)
thor
tilt
- hashdiff (0.3.2)
+ hashdiff (0.3.4)
hashie (3.5.5)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
@@ -888,7 +888,7 @@ GEM
vmstat (2.3.0)
warden (1.2.6)
rack (>= 1.0)
- webmock (1.24.6)
+ webmock (2.3.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
@@ -1118,7 +1118,7 @@ DEPENDENCIES
version_sorter (~> 2.1.0)
virtus (~> 1.0.1)
vmstat (~> 2.3.0)
- webmock (~> 1.24.0)
+ webmock (~> 2.3.2)
webpack-rails (~> 0.9.10)
wikicloth (= 0.8.1)