From f50fdacae4fa1b6313ec9c36541749678267a082 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Tue, 15 Nov 2016 22:57:28 +0100
Subject: Upgrade grape-entity

Fixes gitlab-org/gitlab-ce#14329
---
 Gemfile      | 2 +-
 Gemfile.lock | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9e815925a1f..14ea7ec7ea0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
 
 # API
 gem 'grape',        '~> 0.15.0'
-gem 'grape-entity', '~> 0.4.2'
+gem 'grape-entity', '~> 0.5.2'
 gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
 
 # Pagination
diff --git a/Gemfile.lock b/Gemfile.lock
index bdc60552480..331ffd89148 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -316,8 +316,7 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    grape-entity (0.4.8)
-      activesupport
+    grape-entity (0.5.2)
       multi_json (>= 1.3.2)
     haml (4.0.7)
       tilt
@@ -869,7 +868,7 @@ DEPENDENCIES
   gollum-rugged_adapter (~> 0.4.2)
   gon (~> 6.1.0)
   grape (~> 0.15.0)
-  grape-entity (~> 0.4.2)
+  grape-entity (~> 0.5.2)
   haml_lint (~> 0.18.2)
   hamlit (~> 2.6.1)
   health_check (~> 2.2.0)
-- 
cgit v1.2.1