Permalink
Browse files

upgrade to rails 3.0.10

  • Loading branch information...
1 parent 09a764f commit 107adff22a7b53284bf00741c29c0168bfdfe11a Erik Hollensbe committed Aug 17, 2011
Showing with 45 additions and 44 deletions.
  1. +1 −1 Gemfile
  2. +44 −43 Gemfile.lock
View
@@ -1,7 +1,7 @@
source 'http://rubygems.org'
gem 'rack'
-gem 'rails', '~> 3.0.7'
+gem 'rails', '~> 3.0.10'
gem 'mysql2', '~> 0.2.0'
gem 'capistrano'
gem 'haml'
View
@@ -8,50 +8,50 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.9)
- actionpack (= 3.0.9)
+ actionmailer (3.0.10)
+ actionpack (= 3.0.10)
mail (~> 2.2.19)
- actionpack (3.0.9)
- activemodel (= 3.0.9)
- activesupport (= 3.0.9)
+ actionpack (3.0.10)
+ activemodel (= 3.0.10)
+ activesupport (= 3.0.10)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.9)
- activesupport (= 3.0.9)
+ activemodel (3.0.10)
+ activesupport (= 3.0.10)
builder (~> 2.1.2)
i18n (~> 0.5.0)
- activerecord (3.0.9)
- activemodel (= 3.0.9)
- activesupport (= 3.0.9)
+ activerecord (3.0.10)
+ activemodel (= 3.0.10)
+ activesupport (= 3.0.10)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
- activeresource (3.0.9)
- activemodel (= 3.0.9)
- activesupport (= 3.0.9)
- activesupport (3.0.9)
+ activeresource (3.0.10)
+ activemodel (= 3.0.10)
+ activesupport (= 3.0.10)
+ activesupport (3.0.10)
arel (2.0.10)
builder (2.1.2)
- capistrano (2.6.0)
+ capistrano (2.8.0)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- capybara (1.0.0)
+ capybara (1.0.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- selenium-webdriver (~> 0.2.0)
+ selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.1.9)
+ childprocess (0.2.1)
ffi (~> 1.0.6)
- cucumber (1.0.1)
+ cucumber (1.0.2)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.4.5)
@@ -64,12 +64,12 @@ GEM
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
- factory_girl (1.3.3)
- factory_girl_rails (1.0.1)
- factory_girl (~> 1.3)
+ factory_girl (2.0.4)
+ factory_girl_rails (1.1.0)
+ factory_girl (~> 2.0.0)
railties (>= 3.0.0)
ffi (1.0.9)
- gherkin (2.4.5)
+ gherkin (2.4.11)
json (>= 1.4.6)
haml (3.1.2)
highline (1.6.2)
@@ -78,14 +78,14 @@ GEM
json_pure (1.5.3)
kaminari (0.12.4)
rails (>= 3.0.0)
- kgio (2.5.0)
+ kgio (2.6.0)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- mysql2 (0.2.11)
+ mysql2 (0.2.13)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
@@ -94,32 +94,32 @@ GEM
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
nokogiri (1.5.0)
- polyglot (0.3.1)
+ polyglot (0.3.2)
public_suffix_service (0.9.0)
rack (1.2.3)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.9)
- actionmailer (= 3.0.9)
- actionpack (= 3.0.9)
- activerecord (= 3.0.9)
- activeresource (= 3.0.9)
- activesupport (= 3.0.9)
+ rails (3.0.10)
+ actionmailer (= 3.0.10)
+ actionpack (= 3.0.10)
+ activerecord (= 3.0.10)
+ activeresource (= 3.0.10)
+ activesupport (= 3.0.10)
bundler (~> 1.0)
- railties (= 3.0.9)
+ railties (= 3.0.10)
rails3-generators (0.17.4)
railties (>= 3.0.0)
- railties (3.0.9)
- actionpack (= 3.0.9)
- activesupport (= 3.0.9)
+ railties (3.0.10)
+ actionpack (= 3.0.10)
+ activesupport (= 3.0.10)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
raindrops (0.7.0)
rake (0.9.2)
- rdoc (3.8)
+ rdoc (3.9.2)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
@@ -134,18 +134,19 @@ GEM
railties (~> 3.0)
rspec (~> 2.6.0)
rubyzip (0.9.4)
- sass (3.1.4)
- selenium-webdriver (0.2.2)
- childprocess (>= 0.1.9)
+ sass (3.1.7)
+ selenium-webdriver (2.4.0)
+ childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
- term-ansicolor (1.0.5)
+ term-ansicolor (1.0.6)
thor (0.14.6)
tinyatom (0.3.4)
builder (~> 2.0)
public_suffix_service (~> 0.0)
- treetop (1.4.9)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
unicorn (4.0.1)
@@ -167,7 +168,7 @@ DEPENDENCIES
kaminari
mysql2 (~> 0.2.0)
rack
- rails (~> 3.0.7)
+ rails (~> 3.0.10)
rails3-generators
rspec-rails
sass

0 comments on commit 107adff

Please sign in to comment.