From 5dd3675258bc066b5de7c15f51ec4f7564ca8f34 Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Wed, 19 Aug 2015 22:52:32 +0200
Subject: [PATCH] bump diaspora-vines to v0.1.28
closes #6329
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
---
Gemfile | 2 +-
Gemfile.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 1f74d83d4f..985097e069 100644
--- a/Gemfile
+++ b/Gemfile
@@ -147,7 +147,7 @@ gem "omniauth-wordpress", "0.2.2"
gem "active_model_serializers", "0.9.3"
# XMPP chat dependencies
-gem "diaspora-vines", "~> 0.1.27"
+gem "diaspora-vines", "~> 0.1.28"
gem "rails-assets-diaspora_jsxc", "~> 0.1.1", source: "https://rails-assets.org"
# Tags
diff --git a/Gemfile.lock b/Gemfile.lock
index 24d5157e1a..4ac62a8c15 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -49,7 +49,7 @@ GEM
activesupport (>= 3.0.0)
rack (>= 1.1.0)
addressable (2.3.8)
- arel (6.0.2)
+ arel (6.0.3)
asset_sync (1.1.0)
activemodel
fog (>= 1.8.0)
@@ -145,7 +145,7 @@ GEM
devise_lastseenable (0.0.6)
devise
rails (>= 3.0.4)
- diaspora-vines (0.1.27)
+ diaspora-vines (0.1.28)
activerecord (~> 4.1)
bcrypt (~> 3.1)
em-hiredis (~> 0.3.0)
@@ -176,7 +176,7 @@ GEM
erubis (2.7.0)
ethon (0.7.4)
ffi (>= 1.3.0)
- eventmachine (1.0.7)
+ eventmachine (1.0.8)
excon (0.45.4)
execjs (2.5.2)
eye (0.7.pre)
@@ -421,7 +421,7 @@ GEM
mime-types (2.6.1)
mini_magick (4.2.7)
mini_portile (0.6.2)
- minitest (5.7.0)
+ minitest (5.8.0)
mobile-fu (1.3.1)
rack-mobile-detect
rails
@@ -761,7 +761,7 @@ DEPENDENCIES
devise (= 3.5.1)
devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.6)
- diaspora-vines (~> 0.1.27)
+ diaspora-vines (~> 0.1.28)
diaspora_federation-rails (= 0.0.3)
entypo-rails (= 2.2.3)
eye (= 0.7.pre)
--
GitLab