summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-17 14:33:21 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-17 14:33:21 +0200
commita91a6491bf3e74791ecf8dd1111d54435b8578cb (patch)
treed33e3f2da1bc506ba7a1658928467a68b9e0b057 /Gemfile
parent7c60713e82982066e187b8c16ce327978b451b0a (diff)
downloadgitlab-ce-a91a6491bf3e74791ecf8dd1111d54435b8578cb.tar.gz
Use new grape-entity gem with fixed nested entities
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index dc7b60dd380..e3acf4a153d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,8 @@ gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
# API
gem "grape", "~> 0.6.1"
-gem "grape-entity", "~> 0.3.0"
+# 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 'rack-cors', require: 'rack/cors'
# Email validation