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

RAILS_VERSION

@@ -1 +1 @@
-4.1.12
+4.1.13

actionmailer/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 4.1.13 (August 24, 2015) ##
+
+*   No changes.
+
+
 ## Rails 4.1.12 (June 25, 2015) ##
 
 *   Mailer preview now uses `url_for` to fix links to emails for apps running on

actionmailer/lib/action_mailer/gem_version.rb

@@ -7,7 +7,7 @@ module ActionMailer
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 12
+    TINY  = 13
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

actionpack/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 4.1.13 (August 24, 2015) ##
+
+*   No changes.
+
+
 ## Rails 4.1.12 (June 25, 2015) ##
 
 *   Fix handling of empty X_FORWARDED_HOST header in raw_host_with_port

actionpack/lib/action_pack/gem_version.rb

@@ -7,7 +7,7 @@ module ActionPack
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 12
+    TINY  = 13
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

actionview/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 4.1.13 (August 24, 2015) ##
+
+*   No changes.
+
+
 ## Rails 4.1.12 (June 25, 2015) ##
 
 *   `translate` should handle `raise` flag correctly in case of both main and default

actionview/lib/action_view/gem_version.rb

@@ -7,7 +7,7 @@ module ActionView
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 12
+    TINY  = 13
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

activemodel/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 4.1.13 (August 24, 2015) ##
+
+*   No changes.
+
+
 ## Rails 4.1.12 (June 25, 2015) ##
 
 *   No changes.

activemodel/lib/active_model/gem_version.rb

@@ -7,7 +7,7 @@ module ActiveModel
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 12
+    TINY  = 13
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

activerecord/CHANGELOG.md

@@ -1,3 +1,5 @@
+## Rails 4.1.13 (August 24, 2015) ##
+
 *   Don't define autosave association callbacks twice from
     `accepts_nested_attributes_for`.
 

activerecord/lib/active_record/gem_version.rb

@@ -7,7 +7,7 @@ module ActiveRecord
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 12
+    TINY  = 13
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

activesupport/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 4.1.13 (August 24, 2015) ##
+
+*   No changes.
+
+
 ## Rails 4.1.12 (June 25, 2015) ##
 
 *   No changes.

activesupport/lib/active_support/gem_version.rb

@@ -7,7 +7,7 @@ module ActiveSupport
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 12
+    TINY  = 13
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

guides/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 4.1.13 (August 24, 2015) ##
+
+*   No changes.
+
+
 ## Rails 4.1.12 (June 25, 2015) ##
 
 *   No changes.

railties/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 4.1.13 (August 24, 2015) ##
+
+*   No changes.
+
+
 ## Rails 4.1.12 (June 25, 2015) ##
 
 *   Add support for inline images in mailer previews by using an interceptor

railties/lib/rails/gem_version.rb

@@ -7,7 +7,7 @@ module Rails
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 12
+    TINY  = 13
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

tasks/release.rb

@@ -98,7 +98,7 @@ namespace :all do
   task :push            => FRAMEWORKS.map { |f| "#{f}:push"            } + ['rails:push']
 
   task :ensure_clean_state do
-    unless `git status -s | grep -v RAILS_VERSION`.strip.empty?
+    unless `git status -s | grep -v 'RAILS_VERSION\\|CHANGELOG'`.strip.empty?
       abort "[ABORTING] `git status` reports a dirty tree. Make sure all changes are committed"
     end
 

version.rb

@@ -7,7 +7,7 @@ module Rails
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 12
+    TINY  = 13
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")