From 7dbff87a729b470b0ce335ba416cc61bb5deeebc Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Sun, 27 Dec 2015 12:37:57 +0100
Subject: [PATCH] Bundle update
---
Gemfile.lock | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 08e65020d..78c2ec509 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,6 +121,7 @@ GEM
compass (~> 1.0.0)
sass-rails (<= 5.0.1)
sprockets (< 2.13)
+ concurrent-ruby (1.0.0)
debug_inspector (0.0.2)
devise (3.5.3)
bcrypt (~> 3.0)
@@ -226,8 +227,8 @@ GEM
has_scope (~> 0.6.0.rc)
railties (>= 3.2, < 5)
responders
- jbuilder (2.3.2)
- activesupport (>= 3.0.0, < 5)
+ jbuilder (2.4.0)
+ activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
@@ -334,7 +335,7 @@ GEM
ffi (>= 0.5.0)
rdoc (4.2.1)
json (~> 1.4)
- redcarpet (3.3.3)
+ redcarpet (3.3.4)
ref (2.0.0)
request_store (1.2.1)
responders (2.1.1)
--
GitLab