Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-17 16:33:21 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-17 16:33:21 +0400
commita91a6491bf3e74791ecf8dd1111d54435b8578cb (patch)
treed33e3f2da1bc506ba7a1658928467a68b9e0b057 /Gemfile.lock
parent7c60713e82982066e187b8c16ce327978b451b0a (diff)
Use new grape-entity gem with fixed nested entities
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock14
1 files changed, 10 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 615ad62112a..52d6ac31463 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,6 +5,15 @@ GIT
specs:
github-markup (0.7.6)
+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:
@@ -206,9 +215,6 @@ GEM
rack-accept
rack-mount
virtus (>= 1.0.0)
- grape-entity (0.3.0)
- activesupport
- multi_json (>= 1.3.2)
growl (1.0.3)
guard (2.2.4)
formatador (>= 0.2.4)
@@ -596,7 +602,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (= 1.0.4)
gon (~> 5.0.0)
grape (~> 0.6.1)
- grape-entity (~> 0.3.0)
+ grape-entity (~> 0.4.1)!
growl
guard-rspec
guard-spinach