Bumped the rails 3.1.3

This commit is contained in:
Mario Visic 2011-11-26 15:57:22 +11:00
parent cffe64f6be
commit 1d1137fa36
2 changed files with 49 additions and 50 deletions

View File

@ -4,7 +4,7 @@ source 'http://rubygems.org'
gem 'rake', '0.9.2' gem 'rake', '0.9.2'
gem 'rails', '~> 3.1.1' gem 'rails', '~> 3.1.3'
gem 'devise', :git => 'git://github.com/plataformatec/devise.git'# FIXME: waiting for the new devise gem coming soon gem 'devise', :git => 'git://github.com/plataformatec/devise.git'# FIXME: waiting for the new devise gem coming soon
gem 'cancan', '~> 1.6.7' gem 'cancan', '~> 1.6.7'

View File

@ -1,8 +1,8 @@
GIT GIT
remote: git://github.com/chriseppstein/compass.git remote: git://github.com/chriseppstein/compass.git
revision: ebd758a7999a74611a3d682ba72c661a83f97498 revision: 79d94647f9a00b06c4a83db02e86f5d404569baf
specs: specs:
compass (0.12.alpha.0.ebd758a) compass (0.12.alpha.1.79d9464)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
sass (~> 3.1) sass (~> 3.1)
@ -26,9 +26,9 @@ GIT
GIT GIT
remote: git://github.com/plataformatec/devise.git remote: git://github.com/plataformatec/devise.git
revision: a5aa03b98328d8e1fdb4081a74b3c04ff9593607 revision: ede004169c6af7416f8c4e3fc29a653bee133f60
specs: specs:
devise (1.5.0.dev) devise (1.5.1)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3) orm_adapter (~> 0.0.3)
warden (~> 1.1) warden (~> 1.1)
@ -51,35 +51,35 @@ GEM
RedCloth (4.2.8) RedCloth (4.2.8)
SystemTimer (1.2.3) SystemTimer (1.2.3)
ZenTest (4.6.2) ZenTest (4.6.2)
actionmailer (3.1.1) actionmailer (3.1.3)
actionpack (= 3.1.1) actionpack (= 3.1.3)
mail (~> 2.3.0) mail (~> 2.3.0)
actionmailer-with-request (0.3.0) actionmailer-with-request (0.3.0)
rails (>= 3) rails (>= 3)
actionpack (3.1.1) actionpack (3.1.3)
activemodel (= 3.1.1) activemodel (= 3.1.3)
activesupport (= 3.1.1) activesupport (= 3.1.3)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
i18n (~> 0.6) i18n (~> 0.6)
rack (~> 1.3.2) rack (~> 1.3.5)
rack-cache (~> 1.1) rack-cache (~> 1.1)
rack-mount (~> 0.8.2) rack-mount (~> 0.8.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.0.2) sprockets (~> 2.0.3)
activemodel (3.1.1) activemodel (3.1.3)
activesupport (= 3.1.1) activesupport (= 3.1.3)
builder (~> 3.0.0) builder (~> 3.0.0)
i18n (~> 0.6) i18n (~> 0.6)
activerecord (3.1.1) activerecord (3.1.3)
activemodel (= 3.1.1) activemodel (= 3.1.3)
activesupport (= 3.1.1) activesupport (= 3.1.3)
arel (~> 2.2.1) arel (~> 2.2.1)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.1.1) activeresource (3.1.3)
activemodel (= 3.1.1) activemodel (= 3.1.3)
activesupport (= 3.1.1) activesupport (= 3.1.3)
activesupport (3.1.1) activesupport (3.1.3)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.6) addressable (2.2.6)
arel (2.2.1) arel (2.2.1)
@ -95,7 +95,7 @@ GEM
orm_adapter (~> 0.0.3) orm_adapter (~> 0.0.3)
rest-client (>= 1.6.1) rest-client (>= 1.6.1)
cancan (1.6.7) cancan (1.6.7)
capybara (1.1.1) capybara (1.1.2)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
@ -118,10 +118,10 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.1.3) coffee-script-source (1.1.3)
cucumber (1.1.1) cucumber (1.1.3)
builder (>= 2.1.2) builder (>= 2.1.2)
diff-lcs (>= 1.1.2) diff-lcs (>= 1.1.2)
gherkin (~> 2.6.0) gherkin (~> 2.6.7)
json (>= 1.4.6) json (>= 1.4.6)
term-ansicolor (>= 1.0.6) term-ansicolor (>= 1.0.6)
cucumber-rails (1.2.0) cucumber-rails (1.2.0)
@ -129,7 +129,7 @@ GEM
cucumber (>= 1.1.1) cucumber (>= 1.1.1)
nokogiri (>= 1.5.0) nokogiri (>= 1.5.0)
daemons (1.1.4) daemons (1.1.4)
database_cleaner (0.6.7) database_cleaner (0.7.0)
delayed_job (2.1.4) delayed_job (2.1.4)
activesupport (~> 3.0) activesupport (~> 3.0)
daemons daemons
@ -141,15 +141,15 @@ GEM
rack rack
ejs (1.0.0) ejs (1.0.0)
erubis (2.7.0) erubis (2.7.0)
excon (0.7.6) excon (0.7.8)
execjs (1.2.9) execjs (1.2.9)
multi_json (~> 1.0) multi_json (~> 1.0)
factory_girl (2.2.0) factory_girl (2.3.1)
activesupport activesupport
factory_girl_rails (1.3.0) factory_girl_rails (1.4.0)
factory_girl (~> 2.2.0) factory_girl (~> 2.3.0)
railties (>= 3.0.0) railties (>= 3.0.0)
ffi (1.0.9) ffi (1.0.11)
flash_cookie_session (1.1.1) flash_cookie_session (1.1.1)
rails (~> 3.0) rails (~> 3.0)
fog (1.0.0) fog (1.0.0)
@ -166,17 +166,17 @@ GEM
formtastic (2.0.2) formtastic (2.0.2)
rails (~> 3.0) rails (~> 3.0)
fssm (0.2.7) fssm (0.2.7)
gherkin (2.6.2) gherkin (2.6.8)
json (>= 1.4.6) json (>= 1.4.6)
growl-glue (1.0.7) growl-glue (1.0.7)
haml (3.1.3) haml (3.1.3)
highline (1.6.5) highline (1.6.8)
hike (1.2.1) hike (1.2.1)
httparty (0.8.1) httparty (0.8.1)
multi_json multi_json
multi_xml multi_xml
i18n (0.6.0) i18n (0.6.0)
jquery-rails (1.0.16) jquery-rails (1.0.18)
railties (~> 3.0) railties (~> 3.0)
thor (~> 0.14) thor (~> 0.14)
json (1.6.1) json (1.6.1)
@ -196,7 +196,7 @@ GEM
mocha (0.9.12) mocha (0.9.12)
mongo (1.4.0) mongo (1.4.0)
bson (= 1.4.0) bson (= 1.4.0)
mongoid (2.3.3) mongoid (2.3.4)
activemodel (~> 3.1) activemodel (~> 3.1)
mongo (~> 1.3) mongo (~> 1.3)
tzinfo (~> 0.3.22) tzinfo (~> 0.3.22)
@ -220,21 +220,21 @@ GEM
rack rack
rack-test (0.6.1) rack-test (0.6.1)
rack (>= 1.0) rack (>= 1.0)
rails (3.1.1) rails (3.1.3)
actionmailer (= 3.1.1) actionmailer (= 3.1.3)
actionpack (= 3.1.1) actionpack (= 3.1.3)
activerecord (= 3.1.1) activerecord (= 3.1.3)
activeresource (= 3.1.1) activeresource (= 3.1.3)
activesupport (= 3.1.1) activesupport (= 3.1.3)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.1.1) railties (= 3.1.3)
rails-backbone (0.5.4) rails-backbone (0.5.4)
coffee-script (~> 2.2.0) coffee-script (~> 2.2.0)
ejs (~> 1.0.0) ejs (~> 1.0.0)
rails (~> 3.1.0) rails (~> 3.1.0)
railties (3.1.1) railties (3.1.3)
actionpack (= 3.1.1) actionpack (= 3.1.3)
activesupport (= 3.1.1) activesupport (= 3.1.3)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
@ -268,15 +268,14 @@ GEM
sanitize (2.0.3) sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6) nokogiri (>= 1.4.4, < 1.6)
sass (3.1.10) sass (3.1.10)
sass-rails (3.1.4) sass-rails (3.1.5)
actionpack (~> 3.1.0) actionpack (~> 3.1.0)
railties (~> 3.1.0) railties (~> 3.1.0)
sass (>= 3.1.4) sass (~> 3.1.10)
sprockets (~> 2.0.0)
tilt (~> 1.3.2) tilt (~> 1.3.2)
selenium-webdriver (2.10.0) selenium-webdriver (2.13.0)
childprocess (>= 0.2.1) childprocess (>= 0.2.1)
ffi (= 1.0.9) ffi (~> 1.0.9)
json_pure json_pure
rubyzip rubyzip
sprockets (2.0.3) sprockets (2.0.3)
@ -348,7 +347,7 @@ DEPENDENCIES
mongoid (~> 2.3.3) mongoid (~> 2.3.3)
pickle pickle
rack-cache (~> 1.1) rack-cache (~> 1.1)
rails (~> 3.1.1) rails (~> 3.1.3)
rails-backbone (= 0.5.4) rails-backbone (= 0.5.4)
rake (= 0.9.2) rake (= 0.9.2)
responders (~> 0.6.0) responders (~> 0.6.0)