diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-25 17:12:19 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-25 17:12:19 -0700 |
| commit | 89397d09ebb7ca4089f17820d05d5eb223913652 (patch) | |
| tree | a3836aedbeba1670571ebe6cbc14b79c921c0068 /activemodel | |
| parent | 450743cf56125d153b64c3509e75b0e4f86851d1 (diff) | |
| download | rails-89397d09ebb7ca4089f17820d05d5eb223913652.tar.gz rails-89397d09ebb7ca4089f17820d05d5eb223913652.tar.bz2 rails-89397d09ebb7ca4089f17820d05d5eb223913652.zip | |
Prefix internal method with _
This will avoid naming clash with user defined methods
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/validations.rb | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/validations/callbacks.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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 |