summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-10 14:04:12 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-10 14:04:12 +0000
commite407a481f2b52342c79e6a7eca2e785a6e943d2f (patch)
tree0ad9d4659255a00caafb22fb068f6c1066d8affe /Gemfile
parent5a9135ade88e26d21ab2523e7e0c0e4a5bfe4cc0 (diff)
parent94cbf0091f44e879c02066aab7ec0a44eaeb14c3 (diff)
downloadgitlab-ce-e407a481f2b52342c79e6a7eca2e785a6e943d2f.tar.gz
Merge branch 'rs-pre-rspec-3' into 'master'
Changes back-ported from rspec3 branch This is just breaking up the large `road-to-rspec-3` branch a bit. Each of these commits have been cherry-picked and would be good to have in place before the upgrade. See merge request !792
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 37871859517..645e0b5cf7c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -254,10 +254,10 @@ group :development, :test do
end
group :test do
- gem "simplecov", require: false
- gem "shoulda-matchers", "~> 2.7.0"
+ gem 'simplecov', require: false
+ gem 'shoulda-matchers', '~> 2.8.0', require: false
gem 'email_spec'
- gem "webmock"
+ gem 'webmock', '~> 1.21.0'
gem 'test_after_commit'
end