aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix shadowed variable warningsAaron Patterson2013-05-141-5/+5
* polymorphic around callbacksAaron Patterson2013-05-141-15/+79
* polymorphic after filterAaron Patterson2013-05-141-25/+70
* rename terminal to halting, try to keep naming consistentAaron Patterson2013-05-141-4/+4
* push the before filter lambdas to factory methodsAaron Patterson2013-05-141-40/+58
* polymorphic before callbacksAaron Patterson2013-05-141-16/+54
* Merge branch 'master' into normalizecbAaron Patterson2013-05-142-2/+3
|\
| * private callback methods should workAaron Patterson2013-05-141-1/+2
| * Update mail to minimum version 2.5.4Mikel Lindsaar2013-05-141-1/+1
* | use a singleton end nodeAaron Patterson2013-05-131-5/+10
* | Revert "we never pass blocks, so remove this"Aaron Patterson2013-05-131-1/+1
* | if there is nothing to compile, then do not bother compilingAaron Patterson2013-05-131-3/+8
* | Arrays are no longer supportedAaron Patterson2013-05-131-4/+0
* | we never pass blocks, so remove thisAaron Patterson2013-05-131-1/+1
* | raise an argument error if the filter arity is greater than 1Aaron Patterson2013-05-131-12/+6
* | 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-1358-214/+360
|\|
| * add tests for reset_calbacksAaron Patterson2013-05-131-0/+40
| * Merge pull request #10592 from arunagw/build-fix-flash-hashRafael Mendonça França2013-05-131-2/+2
| |\
| | * Fixing build broken by this changeArun Agrawal2013-05-131-2/+2
| |/
| * Merge pull request #10587 from vipulnsward/indent_varRafael Mendonça França2013-05-121-1/+2
| |\
| | * Extract variable out of loopVipul A M2013-05-131-1/+2
| * | Merge pull request #10584 from alindeman/range-missing-alias-attributeRafael Mendonça França2013-05-122-0/+4
| |\ \
| | * | Fixes NoMethodError: `alias_method_chain` when requiring just active_support/...Andy Lindeman2013-05-122-0/+4
| | |/
| * | Merge pull request #10586 from AJ-Acevedo/commentsRafael Mendonça França2013-05-121-1/+1
| |\ \ | | |/ | |/|
| | * Updated comment to Rails 4AJ Acevedo2013-05-121-1/+1
| |/
| * Merge pull request #10581 from shime/better-generator-errorRafael Mendonça França2013-05-121-1/+9
| |\
| | * better error message when app name is not passed in `rails new`Hrvoje Šimić2013-05-121-1/+9
| * | Merge pull request #10580 from CodeTag/masterGuillermo Iguaran2013-05-121-9/+3
| |\ \ | | |/ | |/|
| | * Code cleanup for ActionDispatch::Flash#callJulian Vargas2013-05-121-9/+3
| |/
| * Merge pull request #10577 from vipulnsward/fix_method_typosRafael Mendonça França2013-05-123-3/+3
| |\
| | * Fix class and method name typosVipul A M2013-05-123-3/+3
| * | Merge pull request #10560 from jkutner/masterRafael Mendonça França2013-05-123-10/+0
| |\ \
| | * | Removed jruby-openssl gem from default template GemfileJoe Kutner2013-05-103-10/+0
| * | | 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 pull request #10556 from Empact/deprecate-schema-statements-distinctRafael Mendonça França2013-05-123-13/+31
| * | | Some editorial changes on the documentation.Rafael Mendonça França2013-05-122-27/+27
| * | | respond_to -> respond to in a message from AM::LintXavier Noria2013-05-121-1/+1
| * | | specify that dom_(id|class) are deprecated in controllers, views are fineXavier Noria2013-05-121-1/+1
| * | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-1226-89/+120
| |\ \ \ | | |_|/ | |/| |
| | * | copy edits [ci skip]Vijay Dev2013-05-121-5/+1
| | * | ruby -> RubyPrathamesh Sonpatki2013-05-123-3/+3