diff options
| author | Abdelkader Boudih <terminale@gmail.com> | 2014-10-03 22:33:45 +0100 |
|---|---|---|
| committer | Abdelkader Boudih <terminale@gmail.com> | 2014-10-03 22:33:45 +0100 |
| commit | cefb00aac632f10817b63ef42309df9ecc3103ea (patch) | |
| tree | fbb435cb94952e1e05086591b1d9f4364fc8772e | |
| parent | 1609ec9879d0011f31f0ae90cf3b2bc8b1833390 (diff) | |
| parent | 9ded108e841773017a27762f7ba6b6a6bd5813ab (diff) | |
| download | rails-cefb00aac632f10817b63ef42309df9ecc3103ea.tar.gz rails-cefb00aac632f10817b63ef42309df9ecc3103ea.tar.bz2 rails-cefb00aac632f10817b63ef42309df9ecc3103ea.zip | |
Merge pull request #17172 from rselk/typo
fix typo in in define_model_callbacks comment [ci skip]
| -rw-r--r-- | activemodel/lib/active_model/callbacks.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb index 467028f9e8..b3d70dc515 100644 --- a/activemodel/lib/active_model/callbacks.rb +++ b/activemodel/lib/active_model/callbacks.rb @@ -99,7 +99,7 @@ module ActiveModel # end # # NOTE: +method_name+ passed to `define_model_callbacks` must not end with - # `!`, `?` and `=`. + # `!`, `?` or `=`. def define_model_callbacks(*callbacks) options = callbacks.extract_options! options = { diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 21a2f54bc1..4bc13f20ca 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -721,7 +721,7 @@ module ActiveSupport # would call <tt>Audit#save</tt>. # # NOTE: +method_name+ passed to `define_model_callbacks` must not end with - # `!`, `?` and `=`. + # `!`, `?` or `=`. def define_callbacks(*names) options = names.extract_options! |