Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

* 3-0-rel:
  bumping to 3.0.13
  updating CHANGELOGs
  bumping to 3.0.13.rc1
  • Loading branch information...
commit b2feff233ed96208d3faff7d6ed0fa2ebe2da926 2 parents 33f8e4b + 7102fe8
@tenderlove tenderlove authored
View
2  RAILS_VERSION
@@ -1 +1 @@
-3.0.12
+3.0.13
View
4 actionmailer/CHANGELOG
@@ -1,3 +1,7 @@
+* Rails 3.0.13 (May 31, 2012)
+
+* No changes.
+
*Rails 3.0.10 (August 16, 2011)*
*No changes.
View
2  actionmailer/lib/action_mailer/version.rb
@@ -2,7 +2,7 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 12
+ TINY = 13
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
14 actionpack/CHANGELOG
@@ -1,3 +1,17 @@
+* Rails 3.0.13 (May 31, 2012)
+
+* Strip null bytes from Location header
+
+* load the encoding converter to work around [ruby-core:41556] when switching
+ encodings
+
+* Avoid inspecting the whole route set, closes #1525
+
+* whitelist protocols for auto_link
+
+* Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
+ CVE-2012-2660
+
*Rails 3.0.12 (unreleased)*
* Fix using `tranlate` helper with a html translation which uses the `:count` option for
View
2  actionpack/lib/action_pack/version.rb
@@ -2,7 +2,7 @@ module ActionPack
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 12
+ TINY = 13
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
4 activemodel/CHANGELOG
@@ -1,3 +1,7 @@
+* Rails 3.0.13 (May 31, 2012)
+
+* No changes.
+
*Rails 3.0.10 (August 16, 2011)*
*No changes.
View
2  activemodel/lib/active_model/version.rb
@@ -2,7 +2,7 @@ module ActiveModel
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 12
+ TINY = 13
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
11 activerecord/CHANGELOG
@@ -1,3 +1,14 @@
+* Rails 3.0.13 (May 31, 2012)
+
+* Bugfix circular reference while saving has_one relationship
+
+* Test for circular reference while saving has_one relationship
+
+* Fixed typo in composed_of example with Money#<=>
+
+* predicate builder should not recurse for determining where columns.
+ Thanks to Ben Murphy for reporting this! CVE-2012-2661
+
* Rails 3.0.11 (unreleased)
* Exceptions from database adapters should not lose their backtrace.
View
2  activerecord/lib/active_record/version.rb
@@ -2,7 +2,7 @@ module ActiveRecord
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 12
+ TINY = 13
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
4 activeresource/CHANGELOG
@@ -1,3 +1,7 @@
+* Rails 3.0.13 (May 31, 2012)
+
+* No changes.
+
*Rails 3.0.10 (August 16, 2011)*
* No changes.
View
2  activeresource/lib/active_resource/version.rb
@@ -2,7 +2,7 @@ module ActiveResource
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 12
+ TINY = 13
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
4 activesupport/CHANGELOG
@@ -1,3 +1,7 @@
+* Rails 3.0.13 (May 31, 2012)
+
+* Stop SafeBuffer#clone_empty from issuing warnings
+
* Rails 3.0.10 (August 16, 2011)
* Delayed backtrace scrubbing in `load_missing_constant` until we actually
View
2  activesupport/lib/active_support/version.rb
@@ -2,7 +2,7 @@ module ActiveSupport
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 12
+ TINY = 13
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
4 railties/CHANGELOG
@@ -1,3 +1,7 @@
+* Rails 3.0.13 (May 31, 2012)
+
+* No changes.
+
*Rails 3.0.11 (unreleased)*
* Updated Prototype UJS to lastest version fixing multiples errors in IE [Guillermo Iguaran]
View
2  railties/lib/rails/version.rb
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 12
+ TINY = 13
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
2  version.rb
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 12
+ TINY = 13
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
Please sign in to comment.
Something went wrong with that request. Please try again.