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

rails · Nov 17, 2015 · 689df94 · 689df94
2 parents 32ca78a + e694ac5
commit 689df94
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 44 deletions.
diff --git a/Gemfile.lock b/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)
 

diff --git a/RAILS_VERSION b/RAILS_VERSION
@@ -1 +1 @@
-4.1.14.rc1
+4.1.14
diff --git a/actionmailer/CHANGELOG.md b/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.

diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
 *   No changes.
 

diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actionview/CHANGELOG.md b/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) ##

diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb
@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
 *   No changes.
 

diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb
@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activerecord/CHANGELOG.md b/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.

diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb
@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
 *   No changes.
 

diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb
@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
 *   No changes.
 

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.14.rc1 (October 30, 2015) ##
+## Rails 4.1.14 (November 12, 2015) ##
 
 *   No changes.
 

diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb
@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/tasks/release.rb b/tasks/release.rb
@@ -109,7 +109,7 @@
   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 @@
     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 @@
     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
diff --git a/version.rb b/version.rb
@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 4
     MINOR = 1
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end