aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* 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
| * i18n: t() handles single keys returning an Array, alsoJeremy Kemper2010-05-242-2/+15
| * HTML safety: fix textarea with nil contentJeremy Kemper2010-05-242-1/+7
| * translate method doesn't support arrays anymore and is optimized to be used w...Santiago Pastorino2010-05-245-34/+13
| * Revert "translation method for arrays on TranslationHelper module returns an ...Santiago Pastorino2010-05-244-42/+41
| * Move AV::TC to AV::TC::Behavior [#4678 state:resolved]David Chelimsky2010-05-242-65/+99
| * translation method for arrays on TranslationHelper module returns an array wh...Santiago Pastorino2010-05-244-41/+42
| * Fix a bug where responders were not working properly on method override.José Valim2010-05-242-1/+14
| * refactor evals and adds some __FILE__ and __LINE__Santiago Pastorino2010-05-205-11/+9
* | fix small doc bug about running single unit test filesDavid Chelimsky2010-05-251-1/+1
* | Minor typo fix in callbacks.rb of abstract_controllerRohit Arondekar2010-05-201-1/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-05-1940-462/+711
|\
| * Avoid instance variable @output_buffer not initializedSantiago Pastorino2010-05-191-1/+2
| * Use better assertion methods for testingNeeraj Singh2010-05-192-9/+9
| * 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-187-133/+71
| * Use assert_respond_to because it has better error messagingNeeraj Singh2010-05-183-8/+8
| * Remove deprecated methods since 2-3-stable.José Valim2010-05-182-46/+6
| * Kill legacy dispatcher.José Valim2010-05-181-2/+0
| * Simplify cookie_store by simply relying on cookies.signed.José Valim2010-05-186-142/+130
| * Rely on set and delete cookie logic from rack.José Valim2010-05-182-33/+6
| * Merge remote branch 'origin/master'wycats2010-05-174-3/+38
| |\
| | * Added default currency values to NumberHelper and pass them to I18n.translateSantiago Pastorino2010-05-172-2/+22
| | * Allow root to be given in the resources scope without need to specify :on => ...José Valim2010-05-172-1/+16
| * | Merge branch 'encodings'wycats2010-05-172-5/+9
| |\ \
| | * | Make sure encoding changes don't break 1.8wycats2010-05-172-5/+9
| * | | Revert "Moved encoding work in progress to a feature branch."wycats2010-05-1715-87/+435
| | |/ | |/|
| * | 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-1725-85/+365
|\| |
| * | Moved encoding work in progress to a feature branch.Jeremy Kemper2010-05-1615-435/+87
| |/
| * Significantly improved internal encoding heuristics and support.wycats2010-05-1615-52/+384
| * Initial work to improve the state of encodings for templateswycats2010-05-163-45/+61
| * Take out stale tasks from Actionpack's Rakefile [#4619 state:resolved]Rizwan Reza2010-05-161-19/+0
| * Check blocks are not incorrectly detected when compiling erubis templates [#4...Simon Jefford2010-05-163-1/+7
| * Fixed 1 failure in ActionPack testsuite [#4613 state:resolved]Hussein Morsy2010-05-161-2/+2
| * added support for html attributes in options_for_select [#2165]pleax2010-05-162-2/+81
| * Fixed 1 failure and 2 errors in ActionPack testsuite [#4613 state:commited]rohit2010-05-163-6/+6
| * Sending :id => nil to form helpers now properly omits the "id" html element [...Jeff Dean2010-05-152-5/+118
| * Optimize the code added in fa99de0bd054576336c9José Valim2010-05-151-9/+19
| * Ruby 1.9: fix invalid rack response in testJeremy Kemper2010-05-151-1/+1
| * 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-153-0/+11
| * Add tests for convenience methods #notice and #alert to flash.now [#4369 stat...Anil Wadghule2010-05-151-0/+20
| * added convenience methods #notice and #alert to flash.nowMartin2010-05-151-0/+10
| * fix assert_select messages to its declaration behaviourPaco Guzman2010-05-152-8/+24
| * Accept :alt => nil on image_tag [#4558 state:resolved]Marc-Andre Lafortune2010-05-152-2/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 15:45:43 +0000