nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

we can now use an up-to-date json gem now that chef is gone [ci skip]

Browse source
This commit is contained in:
danielgrippi 2012-01-11 02:31:21 -08:00
parent c47ebd5a18
commit 953eb1db95
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -61,7 +61,7 @@ gem 'jammit', '0.6.5'
# JSON and API # JSON and API
gem 'json', '1.5.2' gem 'json'
gem 'vanna', :git => 'git://github.com/MikeSofaer/vanna.git' gem 'vanna', :git => 'git://github.com/MikeSofaer/vanna.git'
gem 'acts_as_api' gem 'acts_as_api'

4
Gemfile.lock
View file

@ -207,7 +207,7 @@ GEM
rspec (>= 1.3.1) rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3) selenium-webdriver (>= 0.1.3)
jasmine-core (1.1.0) jasmine-core (1.1.0)
json (1.5.2) json (1.6.4)
jsonpath (0.4.2) jsonpath (0.4.2)
multi_json multi_json
jwt (0.1.3) jwt (0.1.3)
@ -442,7 +442,7 @@ DEPENDENCIES
i18n-inflector-rails (~> 1.0) i18n-inflector-rails (~> 1.0)
jammit (= 0.6.5) jammit (= 0.6.5)
jasmine (~> 1.1.2) jasmine (~> 1.1.2)
json (= 1.5.2) json
jwt (= 0.1.3) jwt (= 0.1.3)
linecache (= 0.46) linecache (= 0.46)
messagebus_ruby_api (= 1.0.1) messagebus_ruby_api (= 1.0.1)