Use new grape-entity gem with fixed nested entities
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
7c60713e82
commit
a91a6491bf
3
Gemfile
3
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
|
||||
|
|
14
Gemfile.lock
14
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
|
||||
|
|
Loading…
Reference in New Issue