From 2a5cbd8072e8cef15d143267d66c8d8fd5563e79 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 14 Mar 2013 14:27:43 -0700
Subject: [PATCH] see:
 https://github.com/rails-api/active_model_serializers/pull/233

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

diff --git a/Gemfile b/Gemfile
index df7f8bed48e..4762f098d4c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -115,4 +115,6 @@ group :profile do
   #
   # if you need to profile, uncomment out this line
   # gem 'rack-perftools_profiler', require: 'rack/perftools_profiler', platform: :mri_19 
+  # you could also use this for profiling
+  # gem 'ruby-prof'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 977aba11156..a01a5c033a6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,9 +27,9 @@ GIT
 
 GIT
   remote: git://github.com/rails-api/active_model_serializers.git
-  revision: 0114e492388ff84defcd1afbbb315e547849cb96
+  revision: 6408b73e3cd3d11ab08b541acbd5b4071da5fabd
   specs:
-    active_model_serializers (0.5.2)
+    active_model_serializers (0.7.0)
       activemodel (>= 3.0)
 
 GIT
@@ -215,7 +215,7 @@ GEM
     hike (1.2.1)
     hiredis (0.4.5)
     httpauth (0.2.0)
-    i18n (0.6.1)
+    i18n (0.6.4)
     image_optim (0.7.2)
       fspath (~> 2.0.3)
       image_size (~> 1.1)