update gemfile
This commit is contained in:
Maxwell Salzberg
Raphael Sofaer
parent
0cc018dd6b
commit
9ac88a8c39
1 changed files with 16 additions and 23 deletions
39
Gemfile.lock
39
Gemfile.lock
|
|
@ -94,19 +94,12 @@ GEM
|
||||||
activesupport (= 3.0.9)
|
activesupport (= 3.0.9)
|
||||||
arel (~> 2.0.10)
|
arel (~> 2.0.10)
|
||||||
tzinfo (~> 0.3.23)
|
tzinfo (~> 0.3.23)
|
||||||
<<<<<<< HEAD
|
|
||||||
activerecord-import (0.2.7)
|
activerecord-import (0.2.7)
|
||||||
activerecord (~> 3.0.0)
|
activerecord (~> 3.0.0)
|
||||||
activeresource (3.0.3)
|
|
||||||
activemodel (= 3.0.3)
|
|
||||||
activesupport (= 3.0.3)
|
|
||||||
activesupport (3.0.3)
|
|
||||||
=======
|
|
||||||
activeresource (3.0.9)
|
activeresource (3.0.9)
|
||||||
activemodel (= 3.0.9)
|
activemodel (= 3.0.9)
|
||||||
activesupport (= 3.0.9)
|
activesupport (= 3.0.9)
|
||||||
activesupport (3.0.9)
|
activesupport (3.0.9)
|
||||||
>>>>>>> fixed the safe_buffer issues
|
|
||||||
addressable (2.2.4)
|
addressable (2.2.4)
|
||||||
archive-tar-minitar (0.5.2)
|
archive-tar-minitar (0.5.2)
|
||||||
arel (2.0.10)
|
arel (2.0.10)
|
||||||
|
|
@ -155,19 +148,19 @@ GEM
|
||||||
closure-compiler (1.1.1)
|
closure-compiler (1.1.1)
|
||||||
cloudfiles (1.4.10)
|
cloudfiles (1.4.10)
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
columnize (0.3.2)
|
columnize (0.3.4)
|
||||||
configuration (1.2.0)
|
configuration (1.3.1)
|
||||||
crack (0.1.8)
|
crack (0.1.8)
|
||||||
cucumber (0.10.3)
|
cucumber (1.0.1)
|
||||||
builder (>= 2.1.2)
|
builder (>= 2.1.2)
|
||||||
diff-lcs (>= 1.1.2)
|
diff-lcs (>= 1.1.2)
|
||||||
gherkin (>= 2.3.8)
|
gherkin (~> 2.4.5)
|
||||||
json (>= 1.4.6)
|
json (>= 1.4.6)
|
||||||
term-ansicolor (>= 1.0.5)
|
term-ansicolor (>= 1.0.5)
|
||||||
cucumber-rails (0.3.2)
|
cucumber-rails (0.3.2)
|
||||||
cucumber (>= 0.8.0)
|
cucumber (>= 0.8.0)
|
||||||
culerity (0.2.15)
|
culerity (0.2.15)
|
||||||
daemons (1.1.3)
|
daemons (1.1.4)
|
||||||
database_cleaner (0.6.0)
|
database_cleaner (0.6.0)
|
||||||
devise (1.3.4)
|
devise (1.3.4)
|
||||||
bcrypt-ruby (~> 2.1.2)
|
bcrypt-ruby (~> 2.1.2)
|
||||||
|
|
@ -190,9 +183,9 @@ GEM
|
||||||
addressable (~> 2.2.4)
|
addressable (~> 2.2.4)
|
||||||
multipart-post (~> 1.1.0)
|
multipart-post (~> 1.1.0)
|
||||||
rack (< 2, >= 1.1.0)
|
rack (< 2, >= 1.1.0)
|
||||||
faraday-stack (0.1.2)
|
faraday-stack (0.1.3)
|
||||||
faraday (~> 0.6)
|
faraday (~> 0.6)
|
||||||
faraday_middleware (0.6.3)
|
faraday_middleware (0.6.5)
|
||||||
faraday (~> 0.6.0)
|
faraday (~> 0.6.0)
|
||||||
fastercsv (1.5.4)
|
fastercsv (1.5.4)
|
||||||
fastthread (1.0.7)
|
fastthread (1.0.7)
|
||||||
|
|
@ -208,13 +201,13 @@ GEM
|
||||||
nokogiri (~> 1.4.3.1)
|
nokogiri (~> 1.4.3.1)
|
||||||
ruby-hmac
|
ruby-hmac
|
||||||
foreigner (0.9.1)
|
foreigner (0.9.1)
|
||||||
formatador (0.1.4)
|
formatador (0.1.5)
|
||||||
fuubar (0.0.5)
|
fuubar (0.0.5)
|
||||||
rspec (~> 2.0)
|
rspec (~> 2.0)
|
||||||
rspec-instafail (~> 0.1.4)
|
rspec-instafail (~> 0.1.4)
|
||||||
ruby-progressbar (~> 0.0.10)
|
ruby-progressbar (~> 0.0.10)
|
||||||
gem_plugin (0.2.3)
|
gem_plugin (0.2.3)
|
||||||
gherkin (2.3.10)
|
gherkin (2.4.5)
|
||||||
json (>= 1.4.6)
|
json (>= 1.4.6)
|
||||||
haml (3.1.2)
|
haml (3.1.2)
|
||||||
hashie (1.0.0)
|
hashie (1.0.0)
|
||||||
|
|
@ -274,7 +267,7 @@ GEM
|
||||||
net-ssh (2.0.24)
|
net-ssh (2.0.24)
|
||||||
net-ssh-gateway (1.1.0)
|
net-ssh-gateway (1.1.0)
|
||||||
net-ssh (>= 1.99.1)
|
net-ssh (>= 1.99.1)
|
||||||
newrelic_rpm (3.0.1)
|
newrelic_rpm (3.1.0)
|
||||||
nokogiri (1.4.3.1)
|
nokogiri (1.4.3.1)
|
||||||
oa-basic (0.2.6)
|
oa-basic (0.2.6)
|
||||||
oa-core (= 0.2.6)
|
oa-core (= 0.2.6)
|
||||||
|
|
@ -302,7 +295,7 @@ GEM
|
||||||
oa-core (= 0.2.6)
|
oa-core (= 0.2.6)
|
||||||
rack-openid (~> 1.3.1)
|
rack-openid (~> 1.3.1)
|
||||||
ruby-openid-apps-discovery (~> 1.2.0)
|
ruby-openid-apps-discovery (~> 1.2.0)
|
||||||
oauth (0.4.4)
|
oauth (0.4.5)
|
||||||
oauth2 (0.4.1)
|
oauth2 (0.4.1)
|
||||||
faraday (~> 0.6.1)
|
faraday (~> 0.6.1)
|
||||||
multi_json (>= 0.0.5)
|
multi_json (>= 0.0.5)
|
||||||
|
|
@ -323,7 +316,7 @@ GEM
|
||||||
oa-more (= 0.2.6)
|
oa-more (= 0.2.6)
|
||||||
oa-oauth (= 0.2.6)
|
oa-oauth (= 0.2.6)
|
||||||
oa-openid (= 0.2.6)
|
oa-openid (= 0.2.6)
|
||||||
open4 (1.0.1)
|
open4 (1.1.0)
|
||||||
orm_adapter (0.0.5)
|
orm_adapter (0.0.5)
|
||||||
polyglot (0.3.1)
|
polyglot (0.3.1)
|
||||||
pyu-ruby-sasl (0.0.3.3)
|
pyu-ruby-sasl (0.0.3.3)
|
||||||
|
|
@ -356,7 +349,7 @@ GEM
|
||||||
hashie (~> 1.0.0)
|
hashie (~> 1.0.0)
|
||||||
rcov (0.9.9)
|
rcov (0.9.9)
|
||||||
rdoc (3.8)
|
rdoc (3.8)
|
||||||
redis (2.2.0)
|
redis (2.2.1)
|
||||||
redis-namespace (0.8.0)
|
redis-namespace (0.8.0)
|
||||||
redis (< 3.0.0)
|
redis (< 3.0.0)
|
||||||
resque (1.10.0)
|
resque (1.10.0)
|
||||||
|
|
@ -376,7 +369,7 @@ GEM
|
||||||
rspec-core (2.6.0)
|
rspec-core (2.6.0)
|
||||||
rspec-expectations (2.6.0)
|
rspec-expectations (2.6.0)
|
||||||
diff-lcs (~> 1.1.2)
|
diff-lcs (~> 1.1.2)
|
||||||
rspec-instafail (0.1.7)
|
rspec-instafail (0.1.8)
|
||||||
rspec-mocks (2.6.0)
|
rspec-mocks (2.6.0)
|
||||||
rspec-rails (2.6.1)
|
rspec-rails (2.6.1)
|
||||||
actionpack (~> 3.0)
|
actionpack (~> 3.0)
|
||||||
|
|
@ -449,8 +442,8 @@ GEM
|
||||||
addressable (>= 2.2.2)
|
addressable (>= 2.2.2)
|
||||||
crack (>= 0.1.7)
|
crack (>= 0.1.7)
|
||||||
will_paginate (3.0.pre2)
|
will_paginate (3.0.pre2)
|
||||||
xml-simple (1.0.16)
|
xml-simple (1.1.0)
|
||||||
yard (0.7.1)
|
yard (0.7.2)
|
||||||
yui-compressor (0.9.6)
|
yui-compressor (0.9.6)
|
||||||
POpen4 (>= 0.1.4)
|
POpen4 (>= 0.1.4)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue