From: Tom Hughes <tom@compton.nu>
Date: Tue, 8 Jan 2013 20:36:38 +0000 (+0000)
Subject: Update to rails 3.2.11
X-Git-Tag: live~5700
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/355d62bcf8c22e2bf622158a10b64eab28015156

Update to rails 3.2.11
---

diff --git a/Gemfile b/Gemfile
index 5d4f66989..fee9abb2d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.10'
+gem 'rails', '3.2.11'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', :platforms => :ruby_19
diff --git a/Gemfile.lock b/Gemfile.lock
index 993056846..37129758d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.10)
-      actionpack (= 3.2.10)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.10)
-      activemodel (= 3.2.10)
-      activesupport (= 3.2.10)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -15,18 +15,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.10)
-      activesupport (= 3.2.10)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.10)
-      activemodel (= 3.2.10)
-      activesupport (= 3.2.10)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.10)
-      activemodel (= 3.2.10)
-      activesupport (= 3.2.10)
-    activesupport (3.2.10)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -54,7 +54,7 @@ GEM
     htmlentities (4.3.1)
     http_accept_language (1.0.2)
     httpauth (0.2.0)
-    httpclient (2.3.1)
+    httpclient (2.3.2)
     i18n (0.6.1)
     i18n-js (3.0.0.rc3)
       i18n
@@ -74,7 +74,7 @@ GEM
       treetop (~> 1.4.8)
     memcached (1.5.0)
     mime-types (1.19)
-    minitest (4.3.3)
+    minitest (4.4.0)
     multi_json (1.5.0)
     multipart-post (1.1.5)
     nokogiri (1.5.6)
@@ -100,7 +100,7 @@ GEM
     pg (0.14.1)
     polyglot (0.3.3)
     r2 (0.0.3)
-    rack (1.4.1)
+    rack (1.4.3)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-cors (0.2.7)
@@ -112,19 +112,19 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.10)
-      actionmailer (= 3.2.10)
-      actionpack (= 3.2.10)
-      activerecord (= 3.2.10)
-      activeresource (= 3.2.10)
-      activesupport (= 3.2.10)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.2.10)
+      railties (= 3.2.11)
     rails-i18n (0.7.2)
       i18n (~> 0.5)
-    railties (3.2.10)
-      actionpack (= 3.2.10)
-      activesupport (= 3.2.10)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -137,7 +137,7 @@ GEM
     ruby-openid (2.2.2)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.2.4)
+    sass (3.2.5)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -187,7 +187,7 @@ DEPENDENCIES
   pg
   r2
   rack-cors
-  rails (= 3.2.10)
+  rails (= 3.2.11)
   rails-i18n (>= 0.6.3)
   redcarpet
   rinku (>= 1.2.2)