aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-06-083-3/+75
|\
| * Add shallow routes to the new router [Closes #3765]Diego Carrion2010-06-073-3/+75
* | Updating image_tag to support cid:content_id "URLs"Mikel Lindsaar2010-06-072-2/+14
|/
* regular expressions are usually ASCII-encoded, so force_encoding the content ...wycats2010-06-072-2/+1
* Fix case when rendering a partial inside RJS with inherited layout [#4786 sta...José Valim2010-06-072-1/+4
* Makes text_helper methods sanitize the input if the input is not safe or :saf...Santiago Pastorino2010-06-072-22/+118
* content_tag_string shouldn't escape_html if escape param is falseSantiago Pastorino2010-06-072-1/+3
* Make named helpers unprotected without becoming actions [#4696 state:resolved]wycats2010-06-072-1/+12
* member on resource should not expect an ID.José Valim2010-06-072-6/+3
* Make AP test suite green once again and speed up performance in layouts looku...José Valim2010-06-074-45/+39
* Router accepts member routes on resource. [#4624 state:resolved]Rizwan Reza2010-06-062-5/+27
* Formats should always be an array.Jeremy Kemper2010-06-061-1/+1
* Reset request.parameters after assigning params for functional testsJeremy Kemper2010-06-061-2/+4
* Simplify middleware stack lazy compares using named const referencesJeremy Kemper2010-06-051-13/+5
* Bump i18n to 0.4.1Jeremy Kemper2010-06-051-1/+1
* Restore flash sweepJeremy Kemper2010-06-051-1/+1
* Optimize LookupContextwycats2010-06-044-14/+37
* No need to unescape params twice if we came from Rack::Mountwycats2010-06-041-7/+7
* Memoizing methods on request means we need to clear them out on recycle!wycats2010-06-041-3/+3
* Stop the flash middleware from forcibly loading sessions even if the user doe...wycats2010-06-042-6/+6
* Improve performance of commonly used request methodswycats2010-06-041-7/+19
* Include backtrace in failsafe log. Rescue possible exceptions in failsafe res...Jeremy Kemper2010-06-042-2/+2
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-021-2/+1
|\
| * Add an asset_host accessor for consistency.José Valim2010-06-021-2/+1
* | Missed the extractionDavid Heinemeier Hansson2010-06-021-0/+9
|/
* Extract assets paths and make them available to Action Mailer as wellDavid Heinemeier Hansson2010-06-022-1/+3
* Changes made while working on upgrading cells to Rails 3wycats2010-06-025-4/+8
* Merge branch 'master' of github.com:rails/railswycats2010-06-027-45/+92
|\
| * revises the documentation of String#truncate and the truncate helperXavier Noria2010-06-021-9/+9
| * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-011-0/+2
| |\
| | * Unforce builder from ASSantiago Pastorino2010-06-011-0/+1
| | * Unforce tzinfo from ASSantiago Pastorino2010-06-011-0/+1
| * | Extracted String#truncate from TextHelper#truncate [DHH]David Heinemeier Hansson2010-06-011-11/+5
| |/
| * Base options cant live in lazy loaded helpers as they then wont be available ...David Heinemeier Hansson2010-05-312-7/+4
| * Unforce i18n from ASSantiago Pastorino2010-05-311-0/+1
| * rack-test version updated and removed from GemfileSantiago Pastorino2010-05-311-1/+1
| * Add :only and :except to controllers MiddlewareStack. This allowsJosé Valim2010-05-303-18/+71
* | Update CHANGELOGwycats2010-05-301-0/+2
|/
* Update template to allow handlers to more cleanly handle encodings (ht: nex3)wycats2010-05-304-69/+78
* Remove the laziness from the middleware stack.José Valim2010-05-292-74/+17
* Now that we always return a proxy from mb_chars, even in 1.9, all Strings com...wycats2010-05-291-3/+5
* fix translation test in actionpack [#4701 state:commited]Santiago Pastorino2010-05-291-1/+1
* Removing Metal from Rails 3. wycats2010-05-292-30/+0
* Merge commit 'mislav/auto_link'Michael Koziarski2010-05-292-30/+61
|\
| * avoid auto_linking already linked emails; more robust detection of linked URLsMislav Marohnić2010-05-242-16/+48
| * auto_link: support arbitrary URI schemes like "ftp:" and "file:"Mislav Marohnić2010-05-242-14/+13
* | Merge remote branch 'rails/master'Xavier Noria2010-05-2715-233/+299
|\ \
| * | In AV::TC, move protect_against_forgery? from the test_case to theDavid Chelimsky2010-05-262-4/+24
| * | reorganize tests for AV::TCDavid Chelimsky2010-05-261-140/+138
| * | Support configuration of controller.controller_path on instances ofDavid Chelimsky2010-05-262-4/+9