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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Dan Hansen 2011-04-15 17:31:34 -05:00
commit 0edc6bdeef
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -6,6 +6,7 @@ gem 'foreigner', '0.9.1'
gem 'bundler', '>= 1.0.0'
gem 'chef', '0.9.12', :require => false
gem 'ohai', '0.5.8', :require => false #Chef dependency
gem 'nokogiri', '1.4.3.1'

39
Gemfile.lock
View file

@ -65,6 +65,10 @@ PATH
GEM
remote: http://rubygems.org/
specs:
POpen4 (0.1.4)
Platform (>= 0.4.0)
open4
Platform (0.4.0)
SystemTimer (1.2.1)
abstract (1.0.0)
actionmailer (3.0.3)
@ -127,18 +131,18 @@ GEM
erubis
extlib
highline
json (<= 1.4.6, >= 1.4.4)
json (>= 1.4.4, <= 1.4.6)
mixlib-authentication (>= 1.1.0)
mixlib-cli (>= 1.1.0)
mixlib-config (>= 1.1.2)
mixlib-log (>= 1.2.0)
moneta
ohai (>= 0.5.7)
rest-client (< 1.7.0, >= 1.0.4)
rest-client (>= 1.0.4, < 1.7.0)
uuidtools
childprocess (0.1.7)
ffi (~> 0.6.3)
closure-compiler (1.0.0)
closure-compiler (1.1.1)
cloudfiles (1.4.10)
mime-types (>= 1.16)
columnize (0.3.2)
@ -153,7 +157,7 @@ GEM
cucumber-rails (0.3.2)
cucumber (>= 0.8.0)
culerity (0.2.15)
daemons (1.1.0)
daemons (1.1.2)
database_cleaner (0.6.0)
devise (1.1.3)
bcrypt-ruby (~> 2.1.2)
@ -171,7 +175,7 @@ GEM
faraday (0.5.4)
addressable (~> 2.2.2)
multipart-post (~> 1.1.0)
rack (< 2, >= 1.1.0)
rack (>= 1.1.0, < 2)
faraday_middleware (0.3.2)
faraday (~> 0.5.4)
fastercsv (1.5.4)
@ -189,7 +193,7 @@ GEM
nokogiri (~> 1.4.3.1)
ruby-hmac
foreigner (0.9.1)
formatador (0.1.2)
formatador (0.1.3)
fuubar (0.0.4)
chalofa_ruby-progressbar (~> 0.0.9)
rspec (~> 2.0)
@ -229,7 +233,7 @@ GEM
mixlib-log
mixlib-cli (1.2.0)
mixlib-config (1.1.2)
mixlib-log (1.2.0)
mixlib-log (1.3.0)
moneta (0.6.0)
mongrel (1.1.5)
cgi_multipart_eof_fix (>= 2.4)
@ -278,7 +282,7 @@ GEM
multi_json (~> 0.0.4)
ohai (0.5.8)
extlib
json (<= 1.4.6, >= 1.4.4)
json (>= 1.4.4, <= 1.4.6)
mixlib-cli
mixlib-config
mixlib-log
@ -289,10 +293,11 @@ GEM
oa-enterprise (= 0.1.6)
oa-oauth (= 0.1.6)
oa-openid (= 0.1.6)
open4 (1.0.1)
polyglot (0.3.1)
pyu-ruby-sasl (0.0.3.2)
rack (1.2.2)
rack-mount (0.6.13)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-openid (1.2.0)
rack (>= 1.1.0)
@ -314,7 +319,7 @@ GEM
thor (~> 0.14.4)
rake (0.8.7)
rcov (0.9.9)
redis (2.1.1)
redis (2.2.0)
redis-namespace (0.8.0)
redis (< 3.0.0)
resque (1.10.0)
@ -358,11 +363,11 @@ GEM
json_pure
rubyzip
simple_oauth (0.1.4)
sinatra (1.2.1)
sinatra (1.2.3)
rack (~> 1.1)
tilt (< 2.0, >= 1.2.2)
tilt (>= 1.2.2, < 2.0)
subexec (0.0.4)
systemu (1.2.0)
systemu (2.2.0)
term-ansicolor (1.0.5)
thin (1.2.8)
daemons (>= 1.0.9)
@ -375,7 +380,7 @@ GEM
typhoeus (0.2.4)
mime-types
mime-types
tzinfo (0.3.25)
tzinfo (0.3.26)
uuidtools (2.1.2)
vegas (0.1.8)
rack (>= 1.0.0)
@ -385,8 +390,9 @@ GEM
addressable (>= 2.2.2)
crack (>= 0.1.7)
will_paginate (3.0.pre2)
xml-simple (1.0.14)
yui-compressor (0.9.4)
xml-simple (1.0.15)
yui-compressor (0.9.6)
POpen4 (>= 0.1.4)
PLATFORMS
ruby
@ -426,6 +432,7 @@ DEPENDENCIES
mongrel
mysql2 (= 0.2.6)
nokogiri (= 1.4.3.1)
ohai (= 0.5.8)
omniauth (= 0.1.6)
rails (= 3.0.3)
rcov