kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Upgraded the grape gem

Browse source
This commit is contained in:
Jeroen van Baarsen 2013-12-09 20:50:36 +01:00 committed by Dmitriy Zaporozhets
parent 70bb976bc6
commit 7c1b8694f5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -48,7 +48,7 @@ gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib'
gem "gitlab-linguist", "~> 2.9.6", require: "linguist" gem "gitlab-linguist", "~> 2.9.6", require: "linguist"
# API # API
gem "grape", "~> 0.4.1" gem "grape", "~> 0.6.1"
gem "grape-entity", "~> 0.3.0" gem "grape-entity", "~> 0.3.0"
gem 'rack-cors', require: 'rack/cors' gem 'rack-cors', require: 'rack/cors'

6
Gemfile.lock
View file

@ -210,7 +210,7 @@ GEM
omniauth (~> 1.0) omniauth (~> 1.0)
pyu-ruby-sasl (~> 0.0.3.1) pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1) rubyntlm (~> 0.1.1)
grape (0.4.1) grape (0.6.1)
activesupport activesupport
builder builder
hashie (>= 1.2.0) hashie (>= 1.2.0)
@ -219,7 +219,7 @@ GEM
rack (>= 1.3.0) rack (>= 1.3.0)
rack-accept rack-accept
rack-mount rack-mount
virtus virtus (>= 1.0.0)
grape-entity (0.3.0) grape-entity (0.3.0)
activesupport activesupport
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
@ -608,7 +608,7 @@ DEPENDENCIES
gitlab_meta (= 6.0) gitlab_meta (= 6.0)
gitlab_omniauth-ldap (= 1.0.3) gitlab_omniauth-ldap (= 1.0.3)
gon! gon!
grape (~> 0.4.1) grape (~> 0.6.1)
grape-entity (~> 0.3.0) grape-entity (~> 0.3.0)
growl growl
guard-rspec guard-rspec