Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow value to be set on date_select | Colin Burn-Murdoch | 2013-01-13 | 1 | -1/+1 |
| | |||||
* | 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 | 1 | -1/+1 |
|\ \ | | | | | | | Fixed nested fields bug when called with AssociationProxy | ||||
| * | | Test nested fields with AssociationProxy mockup & fix AssociationProxy ↵ | virusman | 2012-12-27 | 1 | -1/+1 |
| | | | | | | | | | | | | support in form helper | ||||
* | | | Fix json params parsing regression for non-object JSON content. | Dylan Smith | 2013-01-11 | 1 | -2/+2 |
| |/ |/| | | | | | Fixes #8845. | ||||
* | | Merge pull request #8876 from senny/extract_performance_tests | Guillermo Iguaran | 2013-01-10 | 4 | -15/+0 |
|\ \ | | | | | | | Extract ActionDispatch::PerformanceTest | ||||
| * | | extract PerformanceTest into rails-performance_tests gem | Yves Senn | 2013-01-10 | 4 | -15/+0 |
| | | | |||||
* | | | Merge pull request #8821 from jamis/master | Rafael Mendonça França | 2013-01-10 | 1 | -5/+1 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | 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 | 1 | -5/+1 |
| | | | |||||
* | | | 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. | ||||
* | | | | 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. | ||||
* | | | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵ | Aaron Patterson | 2013-01-08 | 2 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79. | ||||
* | | | | Merge branch 'master-sec' | Aaron Patterson | 2013-01-08 | 2 | -5/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵ | Aaron Patterson | 2013-01-07 | 2 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -25/+33 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | 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 |
| | | | | | |||||
| * | | | | 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 | 3 | -8/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -7/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | set 'alt' attribute for image_submit_tag | ||||
| * | | | | | set 'alt' attribute for image_submit_tag | Nihad Abbasov | 2013-01-08 | 1 | -7/+7 |
| | | | | | | |||||
* | | | | | | Revert "unpermitted params" exception -- it's just not going to work. See ↵ | David Heinemeier Hansson | 2013-01-08 | 2 | -59/+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 | 1 | -6/+15 |
| | | | | | | |||||
* | | | | | | Eliminate Rack::File headers deprecation warning | Sam Ruby | 2013-01-08 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://intertwingly.net/projects/AWDwR4/checkdepot/section-6.1.html rake test produces: "Rack::File headers parameter replaces cache_control after Rack 1.5." Despite what the message says, it appears that the hearders parameter change will be effective as of Rack 1.5: https://github.com/rack/rack/blob/rack-1.4/lib/rack/file.rb#L24 https://github.com/rack/rack/blob/master/lib/rack/file.rb#L24 | ||||
* | | / / | Do not generate local vars for partials without object or collection | Carlos Antonio da Silva | 2013-01-08 | 1 | -1/+1 |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously rendering a partial without giving :object or :collection would generate a local variable with the partial name by default. This was noticed due to warnings in Ruby 2.0 of not used variables, which turned out to be the generation of not used variables inside partials that do not contain objects related to them. | ||||
* | | | | Avoid Rack security warning no secret provided | Santiago Pastorino | 2013-01-08 | 1 | -0/+2 |
| |/ / |/| | | | | | | | | This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie." | ||||
* | | | improve StrongParameters documentation [ci skip] | Francesco Rodriguez | 2013-01-07 | 1 | -8/+7 |
| | | | |||||
* | | | access `@path` and `@routes` via reader methods in journey | Gosha Arinich | 2013-01-07 | 2 | -3/+3 |
| | | | |||||
* | | | refactor ShowExceptions' #call to use def-rescue instead of begin-rescue | Gosha Arinich | 2013-01-07 | 1 | -7/+4 |
| | | | |||||
* | | | remove begin-rescue in favor of def-rescue | Gosha Arinich | 2013-01-07 | 1 | -10/+9 |
| | | | |||||
* | | | Fix operators precedence issue | Rafael Mendonça França | 2013-01-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #8787 from tank-bohr/master | Rafael Mendonça França | 2013-01-06 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | masgn and response variable | ||||
| * | | | return multiple assingment and response variable | tank-bohr | 2013-01-07 | 1 | -2/+2 |
| | | | |