Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Dont try to auto-set the etag based on the body if any freshness headers ↵ | David Heinemeier Hansson | 2008-10-21 | 2 | -12/+27 |
| | | | | have already been set [DHH/José Valim] | ||||
* | Remove stuff that was deprecated in 2-1-stable | Pratik Naik | 2008-10-21 | 1 | -26/+0 |
| | |||||
* | No use case handy for justifying fresh? any more | David Heinemeier Hansson | 2008-10-21 | 1 | -5/+0 |
| | |||||
* | Let fresh_when actually do the head(:not_modified). Cleaner and we get the ↵ | David Heinemeier Hansson | 2008-10-21 | 1 | -10/+8 |
| | | | | filter halting for free then. | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-10-21 | 1 | -1/+2 |
|\ | |||||
| * | Ensure ActionView::Helpers::AssetTagHelper::AssetTag::Cache is cleared ↵ | Tim Harper | 2008-10-20 | 1 | -1/+2 |
| | | | | | | | | | | | | before loading so changes to asset files are picked up by the broswer [#1233 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Added stale?/fresh? and fresh_when methods to provide a layer of abstraction ↵ | David Heinemeier Hansson | 2008-10-21 | 2 | -19/+65 |
|/ | | | | above request.fresh? and friends [DHH] | ||||
* | Sanitize the URLs passed to redirect_to to prevent a potential response ↵ | Michael Koziarski | 2008-10-19 | 1 | -2/+2 |
| | | | | | | splitting attack. CGI.rb and mongrel don't do any sanitization of the contents of HTTP headers, so care needs to be taken. | ||||
* | Make sure named routes with parameters can be used in tests before a request ↵ | Eloy Duran | 2008-10-13 | 1 | -0/+3 |
| | | | | | | has been done. [#1208 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Allow use of :path_prefix and :name_prefix outside of namespaced routes. ↵ | Tom Stuart | 2008-10-08 | 1 | -3/+1 |
| | | | | | | [#1188 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Make sure last_modified! works with <= rather than just equality. | Michael Koziarski | 2008-10-07 | 1 | -1/+3 |
| | |||||
* | Merge docrails | Pratik Naik | 2008-10-05 | 1 | -4/+12 |
| | |||||
* | Add tests for ActiveSupport::Rescuable. Use ActiveSupport::Rescuable in ↵ | Pratik Naik | 2008-10-04 | 1 | -99/+3 |
| | | | | ActionController::Base. | ||||
* | Ensure rescue_from handlers are respected inside tests. [#835 state:resolved] | Pratik Naik | 2008-10-04 | 2 | -19/+19 |
| | | | | | | Note : If you're not using rescue_from, you should overrider rescue_action_without_handler() method and not rescue_action(). Afterwards, you can set request.remote_addr to a non "0.0.0.0" value for testing the overridden behavior. | ||||
* | Return processing lock to dispatcher, the finer grained lock was ↵ | Aliaksey Kandratsenka | 2008-10-04 | 2 | -9/+14 |
| | | | | | | | | | | incompatible with the reloading in development mode. This commit also adds ActionController::Dispatcher#dispatch_unlocking -- non-locking version of dispatch. It's named anologously to POSIX {getc,getchar,...}_unlocked functions. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1170 state:committed] | ||||
* | call clear_active_connections! in :after_dispatch to give pooled connections ↵ | Aliaksey Kandratsenka | 2008-10-04 | 2 | -1/+17 |
| | | | | | | | | | | | back This fixes connection pool exhaustion for web servers which create new thread per connection (e.g. Webrick). integration.rb changes are required to keep test transaction active for several requests. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1171 state:committed] | ||||
* | Call controller_path instance method so it can be easily overridden [#1141 ↵ | David Masover | 2008-09-30 | 1 | -2/+2 |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Fix etag! and last_modified! to work as advertised. | Michael Koziarski | 2008-09-30 | 1 | -2/+4 |
| | | | | Add tests too. | ||||
* | Remove unneeded interning. | Michael Koziarski | 2008-09-30 | 1 | -3/+2 |
| | |||||
* | Use ActiveSupport::SecureRandom instead of the strange fallback code. | Michael Koziarski | 2008-09-24 | 1 | -22/+2 |
| | |||||
* | Added support for http_only cookies in cookie_store Added unit tests for ↵ | Pelle Braendgaard | 2008-09-17 | 4 | -3/+10 |
| | | | | | | | secure and http_only cookies in cookie_store Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1046 state:committed] | ||||
* | Merge docrails | Pratik Naik | 2008-09-13 | 1 | -14/+14 |
| | |||||
* | Added ActionController::Translation module delegating to I18n #translate/#t ↵ | Sven Fuchs | 2008-09-10 | 1 | -0/+13 |
| | | | | | | and #localize/#l [status:committed #1008] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Only separate loggings with a comma when there are actually two statements | David Heinemeier Hansson | 2008-09-09 | 1 | -1/+2 |
| | |||||
* | Revert "Revert "Add layout functionality to mailers."" | David Heinemeier Hansson | 2008-09-09 | 1 | -1/+5 |
| | | | | This reverts commit 36c6aa01ee0a7aee5b0510a8e649c44de318b060. | ||||
* | Revert "Add layout functionality to mailers." | David Heinemeier Hansson | 2008-09-09 | 1 | -5/+1 |
| | | | | This reverts commit e9a8e0053be3b293ab89fb584f1d660063f107aa. | ||||
* | Check for uninitialized instance variables | Jeremy Kemper | 2008-09-08 | 1 | -1/+1 |
| | |||||
* | Remove recognized_optimized method before redefining it | Jeremy Kemper | 2008-09-08 | 1 | -2/+15 |
| | |||||
* | Use defined? check since @view_paths may be uninitialized | Jeremy Kemper | 2008-09-08 | 1 | -1/+5 |
| | |||||
* | Ensure routing optimizations are cleared when new routes are added [#981 ↵ | Matt Jones | 2008-09-07 | 2 | -2/+11 |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Use a more sensible resolution on the new millisecond benchmarks | David Heinemeier Hansson | 2008-09-05 | 1 | -5/+5 |
| | |||||
* | Changed all benchmarking reports to be in milliseconds | David Heinemeier Hansson | 2008-09-05 | 1 | -24/+36 |
| | |||||
* | Merge docrails | Pratik Naik | 2008-09-03 | 4 | -64/+69 |
| | |||||
* | Some performance goodness for inheritable attributes. | Clemens Kofler | 2008-09-03 | 2 | -8/+8 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Some performance goodness for routing. | Clemens Kofler | 2008-09-03 | 1 | -3/+3 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Don't set Content-Length on 304 responses | Jonathan del Strother | 2008-09-02 | 1 | -1/+1 |
| | | | | | | | | | Commit 8aad8c claimed to do this, but it checks for the 304 status too early, before handle_conditional_get! has overridden it. [#958 state:resolved] Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ↵ | Jeremy Kemper | 2008-08-31 | 13 | -34/+34 |
| | | | | | | | | | | but it has since been removed from 1.9. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb | ||||
* | Add layout functionality to mailers. | Pratik Naik | 2008-08-31 | 1 | -1/+5 |
| | | | | | Mailer layouts behaves just like controller layouts, except layout names need to have '_mailer' postfix for them to be automatically picked up. | ||||
* | Fixes optimised named routes generating question mark followed by nothing ↵ | Luke Melia | 2008-08-31 | 1 | -2/+3 |
| | | | | | | | when provided an empty hash as the last argument. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#481 state:committed] | ||||
* | Moved layout exemption logic into the view | Joshua Peek | 2008-08-31 | 2 | -19/+7 |
| | |||||
* | Prefix ActionView::Base private methods with an underscore | Joshua Peek | 2008-08-31 | 2 | -2/+2 |
| | |||||
* | Fix AM tests and add tests for rendering logging | Pratik Naik | 2008-08-31 | 1 | -0/+2 |
| | |||||
* | Add lost log messages about template rendering | Pratik Naik | 2008-08-31 | 1 | -1/+0 |
| | |||||
* | Move layout rendering logic to ActionView::Base | Pratik Naik | 2008-08-31 | 3 | -53/+29 |
| | |||||
* | Move copying ivar logic from ActionController::Base to ActionView::Base | Pratik Naik | 2008-08-31 | 4 | -37/+13 |
| | |||||
* | Remove unused use_full_path argument | Pratik Naik | 2008-08-31 | 1 | -5/+5 |
| | |||||
* | Dont pass controller partial layout option to view | Pratik Naik | 2008-08-30 | 2 | -2/+2 |
| | |||||
* | Remove double layout check | Pratik Naik | 2008-08-30 | 1 | -6/+1 |
| | |||||
* | Add support for shallow nesting of routes. [#838 state:resolved] | Pratik Naik | 2008-08-30 | 1 | -12/+61 |
| | | | | | | | | | | | | | | | | | | Adds :shallow option to resource route definition. If true, paths for nested resources which reference a specific member (ie. those with an :id parameter) will not use the parent path prefix or name prefix. Example : map.resources :users, :shallow => true do |user| user.resources :posts end * GET /users/1/posts (maps to PostsController#index action as usual) named route "user_posts" is added as usual. * GET /posts/2 (maps to PostsController#show action as if it were not nested) Additionally, named route "post" is added too. | ||||
* | Make assert_select_rjs code more readable, make use of unused constants and ↵ | miloops | 2008-08-29 | 1 | -52/+26 |
| | | | | | | | | use more simple Regexps. [#540 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |