aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fix markup for cattr_accessors in Action View and Action Mailer to work ↵Mike Gunderloy2008-11-162-2/+8
| | | | better with RDoc 2+.
* Fix markup for cattr_accessors in Action Controller to work with RDoc 2+.Mike Gunderloy2008-11-164-26/+76
|
* Update info on routing parameter defaults, better example for :requirements ↵Matt Jones2008-11-142-3/+10
| | | | in map.resource.
* Merge commit 'mainstream/master'Pratik Naik2008-11-1431-153/+597
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/doc/guides/html/actioncontroller_basics.html railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/html/debugging_rails_applications.html railties/doc/guides/html/testing_rails_applications.html railties/doc/guides/source/actioncontroller_basics/methods.txt railties/doc/guides/source/actioncontroller_basics/params.txt railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt railties/doc/guides/source/actioncontroller_basics/session.txt railties/doc/guides/source/activerecord_validations_callbacks.txt railties/doc/guides/source/debugging_rails_applications.txt railties/doc/guides/source/testing_rails_applications.txt
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-142-19/+40
| |\
| | * Make inheritance of map.resources :only/:except options behave more predictablyTom Stuart2008-11-142-19/+40
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Prepare for RC2David Heinemeier Hansson2008-11-142-2/+4
| |/
| * Make polymorphic_url compact given array [#1317 state:committed]hiroshi2008-11-143-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-133-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 neededTom Stuart2008-11-132-6/+85
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Instead of overriding html_types, base the verification on ↵Michael Koziarski2008-11-132-7/+20
| | | | | | | | | | | | | | | | browser_generated_types. Also Deprecate the old unverifiable types. [#1145 state:committed]
| * fix two MimeType failing test casesrick2008-11-132-7/+10
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Changed request forgery protection to only worry about HTML-formatted ↵Jeff Cohen2008-11-134-55/+70
| | | | | | | | | | | | content requests. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Add :only/:except options to map.resourcesTom Stuart2008-11-122-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 countingJeremy Kemper2008-11-102-4/+26
| |
| * Pare down object creation during route buildingJeremy Kemper2008-11-102-30/+27
| |
| * Add some basic controller logging testsPratik Naik2008-11-081-0/+46
| |
| * 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
| |
| * 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]
| * 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
| |
* | Improved the use of monospace fonts in the documentation of ↵Daniel Schierbeck2008-11-051-3/+3
|/ | | | ActionController::Base.
* 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
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-10 11:44:55 +0000