summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-25 08:08:26 +0000
committerRémy Coutable <remy@rymai.me>2017-07-25 08:08:26 +0000
commite43bda0ebb56991f9f128946fefed375a695eac1 (patch)
tree3a90bf088b2b13d999e5b012ceaa5d85de14c38e /Gemfile.lock
parent1897aafdf8bada00f171e38558444265ccbadbaa (diff)
parent3a0b9e06e1dd5f6141a6f04dd2b39dbb803c07f1 (diff)
downloadgitlab-ce-e43bda0ebb56991f9f128946fefed375a695eac1.tar.gz
Merge branch 'dz-update-shoulda' into 'master'
Update shoulda-matchers gem to 3.1.2 See merge request !13040
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 6ffff0d8735..f6c1636dfaf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -774,8 +774,8 @@ GEM
sexp_processor (4.9.0)
sham_rack (1.3.6)
rack
- shoulda-matchers (2.8.0)
- activesupport (>= 3.0.0)
+ shoulda-matchers (3.1.2)
+ activesupport (>= 4.0.0)
sidekiq (5.0.4)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
@@ -1084,7 +1084,7 @@ DEPENDENCIES
sentry-raven (~> 2.5.3)
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
- shoulda-matchers (~> 2.8.0)
+ shoulda-matchers (~> 3.1.2)
sidekiq (~> 5.0)
sidekiq-cron (~> 0.6.0)
sidekiq-limit_fetch (~> 3.4)