From fead96788c30c13b5adc25132cd003638a6d4f51 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 8 Apr 2014 16:02:53 +0300
Subject: [PATCH] Update grape-entity

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index e25bf63..b249190 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,7 @@ gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
 # API
 gem "grape", "~> 0.6.1"
 # Replace with rubygems when nesteted entities get released
-gem "grape-entity", "~> 0.4.1", ref: 'd904381c951e86250c3f44213b349a3dd8e83fb1', git: 'https://github.com/intridea/grape-entity.git' 
+gem "grape-entity", "~> 0.4.2"
 gem 'rack-cors', require: 'rack/cors'
 
 # Email validation
diff --git a/Gemfile.lock b/Gemfile.lock
index 0f03979..0407538 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/intridea/grape-entity.git
-  revision: d904381c951e86250c3f44213b349a3dd8e83fb1
-  ref: d904381c951e86250c3f44213b349a3dd8e83fb1
-  specs:
-    grape-entity (0.4.1)
-      activesupport
-      multi_json (>= 1.3.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -214,6 +205,9 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
+    grape-entity (0.4.2)
+      activesupport
+      multi_json (>= 1.3.2)
     growl (1.0.3)
     guard (2.2.4)
       formatador (>= 0.2.4)
@@ -600,7 +594,7 @@ DEPENDENCIES
   gollum-lib (~> 3.0.0)
   gon (~> 5.0.0)
   grape (~> 0.6.1)
-  grape-entity (~> 0.4.1)!
+  grape-entity (~> 0.4.2)
   growl
   guard-rspec
   guard-spinach
--
libgit2 0.21.2