summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d9aa401fb2..dac2f85ce26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -210,7 +210,7 @@ GEM
omniauth (~> 1.0)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
- grape (0.4.1)
+ grape (0.6.1)
activesupport
builder
hashie (>= 1.2.0)
@@ -219,7 +219,7 @@ GEM
rack (>= 1.3.0)
rack-accept
rack-mount
- virtus
+ virtus (>= 1.0.0)
grape-entity (0.3.0)
activesupport
multi_json (>= 1.3.2)
@@ -608,7 +608,7 @@ DEPENDENCIES
gitlab_meta (= 6.0)
gitlab_omniauth-ldap (= 1.0.3)
gon!
- grape (~> 0.4.1)
+ grape (~> 0.6.1)
grape-entity (~> 0.3.0)
growl
guard-rspec