aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'rails/master'Xavier Noria2010-06-1017-319/+93
|\
| * Revert "Add support for multi-subdomain session by setting cookie host in ses...José Valim2010-06-104-47/+2
| * Missing method error doesn't specify which controller it is missing from [#44...Alan Harper2010-06-102-2/+11
| * Remove punctuate_body! No code in lib was using it and it had no documentation.José Valim2010-06-102-31/+0
| * class_attribute is not a direct replacement of class_inheritable_*.José Valim2010-06-103-14/+12
| * Add support for multi-subdomain session by setting cookie host in session coo...Guillermo Álvarez2010-06-104-1/+48
| * Ensure show exceptions middleware properly filters backtrace before logging.José Valim2010-06-091-1/+1
| * Removed textilize, textilize_without_paragraph and markdown helpersSantiago Pastorino2010-06-093-191/+2
| * Better test for ticket [#3914 state:resolved]Neeraj Singh2010-06-091-0/+11
| * Add more cases to previous commit [#4394 state:resolved]José Valim2010-06-082-3/+10
| * Make sure namespaces are nested within resourcesJan De Poorter2010-06-082-0/+23
| * cache_sweeper yields blank outputNeeraj Singh2010-06-083-0/+10
| * Revert "Add shallow routes to the new router" for now. Needs more work.David Heinemeier Hansson2010-06-083-75/+3
| * Memoize the object returned by _view in ActionView::TestCase::BehaviorDavid Chelimsky2010-06-082-6/+12
* | Added :locale option explanation for number_to_currencySlobodan Kovacevic2010-06-101-0/+2
|/
* Get ready for beta 4David Heinemeier Hansson2010-06-082-2/+2
* Fixed double output from cache in no caching modeDavid Heinemeier Hansson2010-06-082-29/+14
* Accept both regexps and strings for LOCALHOST.José Valim2010-06-081-2/+2
* Make sure that rails recognized the full notation of IPv6 loopback address, a...Prem Sichanugrist2010-06-082-3/+3
* Fix resources ignoring scope optionsAndrew White2010-06-082-4/+32
* Made markdown honor :safe option and handle safe input. Also added tests for ...rohit2010-06-082-2/+38
* Add support for actions on a new resource to the new routing DSL [#4328 state...Andrew White2010-06-082-29/+118
* Fixed textilize_without_paragraph and added tests for it. [#4792 state:resolved]rohit2010-06-082-1/+33
* 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