diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-13 15:28:02 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-13 15:28:02 -0700 |
| commit | 1ad68e360065623d5d947d3375b9ab5aae78f461 (patch) | |
| tree | 4d1e9bfef390ebbf0d29f4d25899a9970acdb9cd /activesupport/test | |
| parent | 19b9f7ba334108bd669ec6ae3bdf11d707a7d689 (diff) | |
| parent | b93cd60949bfc8d69b271e09eda0786b200e7a8b (diff) | |
| download | rails-1ad68e360065623d5d947d3375b9ab5aae78f461.tar.gz rails-1ad68e360065623d5d947d3375b9ab5aae78f461.tar.bz2 rails-1ad68e360065623d5d947d3375b9ab5aae78f461.zip | |
Merge branch 'master' into normalizecb
* master:
extract getting an setting callbacks to methods
call extracted method from callback manipulation methods
extract callback param munging
no reason to make these defaulted, we always pass values in
Conflicts:
activesupport/lib/active_support/callbacks.rb
Diffstat (limited to 'activesupport/test')
0 files changed, 0 insertions, 0 deletions