Rails security update

openlocal · Jan 3, 2013 · 6f4681c · 6f4681c
1 parent c154340
commit 6f4681c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails', '3.0.17'
+gem 'rails', '3.0.18'
 
 gem "capistrano"
 # Need to use older version of mysql2 because we're on Rails 3.0

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -17,12 +17,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.17)
-      actionpack (= 3.0.17)
+    actionmailer (3.0.18)
+      actionpack (= 3.0.18)
       mail (~> 2.2.19)
-    actionpack (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    actionpack (3.0.18)
+      activemodel (= 3.0.18)
+      activesupport (= 3.0.18)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -41,19 +41,19 @@ GEM
       meta_search (>= 0.9.2)
       rails (>= 3.0.0)
       sass (>= 3.1.0)
-    activemodel (3.0.17)
-      activesupport (= 3.0.17)
+    activemodel (3.0.18)
+      activesupport (= 3.0.18)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    activerecord (3.0.18)
+      activemodel (= 3.0.18)
+      activesupport (= 3.0.18)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-    activesupport (3.0.17)
+    activeresource (3.0.18)
+      activemodel (= 3.0.18)
+      activesupport (= 3.0.18)
+    activesupport (3.0.18)
     addressable (2.3.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
@@ -152,7 +152,7 @@ GEM
     jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.7.5)
+    json (1.7.6)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -201,21 +201,21 @@ GEM
       rack (>= 1.0)
     rack-throttle (0.3.0)
       rack (>= 1.0.0)
-    rails (3.0.17)
-      actionmailer (= 3.0.17)
-      actionpack (= 3.0.17)
-      activerecord (= 3.0.17)
-      activeresource (= 3.0.17)
-      activesupport (= 3.0.17)
+    rails (3.0.18)
+      actionmailer (= 3.0.18)
+      actionpack (= 3.0.18)
+      activerecord (= 3.0.18)
+      activeresource (= 3.0.18)
+      activesupport (= 3.0.18)
       bundler (~> 1.0)
-      railties (= 3.0.17)
-    railties (3.0.17)
-      actionpack (= 3.0.17)
-      activesupport (= 3.0.17)
+      railties (= 3.0.18)
+    railties (3.0.18)
+      actionpack (= 3.0.18)
+      activesupport (= 3.0.18)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rb-fchange (0.0.5)
       ffi
     rb-fsevent (0.9.1)
@@ -261,10 +261,10 @@ GEM
       builder (>= 2.1.2)
       riddle (>= 1.5.3)
     thor (0.14.6)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
     validates_email_format_of (1.5.3)
     vanity (1.8.0)
       redis (~> 2.0)
@@ -312,7 +312,7 @@ DEPENDENCIES
   rabl
   rack-livereload
   rack-throttle
-  rails (= 3.0.17)
+  rails (= 3.0.18)
   rake
   rspec-rails (~> 2.4)
   rvm-capistrano