From c81aadd5746c67d640d3493f7bd7dd7eb0988485 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 22 Jul 2017 03:27:08 +0200
Subject: [PATCH] Bump active_model_serializers
---
Gemfile | 2 +-
Gemfile.lock | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 5eb0d54130..a75a9ef7ed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -162,7 +162,7 @@ gem "openid_connect", "1.1.2"
# Serializers
-gem "active_model_serializers", "0.9.5"
+gem "active_model_serializers", "0.9.7"
# XMPP chat dependencies
gem "diaspora-prosody-config", "0.0.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ec61ad263..1c51fc8845 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,8 +21,9 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- active_model_serializers (0.9.5)
+ active_model_serializers (0.9.7)
activemodel (>= 3.2)
+ concurrent-ruby (~> 1.0)
activejob (4.2.9)
activesupport (= 4.2.9)
globalid (>= 0.3.0)
@@ -755,7 +756,7 @@ PLATFORMS
ruby
DEPENDENCIES
- active_model_serializers (= 0.9.5)
+ active_model_serializers (= 0.9.7)
activerecord-import (= 0.19.1)
acts-as-taggable-on (= 3.5.0)
acts_as_api (= 1.0.0)
--
GitLab