aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Add :only and :except to controllers MiddlewareStack. This allowsJosé Valim2010-05-302-7/+49
* Update template to allow handlers to more cleanly handle encodings (ht: nex3)wycats2010-05-303-65/+65
* Remove the laziness from the middleware stack.José Valim2010-05-291-57/+15
* Removing Metal from Rails 3. wycats2010-05-292-30/+0
* Merge commit 'mislav/auto_link'Michael Koziarski2010-05-291-12/+21
|\
| * avoid auto_linking already linked emails; more robust detection of linked URLsMislav Marohnić2010-05-241-9/+18
| * auto_link: support arbitrary URI schemes like "ftp:" and "file:"Mislav Marohnić2010-05-241-3/+3
* | Merge remote branch 'rails/master'Xavier Noria2010-05-277-90/+114
|\ \
| * | In AV::TC, move protect_against_forgery? from the test_case to theDavid Chelimsky2010-05-261-4/+9
| * | Support configuration of controller.controller_path on instances ofDavid Chelimsky2010-05-261-2/+7
| * | i18n: t() handles single keys returning an Array, alsoJeremy Kemper2010-05-241-2/+5
| * | HTML safety: fix textarea with nil contentJeremy Kemper2010-05-241-1/+1
| * | translate method doesn't support arrays anymore and is optimized to be used w...Santiago Pastorino2010-05-241-18/+10
| * | Revert "translation method for arrays on TranslationHelper module returns an ...Santiago Pastorino2010-05-241-25/+25
| * | Move AV::TC to AV::TC::Behavior [#4678 state:resolved]David Chelimsky2010-05-241-65/+85
| * | translation method for arrays on TranslationHelper module returns an array wh...Santiago Pastorino2010-05-241-25/+25
| * | Fix a bug where responders were not working properly on method override.José Valim2010-05-241-1/+1
| |/
| * refactor evals and adds some __FILE__ and __LINE__Santiago Pastorino2010-05-204-8/+7
* | Minor typo fix in callbacks.rb of abstract_controllerRohit Arondekar2010-05-201-1/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-05-1915-367/+414
|\
| * Avoid instance variable @output_buffer not initializedSantiago Pastorino2010-05-191-1/+2
| * Avoid creating a Rack::Response object in the cookie middleware since it may ...José Valim2010-05-181-9/+13
| * Cut the fat and make session stores rely on request.cookie_jar and change set...José Valim2010-05-183-130/+55
| * Remove deprecated methods since 2-3-stable.José Valim2010-05-181-34/+6
| * Kill legacy dispatcher.José Valim2010-05-181-2/+0
| * Simplify cookie_store by simply relying on cookies.signed.José Valim2010-05-182-94/+45
| * Rely on set and delete cookie logic from rack.José Valim2010-05-181-33/+2
| * Merge remote branch 'origin/master'wycats2010-05-172-2/+10
| |\
| | * Added default currency values to NumberHelper and pass them to I18n.translateSantiago Pastorino2010-05-171-2/+5
| | * Allow root to be given in the resources scope without need to specify :on => ...José Valim2010-05-171-0/+5
| * | Merge branch 'encodings'wycats2010-05-171-1/+3
| |\ \
| | * | Make sure encoding changes don't break 1.8wycats2010-05-171-1/+3
| * | | Revert "Moved encoding work in progress to a feature branch."wycats2010-05-175-72/+289
| | |/ | |/|
| * | Ruby 1.9: helper path may be a pathname, so convert to a string before quotin...Jeremy Kemper2010-05-161-1/+1
* | | fix documentation typoMarius Nuennerich2010-05-181-2/+2
* | | Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-05-1711-52/+122
|\| |
| * | Moved encoding work in progress to a feature branch.Jeremy Kemper2010-05-165-289/+72
| |/
| * Significantly improved internal encoding heuristics and support.wycats2010-05-165-37/+238
| * Initial work to improve the state of encodings for templateswycats2010-05-163-45/+61
| * Check blocks are not incorrectly detected when compiling erubis templates [#4...Simon Jefford2010-05-161-1/+1
| * added support for html attributes in options_for_select [#2165]pleax2010-05-161-2/+25
| * Sending :id => nil to form helpers now properly omits the "id" html element [...Jeff Dean2010-05-151-5/+11
| * Optimize the code added in fa99de0bd054576336c9José Valim2010-05-151-9/+19
| * make sure `as` is set before trying to build an #{as}_counter. [#2804 state:r...Jeff Kreeftmeijer2010-05-151-1/+1
| * partial counters with :as [#2804 state:resolved]Jeff Kreeftmeijer2010-05-151-0/+1
| * added convenience methods #notice and #alert to flash.nowMartin2010-05-151-0/+10
| * fix assert_select messages to its declaration behaviourPaco Guzman2010-05-151-5/+11
| * Accept :alt => nil on image_tag [#4558 state:resolved]Marc-Andre Lafortune2010-05-151-1/+1
| * Improve previous patch a bit [#3645 state:resolved]José Valim2010-05-152-9/+6
| * Let label helpers accept blocks.Stephen Celis2010-05-152-18/+40