bundle update rails

This commit is contained in:
Matt Rogers 2013-01-11 09:39:28 -06:00
parent 0df2a41f55
commit d0e25d688f
2 changed files with 20 additions and 20 deletions

View file

@ -6,7 +6,7 @@ gem "rails", "~>2.3.15"
gem "highline", "~>1.5.0"
gem "RedCloth", "4.2.8"
gem "sanitize", "~>1.2.1"
gem "rack", "1.1.0"
gem "rack", "~>1.1"
gem "will_paginate", "~> 2.3.15"
gem "has_many_polymorphs", "~> 2.13", :path => "vendor/gems/has_many_polymorphs-2.13" # vendorred to get rid of some deprecation warnings
gem "acts_as_list", "= 0.1.4"

View file

@ -16,16 +16,16 @@ GEM
RedCloth (4.2.8)
ZenTest (4.8.3)
aasm (2.2.1)
actionmailer (2.3.14)
actionpack (= 2.3.14)
actionpack (2.3.14)
activesupport (= 2.3.14)
rack (~> 1.1.0)
activerecord (2.3.14)
activesupport (= 2.3.14)
activeresource (2.3.14)
activesupport (= 2.3.14)
activesupport (2.3.14)
actionmailer (2.3.15)
actionpack (= 2.3.15)
actionpack (2.3.15)
activesupport (= 2.3.15)
rack (~> 1.1.3)
activerecord (2.3.15)
activesupport (= 2.3.15)
activeresource (2.3.15)
activesupport (= 2.3.15)
activesupport (2.3.15)
acts_as_list (0.1.4)
addressable (2.3.2)
bcrypt-ruby (2.1.4)
@ -85,15 +85,15 @@ GEM
mysql (2.9.0)
nokogiri (1.4.7)
polyglot (0.3.3)
rack (1.1.0)
rack (1.1.4)
rack-test (0.6.2)
rack (>= 1.0)
rails (2.3.14)
actionmailer (= 2.3.14)
actionpack (= 2.3.14)
activerecord (= 2.3.14)
activeresource (= 2.3.14)
activesupport (= 2.3.14)
rails (2.3.15)
actionmailer (= 2.3.15)
actionpack (= 2.3.15)
activerecord (= 2.3.15)
activeresource (= 2.3.15)
activesupport (= 2.3.15)
rake (>= 0.8.3)
rake (0.8.7)
rbx-require-relative (0.0.9)
@ -159,8 +159,8 @@ DEPENDENCIES
memory_test_fix (~> 0.1.3)
mongrel
mysql
rack (= 1.1.0)
rails (~> 2.3.12)
rack (~> 1.1)
rails (~> 2.3.15)
rake (~> 0.8.7)
rspec-rails (~> 1.3.3)
ruby-debug