aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into normalizecbAaron Patterson2013-05-131-0/+40
|\
| * adding more callback type coverageAaron Patterson2013-05-131-0/+40
* | Merge branch 'master' into normalizecbAaron Patterson2013-05-131-20/+34
|\|
| * extract getting an setting callbacks to methodsAaron Patterson2013-05-131-15/+22
| * call extracted method from callback manipulation methodsAaron Patterson2013-05-131-6/+8
| * extract callback param mungingAaron Patterson2013-05-131-3/+8
| * no reason to make these defaulted, we always pass values inAaron Patterson2013-05-131-1/+1
* | pass the actual filter, not a stringAaron Patterson2013-05-132-2/+2
* | Merge branch 'master' into normalizecbAaron Patterson2013-05-1312-51/+97
|\|
| * add tests for reset_calbacksAaron Patterson2013-05-131-0/+40
| * Fixes NoMethodError: `alias_method_chain` when requiring just active_support/...Andy Lindeman2013-05-122-0/+4
| * Fix typo: require -> requiresRafael Mendonça França2013-05-121-1/+1
| * Add CHANGELOG entry for #10576Rafael Mendonça França2013-05-121-0/+7
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-124-2/+11
| |\
| | * added docs for InheritedOptions class [ci skip]Anton Kalyaev2013-05-111-0/+8
| | * changed rails -> Rails at two placesaditya-kapoor2013-05-092-2/+2
| | * Changed spelling of Busines to Businessaditya-kapoor2013-05-081-1/+1
| | * replace apostrophe with backquote for matching [ci skip]Anton Kalyaev2013-05-031-2/+2
| | * document String#to_time exceptionVipul A M2013-05-021-0/+1
| * | Replace multi_json with jsonErik Michaels-Ober2013-05-113-45/+18
| * | Give credits to all the envolved people [ci skip]Rafael Mendonça França2013-05-101-1/+1
| * | Merge pull request #10534 from cmaruz/masterRafael Mendonça França2013-05-103-3/+12
| |\ \
| | * | Added escaping of U+2028 and U+2029 inside the json encoder.Mario Caropreso2013-05-093-5/+14
| * | | Fix syntax error on Ruby 2.0Rafael Mendonça França2013-05-101-2/+4
| * | | Merge pull request #10057 from zackham/patch-1Rafael Mendonça França2013-05-101-2/+4
| |\ \ \
| | * | | Escape multibyte line terminators in JSON encodingzackham2013-04-021-2/+4
* | | | | do not keep a reference to the chain in the callback objectsAaron Patterson2013-05-101-12/+10
* | | | | fix deprecation testAaron Patterson2013-05-101-0/+2
* | | | | push merge code to the callback itselfAaron Patterson2013-05-101-18/+10
* | | | | dup the callback and set the chainAaron Patterson2013-05-101-8/+8
* | | | | remove klass because it is not usedAaron Patterson2013-05-101-9/+7
* | | | | rename instance variablesAaron Patterson2013-05-101-12/+14
* | | | | push duplicates? logic to the instanceAaron Patterson2013-05-101-16/+7
* | | | | callback chain is in charge of the cache, so remove method based cacheAaron Patterson2013-05-101-21/+0
* | | | | __define_callbacks method is not necessary anymoreAaron Patterson2013-05-101-8/+1
* | | | | just run compiled callbacks since they are cachedAaron Patterson2013-05-101-14/+4
* | | | | cache compiled callbacksAaron Patterson2013-05-101-7/+27
* | | | | use delegation over inheritance so we can figure when to cache / bust cacheAaron Patterson2013-05-101-5/+22
* | | | | fixing activemodel testsAaron Patterson2013-05-101-1/+2
* | | | | use an environment object to hold state about the filter callsAaron Patterson2013-05-101-21/+41
* | | | | object based callbacks cannot be duplicatedAaron Patterson2013-05-101-7/+4
* | | | | pass the run block as a normal variable to the rest of the callbacksAaron Patterson2013-05-101-12/+12
* | | | | fixing more variable namesAaron Patterson2013-05-101-10/+10
* | | | | fix variable nameAaron Patterson2013-05-101-6/+6
* | | | | reduce the number of lambasAaron Patterson2013-05-101-5/+2
* | | | | callback sequence is no longer usedAaron Patterson2013-05-101-6/+0
* | | | | no need for variable assignments, just pass the values inAaron Patterson2013-05-101-6/+2
* | | | | make_lambda is never called with an ArrayAaron Patterson2013-05-101-2/+0
* | | | | callbacks are wrapped with lambdasAaron Patterson2013-05-101-106/+76
* | | | | remove dead codeAaron Patterson2013-05-101-10/+0