aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix typo in the generated routes.rb [#2433 state:resolved]Paulo Schneider2009-05-171-1/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Supply valid ruby-prof parameters [#1804 state:resolved]Jacob Kjeldahl2009-05-171-1/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * has_one :through should not create a new association when assigned nil [#698 ↵Daniel Guettler2009-05-172-9/+16
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure rake test does not run new base tests as that requires rack/testPratik Naik2009-05-171-1/+1
| |
| * Ensure WhiteListSanitizer allows dl tag [#2393 state:resolved]Jeffrey Chupp2009-05-171-1/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Get Railties passing againYehuda Katz2009-05-168-17/+23
| |
| * Fix ActionMailer Symbol#to_proc instanceYehuda Katz2009-05-161-1/+1
| |
| * Get AR CI passing again by requiring the entire core_extYehuda Katz2009-05-161-0/+3
| | | | | | | | | | Note that this includes Time and Date; we should really figure out what parts of core_ext are really required for AR and require just those.
| * ChangelogBryan Helmkamp2009-05-161-0/+2
| |
| * Instead of checking Rails.env.test? in Failsafe middleware, check ↵Bryan Helmkamp2009-05-163-8/+9
| | | | | | | | env["rails.raise_exceptions"]
| * Include guides directory in the rails gemPratik Naik2009-05-161-3/+4
| |
| * Ported Rescuable to new baseYehuda Katz + Carl Lerche2009-05-159-27/+111
| |
| * Refactored AbstractController to provide better hook points for overriding ↵Yehuda Katz + Carl Lerche2009-05-155-33/+39
| | | | | | | | aspects of action dispatching
| * Allow strings to be sent as collection to select.José Valim2009-05-152-0/+24
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-1411-16/+65
| |\ | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb
| * | Got new base to pass controller/base_test.rb, implemented method_missing ↵Yehuda Katz + Carl Lerche2009-05-148-11/+61
| | | | | | | | | | | | action semantics in compatibility mode, and fixed a few action_missing bugs.
| * | Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-1411-33/+122
| | |
* | | Active Support dependenciesJeremy Kemper2009-05-142-0/+2
| |/ |/|
* | Minimal base/new_base comparisonJeremy Kemper2009-05-146-21/+50
| |
* | Cherry-picking Active Support extensionsJeremy Kemper2009-05-142-2/+5
| |
* | Simple example for require profilingJeremy Kemper2009-05-141-0/+17
| |
* | Changed ActiveRecord::Base#exists? to invoke find_initial so that it is ↵Peter Marklund2009-05-142-8/+9
|/ | | | | | | compatible with, and doesn't lose, :include scopes (references to eager loaded tables) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2543 state:committed]
* Ported over render :file tests.Yehuda Katz + Carl Lerche2009-05-138-321/+585
|
* Simple examples for require profilingJeremy Kemper2009-05-133-2/+32
|
* Cherry-pick core extensionsJeremy Kemper2009-05-1371-83/+168
|
* isolated_test taskJeremy Kemper2009-05-132-6/+20
|
* Remove support for deprecated validation message interpolation formatJeremy Kemper2009-05-133-53/+8
|
* Preserve orderingJeremy Kemper2009-05-131-2/+8
|
* Defer rake/contrib requires so we can use the stdlib rake instead of the ↵Jeremy Kemper2009-05-132-2/+4
| | | | full gem
* Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-1220-102/+251
|
* Fixed new callbacks to not call the action when a callback sets the response ↵Yehuda Katz + Carl Lerche2009-05-122-1/+20
| | | | body
* Defer rake/contrib/sshpublisher require so we can use the stdlib rake ↵Jeremy Kemper2009-05-111-1/+2
| | | | instead of the full gem
* Use DependencyModule for included hooks in ActiveRecordBryan Helmkamp2009-05-1121-125/+111
|
* Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-11125-930/+1539
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb
| * Revert "Whitespace!"Yehuda Katz + Carl Lerche2009-05-1114-84/+95
| | | | | | | | This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716.
| * Revert "Fixed bug with polymorphic has_one :as pointing to an STI record"Jeremy Kemper2009-05-116-21/+5
| | | | | | | | | | | | [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5.
| * ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash instead of a Hash.Douglas F Shearer2009-05-112-0/+16
| | | | | | | | | | | | [#2615 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-1117-13/+173
| |\
| | * Added db/seeds.rb as a default file for storing seed data for the database. ↵David Heinemeier Hansson2009-05-115-2/+31
| | | | | | | | | | | | Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the "Stop Putting Gawd Damn Seed Data In Your Migrations" feature) [DHH]
| | * Change spelling of Kyev timezone to Kyiv [#2613 state:resolved]Alexander Dymo2009-05-102-2/+4
| | |
| | * Allow you to pass :all_blank to :reject_if option to automatically create a ↵Mike Breen2009-05-104-2/+30
| | | | | | | | | | | | Proc that will reject any record with blank attributes.
| | * Fixed eager load error on find with include => [:table_name] and hash ↵Anthony Crumley2009-05-102-4/+28
| | | | | | | | | | | | | | | | | | conditions like {:table_name => {:column => 'value'}} Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * ActiveSupport::OrderedHash#to_a method returns an ordered set of arrays. ↵Ken Collins2009-05-102-0/+8
| | | | | | | | | | | | | | | | | | | | | Matches ruby1.9's Hash#to_a. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2629 state:committed]
| | * honour :inverse_of for joins based includeFrederick Cheung2009-05-102-2/+36
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * honour inverse_of when preloading associationsFrederick Cheung2009-05-102-1/+36
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Check for date/time methods that moved upstream in 1.9Jeremy Kemper2009-05-073-6/+6
| | |
| * | Defer rake/contrib/sshpublisher require so basic tasks don't need the full ↵Jeremy Kemper2009-05-071-1/+2
| |/ | | | | | | rake gem
| * Tool for profiling resource usage in each require call.Jeremy Kemper2009-05-071-0/+75
| | | | | | | | | | | | | | | | | | $ ruby -Iactiveresource/lib tools/profile_requires.rb active_resource 91.84 KB 3220 obj 4.0 ms active_resource 83.86 KB 3108 obj 3.3 ms active_support 69.32 KB 2682 obj 2.6 ms active_support/vendor 33.98 KB 651 obj 0.6 ms i18n 94.40 KB 315 obj 4.0 ms 44 KB RSS
| * Whitespace!Joshua Peek2009-05-0714-95/+84
| |
| * Prefer "included" language over "setup"Joshua Peek2009-05-077-30/+33
| |