Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
| | | ||||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-07 | 3 | -3/+3 | |
|\| | ||||||
| * | 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] | |||||
* | | Check whether last arg is a Hash instead of duck-typing against [] | Jeremy Kemper | 2008-11-07 | 1 | -4/+9 | |
| | | ||||||
* | | Don't worry about attribute ordering | Jeremy Kemper | 2008-11-07 | 1 | -1/+2 | |
| | | ||||||
* | | Use delete if the rhs is nil | Jeremy Kemper | 2008-11-07 | 1 | -1/+5 | |
| | | ||||||
* | | Update AR integration tests for TestCase changes | Jeremy Kemper | 2008-11-07 | 2 | -12/+5 | |
| | | ||||||
* | | Move controller assertions from base TestCase to AC:: and AV::TestCase | Jeremy Kemper | 2008-11-07 | 26 | -265/+191 | |
| | | ||||||
* | | Remove controller assertions from Test::Unit::TestCase. Use ↵ | Jeremy Kemper | 2008-11-07 | 3 | -71/+58 | |
|/ | | | | ActionController::TestCase. | |||||
* | 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 | |
|/ | ||||||
* | 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] |