Merge pull request #1661 from elzj/rails_cve_upgrade

Update Rails version

Gemfile

@@ -4,7 +4,7 @@ ruby '1.9.3'
 
 gem 'bundler'
 
-gem 'rails', '3.2.13'
+gem 'rails', '3.2.18'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

Gemfile.lock

@@ -2,39 +2,39 @@ GEM
   remote: http://rubygems.org/
   specs:
     aaronh-chronic (0.3.9)
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionmailer (3.2.18)
+      actionpack (= 3.2.18)
+      mail (~> 2.5.4)
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activeresource (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+    activesupport (3.2.18)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     acts_as_list (0.2.0)
       activerecord (>= 3.0)
     addressable (2.3.5)
     akismetor (1.0.0)
     ansi (1.4.3)
-    arel (3.0.2)
+    arel (3.0.3)
     authlogic (3.3.0)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
@@ -117,12 +117,12 @@ GEM
     htmlentities (4.3.1)
     http-cookie (1.0.1)
       domain_name (~> 0.5)
-    i18n (0.6.1)
+    i18n (0.6.9)
     journey (1.0.4)
     jquery-rails (3.0.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.0)
+    json (1.8.1)
     kgio (2.8.0)
     launchy (2.3.0)
       addressable (~> 2.3)
@@ -140,10 +140,10 @@ GEM
       webrobots (>= 0.0.9, < 0.2)
     memcache-client (1.8.5)
     method_source (0.8.2)
-    mime-types (1.23)
+    mime-types (1.25.1)
     mini_portile (0.5.0)
     mono_logger (1.1.0)
-    multi_json (1.7.7)
+    multi_json (1.10.0)
     mysql2 (0.3.11)
     mysql2 (0.3.11-x86-mingw32)
     net-http-digest_auth (1.3)
@@ -175,7 +175,7 @@ GEM
     pickle (0.4.11)
       cucumber (>= 0.8)
       rake
-    polyglot (0.3.3)
+    polyglot (0.3.4)
     pry (0.9.12.4)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -190,27 +190,27 @@ GEM
       rack (>= 0.4)
     rack-protection (1.5.0)
       rack
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
+    rails (3.2.18)
+      actionmailer (= 3.2.18)
+      actionpack (= 3.2.18)
+      activerecord (= 3.2.18)
+      activeresource (= 3.2.18)
+      activesupport (= 3.2.18)
       bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
+      railties (= 3.2.18)
+    railties (3.2.18)
+      actionpack (= 3.2.18)
+      activesupport (= 3.2.18)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.11.0)
-    rake (10.1.0)
+    rake (10.3.1)
     rdoc (3.12.2)
       json (~> 1.4)
     redis (3.0.4)
@@ -268,7 +268,7 @@ GEM
     stringex (2.0.3)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
-    thor (0.18.1)
+    thor (0.19.1)
     tilt (1.4.1)
     timeliness (0.3.7)
     tins (0.13.1)
@@ -280,12 +280,12 @@ GEM
       multi_json (~> 1.3)
       rake
       rest-client (~> 1.6)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     typhoeus (0.6.7)
       ethon (~> 0.6.2)
-    tzinfo (0.3.37)
+    tzinfo (0.3.39)
     unf (0.1.1)
       unf_ext
     unf_ext (0.0.6)
@@ -348,7 +348,7 @@ DEPENDENCIES
   permit_yo
   pickle
   pry
-  rails (= 3.2.13)
+  rails (= 3.2.18)
   redis (>= 3.0)
   redis-namespace
   resque (>= 1.14.0)