Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | A few more dependency updates | David Heinemeier Hansson | 2008-11-14 | 1 | -1/+1 |
| | |||||
* | Merge docrails. | Pratik Naik | 2008-11-14 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-11-14 | 2 | -19/+40 |
|\ | |||||
| * | Make inheritance of map.resources :only/:except options behave more predictably | Tom Stuart | 2008-11-14 | 2 | -19/+40 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Prepare for RC2 | David Heinemeier Hansson | 2008-11-14 | 2 | -2/+4 |
|/ | |||||
* | Make polymorphic_url compact given array [#1317 state:committed] | hiroshi | 2008-11-14 | 3 | -1/+14 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Tag helper should output an attribute with the value 'false' instead of ↵ | Hongli Lai (Phusion) | 2008-11-13 | 3 | -5/+11 |
| | | | | omitting the attribute, if the associated option is false but not nil. | ||||
* | Fix map.resources to always generate named routes if they're needed | Tom Stuart | 2008-11-13 | 2 | -6/+85 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Instead of overriding html_types, base the verification on ↵ | Michael Koziarski | 2008-11-13 | 2 | -7/+20 |
| | | | | | | | | browser_generated_types. Also Deprecate the old unverifiable types. [#1145 state:committed] | ||||
* | fix two MimeType failing test cases | rick | 2008-11-13 | 2 | -7/+10 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Changed request forgery protection to only worry about HTML-formatted ↵ | Jeff Cohen | 2008-11-13 | 4 | -55/+70 |
| | | | | | | content requests. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Add :only/:except options to map.resources | Tom Stuart | 2008-11-12 | 2 | -37/+247 |
| | | | | | | | This allows people with huge numbers of resource routes to cut down on the memory consumption caused by the generated code. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1215 state:committed] | ||||
* | Eliminate excess Regexp creation due to capture counting | Jeremy Kemper | 2008-11-10 | 2 | -4/+26 |
| | |||||
* | Pare down object creation during route building | Jeremy Kemper | 2008-11-10 | 2 | -30/+27 |
| | |||||
* | Add some basic controller logging tests | Pratik Naik | 2008-11-08 | 1 | -0/+46 |
| | |||||
* | Work around ruby 1.9 segfault | Jeremy Kemper | 2008-11-07 | 1 | -0/+1 |
| | |||||
* | Don't worry about attribute ordering | Jeremy Kemper | 2008-11-07 | 1 | -1/+2 |
| | |||||
* | Check whether last arg is a Hash instead of duck-typing against [] | Jeremy Kemper | 2008-11-07 | 1 | -4/+9 |
| | |||||
* | Use delete if the rhs is nil | Jeremy Kemper | 2008-11-07 | 1 | -1/+5 |
| | |||||
* | Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. ↵ | Nick Sieger | 2008-11-08 | 1 | -1/+0 |
| | | | | | | [Nick Sieger, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | auto_link view helper was failing on URLs with colons after a query param | Rich Manalang | 2008-11-07 | 2 | -2/+3 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1341 state:committed] | ||||
* | Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised ↵ | Aliaksey Kandratsenka | 2008-11-06 | 1 | -1/+1 |
| | | | | | | | | | recognition code. It produces meaningless line numbers. This also easily produces line numbers greater than recognition_optimization.rb have, which causes rcov to trash memory outside of it's coverage counting arrays. [#1319 state:committed] Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Fix stupid typo | Michael Koziarski | 2008-11-06 | 1 | -1/+1 |
| | |||||
* | Fixed the sanitize helper to avoid double escaping already properly escaped ↵ | David Heinemeier Hansson | 2008-11-06 | 3 | -1/+7 |
| | | | | entities [#683 state:committed] | ||||
* | Dont bother logging the parameters hash if there are no parameters | David Heinemeier Hansson | 2008-11-06 | 1 | -1/+1 |
| | |||||
* | Fixed that FormTagHelper generates illegal html if name contains e.g. square ↵ | Vladimir Dobriakov | 2008-11-04 | 3 | -5/+46 |
| | | | | | | brackets [#1238 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Fix regression bug that made date_select and datetime_select raise a Null ↵ | Bernardo de Pádua | 2008-11-04 | 3 | -2/+44 |
| | | | | | | Pointer Exception when a nil date/datetime was passed and only month and year were displayed [#1289 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Dont log the _method attribute either. Its already available in the header | David Heinemeier Hansson | 2008-11-04 | 5 | -26/+43 |
|\ | |||||
| * | Remove unused debug_routes | Pratik Naik | 2008-11-02 | 1 | -6/+0 |
| | | |||||
| * | Dont dup params twice when filter_parameters is present | Pratik Naik | 2008-11-02 | 1 | -2/+2 |
| | | |||||
| * | Dont document internals | Pratik Naik | 2008-11-02 | 1 | -3/+0 |
| | | |||||
| * | Backwards compatibility fixes for relative_url_root | Michael Koziarski | 2008-11-02 | 2 | -6/+4 |
| | | | | | | | | | | * Make the old deprecated relative_url_root still set the value as it's still used by mongrel * Set the default from the ENV value when the file is required, not at runtime. | ||||
| * | Merge with docrails | Pratik Naik | 2008-11-02 | 2 | -5/+8 |
| | | |||||
| * | Cleaned up route optimisation guard condition generation code as it was ↵ | Tom Lea | 2008-11-01 | 2 | -7/+32 |
| | | | | | | | | | | | | | | | | getting a little messy. Add additional condition to handle the case where default_url_options is only defined in the controller, not the view. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Dont log the _method attribute either. Its already available in the header | David Heinemeier Hansson | 2008-11-04 | 1 | -2/+2 |
|/ | |||||
* | Simplified the logging format for parameters (don't include controller, ↵ | David Heinemeier Hansson | 2008-11-01 | 2 | -6/+25 |
| | | | | action, and format as duplicates) [DHH] | ||||
* | 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 |
|/ |