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

Gemfile.lock

@@ -1,45 +1,45 @@
 PATH
   remote: .
   specs:
-    actionmailer (4.1.14.rc1)
-      actionpack (= 4.1.14.rc1)
-      actionview (= 4.1.14.rc1)
+    actionmailer (4.1.14)
+      actionpack (= 4.1.14)
+      actionview (= 4.1.14)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.14.rc1)
-      actionview (= 4.1.14.rc1)
-      activesupport (= 4.1.14.rc1)
+    actionpack (4.1.14)
+      actionview (= 4.1.14)
+      activesupport (= 4.1.14)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.14.rc1)
-      activesupport (= 4.1.14.rc1)
+    actionview (4.1.14)
+      activesupport (= 4.1.14)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.14.rc1)
-      activesupport (= 4.1.14.rc1)
+    activemodel (4.1.14)
+      activesupport (= 4.1.14)
       builder (~> 3.1)
-    activerecord (4.1.14.rc1)
-      activemodel (= 4.1.14.rc1)
-      activesupport (= 4.1.14.rc1)
+    activerecord (4.1.14)
+      activemodel (= 4.1.14)
+      activesupport (= 4.1.14)
       arel (~> 5.0.0)
-    activesupport (4.1.14.rc1)
+    activesupport (4.1.14)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    rails (4.1.14.rc1)
-      actionmailer (= 4.1.14.rc1)
-      actionpack (= 4.1.14.rc1)
-      actionview (= 4.1.14.rc1)
-      activemodel (= 4.1.14.rc1)
-      activerecord (= 4.1.14.rc1)
-      activesupport (= 4.1.14.rc1)
+    rails (4.1.14)
+      actionmailer (= 4.1.14)
+      actionpack (= 4.1.14)
+      actionview (= 4.1.14)
+      activemodel (= 4.1.14)
+      activerecord (= 4.1.14)
+      activesupport (= 4.1.14)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.14.rc1)
+      railties (= 4.1.14)
       sprockets-rails (~> 2.0)
-    railties (4.1.14.rc1)
-      actionpack (= 4.1.14.rc1)
-      activesupport (= 4.1.14.rc1)
+    railties (4.1.14)
+      actionpack (= 4.1.14)
+      activesupport (= 4.1.14)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
 

RAILS_VERSION

@@ -1 +1 @@
-4.1.14.rc1
+4.1.14

actionmailer/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 4.1.14 (November 12, 2015) ##
+
+*   No changes.
+
+
 ## Rails 4.1.14.rc1 (October 30, 2015) ##
 
 *   No changes.

actionmailer/lib/action_mailer/gem_version.rb

@@ -8,7 +8,7 @@ module ActionMailer
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

actionpack/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
 *   No changes.
 

actionpack/lib/action_pack/gem_version.rb

@@ -8,7 +8,7 @@ module ActionPack
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

actionview/CHANGELOG.md

@@ -4,9 +4,11 @@
     *Christoph Geschwind*
 
 
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
-*   No changes.
+*   Fix `mail_to` when called with `nil` as argument.
+
+    *Rafael Mendonça França*
 
 
 ## Rails 4.1.13 (August 24, 2015) ##

actionview/lib/action_view/gem_version.rb

@@ -8,7 +8,7 @@ module ActionView
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

activemodel/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
 *   No changes.
 

activemodel/lib/active_model/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveModel
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

activerecord/CHANGELOG.md

@@ -3,7 +3,11 @@
     *Paul Sadauskas*
 
 
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
+
+*   No longer pass deprecated option `-i` to `pg_dump`.
+
+    *Paul Sadauskas*
 
 *   Includes HABTM returns correct size now. It's caused by the join dependency
     only instantiates one HABTM object because the join table hasn't a primary key.

activerecord/lib/active_record/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveRecord
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

activesupport/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
 *   No changes.
 

activesupport/lib/active_support/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveSupport
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

guides/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
 *   No changes.
 

railties/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
 *   No changes.
 

railties/lib/rails/gem_version.rb

@@ -8,7 +8,7 @@ module Rails
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

tasks/release.rb

@@ -109,7 +109,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\\|CHANGELOG'`.strip.empty?
+    unless `git status -s | grep -v 'RAILS_VERSION\\|CHANGELOG\\|Gemfile.lock'`.strip.empty?
       abort "[ABORTING] `git status` reports a dirty tree. Make sure all changes are committed"
     end
 
@@ -119,6 +119,10 @@ namespace :all do
     end
   end
 
+  task :bundle do
+    sh 'bundle check'
+  end
+
   task :commit do
     File.open('pkg/commit_message.txt', 'w') do |f|
       f.puts "# Preparing for #{version} release\n"
@@ -135,5 +139,5 @@ namespace :all do
     sh "git push --tags"
   end
 
-  task :release => %w(ensure_clean_state build commit tag push)
+  task :release => %w(ensure_clean_state build bundle commit tag push)
 end

version.rb

@@ -8,7 +8,7 @@ module Rails
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end