Permalink
Browse files

Bumping Rails

  • Loading branch information...
1 parent a9c6969 commit fb2097f2e1d684913106137744cd16ee122d6fc6 @GeekOnCoffee GeekOnCoffee committed Feb 11, 2013
Showing with 32 additions and 32 deletions.
  1. +1 −1 Gemfile
  2. +31 −31 Gemfile.lock
View
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'rails', '3.2.11'
+gem 'rails', '3.2.12'
gem 'mysql2'
gem 'sqlite3'
gem 'aws-sdk'
View
@@ -111,16 +111,16 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
+ actionmailer (3.2.12)
+ actionpack (= 3.2.12)
mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionpack (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
- rack (~> 1.4.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
@@ -135,18 +135,18 @@ GEM
i18n
json (>= 1.5.1)
money (<= 3.7.1)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
+ activeresource (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_list (0.1.4)
@@ -226,7 +226,7 @@ GEM
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.7.6)
+ json (1.7.7)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -241,10 +241,10 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
+ mime-types (1.21)
money (3.7.1)
i18n (~> 0.4)
- multi_json (1.5.0)
+ multi_json (1.5.1)
multi_xml (0.5.1)
multipart-post (1.1.5)
mysql2 (0.3.11)
@@ -295,24 +295,24 @@ GEM
rabl (0.6.5)
activesupport (>= 2.3.14)
multi_json (~> 1.0)
- rack (1.4.4)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
+ rails (3.2.12)
+ actionmailer (= 3.2.12)
+ actionpack (= 3.2.12)
+ activerecord (= 3.2.12)
+ activeresource (= 3.2.12)
+ activesupport (= 3.2.12)
bundler (~> 1.0)
- railties (= 3.2.11)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (= 3.2.12)
+ railties (3.2.12)
+ actionpack (= 3.2.12)
+ activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -323,7 +323,7 @@ GEM
actionpack (~> 3.0)
activerecord (~> 3.0)
polyamorous (~> 0.5.0)
- rdoc (3.12)
+ rdoc (3.12.1)
json (~> 1.4)
recaptcha (0.3.4)
rspec (2.10.0)
@@ -440,7 +440,7 @@ DEPENDENCIES
launchy (>= 0.3.7)
mysql2
newrelic_rpm
- rails (= 3.2.11)
+ rails (= 3.2.12)
rspec-rails (>= 2.0.1)
sass-rails (~> 3.2.0)
spree (= 1.1.2.rc1)

0 comments on commit fb2097f

Please sign in to comment.