aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-08-1440-679/+1143
|\ | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/request.rb actionpack/lib/action_controller/resources.rb
| * TestRequest#recycle! uses unmemoize_all to reset cached request method, ↵Jeremy Kemper2008-08-131-3/+3
| | | | | | | | accepts, etc.
| * Fix rendering partials at the top level [#795 state:resolved]Joshua Peek2008-08-134-1/+21
| |
| * Refactor Filter predicate methods to use inheritance. [#815 state:resolved]Josh Susser2008-08-131-3/+16
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Set asset-cached file ctime and mtime to the max mtime of the combined ↵Jeremy Kemper2008-08-122-1/+7
| | | | | | | | files. Allows for consistent ETag generation without having a shared filesystem.
| * Merge branch 'conditional-get'Jeremy Kemper2008-08-1215-300/+323
| |\
| | * Update changelog for conditional GET utility methodsJeremy Kemper2008-08-121-2/+8
| | |
| | * Update tests for request memoizationJeremy Kemper2008-08-089-121/+146
| | |
| | * Don't shadow host methodJeremy Kemper2008-08-081-1/+1
| | |
| | * Simplifying usage of ETags and Last-Modified and conditional GET requestsJeremy Kemper2008-08-077-135/+169
| | |
| | * Inherit these from AbstractRequest insteadJeremy Kemper2008-08-071-46/+4
| | |
| * | Fixed autolink regexp compatibility for ruby 1.9 [#783 state:resolved]Stefan Kaes2008-08-091-1/+1
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | Added tests for partial collection counters [#766 state:resolved]Cameron Yule2008-08-093-4/+18
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | mail_to should use decodeURIcomponent instead of unescape to be utf friendly.miloops2008-08-082-5/+9
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | dryed up resources; fixed small formatting issue in resources rdocJames Rosen2008-08-081-25/+25
| |/ | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Refactor DateHelper to use DateTimeSelector presenter patternClemens Kofler2008-08-073-259/+638
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Tidy up ActionMailer rendering logic to take advantage of view path cache ↵Joshua Peek2008-08-063-27/+21
| | | | | | | | instead of using file system lookups
| * Be more careful about deducing action_methodsJeremy Kemper2008-08-061-6/+10
| |
| * MemoryStore is the only "unsafe" store. Make it threadsafe by default.Joshua Peek2008-08-061-1/+1
| |
| * Strip newlines from cookie session dataJeremy Kemper2008-08-051-1/+1
| |
| * Ensure public superclass methods don't shadow public controller methods. ↵Jeremy Kemper2008-08-051-3/+3
| | | | | | | | Case in point, ruby-debug's Kernel#start shadowing a controller's start action.
| * Make assert_template failure message more friendlyJeffrey Hardy2008-08-051-2/+2
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fixed i18n bulk translate issues in NumberHelperClemens Kofler2008-08-042-38/+44
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Expose Routing::Segment::SAFE_PCHAR list of path characters that don't need ↵Jeremy Kemper2008-08-041-1/+2
| | | | | | | | escaping
* | Fixes file_field_tag docs by taking out deprecated end_form_tag and makes ↵Tieg Zaharia2008-08-131-2/+2
| | | | | | | | form_tag evaluated instead of output
* | Fix reference to incorrect block variable in :cache_path example for ↵Cheah Chu Yeow2008-08-121-2/+2
| | | | | | | | caches_action.
* | Typo in comment.Henrik N2008-08-071-1/+1
| |
* | Added missing opening double quote to doc example in prototype helper.miloops2008-08-061-1/+1
| |
* | Merge commit 'mainstream/master'Pratik Naik2008-08-0336-525/+635
|\|
| * Ensure mailer view path is loaded when it's assigned. Path#[] raises if it ↵Jeremy Kemper2008-07-311-0/+2
| | | | | | | | isn't loaded.
| * List available actions in UnknownAction exception messageJeremy Kemper2008-07-311-1/+1
| |
| * Use "/usr/bin/env ruby" instead of "/usr/local/bin/ruby"Tarmo Tänav2008-07-311-7/+7
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fix file permissionsTarmo Tänav2008-07-3111-0/+0
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * In javascript helpers option[:type] = :synchronous should work as described ↵miloops2008-07-312-1/+7
| | | | | | | | | | | | in docs. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Prototype helpers should generate Element.insert instead of Insertion.new, ↵miloops2008-07-303-22/+28
| | | | | | | | which has been deprecated in Prototype 1.6.
| * Reapply 'cab168ac' because it was accidentally patched over in '10d9fe4b'Joshua Peek2008-07-291-1/+1
| |
| * Updated NumberHelper: Full i18n support (except number_to_phone), ↵Clemens Kofler2008-07-294-96/+219
| | | | | | | | | | | | consolidated API (almost all methods now support :precision, :delimiter and :separator). Added deprecation notices for old API. Added tests for new options [#716 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fix that label_tag doesn't take a symbol for a name. [#719 state:resolved]Jan De Poorter2008-07-292-1/+7
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Remove send! usage, relic of reverted 1.9 behaviorJeremy Kemper2008-07-281-1/+1
| |
| * Added back ActionController::Base.allow_concurrency flag and moved lock down ↵Joshua Peek2008-07-283-12/+23
| | | | | | | | to controller processing.
| * Prepare Route#generate and Route#recognize early. Also refactor segments a ↵Joshua Peek2008-07-288-298/+259
| | | | | | | | bit to try to make immutable.
| * Routing whitespace cleanupJoshua Peek2008-07-2810-89/+84
| |
* | revised conventions, fixed an example, escaped autolinked words, and other ↵Xavier Noria2008-07-291-36/+41
| | | | | | | | assorted details in request.rb
* | escaping otherwise autolinked "resource(s)" in resource.rb and assorted ↵Xavier Noria2008-07-281-30/+30
|/ | | | minor touches
* Merge docrails changesPratik Naik2008-07-285-31/+203
|
* Refactored TextHelper#truncate, highlight, excerpt, word_wrap and auto_link ↵Clemens Kofler2008-07-273-68/+191
| | | | | | to accept options hash [#705 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* error_message_on takes an options hash instead of ordered parameters [#704 ↵Clemens Kofler2008-07-273-40/+58
| | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* ActionController::Base.relative_url_root falls back to ↵Joshua Peek2008-07-241-1/+6
| | | | ENV['RAILS_RELATIVE_URL_ROOT']
* AbstractRequest.relative_url_root is no longer automatically configured by a ↵Joshua Peek2008-07-2411-219/+161
| | | | HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root
* Fixed bc5896e, and added test case for the caching bug it originally introduced.Joshua Peek2008-07-234-6/+13
|