Download as
Browse Code »

Commit a91a6491bf3e74791ecf8dd1111d54435b8578cb

Authored by Dmitriy Zaporozhets
1 parent 7c60713e
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Use new grape-entity gem with fixed nested entities 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 12 additions and 5 deletions   Show diff stats
@@ -48,7 +48,8 @@ gem &quot;gitlab-linguist&quot;, &quot;~&gt; 3.0.0&quot;, require: &quot;linguist&quot; @@ -48,7 +48,8 @@ gem &quot;gitlab-linguist&quot;, &quot;~&gt; 3.0.0&quot;, require: &quot;linguist&quot;
48 48
49 # API 49 # API
50 gem "grape", "~> 0.6.1" 50 gem "grape", "~> 0.6.1"
51 -gem "grape-entity", "~> 0.3.0" 51 +# Replace with rubygems when nesteted entities get released
  52 +gem "grape-entity", "~> 0.4.1", ref: 'd904381c951e86250c3f44213b349a3dd8e83fb1', git: 'https://github.com/intridea/grape-entity.git'
52 gem 'rack-cors', require: 'rack/cors' 53 gem 'rack-cors', require: 'rack/cors'
53 54
54 # Email validation 55 # Email validation
@@ -5,6 +5,15 @@ GIT @@ -5,6 +5,15 @@ GIT
5 specs: 5 specs:
6 github-markup (0.7.6) 6 github-markup (0.7.6)
7 7
  8 +GIT
  9 + remote: https://github.com/intridea/grape-entity.git
  10 + revision: d904381c951e86250c3f44213b349a3dd8e83fb1
  11 + ref: d904381c951e86250c3f44213b349a3dd8e83fb1
  12 + specs:
  13 + grape-entity (0.4.1)
  14 + activesupport
  15 + multi_json (>= 1.3.2)
  16 +
8 GEM 17 GEM
9 remote: https://rubygems.org/ 18 remote: https://rubygems.org/
10 specs: 19 specs:
@@ -206,9 +215,6 @@ GEM @@ -206,9 +215,6 @@ GEM
206 rack-accept 215 rack-accept
207 rack-mount 216 rack-mount
208 virtus (>= 1.0.0) 217 virtus (>= 1.0.0)
209 - grape-entity (0.3.0)  
210 - activesupport  
211 - multi_json (>= 1.3.2)  
212 growl (1.0.3) 218 growl (1.0.3)
213 guard (2.2.4) 219 guard (2.2.4)
214 formatador (>= 0.2.4) 220 formatador (>= 0.2.4)
@@ -596,7 +602,7 @@ DEPENDENCIES @@ -596,7 +602,7 @@ DEPENDENCIES
596 gitlab_omniauth-ldap (= 1.0.4) 602 gitlab_omniauth-ldap (= 1.0.4)
597 gon (~> 5.0.0) 603 gon (~> 5.0.0)
598 grape (~> 0.6.1) 604 grape (~> 0.6.1)
599 - grape-entity (~> 0.3.0) 605 + grape-entity (~> 0.4.1)!
600 growl 606 growl
601 guard-rspec 607 guard-rspec
602 guard-spinach 608 guard-spinach