From: Tom Hughes <tom@compton.nu>
Date: Mon, 18 Jun 2012 09:50:54 +0000 (+0100)
Subject: Update to rails 3.2.6
X-Git-Tag: live~5512
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0adb54ad86ee5874499f6fced3af7b6e13ce66eb

Update to rails 3.2.6
---

diff --git a/Gemfile b/Gemfile
index 5ddb27e47..3e83536b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.5'
+gem 'rails', '3.2.6'
 
 # 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 8b7976650..f434a6a68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.5)
-      actionpack (= 3.2.5)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
       mail (~> 2.4.4)
-    actionpack (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
@@ -15,23 +15,23 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    activemodel (3.2.5)
-      activesupport (= 3.2.5)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activerecord (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-    activesupport (3.2.5)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     bigdecimal (1.1.0)
-    browser (0.1.3)
+    browser (0.1.4)
     builder (3.0.0)
     cocaine (0.2.1)
     coffee-rails (3.2.2)
@@ -57,7 +57,7 @@ GEM
     httpclient (2.2.5)
     i18n (0.6.0)
     iconv (0.1)
-    journey (1.0.3)
+    journey (1.0.4)
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
@@ -68,12 +68,12 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcached (1.4.1)
+    memcached (1.4.2)
     mime-types (1.18)
-    minitest (3.0.1)
+    minitest (3.1.0)
     multi_json (1.3.6)
     multipart-post (1.1.5)
-    nokogiri (1.5.3)
+    nokogiri (1.5.4)
     oauth (0.4.6)
     oauth2 (0.7.1)
       faraday (~> 0.8)
@@ -104,19 +104,19 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.5)
-      actionmailer (= 3.2.5)
-      actionpack (= 3.2.5)
-      activerecord (= 3.2.5)
-      activeresource (= 3.2.5)
-      activesupport (= 3.2.5)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.2.5)
+      railties (= 3.2.6)
     rails-i18n (0.6.4)
       i18n (~> 0.5)
-    railties (3.2.5)
-      actionpack (= 3.2.5)
-      activesupport (= 3.2.5)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -175,7 +175,7 @@ DEPENDENCIES
   openstreetmap-oauth-plugin (>= 0.4.0.1)
   paperclip (~> 2.0)
   pg
-  rails (= 3.2.5)
+  rails (= 3.2.6)
   rails-i18n (>= 0.6.3)
   redcarpet
   rinku (>= 1.2.2)
diff --git a/config/initializers/buffered_logger.rb b/config/initializers/buffered_logger.rb
index b75e74ec6..c3a31b319 100644
--- a/config/initializers/buffered_logger.rb
+++ b/config/initializers/buffered_logger.rb
@@ -4,7 +4,7 @@ module ActiveSupport
     alias_method :old_add, :add
 
     def add(severity, message = nil, progname = nil, &block)
-      return if @level > severity
+      return if self.level > severity
       message = (message || (block && block.call) || progname).to_s
       time = Time.now
       message = "[%s.%06d #%d] %s" % [time.strftime("%Y-%m-%d %H:%M:%S"), time.usec, $$, message.sub(/^\n+/, "")]