Merge branch 'master' of github.com:rails/rails

5 files changed, 14 insertions, 6 deletions

diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb
index ca04f48c1c..ae185694ca 100644
--- a/activemodel/lib/active_model/dirty.rb
+++ b/activemodel/lib/active_model/dirty.rb
@@ -1,5 +1,6 @@
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/string/filters'
 
 module ActiveModel
   # == Active \Model \Dirty
@@ -200,7 +201,11 @@ module ActiveModel
       end
 
       def reset_changes
-        ActiveSupport::Deprecation.warn "#reset_changes is deprecated and will be removed on Rails 5. Please use #clear_changes_information instead."
+        ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          `#reset_changes` is deprecated and will be removed on Rails 5.
+          Please use `#clear_changes_information` instead.
+        MSG
+
         clear_changes_information
       end
 
@@ -224,7 +229,10 @@ module ActiveModel
 
       # Handle <tt>reset_*!</tt> for +method_missing+.
       def reset_attribute!(attr)
-        ActiveSupport::Deprecation.warn "#reset_#{attr}! is deprecated and will be removed on Rails 5. Please use #restore_#{attr}! instead."
+        ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          `#reset_#{attr}!` is deprecated and will be removed on Rails 5.
+          Please use `#restore_#{attr}!` instead.
+        MSG
 
         restore_attribute!(attr)
       end
diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb
index e37edcf581..932fe3e5a9 100644
--- a/activemodel/lib/active_model/gem_version.rb
+++ b/activemodel/lib/active_model/gem_version.rb
@@ -8,7 +8,7 @@ module ActiveModel
     MAJOR = 4
     MINOR = 2
     TINY  = 0
-    PRE   = "beta2"
+    PRE   = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 1116f6b8ee..c1e344b215 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -392,7 +392,7 @@ module ActiveModel
   protected
 
     def run_validations! #:nodoc:
-      run_validate_callbacks
+      _run_validate_callbacks
       errors.empty?
     end
   end
diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb
index 1a5192b0ff..25ccabd66b 100644
--- a/activemodel/lib/active_model/validations/callbacks.rb
+++ b/activemodel/lib/active_model/validations/callbacks.rb
@@ -110,7 +110,7 @@ module ActiveModel
 
       # Overwrite run validations to include callbacks.
       def run_validations! #:nodoc:
-        run_validation_callbacks { super }
+        _run_validation_callbacks { super }
       end
     end
   end
diff --git a/activemodel/lib/active_model/validations/format.rb b/activemodel/lib/active_model/validations/format.rb
index ff3e95da34..02478dd5b6 100644
--- a/activemodel/lib/active_model/validations/format.rb
+++ b/activemodel/lib/active_model/validations/format.rb
@@ -54,7 +54,7 @@ module ActiveModel
 
     module HelperMethods
       # Validates whether the value of the specified attribute is of the correct
-      # form, going by the regular expression provided.You can require that the
+      # form, going by the regular expression provided. You can require that the
       # attribute matches the regular expression:
       #
       #   class Person < ActiveRecord::Base