Commit fead96788c30c13b5adc25132cd003638a6d4f51
1 parent
f382983f
Exists in
spb-stable
and in
3 other branches
Update grape-entity
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
5 additions
and
11 deletions
Show diff stats
Gemfile
@@ -47,7 +47,7 @@ gem "gitlab-linguist", "~> 3.0.0", require: "linguist" | @@ -47,7 +47,7 @@ gem "gitlab-linguist", "~> 3.0.0", require: "linguist" | ||
47 | # API | 47 | # API |
48 | gem "grape", "~> 0.6.1" | 48 | gem "grape", "~> 0.6.1" |
49 | # Replace with rubygems when nesteted entities get released | 49 | # Replace with rubygems when nesteted entities get released |
50 | -gem "grape-entity", "~> 0.4.1", ref: 'd904381c951e86250c3f44213b349a3dd8e83fb1', git: 'https://github.com/intridea/grape-entity.git' | 50 | +gem "grape-entity", "~> 0.4.2" |
51 | gem 'rack-cors', require: 'rack/cors' | 51 | gem 'rack-cors', require: 'rack/cors' |
52 | 52 | ||
53 | # Email validation | 53 | # Email validation |
Gemfile.lock
1 | -GIT | ||
2 | - remote: https://github.com/intridea/grape-entity.git | ||
3 | - revision: d904381c951e86250c3f44213b349a3dd8e83fb1 | ||
4 | - ref: d904381c951e86250c3f44213b349a3dd8e83fb1 | ||
5 | - specs: | ||
6 | - grape-entity (0.4.1) | ||
7 | - activesupport | ||
8 | - multi_json (>= 1.3.2) | ||
9 | - | ||
10 | GEM | 1 | GEM |
11 | remote: https://rubygems.org/ | 2 | remote: https://rubygems.org/ |
12 | specs: | 3 | specs: |
@@ -214,6 +205,9 @@ GEM | @@ -214,6 +205,9 @@ GEM | ||
214 | rack-accept | 205 | rack-accept |
215 | rack-mount | 206 | rack-mount |
216 | virtus (>= 1.0.0) | 207 | virtus (>= 1.0.0) |
208 | + grape-entity (0.4.2) | ||
209 | + activesupport | ||
210 | + multi_json (>= 1.3.2) | ||
217 | growl (1.0.3) | 211 | growl (1.0.3) |
218 | guard (2.2.4) | 212 | guard (2.2.4) |
219 | formatador (>= 0.2.4) | 213 | formatador (>= 0.2.4) |
@@ -600,7 +594,7 @@ DEPENDENCIES | @@ -600,7 +594,7 @@ DEPENDENCIES | ||
600 | gollum-lib (~> 3.0.0) | 594 | gollum-lib (~> 3.0.0) |
601 | gon (~> 5.0.0) | 595 | gon (~> 5.0.0) |
602 | grape (~> 0.6.1) | 596 | grape (~> 0.6.1) |
603 | - grape-entity (~> 0.4.1)! | 597 | + grape-entity (~> 0.4.2) |
604 | growl | 598 | growl |
605 | guard-rspec | 599 | guard-rspec |
606 | guard-spinach | 600 | guard-spinach |