Merge branch 'hotfix/0.0.2.1'

Changelog.md

@@ -1,3 +1,7 @@
+# 0.0.2.1
+
+* Upgrade to Rails 3.2.10 as per CVE-2012-5664. [Read more](https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53)
+
 # 0.0.2.0
 
 ## Refactor

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.8'
+gem 'rails', '3.2.10'
 
 gem 'foreman', '0.60.2'
 

Gemfile.lock

@@ -17,34 +17,34 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
+    actionmailer (3.2.10)
-      actionpack (= 3.2.8)
+      actionpack (= 3.2.10)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
+    actionpack (3.2.10)
-      activemodel (= 3.2.8)
+      activemodel (= 3.2.10)
-      activesupport (= 3.2.8)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
+      sprockets (~> 2.2.1)
-    activemodel (3.2.8)
+    activemodel (3.2.10)
-      activesupport (= 3.2.8)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
+    activerecord (3.2.10)
-      activemodel (= 3.2.8)
+      activemodel (= 3.2.10)
-      activesupport (= 3.2.8)
+      activesupport (= 3.2.10)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-import (0.2.11)
       activerecord (~> 3.0)
       activerecord (~> 3.0)
-    activeresource (3.2.8)
+    activeresource (3.2.10)
-      activemodel (= 3.2.8)
+      activemodel (= 3.2.10)
-      activesupport (= 3.2.8)
+      activesupport (= 3.2.10)
-    activesupport (3.2.8)
+    activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts-as-taggable-on (2.3.3)
@@ -231,7 +231,7 @@ GEM
     mobile-fu (1.1.0)
       rack-mobile-detect
       rails
-    multi_json (1.3.7)
+    multi_json (1.5.0)
     multipart-post (1.1.5)
     mysql2 (0.3.11)
     nested_form (0.2.3)
@@ -292,14 +292,14 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
+    rails (3.2.10)
-      actionmailer (= 3.2.8)
+      actionmailer (= 3.2.10)
-      actionpack (= 3.2.8)
+      actionpack (= 3.2.10)
-      activerecord (= 3.2.8)
+      activerecord (= 3.2.10)
-      activeresource (= 3.2.8)
+      activeresource (= 3.2.10)
-      activesupport (= 3.2.8)
+      activesupport (= 3.2.10)
       bundler (~> 1.0)
-      railties (= 3.2.8)
+      railties (= 3.2.10)
     rails-i18n (0.7.0)
       i18n (~> 0.5)
     rails_admin (0.2.0)
@@ -318,15 +318,15 @@ GEM
       sass-rails (~> 3.1)
     rails_autolink (1.0.9)
       rails (~> 3.1)
-    railties (3.2.8)
+    railties (3.2.10)
-      actionpack (= 3.2.8)
+      actionpack (= 3.2.10)
-      activesupport (= 3.2.8)
+      activesupport (= 3.2.10)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.10.0)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rb-fsevent (0.9.2)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
@@ -379,8 +379,9 @@ GEM
       tilt (~> 1.3, >= 1.3.3)
     slop (3.3.3)
     spork (1.0.0rc3)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     subexec (0.2.2)
@@ -469,9 +470,10 @@ DEPENDENCIES
   rack-cors (= 0.2.7)
   rack-google-analytics (= 0.11.0)
   rack-piwik (= 0.1.3)
+  rack-protection (= 1.2)
   rack-rewrite (= 1.3.1)
   rack-ssl (= 1.3.2)
-  rails (= 3.2.8)
+  rails (= 3.2.10)
   rails-i18n (= 0.7.0)
   rails_admin (= 0.2.0)
   rails_autolink (= 1.0.9)

config/defaults.yml

@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.0.2.0"
+    number: "0.0.2.1"
     release: true # Do not touch unless in a merge conflict on doing a release, master should have a commit setting this to true which is not backported to the develop branch.
   heroku: false
   environment: