aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock27
1 files changed, 16 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 59bb98d..066bbfe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,18 @@
+GIT
+ remote: git://github.com/intridea/grape.git
+ revision: 1fecd022c119239ed6b476aee05590fad689e10a
+ specs:
+ grape (0.7.0)
+ activesupport
+ builder
+ hashie (>= 1.2.0)
+ multi_json (>= 1.3.2)
+ multi_xml (>= 0.5.2)
+ rack (>= 1.3.0)
+ rack-accept
+ rack-mount
+ virtus (>= 1.0.0)
+
GEM
remote: https://rubygems.org/
specs:
@@ -75,16 +90,6 @@ GEM
railties (>= 3.0.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
- grape (0.6.1)
- activesupport
- builder
- hashie (>= 1.2.0)
- multi_json (>= 1.3.2)
- multi_xml (>= 0.5.2)
- rack (>= 1.3.0)
- rack-accept
- rack-mount
- virtus (>= 1.0.0)
grape-rabl (0.2.2)
grape
i18n
@@ -267,7 +272,7 @@ DEPENDENCIES
dalli
em-work_queue
factory_girl_rails
- grape
+ grape!
grape-rabl
haml-rails
jquery-rails