Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use to_param (and change method to name accordingly) | David Chelimsky | 2011-05-22 | 1 | -8/+8 |
| | | | | | - exclude Rack::Test::UploadedFile to pass existing tests. Are there any other types we're missing? | ||||
* | Stringify param values in controller tests. | David Chelimsky | 2011-05-22 | 2 | -0/+29 |
| | | | | | | | | This reduces false positives that come from using ints in params in tests, which do not get converted to strings in the tests. In implementations going through rack, they do get converted to strings. - David Chelimsky and Sam Umbach | ||||
* | Bump versions for rc1 | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1165 from arunagw/rubyforge_remove | José Valim | 2011-05-21 | 1 | -1/+0 |
|\ | | | | | Not updating rubyforge for new versions. | ||||
| * | Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵ | Arun Agrawal | 2011-05-20 | 1 | -1/+0 |
| | | | | | | | | not useful. | ||||
* | | Correct example and expand on description of :shallow option for resources | Andrew White | 2011-05-21 | 1 | -3/+7 |
| | | |||||
* | | Merge pull request #1177 from joshk/ruby19_warnings | José Valim | 2011-05-20 | 2 | -2/+0 |
|\ \ | | | | | | | Fixed some ruby 19 warnings | ||||
| * | | fixed some ruby 19 warnings, including circular requires and variable name reuse | Josh Kalderimis | 2011-05-21 | 2 | -2/+0 |
| | | | |||||
* | | | Temporarily ship with ContentLength middleware. | José Valim | 2011-05-20 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Sprockets version update. | Arun Agrawal | 2011-05-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1151 from joshk/wrap_params_options_change | José Valim | 2011-05-19 | 3 | -26/+26 |
|\ \ | | | | | | | renamed the wrap_parameters :only and :except options to :include and :ex | ||||
| * | | renamed the wrap_parameters :only and :except options to :include and ↵ | Josh Kalderimis | 2011-05-19 | 3 | -26/+26 |
| |/ | | | | | | | :exclude to make it consistent with controller filters | ||||
* | | adding test | steve | 2011-05-19 | 1 | -4/+8 |
| | | |||||
* | | fixing sym and string cookie name, two cookies to browser bug. | steve | 2011-05-19 | 1 | -3/+3 |
|/ | |||||
* | Example Usage updated for actionpack and actionmailer. | Arun Agrawal | 2011-05-19 | 2 | -11/+11 |
| | |||||
* | README updated for for => each | Arun Agrawal | 2011-05-19 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-18 | 1 | -1/+1 |
|\ | |||||
| * | fix coding error in readme reported in rails GH #980 | Vijay Dev | 2011-05-17 | 1 | -1/+1 |
| | | |||||
* | | Update Rack::Mount to 0.8.1 | Prem Sichanugrist | 2011-05-18 | 1 | -1/+1 |
| | | |||||
* | | Dump and load rack-cache stuff. | José Valim | 2011-05-17 | 2 | -2/+27 |
| | | |||||
* | | Merge pull request #247 from goncalossilva/performance_test | Jeremy Kemper | 2011-05-17 | 1 | -13/+6 |
|\ \ | | | | | | | Performance tests improved | ||||
| * \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-05-08 | 111 | -1590/+2738 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/testing/performance.rb | ||||
| * \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-17 | 118 | -3441/+1347 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-03 | 10 | -32/+132 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-30 | 9 | -28/+127 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-28 | 13 | -14/+191 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | remove deprecated documentation | Gonçalo Silva | 2011-03-28 | 1 | -3/+0 |
| | | | | | | | | |||||
| * | | | | | | | move "check for ruby-prof" from AD/testing/performance_test to ↵ | Gonçalo Silva | 2011-03-24 | 1 | -13/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS/testing/performance, where it is actually required | ||||
* | | | | | | | | Bump sprockets dependency | Joshua Peek | 2011-05-17 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Remove old call to sprockets context | Joshua Peek | 2011-05-17 | 1 | -9/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1093 from lucasmazza/patch-1 | José Valim | 2011-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Using the correct CSS compressor for the yui-compressor gem. | ||||
| * | | | | | | | | Using the correct CSS compressor for the yui-compressor gem. | Lucas Mazza | 2011-05-16 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Use anonymous? that works on both Ruby 1.8 and 1.9. | José Valim | 2011-05-17 | 2 | -5/+7 |
| | | | | | | | | | |||||
* | | | | | | | | | add more robust test for wrapping params with anonymous class | David Chelimsky | 2011-05-17 | 3 | -28/+51 |
| | | | | | | | | | |||||
* | | | | | | | | | Add fix for error when an anonymous controller subclasses ApplicationController | Andy Lindeman | 2011-05-17 | 1 | -1/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | better test name | David Chelimsky | 2011-05-17 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | add failing test for https://github.com/rails/rails/issues/1089 | David Chelimsky | 2011-05-17 | 1 | -0/+7 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #570 from sikachu/decouple_actionpack | José Valim | 2011-05-15 | 3 | -14/+12 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Make ParamsWrapper use a well-defined API and not rely on AR methods | ||||
| * | | | | | | | | Make ParamsWrapper calling newly introduced `Model.attribute_names` instead ↵ | Prem Sichanugrist | 2011-05-15 | 3 | -14/+12 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | of `.column_names` | ||||
* | | | | | | | | Merge pull request #568 from carlosantoniodasilva/fields_for_fixes | José Valim | 2011-05-15 | 2 | -36/+40 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fields for fixes for non nested attributes and without object | ||||
| * | | | | | | | Use record_name to make fields for methods more consistent | Carlos Antonio da Silva | 2011-05-14 | 1 | -6/+6 |
| | | | | | | | | |||||
| * | | | | | | | Refactor fields_for to make the api more clear, and fix usage with non ↵ | Carlos Antonio da Silva | 2011-05-14 | 2 | -26/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nested attributes and without object | ||||
| * | | | | | | | Cleanup instantiate builder method definition | Carlos Antonio da Silva | 2011-05-14 | 1 | -5/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-15 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Clean up redundant backslashes | Pirogov Evgenij | 2011-05-14 | 1 | -4/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | Do not try to call `column_names` on the abstract class. | Prem Sichanugrist | 2011-05-15 | 2 | -2/+15 |
| |/ / / / / / / |/| | | | | | | | | | | | | | | | Normally the table for abstract class won't be existed, so we should not trying to call `#column_names` on it. | ||||
* | | | | | | | | Reset ActiveRecord::LogSubscriber runtime at the start of each request | Tom Ward | 2011-05-14 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called. Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect. Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously. | ||||
* | | | | | | | | Escape regex in controller_runtime_test to actually check that the ↵ | Tom Ward | 2011-05-14 | 1 | -1/+1 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | ActiveRecord message appears | ||||
* | | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 16 | -128/+163 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt | ||||
| * | | | | | | | minor edits after going through what's new in docrails | Xavier Noria | 2011-05-14 | 3 | -10/+13 |
| | | | | | | | |