diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-05-12 15:57:14 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-05-12 15:57:14 +0530 |
commit | d8b8c0ef8717508c01ab21687666941008413906 (patch) | |
tree | bc148d9244b01f88a8547b4581818abe4ec138a5 /activesupport/lib/active_support/callbacks.rb | |
parent | a395c22fd3f55040c041a330c14b3676bfee29fc (diff) | |
parent | 1a9766f1280f9550ba1de4538fccd5ad51c557ac (diff) | |
download | rails-d8b8c0ef8717508c01ab21687666941008413906.tar.gz rails-d8b8c0ef8717508c01ab21687666941008413906.tar.bz2 rails-d8b8c0ef8717508c01ab21687666941008413906.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activesupport/lib/active_support/callbacks.rb
Diffstat (limited to 'activesupport/lib/active_support/callbacks.rb')
-rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 6fe7e0f4fb..a151aa03b5 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -227,7 +227,7 @@ module ActiveSupport # Compile around filters with conditions into proxy methods # that contain the conditions. # - # For `set_callback :save, :around, :filter_name, if: :condition': + # For `set_callback :save, :around, :filter_name, if: :condition`: # # def _conditional_callback_save_17 # if condition |