Merge branch '3-1-rel' into 3-1-stable

* 3-1-rel:
  bumping to 3.1.5
  updating the CHANGELOG
  bumping to 3.1.5.rc1

RAILS_VERSION

@@ -1 +1 @@
-3.1.4
+3.1.5

actionmailer/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Rails 3.1.5 (May 31, 2012) ##
+
+*   Increase minimum version of mail.
+
 ## Rails 3.1.1 (October 7, 2011) ##
 
 *   No changes

actionmailer/lib/action_mailer/version.rb

@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

actionpack/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Rails 3.1.5 (May 31, 2012) ##
+
+*   Detect optional glob params when adding non-greedy regexp - closes #4817.
+
+*   Strip null bytes from Location header
+
+*   Return the same session data object when setting session id
+
+*   Avoid inspecting the whole route set, closes #1525
+
+*   Strip [nil] from parameters hash.  Thanks to Ben Murphy for reporting this!
+    CVE-2012-2660
+
 ## Rails 3.1.4 (unreleased) ##
 
 *   :subdomain can now be specified with a value of false in url_for, 

actionpack/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

activemodel/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Rails 3.1.5 (May 31, 2012) ##
+
+*   No changes.
+
 ## Rails 3.1.1 (October 7, 2011) ##
 
 *   Remove hard dependency on bcrypt-ruby to avoid make ActiveModel dependent on a binary library.

activemodel/lib/active_model/version.rb

@@ -2,7 +2,7 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

activerecord/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Rails 3.1.5 (May 31, 2012) ##
+
+*   Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.
+
+*   only log an error if there is a logger. fixes #5226
+
+*   fix activerecord query_method regression with offset into Fixnum
+
+*   predicate builder should not recurse for determining where columns.
+    Thanks to Ben Murphy for reporting this! CVE-2012-2661
+
 ## Rails 3.1.4 (unreleased) ##
 
 *   Fix a custom primary key regression *GH 3987*

activerecord/lib/active_record/version.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

activeresource/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Rails 3.1.5 (May 31, 2012) ##
+
+*   No changes
+
 ## Rails 3.1.1 (October 7, 2011) ##
 
 *   No changes

activeresource/lib/active_resource/version.rb

@@ -2,7 +2,7 @@ module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

activesupport/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Rails 3.1.5 (May 31, 2012) ##
+
+*   call binmode on the tempfile for Ruby 1.8 compatibility
+
+*   Stop SafeBuffer#clone_empty from issuing warnings
+
+*   Use 1.9 native XML escaping to speed up html_escape and shush regexp warnings
+
 ## Rails 3.1.1 (October 7, 2011) ##
 
 *   ruby193: String#prepend is also unsafe *Akira Matsuda*

activesupport/lib/active_support/version.rb

@@ -2,7 +2,7 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

railties/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Rails 3.1.5 (May 31, 2012) ##
+
+*   No changes.
+
 ## Rails 3.1.4 (unreleased) ##
 
 *   Setting config.force_ssl also marks the session cookie as secure.

railties/lib/rails/version.rb

@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

version.rb

@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')