summaryrefslogtreecommitdiff
path: root/Gemfile
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
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')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 42b75af3a5c..71d2eb1557c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -355,7 +355,7 @@ group :test do
gem 'shoulda-matchers', '~> 2.8.0', require: false
gem 'email_spec', '~> 1.6.0'
gem 'json-schema', '~> 2.6.2'
- gem 'webmock', '~> 1.24.0'
+ gem 'webmock', '~> 2.3.2'
gem 'test_after_commit', '~> 1.1'
gem 'sham_rack', '~> 1.3.6'
gem 'timecop', '~> 0.8.0'