aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into loofahRafael Mendonça França2014-08-1731-1381/+464
|\
| * Merge pull request #16294 from bf4/code_toolsRafael Mendonça França2014-08-171-21/+3
| |\
| | * Encapsulate rake lines from ActiveRecord/ActionPack as CodeTools::LineStatisticsBenjamin Fleischer2014-07-251-21/+3
| * | Use AS::JSON for (de)serializing cookiesGodfrey Chan2014-08-173-2/+50
| * | `responders` 1.x won't do it. Told you to RTFM for details!Godfrey Chan2014-08-172-3/+8
| * | The gem is called 'responders'Godfrey Chan2014-08-172-4/+4
| * | Raise a more helpful error for people who are using these extracted featuresGodfrey Chan2014-08-172-1/+46
| * | Fixed broken reference caused by 14965baGodfrey Chan2014-08-171-2/+2
| * | Merge pull request #16467 from strzalek/cookies-digest-config-option2Godfrey Chan2014-08-173-3/+64
| |\ \
| | * | Add config option for cookies digestŁukasz Strzałkowski2014-08-123-3/+64
| * | | Merge pull request #16484 from strzalek/remove-redundant-null-serializerGodfrey Chan2014-08-171-16/+7
| |\ \ \
| | * | | Remove redundant NullSerializerŁukasz Strzałkowski2014-08-131-16/+7
| | |/ /
| * | | Remove more references to respond_withJosé Valim2014-08-177-6/+0
| * | | Move respond_with to the responders gemJosé Valim2014-08-174-1265/+8
| * | | When your templates change, browser caches bust automatically.Jeremy Kemper2014-08-177-9/+136
| * | | extract methods and metaprogram less.Aaron Patterson2014-08-141-11/+16
| * | | remove deprecated `MissingHelperError` proxy.Yves Senn2014-08-142-3/+5
| * | | Merge pull request #16027 from tgxworld/template_assertionsYves Senn2014-08-143-0/+36
| |\ \ \
| | * | | Fix assert_template for files.Guo Xiang Tan2014-08-143-0/+36
| * | | | ask the scope object if it is a resource_method_scopeAaron Patterson2014-08-131-10/+13
| * | | | ask the scope for the action nameAaron Patterson2014-08-131-14/+18
| * | | | reduce calls to scope_levelAaron Patterson2014-08-131-1/+5
| * | | | change to attr_readerAaron Patterson2014-08-131-5/+1
| * | | | scope_level is no longer a hash key, just use the ivarAaron Patterson2014-08-131-4/+9
| * | | | move the scope level key fully inside the scope objectAaron Patterson2014-08-131-1/+5
| * | | | move scope_level to a method on the scope objectAaron Patterson2014-08-131-7/+20
| * | | | only look up scope level onceAaron Patterson2014-08-131-6/+7
| * | | | only test `prefix` onceAaron Patterson2014-08-131-2/+4
| * | | | pass consistent parameters to canonical_action?Aaron Patterson2014-08-131-5/+5
| * | | | fewer operations on the options hashAaron Patterson2014-08-132-11/+11
| * | | | this should be accessing the hash, not calling a methodAaron Patterson2014-08-131-1/+1
| * | | | UnexpectedErrors may reference exceptions that can't be dumpedAaron Patterson2014-08-131-0/+17
| * | | | [ci skip] correct default cache store classAditya Kapoor2014-08-131-1/+1
| |/ / /
| * | | Merge pull request #16491 from akshay-vishnoi/doc-changesYves Senn2014-08-131-1/+1
| |\ \ \
| | * | | [ci skip] fix spelling of overrideAkshay Vishnoi2014-08-131-1/+1
| * | | | AM, AP, AV, and AMo tests are already order_independent!Akira Matsuda2014-08-131-5/+0
| |/ / /
* | | | Prepare for partial release.Kasper Timm Hansen2014-08-172-5/+2
* | | | Merge branch 'master' into loofahRafael Mendonça França2014-08-12122-799/+1184
|\| | |
| * | | Merge pull request #16476 from akshay-vishnoi/doc-changesRafael Mendonça França2014-08-122-2/+2
| |\ \ \
| | * | | use 'based on' instead of 'based off' [ci skip]Akshay Vishnoi2014-08-122-2/+2
| * | | | Nobody sucks so nobody should call this awful method nameRafael Mendonça França2014-08-121-1/+1
| |/ / /
| * | | users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent!Akira Matsuda2014-08-121-0/+5
| * | | Merge pull request #16440 from tgxworld/pass_log_in_blockSantiago Pastorino2014-08-091-4/+6
| |\ \ \
| | * | | Pass block for logging.Guo Xiang Tan2014-08-091-4/+6
| * | | | Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"Santiago Pastorino2014-08-083-30/+2
| * | | | Add config option for cookies digestŁukasz Strzałkowski2014-08-083-2/+30
| | |/ / | |/| |
| * | | Merge pull request #16427 from ryandao/full_stack_source_extractGuillermo Iguaran2014-08-089-69/+114
| |\ \ \
| | * | | Update actionpack CHANGELOGRyan Dao2014-08-081-0/+5
| | * | | Retrieve source code for the entire stack traceRyan Dao2014-08-088-69/+109
| | |/ /
| * / / Fixes to TestCaseTest.Guo Xiang Tan2014-08-081-4/+5
| |/ /