aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Remove duplicate distribution of prototype and scriptaculous.Michael Koziarski2008-11-184-7384/+0
* Remove mention of long-dead define_javascript_functionsMichael Koziarski2008-11-181-3/+0
* Update Prototype to 1.6.0.3 and update script.aculo.us to 1.8.2Thomas Fuchs2008-11-184-520/+628
* use :en as a default locale (in favor of :en-US)Sven Fuchs2008-11-187-44/+44
* Prevent assert_template failures when a render :inline is called before rende...Luke Melia2008-11-172-10/+22
* BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb a...David Heinemeier Hansson2008-11-171-8/+1
* Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that they...David Heinemeier Hansson2008-11-172-81/+74
* Add text/plain to the browser_generated_types array as webkit and gecko can s...Michael Koziarski2008-11-161-2/+2
* Merge branch 'master' into testingJeremy Kemper2008-11-1518-186/+601
|\
| * auto_link helper: add intelligent ending closing bracket handling. add new te...Mislav Marohnić2008-11-152-56/+94
| * refactor autolink helper. change tests to expect HTML-escaped URLsMislav Marohnić2008-11-152-39/+44
| * Missing changelogs for relative_url_root changesMichael Koziarski2008-11-141-0/+2
| * Missing changelog for CSRF changesMichael Koziarski2008-11-141-0/+6
| * Missing changelog for :only/:except on map.resourcesMichael Koziarski2008-11-141-0/+2
| * A few more dependency updatesDavid Heinemeier Hansson2008-11-141-1/+1
| * Merge docrails.Pratik Naik2008-11-141-3/+3
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-142-19/+40
| |\
| | * Make inheritance of map.resources :only/:except options behave more predictablyTom Stuart2008-11-142-19/+40
| * | Prepare for RC2David Heinemeier Hansson2008-11-142-2/+4
| |/
| * Make polymorphic_url compact given array [#1317 state:committed]hiroshi2008-11-143-1/+14
| * Tag helper should output an attribute with the value 'false' instead of omitt...Hongli Lai (Phusion)2008-11-133-5/+11
| * Fix map.resources to always generate named routes if they're neededTom Stuart2008-11-132-6/+85
| * Instead of overriding html_types, base the verification on browser_generated_...Michael Koziarski2008-11-132-7/+20
| * fix two MimeType failing test casesrick2008-11-132-7/+10
| * Changed request forgery protection to only worry about HTML-formatted content...Jeff Cohen2008-11-134-55/+70
| * Add :only/:except options to map.resourcesTom Stuart2008-11-122-37/+247
* | Merge branch 'master' into testingJeremy Kemper2008-11-114-34/+53
|\|
| * Eliminate excess Regexp creation due to capture countingJeremy Kemper2008-11-102-4/+26
| * Pare down object creation during route buildingJeremy Kemper2008-11-102-30/+27
* | Ruby 1.9 compat: rescue Exception since minitest's assertion doesn't subclass...Jeremy Kemper2008-11-081-2/+2
* | Wrap straggling mocha user with uses_mocha blockJeremy Kemper2008-11-081-5/+7
* | Ruby 1.9 compat: CGI switched back to TempfileJeremy Kemper2008-11-081-10/+4
* | Workaround lack of Mocha on 1.9 (hasn't been updated for minitest yet)Jeremy Kemper2008-11-081-1/+2
* | Merge branch 'master' into testingJeremy Kemper2008-11-081-0/+46
|\|
| * Add some basic controller logging testsPratik Naik2008-11-081-0/+46
* | Merge branch 'master' into testingJeremy Kemper2008-11-071-0/+1
|\|
| * Work around ruby 1.9 segfaultJeremy Kemper2008-11-071-0/+1
| * Don't worry about attribute orderingJeremy Kemper2008-11-071-1/+2
| * Check whether last arg is a Hash instead of duck-typing against []Jeremy Kemper2008-11-071-4/+9
| * Use delete if the rhs is nilJeremy Kemper2008-11-071-1/+5
* | Merge branch 'master' into testingJeremy Kemper2008-11-073-3/+3
|\|
| * Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. ...Nick Sieger2008-11-081-1/+0
| * auto_link view helper was failing on URLs with colons after a query paramRich Manalang2008-11-072-2/+3
* | Check whether last arg is a Hash instead of duck-typing against []Jeremy Kemper2008-11-071-4/+9
* | Don't worry about attribute orderingJeremy Kemper2008-11-071-1/+2
* | Use delete if the rhs is nilJeremy Kemper2008-11-071-1/+5
* | Update AR integration tests for TestCase changesJeremy Kemper2008-11-072-12/+5
* | Move controller assertions from base TestCase to AC:: and AV::TestCaseJeremy Kemper2008-11-0726-265/+191
* | Remove controller assertions from Test::Unit::TestCase. Use ActionController:...Jeremy Kemper2008-11-073-71/+58
|/
* Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised rec...Aliaksey Kandratsenka2008-11-061-1/+1