Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Recreate symlink in layouts for tests | Piotr Sarnacki | 2010-12-31 | 1 | -0/+1 |
| | |||||
* | Don't be so picky on MissingTemplate error details, this fails randomly on ↵ | Piotr Sarnacki | 2010-12-31 | 1 | -4/+3 |
| | | | | 1.8.7 because of not ordered hash | ||||
* | added tests for the MissingTemplate exception message. | Nick Sutterer | 2010-12-31 | 1 | -0/+21 |
| | |||||
* | ActionController::Base.helpers.sanitize ignores case in protocol | Timothy N. Tsvetkov | 2010-12-30 | 3 | -2/+8 |
| | | | | | | [#6044 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | process_action accepts multiple args, even with Callbacks. | Nick Sutterer | 2010-12-29 | 2 | -1/+22 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-29 | 4 | -15/+13 |
|\ | |||||
| * | Fix typo in ActionPack changelog. | Cheah Chu Yeow | 2010-12-29 | 1 | -1/+1 |
| | | |||||
| * | Remove link to outdated Github tag comparison in ActionPack changelog. | Cheah Chu Yeow | 2010-12-29 | 1 | -2/+0 |
| | | |||||
| * | .erb => .html.erb | Akira Matsuda | 2010-12-25 | 2 | -6/+6 |
| | | |||||
| * | for ... in => each ... do | Akira Matsuda | 2010-12-25 | 2 | -6/+6 |
| | | |||||
* | | Clean up PathSet. | José Valim | 2010-12-27 | 1 | -19/+4 |
| | | |||||
* | | No need to symbolize these. | José Valim | 2010-12-27 | 1 | -2/+2 |
| | | |||||
* | | Final tidy up on templates inheritance. | José Valim | 2010-12-27 | 5 | -17/+15 |
| | | |||||
* | | Speed up template inheritance and remove template inheritance option | wycats | 2010-12-26 | 2 | -28/+17 |
| | | |||||
* | | A bunch of cleanup on the inherited template patch | wycats | 2010-12-26 | 4 | -11/+33 |
| | | |||||
* | | all tests pass | artemave | 2010-12-26 | 9 | -40/+40 |
| | | |||||
* | | #948 make template inheritance optional | artemave | 2010-12-26 | 2 | -4/+23 |
| | | |||||
* | | #948 template_inheritance | artemave | 2010-12-26 | 12 | -42/+129 |
| | | |||||
* | | Bump up rack-cache | Santiago Pastorino | 2010-12-24 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2010-12-24 | 7 | -13/+57 |
|\ | |||||
| * | Don't deprecate to_prepare. | José Valim | 2010-12-23 | 2 | -9/+11 |
| | | |||||
| * | Clean up callbacks should also be called on exceptions. | José Valim | 2010-12-23 | 2 | -0/+17 |
| | | |||||
| * | Allow registering javascript/stylesheet_expansions to existing symbols | Santiago Pastorino | 2010-12-22 | 3 | -4/+29 |
| | | |||||
* | | 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 | 2 | -1/+11 |
|/ | | | | | 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 | 2 | -7/+7 |
|\ | |||||
| * | minor fixesin READMEs | Vijay Dev | 2010-12-20 | 1 | -1/+1 |
| | | |||||
| * | 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 | 2 | -2/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -40/+8 |
| | | | |||||
* | | | Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepare | John Firebaugh | 2010-12-20 | 2 | -84/+19 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | Introduce ActionDispatch::Reloader | John Firebaugh | 2010-12-20 | 3 | -0/+222 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+8 |
| | | | |||||
* | | | 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 | 2 | -8/+2 |
| | | | | | | | | | | | | This reverts commit 006ec77e60163d57d655479602230672d98e0f10. | ||||
* | | | Fixed number_with_precision rounding error [#6182 state:resolved] | Don Wilson | 2010-12-17 | 2 | -2/+8 |
| | | | |||||
* | | | Changelog and guide entries for config.action_view.cache_template_loading | Piotr Sarnacki | 2010-12-16 | 1 | -0/+2 |
| | | | |||||
* | | | Bring back config.action_view.cache_template_loading [#5847 state:resolved] | Piotr Sarnacki | 2010-12-16 | 3 | -4/+25 |
| | | | |||||
* | | | Replace rudimentary named_scope with scope. [#6052 state:resolved] | Pavel Gorbokon | 2010-12-15 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | * rename method names (actually in tests) * rename instance variable @_named_scopes_cache to @_scopes_cache * rename references in doc comments * don't touch CHANGELOG :) | ||||
* | | | Fix edge cases for domain :all option on cookie store | brainopia | 2010-12-16 | 2 | -2/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | Dont set explicit domain for cookies if host is not a domain name [#6002 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> |