summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-06-27 17:30:43 +0000
committerDouwe Maan <douwe@gitlab.com>2017-06-27 17:30:43 +0000
commit585e6aa5b20b31b1de01f7c5aa9aea67d7a377f4 (patch)
tree27359d8d3d04cfb363c3ed1c27722649765ebd63 /Gemfile.lock
parent471a40ace1952d43266b8814c08af72f40874e43 (diff)
parenta274359ecd485218ed7c42b750a43992ff3142ef (diff)
downloadgitlab-ce-585e6aa5b20b31b1de01f7c5aa9aea67d7a377f4.tar.gz
Merge branch 'bugfix/ruby2.4-compat' into 'master'
ruby 2.4 compat: update to webmock 2.3.2 See merge request !12471
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 d77ba37f16f..865d13c6f53 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -368,7 +368,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)
@@ -891,7 +891,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
@@ -1122,7 +1122,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)