aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Allow value to be set on date_selectColin Burn-Murdoch2013-01-133-1/+26
* Associaton -> AssociationSteve Klabnik2013-01-131-2/+2
* Fix regression introduced in pull request 8812Sam Ruby2013-01-111-1/+2
* Merge pull request #8882 from goshakkk/clearer-conditionalCarlos Antonio da Silva2013-01-111-3/+3
|\
| * clearer conditional in constraint match checkGosha Arinich2013-01-101-3/+3
* | Merge pull request #8623 from virusman/form_helpers_collectionproxy_fixJon Leighton2013-01-112-1/+24
|\ \
| * | Test nested fields with AssociationProxy mockup & fix AssociationProxy suppor...virusman2012-12-272-1/+24
* | | Fix json params parsing regression for non-object JSON content.Dylan Smith2013-01-113-2/+13
| |/ |/|
* | Merge pull request #8876 from senny/extract_performance_testsGuillermo Iguaran2013-01-105-15/+7
|\ \
| * | extract PerformanceTest into rails-performance_tests gemYves Senn2013-01-105-15/+7
* | | Merge pull request #8821 from jamis/masterRafael Mendonça França2013-01-102-7/+3
|\ \ \ | |/ / |/| |
| * | evaluate the dependency blocks at the instance level, not class levelJamis Buck2013-01-082-7/+3
* | | Remove redundant double quotation markszires2013-01-101-1/+1
* | | adding missing requiresAaron Patterson2013-01-092-0/+9
* | | Fix typo in deprecation warningNathaniel Jones2013-01-091-1/+1
* | | Merge pull request #8824 from mjtko/fix/cookie-store-inheritanceSantiago Pastorino2013-01-082-5/+26
|\ \ \
| * | | Revert cb3181e - no longer required.Mark J. Titorenko2013-01-081-2/+0
| * | | Fix CookieStore middleware inheritance hierarchy s.t. it inherits from Rack::...Mark J. Titorenko2013-01-081-3/+26
* | | | Remove :yaml related tests and fix other related to parsing empty arraysCarlos Antonio da Silva2013-01-082-45/+2
* | | | Fix warning: & interpreted as argument prefixCarlos Antonio da Silva2013-01-081-1/+1
* | | | remove yaml as a param parser :burn:Aaron Patterson2013-01-081-2/+0
* | | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-081-0/+13
* | | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin...Aaron Patterson2013-01-084-5/+38
* | | | Revert "Merge branch 'master-sec'"Jeremy Kemper2013-01-085-51/+5
* | | | Merge branch 'master-sec'Aaron Patterson2013-01-085-5/+51
|\ \ \ \
| * | | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-081-0/+13
| * | | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin...Aaron Patterson2013-01-074-5/+38
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-01-0910-26/+34
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | prefer american spelling of 'behavior'Gosha Arinich2013-01-071-1/+1
| * | | | HTTP 302 means Found, not MovedChase DuBois2013-01-051-1/+1
| * | | | extract alert= and notice= examples to FlashHash#now [ci skip]Francesco Rodriguez2013-01-031-17/+15
| * | | | Revert "TODO typo fix"Akira Matsuda2013-01-041-1/+1
| * | | | TODO typo fixGosha Arinich2013-01-041-1/+1
| * | | | Add examples `alert=` and `notice=`, using memeslambda_2013-01-031-0/+10
| * | | | Change `Example for` to `Example of`lambda_2013-01-031-2/+2
| * | | | PUT => PATCHAkira Matsuda2013-01-033-6/+6
| * | | | s/ERb/ERB/Akira Matsuda2013-01-021-1/+1
| * | | | PUT => PATCH or PUTAkira Matsuda2013-01-021-1/+1
| * | | | find_or_create_by is deprecated in AR 4Akira Matsuda2013-01-021-3/+3
| * | | | Model.scoped is deprecated in favour of Model.allAkira Matsuda2013-01-021-4/+4
* | | | | view_cache_dependency APIJamis Buck2013-01-086-10/+72
* | | | | Merge pull request #8810 from NARKOZ/image-submit-tagSteve Klabnik2013-01-083-9/+14
|\ \ \ \ \
| * | | | | set 'alt' attribute for image_submit_tagNihad Abbasov2013-01-083-9/+14
* | | | | | Revert "unpermitted params" exception -- it's just not going to work. See the...David Heinemeier Hansson2013-01-083-102/+11
* | | | | | Never treat action or controller as unpermitted paramsDavid Heinemeier Hansson2013-01-082-6/+25
* | | | | | Bump rack dependency to 1.4.3Carlos Antonio da Silva2013-01-081-1/+1
* | | | | | Eliminate Rack::File headers deprecation warningSam Ruby2013-01-081-1/+1
|/ / / / /
* | | / / Do not generate local vars for partials without object or collectionCarlos Antonio da Silva2013-01-084-1/+15
| |_|/ / |/| | |
* | | | Avoid Rack security warning no secret providedSantiago Pastorino2013-01-081-0/+2
| |/ / |/| |
* | | improve StrongParameters documentation [ci skip]Francesco Rodriguez2013-01-071-8/+7