Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2010-12-24 | 4 | -8/+17 |
|\ | |||||
| * | Don't deprecate to_prepare. | José Valim | 2010-12-23 | 1 | -4/+4 |
| | | |||||
| * | Clean up callbacks should also be called on exceptions. | José Valim | 2010-12-23 | 1 | -0/+3 |
| | | |||||
| * | Allow registering javascript/stylesheet_expansions to existing symbols | Santiago Pastorino | 2010-12-22 | 2 | -4/+10 |
| | | |||||
* | | Edits to caching/fragments. | Rizwan Reza | 2010-12-23 | 1 | -17/+39 |
| | | |||||
* | | More minor edits. | Rizwan Reza | 2010-12-23 | 1 | -5/+5 |
| | | |||||
* | | Revised documentation for cache_helper. | Rizwan Reza | 2010-12-23 | 1 | -12/+10 |
|/ | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-23 | 1 | -7/+15 |
|\ | |||||
| * | Typo (request -> response) | John Firebaugh | 2010-12-21 | 1 | -1/+1 |
| | | |||||
| * | Expand ActionDispatch::Reloader docs | John Firebaugh | 2010-12-21 | 1 | -6/+14 |
| | | |||||
* | | Do not use the same hash instance for expansions [#6114 state:resolved] | Piotr Sarnacki | 2010-12-22 | 1 | -1/+3 |
|/ | | | | | Using the same hash instance makes using the same expansions for both javascripts and stylesheets. | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-20 | 1 | -6/+6 |
|\ | |||||
| * | Fix respond_with example code so it makes sense | Will | 2010-12-19 | 1 | -2/+2 |
| | | |||||
| * | Correct deprecated AR usage in ActionController::MimeResponds documentation | Will | 2010-12-19 | 1 | -4/+4 |
| | | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-15 | 3 | -18/+34 |
| |\ | |||||
| * | | Fix edge cases for domain :all option on cookie store | brainopia | 2010-12-15 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Dont set explicit domain for cookies if host is not a domain name [#6002 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | Set proper engine's asset directories when assets are served from engine. | Piotr Sarnacki | 2010-12-15 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When using stylesheet_link_tag(:all) or javascript_include_tag(:all), assets directories are searched for css or js files. When config.serve_static_assets is set to true, those files can be served directly from engine's directories. That's why assets paths should be set individually for controllers inside engine if we want to serve static assets with ActionDispatch::Static | ||||
* | | | Small changes on AD::Reloader. | José Valim | 2010-12-20 | 1 | -20/+3 |
| | | | |||||
* | | | Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepare | John Firebaugh | 2010-12-20 | 1 | -25/+6 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | Introduce ActionDispatch::Reloader | John Firebaugh | 2010-12-20 | 2 | -0/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on the implementation on the 2-3-stable branch, patches by Hongli Lai <hongli@phusion.nl>, and helpful suggestions from José Valim. Hongli Lai's patches included locking around the request cycle; this is now handled by Rack::Lock (https://github.com/rack/rack/issues/issue/87/). [#2873] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | Remove require AS::Concern from places where is already in | Santiago Pastorino | 2010-12-19 | 1 | -1/+0 |
| | | | |||||
* | | | Add missing require | Santiago Pastorino | 2010-12-19 | 1 | -0/+1 |
| | | | |||||
* | | | Fixed number_with_precision rounding error [#6182 state:resolved] | Don Wilson | 2010-12-18 | 1 | -2/+3 |
| | | | |||||
* | | | dry up case / when statement | Aaron Patterson | 2010-12-17 | 1 | -5/+3 |
| | | | |||||
* | | | Revert "Fixed number_with_precision rounding error [#6182 state:resolved]" | Piotr Sarnacki | 2010-12-17 | 1 | -3/+2 |
| | | | | | | | | | | | | This reverts commit 006ec77e60163d57d655479602230672d98e0f10. | ||||
* | | | Fixed number_with_precision rounding error [#6182 state:resolved] | Don Wilson | 2010-12-17 | 1 | -2/+3 |
| | | | |||||
* | | | Bring back config.action_view.cache_template_loading [#5847 state:resolved] | Piotr Sarnacki | 2010-12-16 | 3 | -4/+25 |
| | | | |||||
* | | | Fix edge cases for domain :all option on cookie store | brainopia | 2010-12-16 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Dont set explicit domain for cookies if host is not a domain name [#6002 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | | Set proper engine's asset directories when assets are served from engine. | Piotr Sarnacki | 2010-12-16 | 1 | -0/+8 |
| |/ |/| | | | | | | | | | | | | | | | When using stylesheet_link_tag(:all) or javascript_include_tag(:all), assets directories are searched for css or js files. When config.serve_static_assets is set to true, those files can be served directly from engine's directories. That's why assets paths should be set individually for controllers inside engine if we want to serve static assets with ActionDispatch::Static | ||||
* | | eternal confusion! fixed doco to inform correctly | Aditya Sanghi | 2010-12-15 | 1 | -1/+1 |
| | | |||||
* | | Added :placeholder option to ActionView::Helpers::FormTagHelper text_field_tag | Ben Mills | 2010-12-13 | 1 | -0/+4 |
| | | |||||
* | | Fix indentation on the namespace method's documentation | Ryan Bigg | 2010-12-13 | 1 | -16/+16 |
| | | |||||
* | | Remove nodoc from FormBuilder because the methods inside are public API methods | Ryan Bigg | 2010-12-13 | 1 | -1/+1 |
| | | |||||
* | | Provide an example for ActionDispatch::Routing::Mapper#scope | Ryan Bigg | 2010-12-11 | 1 | -0/+12 |
|/ | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-11 | 1 | -5/+10 |
|\ | | | | | | | | | Conflicts: activerecord/lib/active_record/transactions.rb | ||||
| * | Action Controller Overview: Remove dead link to the API docs for filters | Ryan Bigg | 2010-12-10 | 1 | -0/+1 |
| | | |||||
| * | root method options are the same as the match method | Ryan Bigg | 2010-12-10 | 1 | -0/+2 |
| | | |||||
| * | root route should go at the *top* of the routes file, because it is the most ↵ | Ryan Bigg | 2010-12-09 | 1 | -1/+3 |
| | | | | | | | | popular route and should be matched first | ||||
| * | indent code samples for mount doc | Ryan Bigg | 2010-12-09 | 1 | -3/+3 |
| | | |||||
| * | mapper.rb: add "options" to make the default-to-namespace-name line read better | Ryan Bigg | 2010-12-09 | 1 | -1/+1 |
| | | |||||
* | | Ensure that while caching a page rails takes into | Neeraj Singh | 2010-12-09 | 1 | -7/+13 |
| | | | | | | | | | | | | | | | | account the resolved mime type for the request [#6110 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Ensure resolvers backward compatibility. | José Valim | 2010-12-09 | 3 | -6/+4 |
| | | |||||
* | | Clean up asset_host and asset_path. | José Valim | 2010-12-09 | 1 | -2/+2 |
| | | |||||
* | | Properly check the arity for template handlers. | José Valim | 2010-12-09 | 1 | -1/+1 |
| | | |||||
* | | Check if the routes object really responds to define_mount_prefix. | José Valim | 2010-12-09 | 1 | -1/+1 |
|/ | |||||
* | makes a pass to the action caching rdoc | Xavier Noria | 2010-12-08 | 1 | -32/+41 |
| | |||||
* | Add to documentation that action caching does | Neeraj Singh | 2010-12-06 | 1 | -0/+5 |
| | | | | | | handle HTTP_ACCEPT attribute properly and might provide wrong result. Use params[:format] to avoid this issue. | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-05 | 5 | -15/+11 |
|\ | |||||
| * | Fix mime type doc typos | Carlos Antonio da Silva | 2010-12-04 | 1 | -2/+2 |
| | | |||||
| * | Rewording existing comment | Neeraj Singh | 2010-11-30 | 1 | -4/+3 |
| | |