aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into laurocaetano-fix_send_fileAaron Patterson2014-01-1039-162/+409
|\
| * Allow an absolute controller path inside a module scopeAndrew White2014-01-051-2/+6
| * Unique the segment keys array for non-optimized url helpersAndrew White2014-01-051-1/+1
| * Show full route constraints in error messageAndrew White2014-01-052-4/+5
| * Simplify arg parameterizationAndrew White2014-01-051-6/+1
| * Use a custom route vistor for optimized route generationAndrew White2014-01-052-31/+49
| * update copyright notices to 2014. [ci skip]Vipul A M2014-01-012-2/+2
| * Allow engine root relative redirects using an empty string.Andrew White2014-01-011-8/+18
| * Merge pull request #13470 from strzalek/variants-all-anyDavid Heinemeier Hansson2013-12-311-27/+54
| |\
| | * Add any/all support for variantsŁukasz Strzałkowski2013-12-261-27/+54
| * | Fix Encoding::CompatibilityError when public path is UTF-8Andrew White2013-12-291-3/+3
| * | Fix method redefined warning message in mapper.rbAndrew White2013-12-291-2/+3
| |/
| * Improve font of some code in API documentation [ci skip]Chun-wei Kuo2013-12-261-1/+1
| * AC::Parameters#permit! permits hashes in array valuesXavier Noria2013-12-231-2/+4
| * Move the null mime type to request.formatCarlos Antonio da Silva2013-12-234-5/+4
| * Add missing av/railtie requireŁukasz Strzałkowski2013-12-221-0/+1
| * optimizes array conversion in AC::ParametersXavier Noria2013-12-211-2/+12
| * refactors AC::Parameters#fetchXavier Noria2013-12-211-10/+3
| * converts hashes in arrays of unfiltered params to unpermitted params [fixes #...Xavier Noria2013-12-211-3/+10
| * Merge pull request #13188 from imanel/skip_deep_mungeJeremy Kemper2013-12-192-0/+8
| |\
| | * Add configuration option to optionally disable deep_mungeBernard Potocki2013-12-052-0/+8
| * | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-203-3/+3
| |\ \
| | * | Typos. return -> returns. [ci skip]Lauro Caetano2013-12-033-3/+3
| * | | Show routes defined under assets prefixRyunosuke SATO2013-12-191-1/+1
| * | | Change all `MiniTest` to `Minitest` since, `MiniTest` namespace has been rena...Vipul A M2013-12-182-2/+2
| * | | Get ready to release 4.1.0.beta1David Heinemeier Hansson2013-12-171-1/+1
| * | | Clearly limit new CSRF protection to GET requestsJeremy Kemper2013-12-171-2/+7
| * | | Merge pull request #13345 from jeremy/get-csrfJeremy Kemper2013-12-171-13/+61
| |\ \ \
| | * | | CSRF protection from cross-origin <script> tagsJeremy Kemper2013-12-171-13/+61
| * | | | Some assorted fixes for the 4.1 release notes:Godfrey Chan2013-12-171-1/+1
| |/ / /
| * | | Add mailer previews feature based on mail_view gemAndrew White2013-12-171-1/+1
| * | | Update secret_key_base Docsrobertomiranda2013-12-152-10/+11
| * | | Fix syntax error in redirect_to examplePhilipe Fatio2013-12-141-1/+1
| * | | Merge pull request #13293 from akshay-vishnoi/typoCarlos Antonio da Silva2013-12-124-5/+5
| |\ \ \
| | * | | Spelling and Grammar checksAkshay Vishnoi2013-12-124-5/+5
| * | | | Variants inline syntax documentation [ci skip]Łukasz Strzałkowski2013-12-121-0/+9
| |/ / /
| * | | Merge pull request #13288 from dvsuresh/fix_typoDamien Mathieu2013-12-121-1/+1
| |\ \ \
| | * | | Fix typo in action_controller responder.rbdvsuresh2013-12-121-1/+1
| * | | | Merge pull request #13284 from aayushkhandelwal11/typos_correctedGodfrey Chan2013-12-111-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | typos rectified [ci skip]Aayush khandelwal2013-12-121-1/+1
| * | | | Make ActionDispatch::Request::Session#fetch behave like Hash#fetchTrent Ogren2013-12-111-8/+8
| |/ / /
| * | | Fix mounting engines inside a resources blockPiotr Sarnacki2013-12-101-1/+2
| * | | Inline variants syntaxŁukasz Strzałkowski2013-12-101-2/+24
| * | | Simplify @responses hash initializationŁukasz Strzałkowski2013-12-101-1/+2
| * | | Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a l...David Heinemeier Hansson2013-12-081-15/+9
| * | | Merge pull request #13235 from strzalek/variants-inlineDavid Heinemeier Hansson2013-12-081-9/+15
| |\ \ \
| | * | | Inline variants syntaxŁukasz Strzałkowski2013-12-081-8/+14
| | * | | Simplify @responses hash initializationŁukasz Strzałkowski2013-12-081-1/+1
| * | | | Require action_view explicitly in AC::BaseŁukasz Strzałkowski2013-12-082-0/+2
| |/ / /
| * | | Variants can be declared without a block to signify their presence in the con...David Heinemeier Hansson2013-12-071-1/+3