aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into loofahRafael Mendonça França2014-08-174-73/+108
|\
| * Use AS::JSON for (de)serializing cookiesGodfrey Chan2014-08-171-2/+3
| * 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
| | |/
| * | extract methods and metaprogram less.Aaron Patterson2014-08-141-11/+16
| * | 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
* | | Merge branch 'master' into loofahRafael Mendonça França2014-08-1224-307/+434
|\| |
| * | use 'based on' instead of 'based off' [ci skip]Akshay Vishnoi2014-08-122-2/+2
| * | 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
| * refactor Redirecting so we do not need a controller instanceAaron Patterson2014-08-061-7/+2
| * avoid testing only_pathAaron Patterson2014-08-041-0/+4
| * 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
| * 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
| * Only concatenate path if it was given rather than converting blindlyCarlos Antonio da Silva2014-07-311-1/+1
| * Rename variable to better show its intentCarlos Antonio da Silva2014-07-311-12/+12
| * Simplify conditionalCarlos Antonio da Silva2014-07-311-3/+2
| * Push options check up so we can simplify internal methodsCarlos Antonio da Silva2014-07-311-13/+10
| * remove useless deupAaron Patterson2014-07-301-1/+1
| * push options inside the scope objectAaron Patterson2014-07-301-4/+9
| * turn scope in to a linked listAaron Patterson2014-07-301-15/+36
| * remove alias_method_chainAaron Patterson2014-07-301-4/+2
| * avoid instrospection on the moduleAaron Patterson2014-07-301-1/+2
| * fix variable nameAaron Patterson2014-07-301-3/+3
| * split path_helpers and url_helpersAaron Patterson2014-07-301-18/+25
| * `add` will remove the method if it exists alreadyAaron Patterson2014-07-301-1/+0
| * Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-301-48/+72
| * Revert "Merge pull request #15305 from tgxworld/remove_unnecessary_require"Santiago Pastorino2014-07-301-0/+1
| * oops! :bomb:Aaron Patterson2014-07-291-1/+1
| * ask the named routes collection if the route is definedAaron Patterson2014-07-292-1/+5