Permalink
Browse files

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

Conflicts:
	activerecord/CHANGELOG.md
  • Loading branch information...
rafaelfranca committed Mar 14, 2014
2 parents d436477 + 2abe4b0 commit eb39505adebfa0639574b7e377b840aa7ef6988c
View
@@ -1 +1 @@
-4.0.3
+4.0.4
@@ -1,4 +1,4 @@
-## Rails 4.0.4 ##
+## Rails 4.0.4 (March 14, 2014) ##
* Calling `mail()` without arguments serves as getter for the current mail
message and keeps previously set headers.
@@ -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.3"
+ Gem::Version.new "4.0.4"
end
module VERSION #:nodoc:
View
@@ -1,4 +1,4 @@
-## Rails 4.0.4 ##
+## Rails 4.0.4 (March 14, 2014) ##
* Fix label translation for more than 10 nested elements.
@@ -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.3"
+ Gem::Version.new "4.0.4"
end
module VERSION #:nodoc:
View
@@ -1,4 +1,4 @@
-## Rails 4.0.4 ##
+## Rails 4.0.4 (March 14, 2014) ##
* `#to_param` returns `nil` if `#to_key` returns `nil`. Fixes #11399.
@@ -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.3"
+ Gem::Version.new "4.0.4"
end
module VERSION #:nodoc:
@@ -5,7 +5,7 @@
*arthurnn*
-## Rails 4.0.4 ##
+## Rails 4.0.4 (March 14, 2014) ##
* Only save has_one associations if record has changes.
Previously after save related callbacks, such as `#after_commit`, were triggered when the has_one
@@ -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.3"
+ Gem::Version.new "4.0.4"
end
module VERSION #:nodoc:
@@ -1,4 +1,4 @@
-## Rails 4.0.4 ##
+## Rails 4.0.4 (March 14, 2014) ##
* Fix parsing bugs in `XmlMini`
@@ -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.3"
+ Gem::Version.new "4.0.4"
end
module VERSION #:nodoc:
View
@@ -1,4 +1,4 @@
-## Rails 4.0.4 ##
+## Rails 4.0.4 (March 14, 2014) ##
*No changes*
View
@@ -1,4 +1,4 @@
-## Rails 4.0.4 ##
+## Rails 4.0.4 (March 14, 2014) ##
* Added Thor-action for creation of migrations.
@@ -2,7 +2,7 @@ module Rails
module VERSION
MAJOR = 4
MINOR = 0
- TINY = 3
+ TINY = 4
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
View
@@ -68,7 +68,7 @@
namespace :changelog do
task :release_date do
- FRAMEWORKS.each do |fw|
+ FRAMEWORKS + ['guides'].each do |fw|
require 'date'
replace = '\1(' + Date.today.strftime('%B %d, %Y') + ')'
fname = File.join fw, 'CHANGELOG.md'
@@ -102,7 +102,7 @@
abort "[ABORTING] `git status` reports a dirty tree. Make sure all changes are committed"
end
- unless ENV['SKIP_TAG'] || `git tag | grep #{tag}`.strip.empty?
+ unless ENV['SKIP_TAG'] || `git tag | grep '^#{tag}$`.strip.empty?
abort "[ABORTING] `git tag` shows that #{tag} already exists. Has this version already\n"\
" been released? Git tagging can be skipped by setting SKIP_TAG=1"
end
View
@@ -2,7 +2,7 @@ module Rails
module VERSION
MAJOR = 4
MINOR = 0
- TINY = 3
+ TINY = 4
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

0 comments on commit eb39505

Please sign in to comment.