summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDrew Blessing <drew.blessing@buckle.com>2013-05-25 19:43:51 -0500
committerDrew Blessing <drew.blessing@buckle.com>2013-05-25 19:43:51 -0500
commit245deb5cce916fb7a42c33cc98210ce5e4b6ed0a (patch)
tree1015f1278939e0644bfceedbcb920af6840d9310 /Gemfile.lock
parentd58aca0693d28e17633fb0d2825f1cddfd4f0748 (diff)
downloadgitlab-ce-245deb5cce916fb7a42c33cc98210ce5e4b6ed0a.tar.gz
Fix regression caused by using newer version of Grape
This commit fixes the regression caused by using a newer version of Grape and Grape entity. This solves Issue 4023.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 48be954c0c5..32745866b4f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
gon (4.1.0)
actionpack (>= 2.3.0)
json
- grape (0.4.1)
+ grape (0.3.1)
activesupport
builder
hashie (>= 1.2.0)
@@ -183,7 +183,7 @@ GEM
rack-accept
rack-mount
virtus
- grape-entity (0.3.0)
+ grape-entity (0.2.0)
activesupport
multi_json (>= 1.3.2)
growl (1.0.3)