Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2596 from dharmatech/patch-1 | Santiago Pastorino | 2011-08-20 | 1 | -1/+1 |
|\ | | | | | ActionController::Redirecting : fix docs typo | ||||
| * | ActionController::Redirecting : fix docs typo | dharmatech | 2011-08-20 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2597 from dharmatech/patch-2 | Santiago Pastorino | 2011-08-20 | 1 | -1/+1 |
|\ \ | | | | | | | actionpack/lib/action_controller/base.rb: docs typo | ||||
| * | | actionpack/lib/action_controller/base.rb: docs typo | dharmatech | 2011-08-20 | 1 | -1/+1 |
| |/ | |||||
* / | params wrapper docs correction | Vijay Dev | 2011-08-21 | 1 | -4/+3 |
|/ | |||||
* | Tags with invalid names should also be stripped in order to prevent | Aaron Patterson | 2011-08-16 | 1 | -1/+1 |
| | | | | XSS attacks. Thanks Sascha Depold for the report. | ||||
* | Use lazy load hooks to set parameter wrapping configuration. This means that ↵ | Jon Leighton | 2011-08-16 | 1 | -2/+0 |
| | | | | it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint. | ||||
* | Don't refer to ActionController::Base in the wrap_parameters initializer - ↵ | Jon Leighton | 2011-08-16 | 1 | -0/+2 |
| | | | | use config object instead. Cuts about 15% off the load time. (#734) | ||||
* | Methods like status and location are interfering with redirect_to [Closes #2511] | Franck Verrot | 2011-08-14 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-13 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile | ||||
| * | Typo fix | Oge Nnadi | 2011-08-13 | 1 | -1/+1 |
| | | |||||
| * | Fix the issue where default_url_options is being cached on test cases. ↵ | thoefer | 2011-08-13 | 2 | -0/+6 |
| | | | | | | | | | | | | Closes #1872. Closes #2031. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | x_sendfile_header now defaults to nil and production.rb env file doesn't | Santiago Pastorino | 2011-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | set a particular value for it. This allows servers to set it through X-Sendfile-Type, read https://github.com/rack/rack/blob/master/lib/rack/sendfile.rb for more info. Anyways you can force this value in your production.rb | ||||
* | | Fix the issue where default_url_options is being cached on test cases. ↵ | thoefer | 2011-08-01 | 2 | -0/+6 |
|/ | | | | | | Closes #1872. Closes #2031. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Changed a few instances of of words in the API docs written in British ↵ | Oemuer Oezkir | 2011-07-24 | 1 | -1/+1 |
| | | | | | | English to American English(according to Weber) | ||||
* | Ensure that status codes are logged properly | Jesse Storimer | 2011-07-18 | 1 | -4/+4 |
| | | | | | | Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue so that status codes rendered from rescue_from blocks are logged properly. | ||||
* | Merge pull request #2009 from vatrai/autoload-todo-new | José Valim | 2011-07-11 | 2 | -0/+2 |
|\ | | | | | TODO fix explicitly loading exceptations, autoload removed | ||||
| * | TODO fix explicitly loading exceptations, autoload removed | Vishnu Atrai | 2011-07-11 | 2 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-09 | 3 | -4/+4 |
|\ \ | |/ |/| | |||||
| * | find(:all) => all | Akira Matsuda | 2011-07-08 | 3 | -4/+4 |
| | | |||||
* | | Remove stream at the class level. | José Valim | 2011-07-06 | 1 | -38/+5 |
|/ | | | | | | This is because only template rendering works with streaming. Setting it at the class level was also changing the behavior of JSON and XML responses, closes #1337. | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-05 | 2 | -11/+13 |
|\ | |||||
| * | document handle_unverified_request method | Vijay Dev | 2011-07-02 | 1 | -0/+2 |
| | | |||||
| * | update doc about resetting the session in case of authenticity token mismatch | Vijay Dev | 2011-07-01 | 1 | -6/+5 |
| | | |||||
| * | clarify which url would be used to cache a page when options are not ↵ | Matt Jankowski | 2011-06-26 | 1 | -2/+2 |
| | | | | | | | | provided to #cache_page to determine that url | ||||
| * | elaborate on how web server configuration to check for static files on disk ↵ | Matt Jankowski | 2011-06-26 | 1 | -3/+4 |
| | | | | | | | | enables page caching to work without hitting the app server stack | ||||
* | | Make sure respond_with with :js tries to render a template in all cases | José Valim | 2011-06-30 | 1 | -0/+5 |
| | | |||||
* | | [IMPORTANT] Make "sprockets/railtie" require explicit. | José Valim | 2011-06-29 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | This makes "sprockets/railtie" explicit. This means that sprockets will be loaded when you require "rails/all". If you are not using requiring "rails/all", you need to manually load it with all other framework railties. In order to be complete, this commit also adds --skip-sprockets to the rails generator. | ||||
* | | Make send_file guess content-type from file extension, if type wasn't ↵ | Esad Hajdarevic | 2011-06-28 | 1 | -2/+13 |
| | | | | | | | | supplied (Issue #1847). Update tests & documentation. | ||||
* | | make the logs a little simpler to view, put the render message inline with ↵ | James Cox | 2011-06-24 | 1 | -4/+5 |
|/ | | | | other events, pull processing to char[0] and add a new line to the completed. looks more like a block now, which is useful for serial actions like test/dev | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-23 | 1 | -7/+9 |
|\ | |||||
| * | more detail on how the flow between redirect and show works, and minor grammar | Matt Jankowski | 2011-06-21 | 1 | -7/+9 |
| | | |||||
* | | Fixes an issue where cache sweepers with only after filters would have no ↵ | Jeroen Jacobs | 2011-06-21 | 1 | -0/+1 |
| | | | | | | | | | | | | controller object It would raise undefined method controller_name for nil | ||||
* | | Call super here to allow SessionHash initialize new stuff for us | Santiago Pastorino | 2011-06-19 | 1 | -1/+1 |
|/ | |||||
* | Tweak linebreak in ActionController::Redirecting doc | Christine Yen | 2011-06-15 | 1 | -2/+2 |
| | |||||
* | Improve documentation around status code argument of redirect_to | Christine Yen | 2011-06-15 | 1 | -1/+2 |
| | |||||
* | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 2 | -2/+1 |
| | |||||
* | Added missing assert to test checking form with namespaced isolated model ↵ | Piotr Sarnacki | 2011-06-07 | 1 | -1/+1 |
| | | | | and fixed helpers to work correctly in such case | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 3 | -6/+5 |
|\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | ||||
| * | Remove trailing white-spaces | Guillermo Iguaran | 2011-06-05 | 1 | -1/+0 |
| | | |||||
| * | some grammatical corrections | Vijay Dev | 2011-06-04 | 1 | -3/+3 |
| | | |||||
| * | Removing trailing white-spaces | Guillermo Iguaran | 2011-05-31 | 1 | -2/+2 |
| | | |||||
* | | Add backward compatibility for testing cookies | Andrew White | 2011-06-05 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit restores the ability to assign cookies for testing via @request.env['HTTP_COOKIE'] and @request.cookies, e.g: @request.env['HTTP_COOKIE'] = 'user_name=david' get :index assert_equal 'david', cookies[:user_name] and @request.cookies[:user_name] = 'david' get :index assert_equal 'david', cookies[:user_name] Assigning via cookies[] is the preferred method and will take precedence over the other two methods. This is so that cookies set in controller actions have precedence and are carried over between calls to get, post, etc. | ||||
* | | Refactor ActionController::TestCase cookies | Andrew White | 2011-06-04 | 1 | -13/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning cookies for test cases should now use cookies[], e.g: cookies[:email] = 'user@example.com' get :index assert_equal 'user@example.com', cookies[:email] To clear the cookies, use clear, e.g: cookies.clear get :index assert_nil cookies[:email] We now no longer write out HTTP_COOKIE and the cookie jar is persistent between requests so if you need to manipulate the environment for your test you need to do it before the cookie jar is created. | ||||
* | | Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests | José Valim | 2011-05-28 | 1 | -0/+19 |
|\ \ | | | | | | | Stringify param values in controller tests. | ||||
| * | | 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 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | Merge pull request #1324 from dmathieu/no_error_on_invalid_format | José Valim | 2011-05-26 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Don't raise an exception if the format isn't recognized | ||||
| * | | don't raise an exception if the format isn't recognized | dmathieu | 2011-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | | Fixed while traveling to heuruko | ||||
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 6 | -14/+14 |
|\ \ \ | |/ / |/| | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb |