Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure habtm use class variable to list association valid keys | Luca Guidi | 2008-11-01 | 1 | -1/+2 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1310 state:committed] | ||||
* | Remove the logging of the Session ID when the session store is CookieStore [DHH] | David Heinemeier Hansson | 2008-11-01 | 2 | -1/+7 |
| | |||||
* | Accidently nixed a doc header | David Heinemeier Hansson | 2008-11-01 | 1 | -0/+1 |
| | |||||
* | Added render :js for people who want to render inline JavaScript replies ↵ | David Heinemeier Hansson | 2008-11-01 | 2 | -1/+33 |
| | | | | without using RJS [DHH] | ||||
* | Ensure content type gets reset after render_to_string [#1182 state:resolved] | Joshua Peek | 2008-10-30 | 2 | -0/+11 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-10-30 | 3 | -2/+6 |
|\ | |||||
| * | Dup local assigns for partial collections so nil values doesn't get ↵ | Joshua Peek | 2008-10-30 | 3 | -2/+6 |
| | | | | | | | | overwritten [#1250 state:resolved] | ||||
* | | Fixed regex in redirect_to to fully support URI schemes [#1247 state:committed] | Seth Fitzsimmons | 2008-10-30 | 3 | -1/+16 |
|/ | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Proper API for reloading translations | David Heinemeier Hansson | 2008-10-29 | 2 | -2/+6 |
| | |||||
* | Ensure @content_for_* is checked before yielding to block in render :layout ↵ | Ryan Bates | 2008-10-28 | 4 | -1/+16 |
| | | | | | | [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-10-28 | 6 | -14/+24 |
|\ | |||||
| * | Track rendered templates in stack so the current template can always be ↵ | Joshua Peek | 2008-10-28 | 5 | -7/+23 |
| | | | | | | | | accessed. Added ActionView::Base#template to access the template object. | ||||
| * | Thread Safety: Ensure recognize_optimized is immediately written instead of ↵ | Joshua Peek | 2008-10-27 | 1 | -7/+1 |
| | | | | | | | | lazily | ||||
* | | A little less hokus pokus | David Heinemeier Hansson | 2008-10-28 | 1 | -5/+4 |
|/ | |||||
* | modified current_page? to ignore extra parameters unless specified in options | Erik Andrejko | 2008-10-26 | 2 | -3/+24 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#805 state:committed] | ||||
* | Fixed bug with asset timestamping when using relative_url_root (Joe ↵ | David Heinemeier Hansson | 2008-10-26 | 3 | -1/+14 |
| | | | | Goldwasser) [#1265 status:committed] | ||||
* | Update CHANGELOGs with the last few fixes, set date for today | David Heinemeier Hansson | 2008-10-24 | 1 | -1/+3 |
| | |||||
* | Fix incorrect closing CDATA delimiter. Add tests for CDATA nodes. | Jeffrey Hardy | 2008-10-23 | 2 | -1/+16 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix that HTML::Node.parse would blow up on unclosed CDATA sections. | Jeffrey Hardy | 2008-10-23 | 3 | -1/+39 |
| | | | | | | | | If an unclosed CDATA section is encountered and parsing is strict, an exception will be raised. Otherwise, we consider the remainder of the line to be the section contents. This is consistent with HTML::Tokenizer#scan_tag. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Proper update call for gem server | David Heinemeier Hansson | 2008-10-23 | 1 | -1/+1 |
| | |||||
* | Push to new gem server | David Heinemeier Hansson | 2008-10-23 | 1 | -2/+2 |
| | |||||
* | Prepare for Rails 2.2.0 [RC1] | David Heinemeier Hansson | 2008-10-23 | 2 | -2/+2 |
| | |||||
* | Merge with docrails. Also add a rake task to generate guides in your rails ↵ | Pratik Naik | 2008-10-21 | 1 | -6/+6 |
| | | | | | | | | application : rake doc:guides The rake task will generate guides inside doc/guides directory of your application. Open index.html to browse. | ||||
* | Dont try to auto-set the etag based on the body if any freshness headers ↵ | David Heinemeier Hansson | 2008-10-21 | 3 | -17/+49 |
| | | | | have already been set [DHH/José Valim] | ||||
* | Remove stuff that was deprecated in 2-1-stable | Pratik Naik | 2008-10-21 | 2 | -42/+0 |
| | |||||
* | No use case handy for justifying fresh? any more | David Heinemeier Hansson | 2008-10-21 | 2 | -6/+1 |
| | |||||
* | Let fresh_when actually do the head(:not_modified). Cleaner and we get the ↵ | David Heinemeier Hansson | 2008-10-21 | 2 | -13/+9 |
| | | | | filter halting for free then. | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-10-21 | 2 | -2/+11 |
|\ | |||||
| * | Ensure ActionView::Helpers::AssetTagHelper::AssetTag::Cache is cleared ↵ | Tim Harper | 2008-10-20 | 2 | -2/+11 |
| | | | | | | | | | | | | 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 | 4 | -30/+113 |
|/ | | | | 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. | ||||
* | Added inline builder yield to atom_feed_helper tags where appropriate (Sam ↵ | David Heinemeier Hansson | 2008-10-13 | 3 | -8/+84 |
| | | | | Ruby) [#8994 status:committed] | ||||
* | Add support for xml processing instructions in atom_feed_helper [#926 ↵ | Matthew M. Boedicker | 2008-10-13 | 2 | -0/+61 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Make sure named routes with parameters can be used in tests before a request ↵ | Eloy Duran | 2008-10-13 | 2 | -0/+4 |
| | | | | | | 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 | 2 | -3/+22 |
| | | | | | | [#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 | 2 | -1/+9 |
| | |||||
* | Ensure select_tag#name attribute uses [] when :multiple is true. [#1146 ↵ | Andrew Kaspick | 2008-10-07 | 2 | -4/+6 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Implement submit_to_remote as a wrapper around a more generic button_to_remote | Tarmo Tänav | 2008-10-07 | 3 | -15/+11 |
| | | | | | | | Removed the "return false" from submit_to_remote onclick end as button input elements have no default behavior to cancel. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix image_tag behavior on windows. [#1085 state:resolved] | madlep | 2008-10-06 | 2 | -1/+14 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Merge docrails | Pratik Naik | 2008-10-05 | 2 | -8/+16 |
| | |||||
* | Move controller ivar copying to a separate method | Pratik Naik | 2008-10-05 | 1 | -8/+10 |
| | |||||
* | 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 | 3 | -43/+30 |
| | | | | | | 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] | ||||
* | Fixed load path for actionmailer and activesupport tests to always load from ↵ | madlep | 2008-10-04 | 1 | -1/+1 |
| | | | | | | | | local lib files. [#983 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | 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 | 2 | -3/+44 |
| | | | | Add tests too. | ||||
* | Remove unneeded interning. | Michael Koziarski | 2008-09-30 | 1 | -3/+2 |
| | |||||
* | Add options to field_set_tag | Andrew Kaspick | 2008-09-29 | 2 | -2/+14 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1116 state:committed] |