aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Make module dependency DSL opt inJoshua Peek2009-05-0714-52/+64
|
* Add test coverage to module setup extensionsJoshua Peek2009-05-071-0/+74
|
* Remove stray call to gems:unpack in gems:build:forceMatt Jones2009-05-061-2/+1
| | | | | | [#2266 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix tests on 1.8.6Jeremy Kemper2009-05-062-0/+2
|
* Fix old reference to ActionController::FailsafeJeremy Kemper2009-05-061-1/+1
|
* Cherry pick Active Support dependencies. Autoload.Jeremy Kemper2009-05-0611-81/+100
|
* Remove superfluous CGI requireJeremy Kemper2009-05-051-1/+0
|
* Prefer sibling Active SupportJeremy Kemper2009-05-051-9/+3
|
* Cherry-pick the inflector onlyJeremy Kemper2009-05-051-11/+2
|
* assert_redirect_to's partial hash matching was deprecated in 2-3 stable ↵Joshua Peek2009-05-041-7/+0
| | | | 7f1f16c01
* fix problems with requires in metal choking under development reloading ↵Tim Connor2009-05-041-1/+2
| | | | | | [#2579 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fix consoleJoshua Peek2009-05-041-2/+3
|
* Providing support for :inverse_of as an option to associations.Murray Steele2009-05-0418-12/+418
| | | | | | | | | | | | | | | | | | | | | | You can now add an :inverse_of option to has_one, has_many and belongs_to associations. This is best described with an example: class Man < ActiveRecord::Base has_one :face, :inverse_of => :man end class Face < ActiveRecord::Base belongs_to :man, :inverse_of => :face end m = Man.first f = m.face Without :inverse_of m and f.man would be different instances of the same object (f.man being pulled from the database again). With these new :inverse_of options m and f.man are the same in memory instance. Currently :inverse_of supports has_one and has_many (but not the :through variants) associations. It also supplies inverse support for belongs_to associations where the inverse is a has_one and it's not a polymorphic. Signed-off-by: Murray Steele <muz@h-lame.com> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fixed Hash#from_xml with keys that are all caps.codebrulee2009-05-042-1/+17
| | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-0430-592/+422
|\
| * Wrap dispatcher callbacks around the whole middleware chain. Kill ↵Joshua Peek2009-05-033-38/+22
| | | | | | | | unnecessary Reloader middleware.
| * Show lazy middleware args in pretty printJoshua Peek2009-05-031-2/+1
| |
| * Extract ActionController rescue templates into Rescue and ShowExceptions ↵Joshua Peek2009-05-0228-556/+403
| | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
* | Don't use #tap before Active Support is available, since older versions of ↵Chris Kampmeier2009-05-041-3/+2
|/ | | | | | | | ruby don't have native implementations [#2603 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix implicit ordering expectationJeremy Kemper2009-05-021-1/+1
|
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-0221-105/+132
|\
| * Deprecate Controller.process interfaceJoshua Peek2009-05-023-10/+13
| |
| * Switch functional tests to run through the rack interface instead of processJoshua Peek2009-05-027-10/+28
| |
| * Functional test runner finalizes response just like the integration test ↵Joshua Peek2009-05-029-58/+66
| | | | | | | | | | runner. In both runners, the @response object will now behave the same. Some functional tests will need to be updated if they are relying on preprocessed data on the response.
| * Deprecate assert_redirect_to's partial hash matchingJoshua Peek2009-05-028-28/+26
| |
* | Check for sibling Active Support firstJeremy Kemper2009-05-021-8/+3
|/
* Added routing test for irregular ID requirements and custom member action.Ruy Asan2009-05-011-0/+8
| | | | | | [#2595 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fixed bug with polymorphic has_one :as pointing to an STI recordRuy Asan2009-05-016-5/+21
| | | | | | [#2594 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Default scope :order should be overridden by named scopes.Alexander Podgorbunsky2009-05-012-5/+5
| | | | | | [#2346 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Rename vendor/rack to vendor/rack-1.1.prePratik Naik2009-05-0152-2/+2
|
* Vendor Rack edge ( commit : 815342a8e15db564b766f209ffb1e340233f064f )Pratik Naik2009-05-0152-1/+5418
|
* Tests should use ActiveRecord::Base.connection.rollback_db_transaction to ↵steve2009-05-011-1/+1
| | | | | | rollback a transaction Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure ActiveRecord::Base.connection_pool.with_connection creates a new ↵steve2009-05-012-5/+35
| | | | | | connection only when needed [#1752 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Use table_exists? in #initialize_schema_migrations_table [#1923 state:resolved]Ken Collins2009-05-011-2/+2
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>