aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into testingJeremy Kemper2008-11-071-0/+1
|\
| * Work around ruby 1.9 segfaultJeremy Kemper2008-11-071-0/+1
| |
| * Don't worry about attribute orderingJeremy Kemper2008-11-071-1/+2
| |
| * Check whether last arg is a Hash instead of duck-typing against []Jeremy Kemper2008-11-071-4/+9
| |
| * Use delete if the rhs is nilJeremy Kemper2008-11-071-1/+5
| |
* | Merge branch 'master' into testingJeremy Kemper2008-11-073-3/+3
|\|
| * Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. ↵Nick Sieger2008-11-081-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 paramRich Manalang2008-11-072-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 Kemper2008-11-071-4/+9
| |
* | Don't worry about attribute orderingJeremy Kemper2008-11-071-1/+2
| |
* | Use delete if the rhs is nilJeremy Kemper2008-11-071-1/+5
| |
* | Update AR integration tests for TestCase changesJeremy Kemper2008-11-072-12/+5
| |
* | Move controller assertions from base TestCase to AC:: and AV::TestCaseJeremy Kemper2008-11-0726-265/+191
| |
* | Remove controller assertions from Test::Unit::TestCase. Use ↵Jeremy Kemper2008-11-073-71/+58
|/ | | | ActionController::TestCase.
* Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised ↵Aliaksey Kandratsenka2008-11-061-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 typoMichael Koziarski2008-11-061-1/+1
|
* Fixed the sanitize helper to avoid double escaping already properly escaped ↵David Heinemeier Hansson2008-11-063-1/+7
| | | | entities [#683 state:committed]
* Dont bother logging the parameters hash if there are no parametersDavid Heinemeier Hansson2008-11-061-1/+1
|
* Fixed that FormTagHelper generates illegal html if name contains e.g. square ↵Vladimir Dobriakov2008-11-043-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ádua2008-11-043-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 headerDavid Heinemeier Hansson2008-11-045-26/+43
|\
| * Remove unused debug_routesPratik Naik2008-11-021-6/+0
| |
| * Dont dup params twice when filter_parameters is presentPratik Naik2008-11-021-2/+2
| |
| * Dont document internalsPratik Naik2008-11-021-3/+0
| |
| * Backwards compatibility fixes for relative_url_rootMichael Koziarski2008-11-022-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 docrailsPratik Naik2008-11-022-5/+8
| |
| * Cleaned up route optimisation guard condition generation code as it was ↵Tom Lea2008-11-012-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 headerDavid Heinemeier Hansson2008-11-041-2/+2
|/
* Simplified the logging format for parameters (don't include controller, ↵David Heinemeier Hansson2008-11-012-6/+25
| | | | action, and format as duplicates) [DHH]
* Make sure habtm use class variable to list association valid keysLuca Guidi2008-11-011-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 Hansson2008-11-012-1/+7
|
* Accidently nixed a doc headerDavid Heinemeier Hansson2008-11-011-0/+1
|
* Added render :js for people who want to render inline JavaScript replies ↵David Heinemeier Hansson2008-11-012-1/+33
| | | | without using RJS [DHH]
* Ensure content type gets reset after render_to_string [#1182 state:resolved]Joshua Peek2008-10-302-0/+11
|
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-10-303-2/+6
|\
| * Dup local assigns for partial collections so nil values doesn't get ↵Joshua Peek2008-10-303-2/+6
| | | | | | | | overwritten [#1250 state:resolved]
* | Fixed regex in redirect_to to fully support URI schemes [#1247 state:committed]Seth Fitzsimmons2008-10-303-1/+16
|/ | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Proper API for reloading translationsDavid Heinemeier Hansson2008-10-292-2/+6
|
* Ensure @content_for_* is checked before yielding to block in render :layout ↵Ryan Bates2008-10-284-1/+16
| | | | | | [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-10-286-14/+24
|\
| * Track rendered templates in stack so the current template can always be ↵Joshua Peek2008-10-285-7/+23
| | | | | | | | accessed. Added ActionView::Base#template to access the template object.
| * Thread Safety: Ensure recognize_optimized is immediately written instead of ↵Joshua Peek2008-10-271-7/+1
| | | | | | | | lazily
* | A little less hokus pokusDavid Heinemeier Hansson2008-10-281-5/+4
|/
* modified current_page? to ignore extra parameters unless specified in optionsErik Andrejko2008-10-262-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 Hansson2008-10-263-1/+14
| | | | Goldwasser) [#1265 status:committed]
* Update CHANGELOGs with the last few fixes, set date for todayDavid Heinemeier Hansson2008-10-241-1/+3
|
* Fix incorrect closing CDATA delimiter. Add tests for CDATA nodes.Jeffrey Hardy2008-10-232-1/+16
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix that HTML::Node.parse would blow up on unclosed CDATA sections.Jeffrey Hardy2008-10-233-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 serverDavid Heinemeier Hansson2008-10-231-1/+1
|
* Push to new gem serverDavid Heinemeier Hansson2008-10-231-2/+2
|