aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' into laurocaetano-fix_send_fileAaron Patterson2014-01-1011-57/+218
|\ \
| * | Add any/all support for variantsŁukasz Strzałkowski2013-12-261-27/+54
| * | 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-231-2/+1
| * | 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 branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-201-1/+1
| |\ \
| | * | Typos. return -> returns. [ci skip]Lauro Caetano2013-12-031-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
| |/ / /
| * | | Fix syntax error in redirect_to examplePhilipe Fatio2013-12-141-1/+1
| * | | Merge pull request #13293 from akshay-vishnoi/typoCarlos Antonio da Silva2013-12-121-1/+1
| |\ \ \
| | * | | Spelling and Grammar checksAkshay Vishnoi2013-12-121-1/+1
| * | | | 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
| * | | | typos rectified [ci skip]Aayush khandelwal2013-12-121-1/+1
| |/ / /
| * | | 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-081-0/+1
| |/ / /
| * | | Variants can be declared without a block to signify their presence in the con...David Heinemeier Hansson2013-12-071-1/+3
| * | | Allow code execution in case no variant has been set with variant.noneDavid Heinemeier Hansson2013-12-071-4/+5
| * | | Merge pull request #13189 from strzalek/retain-ap-av-depJeremy Kemper2013-12-051-15/+3
| |\ \ \
| | * | | Retain ActionPack dependency on ActionViewŁukasz Strzałkowski2013-12-051-15/+3
| * | | | Improve a couple exception messages related to variants and mime typesCarlos Antonio da Silva2013-12-031-2/+4
| * | | | Add nodoc to added VariantFilter classCarlos Antonio da Silva2013-12-031-3/+3
| |/ / /
| * | | Action Pack VariantsŁukasz Strzałkowski2013-12-041-4/+46
| * | | Cleanups in comment about conditionalGuillermo Iguaran2013-12-031-1/+2
| * | | Merge branch 'format_localized_template' of https://github.com/acapilleri/railsGuillermo Iguaran2013-12-031-1/+1
| |\ \ \
| | * | | Fix header Content-Type: #<Mime::NullType:...> in localized templateAngelo capilleri2013-12-031-1/+1
| | |/ /
| * / / Use genderless pronouns in API docsGuillermo Iguaran2013-12-011-1/+1
| |/ /
* / / Fix stream closing when sending file with `ActionController::Live` included.Lauro Caetano2013-11-301-1/+1
|/ /
* | Revert "Used Yield instead of block.call" -- this causes all of atom_feed_hel...David Heinemeier Hansson2013-11-141-2/+2
* | Merge pull request #12889 from kuldeepaggarwal/speed_upsRafael Mendonça França2013-11-141-2/+2
|\ \
| * | Used Yield instead of block.callKuldeep Aggarwal2013-11-151-2/+2
* | | #presence usedAkshay Vishnoi2013-11-141-5/+1
* | | Remove order attribute from collectorLukasz Strzalkowski2013-11-101-4/+3
|/ /
* | calculate the ivars to remove in advance as a set and cache them in aAaron Patterson2013-11-061-3/+10
* | Improve wording in AC::ParameterMissing error messageGuillermo Iguaran2013-11-021-1/+1
* | Revert "Merge pull request #9660 from sebasoga/change_strong_parameters_requi...Guillermo Iguaran2013-11-021-23/+9
* | Merge pull request #9660 from sebasoga/change_strong_parameters_require_behav...Guillermo Iguaran2013-11-011-9/+23
|\ \