aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-05-1299-654/+1819
|\
| * 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
| * | Fixed a bug with handling render optionsYehuda Katz + Carl Lerche2009-05-113-66/+12
| | |
| * | Aliased AbstractController::ActionNotFound to ActionController::UnknownActionYehuda Katz + Carl Lerche2009-05-114-10/+12
| | |
| * | Ported ConditionalGet to new BaseYehuda Katz + Carl Lerche2009-05-117-5/+102
| | |
| * | Don't run the action if callbacks are halted.Yehuda Katz + Carl Lerche2009-05-113-5/+13
| | | | | | | | | In AbstractController, this means that response_body is not empty
| * | Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-110-0/+0
| |\ \
| | * | Makes new callbacks support keys with special charactersYehuda Katz + Carl Lerche2009-04-272-0/+29
| | | |
| * | | Ported fresh_when into a ConditionalGet moduleYehuda Katz + Carl Lerche2009-05-115-0/+92
| | | |
| * | | More community code review :)Yehuda Katz2009-05-118-43/+37
| | | |
| * | | Fix implicit ordering expectationJeremy Kemper2009-05-021-1/+1
| | | |
| * | | Implement FooController.action(:name)Yehuda Katz2009-05-027-34/+57
| | | | | | | | | | | | | | | | | | | | | | | | * Rails actions are now Rack endpoints, and can be retrieved via FooController.action(name) and called with an env * Updated some tests that relied on the old internal #process/#call implementation
| * | | Get render :inline workingYehuda Katz + Carl Lerche2009-05-013-2/+6
| | | |
| * | | A few more tweaks to get new Base running old render tests againYehuda Katz + Carl Lerche2009-05-013-17/+10
| | | |
| * | | Renamed Base2 to Base and don't require old action_controller for new BaseYehuda Katz + Carl Lerche2009-05-0113-141/+157
| | | |
| * | | Starting to get new_base to run on old testsYehuda Katz + Carl Lerche2009-05-018-3/+313
| | | |
| * | | Add support for stripping "layouts/" from the layout name Yehuda Katz + Carl Lerche2009-05-012-0/+8
| | | |
| * | | Modify new_base to use String action_names for back-compatYehuda Katz + Carl Lerche2009-05-014-8/+8
| | | |
| * | | Committing the last changes before we start trying to get the old tests to ↵Yehuda Katz + Carl Lerche2009-05-013-7/+70
| | | | | | | | | | | | | | | | pass on the new base
| * | | Ported over the concept of public instance methods on controller child ↵Yehuda Katz + Carl Lerche2009-05-015-20/+69
| | | | | | | | | | | | | | | | classes as callable action methods
| * | | Move ContentType inline for now. Yehuda Katz + Carl Lerche2009-05-014-21/+6
| | | | | | | | | | | | | | | | Trying to avoid premature proliferation of modules.
| * | | Support implicit and explicit content typesYehuda Katz + Carl Lerche2009-05-016-2/+139
| | | |
| * | | Support implicit render and blank renderYehuda Katz + Carl Lerche2009-05-016-27/+69
| | | |
| * | | Ported over render :template testsYehuda Katz + Carl Lerche2009-05-016-8/+39
| | | |
| * | | Finished implementing render :text in Base2Yehuda Katz + Carl Lerche2009-05-016-8/+54
| | | |
| * | | Renamed the new_base testsYehuda Katz + Carl Lerche2009-05-014-94/+98
| | | |
| * | | Renamed ActionController::AbstractBase to ActionController::HttpYehuda Katz + Carl Lerche2009-05-014-18/+18
| | | |
| * | | Removed a stray method_missing in the new callbacks systemYehuda Katz + Carl Lerche2009-05-011-9/+0
| | | |
| * | | OMG, a lot of workYehuda Katz + Carl Lerche2009-05-0119-86/+210
| | | |
| * | | Makes new callbacks support keys with special charactersYehuda Katz + Carl Lerche2009-05-012-0/+29
| | | |
* | | | Merge commit 'rails/master'Emilio Tagua2009-05-0927-153/+307
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| | | |
| * | | Make module dependency DSL opt inJoshua Peek2009-05-0714-52/+64
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-03 15:53:27 +0000