summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-03-25 13:01:11 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-03-26 20:29:41 -0400
commit7d751853e9691e0f2de8839cd594085f9e041917 (patch)
tree8c6cb37996cf3c654aa78112ab800ebb7baa50ae /Gemfile.lock
parentce906f48a5fa7cd7748018c0c17d0d82d86baa44 (diff)
downloadgitlab-ce-7d751853e9691e0f2de8839cd594085f9e041917.tar.gz
Update webmock 1.21.0 -> 1.24.6
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f90620169b7..3168bc0d680 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -343,6 +343,7 @@ GEM
temple (~> 0.7.6)
thor
tilt
+ hashdiff (0.3.2)
hashie (3.5.5)
health_check (2.6.0)
rails (>= 4.0)
@@ -818,9 +819,10 @@ GEM
vmstat (2.3.0)
warden (1.2.6)
rack (>= 1.0)
- webmock (1.21.0)
+ webmock (1.24.6)
addressable (>= 2.3.6)
crack (>= 0.3.2)
+ hashdiff
webpack-rails (0.9.9)
rails (>= 3.2.0)
websocket-driver (0.6.3)
@@ -1023,7 +1025,7 @@ DEPENDENCIES
version_sorter (~> 2.1.0)
virtus (~> 1.0.1)
vmstat (~> 2.3.0)
- webmock (~> 1.21.0)
+ webmock (~> 1.24.0)
webpack-rails (~> 0.9.9)
wikicloth (= 0.8.1)