Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8938 from colinbm/date_select_value | Steve Klabnik | 2013-01-14 | 4 | -4/+57 |
|\ | | | | | Rename :value to :selected for date_select, and add missing tests/docs | ||||
| * | Rename :value option to :selected, in line with other select helpers | Colin Burn-Murdoch | 2013-01-14 | 4 | -4/+57 |
| | | | | | | | | | | Add tests for time & datetime. Add documentation. | ||||
* | | Revert benchmark helper regression. Use a #capture within a #benchmark | Jeremy Kemper | 2013-01-14 | 3 | -39/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | block. Breaks benchmark calls that return non-String values otherwise. Revert "add benchmark helper that works in erb" This reverts commit 904e544cc8f5846de7c31827bb5556c6a238c0de. Conflicts: actionpack/lib/action_view/helpers.rb actionpack/lib/action_view/helpers/benchmark_helper.rb actionpack/test/template/benchmark_helper_test.rb | ||||
* | | Merge pull request #8916 from josemota/collection-with-block | Rafael Mendonça França | 2013-01-13 | 2 | -4/+53 |
|\ \ | |/ |/| | | | | | Collection radio buttons and collection check boxes through FormBuilder render the provided block. Closes #8897 | ||||
| * | Collection radio buttons and collection check boxes through FormBuilder render | José Mota | 2013-01-12 | 2 | -4/+53 |
| | | | | | | | | | | | | | | | | the provided block. In the case of having a form_for method being called, the block for each collection would not be passed and thus the result expected was always the same. This patch passes the block to the original method like it would be assumed. | ||||
* | | Allow value to be set on date_select | Colin Burn-Murdoch | 2013-01-13 | 3 | -1/+26 |
| | | |||||
* | | Associaton -> Association | Steve Klabnik | 2013-01-13 | 1 | -2/+2 |
|/ | |||||
* | Fix regression introduced in pull request 8812 | Sam Ruby | 2013-01-11 | 1 | -1/+2 |
| | | | | See https://github.com/rails/rails/pull/8812#commitcomment-2416514 | ||||
* | Merge pull request #8882 from goshakkk/clearer-conditional | Carlos Antonio da Silva | 2013-01-11 | 1 | -3/+3 |
|\ | | | | | Clearer conditional in constraint match check | ||||
| * | clearer conditional in constraint match check | Gosha Arinich | 2013-01-10 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #8623 from virusman/form_helpers_collectionproxy_fix | Jon Leighton | 2013-01-11 | 2 | -1/+24 |
|\ \ | | | | | | | Fixed nested fields bug when called with AssociationProxy | ||||
| * | | Test nested fields with AssociationProxy mockup & fix AssociationProxy ↵ | virusman | 2012-12-27 | 2 | -1/+24 |
| | | | | | | | | | | | | support in form helper | ||||
* | | | Fix json params parsing regression for non-object JSON content. | Dylan Smith | 2013-01-11 | 3 | -2/+13 |
| |/ |/| | | | | | Fixes #8845. | ||||
* | | Merge pull request #8876 from senny/extract_performance_tests | Guillermo Iguaran | 2013-01-10 | 5 | -15/+7 |
|\ \ | | | | | | | Extract ActionDispatch::PerformanceTest | ||||
| * | | extract PerformanceTest into rails-performance_tests gem | Yves Senn | 2013-01-10 | 5 | -15/+7 |
| | | | |||||
* | | | Merge pull request #8821 from jamis/master | Rafael Mendonça França | 2013-01-10 | 2 | -7/+3 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Evaluate view_cache_dependencies at the instance level Conflicts: actionpack/lib/action_controller/caching.rb | ||||
| * | | evaluate the dependency blocks at the instance level, not class level | Jamis Buck | 2013-01-08 | 2 | -7/+3 |
| | | | |||||
* | | | Remove redundant double quotation marks | zires | 2013-01-10 | 1 | -1/+1 |
| | | | |||||
* | | | adding missing requires | Aaron Patterson | 2013-01-09 | 2 | -0/+9 |
| | | | |||||
* | | | Fix typo in deprecation warning | Nathaniel Jones | 2013-01-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #8824 from mjtko/fix/cookie-store-inheritance | Santiago Pastorino | 2013-01-08 | 2 | -5/+26 |
|\ \ \ | | | | | | | | | Modify CookieStore middleware inheritance to avoid subclassing Rack::Session::Cookie [Fix for #7372] | ||||
| * | | | Revert cb3181e - no longer required. | Mark J. Titorenko | 2013-01-08 | 1 | -2/+0 |
| | | | | |||||
| * | | | Fix CookieStore middleware inheritance hierarchy s.t. it inherits from ↵ | Mark J. Titorenko | 2013-01-08 | 1 | -3/+26 |
| | | | | | | | | | | | | | | | | Rack::Session::Abstract::ID rather than Rack::Session::Cookie. | ||||
* | | | | Remove :yaml related tests and fix other related to parsing empty arrays | Carlos Antonio da Silva | 2013-01-08 | 2 | -45/+2 |
| | | | | | | | | | | | | | | | | All Action Pack tests are green. | ||||
* | | | | Fix warning: & interpreted as argument prefix | Carlos Antonio da Silva | 2013-01-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | remove yaml as a param parser :burn: | Aaron Patterson | 2013-01-08 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | If you revert this commit, I will hunt you down, I will make you regret ever terrible thing you've ever done, I will make you suffer. | ||||
* | | | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 1 | -0/+13 |
| | | | | |||||
* | | | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵ | Aaron Patterson | 2013-01-08 | 4 | -5/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb | ||||
* | | | | Revert "Merge branch 'master-sec'" | Jeremy Kemper | 2013-01-08 | 5 | -51/+5 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79. | ||||
* | | | | Merge branch 'master-sec' | Aaron Patterson | 2013-01-08 | 5 | -5/+51 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | * master-sec: CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu | ||||
| * | | | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵ | Aaron Patterson | 2013-01-07 | 4 | -5/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb | ||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-01-09 | 10 | -26/+34 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Conflicts: guides/source/getting_started.md | ||||
| * | | | | prefer american spelling of 'behavior' | Gosha Arinich | 2013-01-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | HTTP 302 means Found, not Moved | Chase DuBois | 2013-01-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | extract alert= and notice= examples to FlashHash#now [ci skip] | Francesco Rodriguez | 2013-01-03 | 1 | -17/+15 |
| | | | | | |||||
| * | | | | Revert "TODO typo fix" | Akira Matsuda | 2013-01-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1a59a6dfdca217e31a52779d92aa56b67c6689cb. I guess it's not a typo: https://github.com/jorlhuda/exceptron | ||||
| * | | | | TODO typo fix | Gosha Arinich | 2013-01-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add examples `alert=` and `notice=`, using memes | lambda_ | 2013-01-03 | 1 | -0/+10 |
| | | | | | |||||
| * | | | | Change `Example for` to `Example of` | lambda_ | 2013-01-03 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | PUT => PATCH | Akira Matsuda | 2013-01-03 | 3 | -6/+6 |
| | | | | | |||||
| * | | | | s/ERb/ERB/ | Akira Matsuda | 2013-01-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | PUT => PATCH or PUT | Akira Matsuda | 2013-01-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | find_or_create_by is deprecated in AR 4 | Akira Matsuda | 2013-01-02 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Model.scoped is deprecated in favour of Model.all | Akira Matsuda | 2013-01-02 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | view_cache_dependency API | Jamis Buck | 2013-01-08 | 6 | -10/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A declarative API for specifying dependencies that affect template cache digest computation. In your controller, specify any of said dependencies: view_cache_dependency { "phone" if using_phone? } When the block is evaluated, the resulting value is included in the cache digest calculation, allowing you to generate different digests for effectively the same template. (Mostly useful if you're mucking with template load paths.) | ||||
* | | | | | Merge pull request #8810 from NARKOZ/image-submit-tag | Steve Klabnik | 2013-01-08 | 3 | -9/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | set 'alt' attribute for image_submit_tag | ||||
| * | | | | | set 'alt' attribute for image_submit_tag | Nihad Abbasov | 2013-01-08 | 3 | -9/+14 |
| | | | | | | |||||
* | | | | | | Revert "unpermitted params" exception -- it's just not going to work. See ↵ | David Heinemeier Hansson | 2013-01-08 | 3 | -102/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | the discussion on https://github.com/rails/strong_parameters/pull/75. | ||||
* | | | | | | Never treat action or controller as unpermitted params | David Heinemeier Hansson | 2013-01-08 | 2 | -6/+25 |
| | | | | | |