aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into loofahRafael Mendonça França2014-08-1713-607/+218
|\
| * Use AS::JSON for (de)serializing cookiesGodfrey Chan2014-08-171-2/+3
| * `responders` 1.x won't do it. Told you to RTFM for details!Godfrey Chan2014-08-171-3/+6
| * The gem is called 'responders'Godfrey Chan2014-08-171-2/+2
| * Raise a more helpful error for people who are using these extracted featuresGodfrey Chan2014-08-171-1/+16
| * Merge pull request #16467 from strzalek/cookies-digest-config-option2Godfrey Chan2014-08-171-3/+9
| |\
| | * Add config option for cookies digestŁukasz Strzałkowski2014-08-121-3/+9
| * | 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
| | |/
| * | Move respond_with to the responders gemJosé Valim2014-08-172-528/+3
| * | When your templates change, browser caches bust automatically.Jeremy Kemper2014-08-174-6/+83
| * | extract methods and metaprogram less.Aaron Patterson2014-08-141-11/+16
| * | remove deprecated `MissingHelperError` proxy.Yves Senn2014-08-141-3/+0
| * | Merge pull request #16027 from tgxworld/template_assertionsYves Senn2014-08-141-0/+9
| |\ \
| | * | Fix assert_template for files.Guo Xiang Tan2014-08-141-0/+9
| * | | 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-131-10/+10
| * | | this should be accessing the hash, not calling a methodAaron Patterson2014-08-131-1/+1
| * | | [ci skip] correct default cache store classAditya Kapoor2014-08-131-1/+1
| |/ /
* | | Merge branch 'master' into loofahRafael Mendonça França2014-08-1236-402/+512
|\| |
| * | use 'based on' instead of 'based off' [ci skip]Akshay Vishnoi2014-08-122-2/+2
| * | 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-081-8/+2
| * | | Add config option for cookies digestŁukasz Strzałkowski2014-08-081-2/+8
| | |/ | |/|
| * | Retrieve source code for the entire stack traceRyan Dao2014-08-088-69/+109
| |/
| * Remove ActionController::RaiseActionExceptions.Guo Xiang Tan2014-08-071-34/+0
| * refactor Redirecting so we do not need a controller instanceAaron Patterson2014-08-062-10/+7
| * avoid testing only_pathAaron Patterson2014-08-042-2/+5
| * Regenerate sid when sbdy tries to fixate the sessionSantiago Pastorino2014-08-041-3/+3
| * Using no_result_var in Journey's parser generatorJack Danger Canty2014-08-032-43/+33
| * Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-021-1/+2
| |\
| | * copy edits[ci skip]Vijay Dev2014-08-021-3/+1
| | * Performed Returns true if redirect/render has happenedGaurish Sharma2014-07-191-1/+4
| * | just set the host, no need for another hash allocation / merge!Aaron Patterson2014-08-011-1/+1
| * | always return a string from find_script_nameAaron Patterson2014-08-012-7/+9
| * | use `get` instead of accessing the named routes internalsAaron Patterson2014-07-311-1/+1
| * | invert check so we fail fasterAaron Patterson2014-07-311-1/+1
| * | do a hash lookup for collision detectionAaron Patterson2014-07-312-1/+5
| * | Realign assignments :scissors:Carlos Antonio da Silva2014-07-311-5/+5
| * | Do not reassign variable when mutation is happeningCarlos Antonio da Silva2014-07-311-8/+5