From 2a0cb17f48f11112ab9a05658f440f7803b5fd05 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 22 Jul 2017 05:05:37 +0200
Subject: [PATCH] Bump shoulda-matchers
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 92cc2ab580..cc6e799efc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -290,9 +290,9 @@ group :test do
# General helpers
gem "factory_girl_rails", "4.8.0"
+ gem "shoulda-matchers", "3.1.2"
gem "timecop", "0.9.1"
gem "webmock", "3.0.1", require: false
- gem "shoulda-matchers", "3.1.1"
gem "diaspora_federation-test", "0.2.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index a9363be1bd..c980a29233 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -631,7 +631,7 @@ GEM
useragent
securecompare (1.0.0)
shellany (0.0.1)
- shoulda-matchers (3.1.1)
+ shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
sidekiq (4.2.10)
concurrent-ruby (~> 1.0)
@@ -872,7 +872,7 @@ DEPENDENCIES
rubyzip (= 1.2.1)
sass-rails (= 5.0.6)
secure_headers (= 3.6.7)
- shoulda-matchers (= 3.1.1)
+ shoulda-matchers (= 3.1.2)
sidekiq (= 4.2.10)
sidekiq-cron (= 0.6.3)
simple_captcha2 (= 0.4.3)
--
GitLab