From 14c868353585789adf3ff5c2103f8abf4bc03c83 Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Wed, 13 Jan 2016 18:58:38 +1100
Subject: [PATCH] Updating active_model_serializers

---
 Gemfile      | 2 +-
 Gemfile.lock | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8230c6a15f..ca4773110d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ gem 'andand'
 gem 'truncate_html'
 gem 'representative_view'
 gem 'rabl'
-gem "active_model_serializers"
+gem "active_model_serializers", '~> 0.8.3'
 gem 'oj'
 gem 'deface', :github => 'spree/deface', :ref => '1110a13'
 gem 'paperclip'
diff --git a/Gemfile.lock b/Gemfile.lock
index 16a319f0ab..1477aedf92 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -122,7 +122,7 @@ GEM
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
     active_link_to (1.0.0)
-    active_model_serializers (0.8.1)
+    active_model_serializers (0.8.3)
       activemodel (>= 3.0)
     activemerchant (1.48.0)
       activesupport (>= 3.2.14, < 5.0.0)
@@ -644,7 +644,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_model_serializers
+  active_model_serializers (~> 0.8.3)
   acts-as-taggable-on (~> 3.4)
   andand
   angular-rails-templates (~> 0.2.0)
@@ -730,6 +730,3 @@ DEPENDENCIES
   whenever
   wicked_pdf
   wkhtmltopdf-binary
-
-BUNDLED WITH
-   1.10.6