Skip to content
Browse files

Merge branch '4-0-1' into 4-0-stable

  • Loading branch information...
2 parents 61ae5ee + 5505c1d commit c37f76784cf81442cbf84a669293e655fbae5f5d @rafaelfranca rafaelfranca committed Nov 1, 2013
View
2 RAILS_VERSION
@@ -1 +1 @@
-4.0.0
+4.0.1
View
2 actionmailer/CHANGELOG.md
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 4.0.1 (November 01, 2013) ##
* Invoke mailer defaults as procs only if they are procs, do not convert
with `to_proc`. That an object is convertible to a proc does not mean it's
View
2 actionmailer/lib/action_mailer/version.rb
@@ -1,7 +1,7 @@
module ActionMailer
# Returns the version of the currently loaded ActionMailer as a Gem::Version
def self.version
- Gem::Version.new "4.0.0"
+ Gem::Version.new "4.0.1"
end
module VERSION #:nodoc:
View
15 actionpack/CHANGELOG.md
@@ -1,5 +1,3 @@
-## unreleased ##
-
* Don't let strong parameters mutate the given hash via `fetch`
Create a new instance if the given parameter is a `Hash` instead of
@@ -8,6 +6,9 @@
*Brendon Murphy*, *Doug Cole*
+
+## Rails 4.0.1 (November 01, 2013) ##
+
* Respect `SCRIPT_NAME` when using `redirect` with a relative path
Example:
@@ -22,20 +23,20 @@
the path. It also allows redirects to work where the application is deployed to a
subdirectory of a website.
- Fixes #7977
+ Fixes #7977.
*Andrew White*
* Fix `ActionDispatch::RemoteIp::GetIp#calculate_ip` to only check for spoofing
attacks if both `HTTP_CLIENT_IP` and `HTTP_X_FORWARDED_FOR` are set.
- Fixes #10844
+ Fixes #10844.
*Tamir Duberstein*
* Strong parameters should permit nested number as key.
- Fixes #12293
+ Fixes #12293.
*kennyj*
@@ -54,14 +55,14 @@
* Fix an issue where router can't recognize downcased url encoding path.
- Fixes #12269
+ Fixes #12269.
*kennyj*
* Fix custom flash type definition. Misusage of the `_flash_types` class variable
caused an error when reloading controllers with custom flash types.
- Fixes #12057
+ Fixes #12057.
*Ricardo de Cillo*
View
2 actionpack/lib/action_pack/version.rb
@@ -1,7 +1,7 @@
module ActionPack
# Returns the version of the currently loaded ActionPack as a Gem::Version
def self.version
- Gem::Version.new "4.0.0"
+ Gem::Version.new "4.0.1"
end
module VERSION #:nodoc:
View
6 activemodel/CHANGELOG.md
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 4.0.1 (November 01, 2013) ##
* Fix `has_secure_password` to honor bcrypt-ruby's cost attribute.
@@ -9,10 +9,12 @@
for non-numerical ones.
Fixes range validations like `:a..:f` that used to pass with values like `:be`.
- Fixes #10593
+
+ Fixes #10593.
*Charles Bergeron*
+
## Rails 4.0.0 (June 25, 2013) ##
* Fix regression in has_secure_password. When a password is set, but a
View
2 activemodel/lib/active_model/version.rb
@@ -1,7 +1,7 @@
module ActiveModel
# Returns the version of the currently loaded ActiveModel as a Gem::Version
def self.version
- Gem::Version.new "4.0.0"
+ Gem::Version.new "4.0.1"
end
module VERSION #:nodoc:
View
13 activerecord/CHANGELOG.md
@@ -1,5 +1,3 @@
-## unreleased ##
-
* Do not add to scope includes values from through associations.
Fixed bug when providing `includes` in through association scope, and fetching targets.
@@ -69,6 +67,9 @@
*Eric Hankins*
+
+## Rails 4.0.1 (November 01, 2013) ##
+
* `NullRelation#pluck` takes a list of columns
The method signature in `NullRelation` was updated to mimic that in
@@ -142,7 +143,7 @@
* Objects instantiated using a null relationship will now retain the
attributes of the where clause.
- Fixes: #11676, #11675, #11376
+ Fixes #11676, #11675, #11376.
*Paul Nikitochkin*, *Peter Brown*, *Nthalk*
@@ -185,7 +186,6 @@
*Ryan Wallace*
-
* Make `find_in_batches` and `find_each` work without a logger.
*Dmitry Polushkin*
@@ -259,6 +259,8 @@
This also affects order defined in `default_scope` or any kind of associations.
+ *Rafael Mendonça França*
+
* When using optimistic locking, `update` was not passing the column to `quote_value`
to allow the connection adapter to properly determine how to quote the value. This was
affecting certain databases that use specific column types.
@@ -291,7 +293,7 @@
* Remove extra select and update queries on `save`/`touch`/`destroy` Active Record model
with belongs to reflection with option `touch: true`.
- Fixes: #11288.
+ Fixes #11288.
*Paul Nikitochkin*
@@ -335,7 +337,6 @@
*Yves Senn*
-
* Fix the `:primary_key` option for `has_many` associations.
Fixes #10693.
View
2 activerecord/lib/active_record/version.rb
@@ -1,7 +1,7 @@
module ActiveRecord
# Returns the version of the currently loaded ActiveRecord as a Gem::Version
def self.version
- Gem::Version.new "4.0.0"
+ Gem::Version.new "4.0.1"
end
module VERSION #:nodoc:
View
5 activesupport/CHANGELOG.md
@@ -1,9 +1,10 @@
-## unreleased ##
-
* Fix `slice!` deleting the default value of the hash.
*Antonio Santos*
+
+## Rails 4.0.1 (November 01, 2013) ##
+
* Disable the ability to iterate over Range of AS::TimeWithZone
due to significant performance issues.
View
2 activesupport/lib/active_support/version.rb
@@ -1,7 +1,7 @@
module ActiveSupport
# Returns the version of the currently loaded ActiveSupport as a Gem::Version
def self.version
- Gem::Version.new "4.0.0"
+ Gem::Version.new "4.0.1"
end
module VERSION #:nodoc:
View
3 railties/CHANGELOG.md
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 4.0.1 (November 01, 2013) ##
* Fix the event name of action_dispatch requests.
@@ -20,6 +20,7 @@
*Nikita Fedyashev*
+
## Rails 4.0.0 (June 25, 2013) ##
* Clearing autoloaded constants triggers routes reloading [Fixes #10685].
View
2 railties/lib/rails/version.rb
@@ -2,7 +2,7 @@ module Rails
module VERSION
MAJOR = 4
MINOR = 0
- TINY = 0
+ TINY = 1
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
View
2 version.rb
@@ -2,7 +2,7 @@ module Rails
module VERSION
MAJOR = 4
MINOR = 0
- TINY = 0
+ TINY = 1
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

0 comments on commit c37f767

Please sign in to comment.
Something went wrong with that request. Please try again.