Joshua Peek 69742ca8fa Merge branch 'master' into active_model ...

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

2009-05-29 16:06:21 -05:00

..

author.rb

Ensure :dependent => :delete_all works for association with hash conditions

2009-04-20 18:12:40 +01:00

auto_id.rb

move assets and models

2008-01-18 07:27:03 +00:00

binary.rb

move assets and models

2008-01-18 07:27:03 +00:00

bird.rb

Add support for nested object forms to ActiveRecord and the helpers in ActionPack

2009-02-01 14:44:30 +13:00

book.rb

move assets and models

2008-01-18 07:27:03 +00:00

categorization.rb

move assets and models

2008-01-18 07:27:03 +00:00

category.rb

Add :having option to find, to use in combination with grouped finds. Also added to has_many and has_and_belongs_to_many associations.

2008-12-01 20:22:31 +01:00

citation.rb

move assets and models

2008-01-18 07:27:03 +00:00

club.rb

Ensure methods called on association proxies respect access control. [#1083 state:resolved] [Adam Milligan, Pratik]

2008-10-13 19:02:34 +02:00

column_name.rb

move assets and models

2008-01-18 07:27:03 +00:00

comment.rb

Merge the has_finder gem, renamed as 'named_scope'. Closes #11404 [nkallen]

2008-03-24 02:50:02 +00:00

company_in_module.rb

Merge branch 'master' into active_model

2009-05-29 16:06:21 -05:00

company.rb

Merge branch 'master' into active_model

2009-04-22 15:26:03 +01:00

computer.rb

move assets and models

2008-01-18 07:27:03 +00:00

contact.rb

move assets and models

2008-01-18 07:27:03 +00:00

course.rb

move assets and models

2008-01-18 07:27:03 +00:00

customer.rb

Added :constructor and :converter options to composed_of and deprecated the conversion block

2008-09-10 18:28:47 +02:00

default.rb

move assets and models

2008-01-18 07:27:03 +00:00

developer.rb

Make sure default_scope#create checks for options[:conditions] [#2181 state:resolved] [James Le Cuirot]

2009-05-18 21:27:42 +02:00

edge.rb

move assets and models

2008-01-18 07:27:03 +00:00

entrant.rb

move assets and models

2008-01-18 07:27:03 +00:00

event.rb

Ensure validates_uniqueness_of considers limit on the field. [#1042 state:resolved]

2009-03-07 13:52:17 +00:00

face.rb

Providing support for :inverse_of as an option to associations.

2009-05-04 15:27:39 -07:00

guid.rb

Fix validates_uniqueness_of for SQL keywords [#23 state:resolved]

2008-05-11 19:30:03 +01:00

interest.rb

Providing support for :inverse_of as an option to associations.

2009-05-04 15:27:39 -07:00

item.rb

move assets and models

2008-01-18 07:27:03 +00:00

job.rb

Ensure table names are quoted by the association preloading code.

2008-04-26 12:14:50 +12:00

joke.rb

move assets and models

2008-01-18 07:27:03 +00:00

keyboard.rb

move assets and models

2008-01-18 07:27:03 +00:00

legacy_thing.rb

move assets and models

2008-01-18 07:27:03 +00:00

man.rb

Providing support for :inverse_of as an option to associations.

2009-05-04 15:27:39 -07:00

matey.rb

move assets and models

2008-01-18 07:27:03 +00:00

member_detail.rb

Fix preloading of has_one :through associations on belongs_to [#1507 state:resolved]

2008-12-18 19:19:36 +00:00

member_type.rb

Fix preloading of has_one :through associations on belongs_to [#1507 state:resolved]

2008-12-18 19:19:36 +00:00

member.rb

Fix preloading of has_one :through associations on belongs_to [#1507 state:resolved]

2008-12-18 19:19:36 +00:00

membership.rb

Add has_one :through support, finally. Closes #4756 [thechrisoshow]

2008-03-21 18:09:03 +00:00

minimalistic.rb

move assets and models

2008-01-18 07:27:03 +00:00

mixed_case_monkey.rb

move assets and models

2008-01-18 07:27:03 +00:00

movie.rb

move assets and models

2008-01-18 07:27:03 +00:00

order.rb

move assets and models

2008-01-18 07:27:03 +00:00

organization.rb

Revert "Fixed bug with polymorphic has_one :as pointing to an STI record"

2009-05-11 12:20:54 -07:00

owner.rb

Ensure has_many :through works with changed primary keys [#736 state:resolved]

2009-03-09 13:43:28 +00:00

parrot.rb

Add support for nested object forms to ActiveRecord and the helpers in ActionPack

2009-02-01 14:44:30 +13:00

person.rb

Fixed limited eager loading associations with numbers in the name [#2668 state:resolved]

2009-05-18 13:56:17 +02:00

pet.rb

Added :touch option to belongs_to associations that will touch the parent record when the current record is saved or destroyed [DHH]

2009-04-16 17:25:55 -05:00

pirate.rb

Allow you to pass :all_blank to :reject_if option to automatically create a Proc that will reject any record with blank attributes.

2009-05-10 15:02:00 +12:00

post.rb

Fixed bug that makes named_scopes _forgot_ current scope

2009-02-25 09:21:08 -08:00

price_estimate.rb

Fix has_many :through a polymorphic has_many. Closes #10529 [Aleksey Kondratenko]

2008-02-02 03:27:31 +00:00

project.rb

Fix tests for sqlite3 3.6.xx

2009-04-21 13:06:26 +01:00

reader.rb

move assets and models

2008-01-18 07:27:03 +00:00

reference.rb

Ensure table names are quoted by the association preloading code.

2008-04-26 12:14:50 +12:00

reply.rb

Deprecate Model#validate/validate_on_create/validate_on_update. Use Model.validate :method and likewise

2009-03-21 19:07:15 +00:00

ship_part.rb

Add support for nested object forms to ActiveRecord and the helpers in ActionPack

2009-02-01 14:44:30 +13:00

ship.rb

Changed API of NestedAttributes to take an array, or hash with index keys, of hashes that have the id on the inside of the attributes hash and updated the FormBuilder to produce such hashes. Also fixed NestedAttributes with composite ids.

2009-02-13 21:47:56 +13:00

sponsor.rb

Add has_one :through support, finally. Closes #4756 [thechrisoshow]

2008-03-21 18:09:03 +00:00

subject.rb

move assets and models

2008-01-18 07:27:03 +00:00

subscriber.rb

Fixed AssociationsPreload such that it doesnt require foreign keys to be integers (fcheung) [#33 state:resolved]

2008-04-30 23:30:50 -05:00

subscription.rb

Added missing files

2008-05-01 15:03:16 -05:00

tag.rb

move assets and models

2008-01-18 07:27:03 +00:00

tagging.rb

move assets and models

2008-01-18 07:27:03 +00:00

task.rb

move assets and models

2008-01-18 07:27:03 +00:00

topic.rb

Returning nil from named scope lambda is equivalent to an empty hash [#1773 state:resolved]

2009-03-12 15:06:19 +00:00

toy.rb

Ensure has_many :through works with changed primary keys [#736 state:resolved]

2009-03-09 13:43:28 +00:00

treasure.rb

Fix has_many :through a polymorphic has_many. Closes #10529 [Aleksey Kondratenko]

2008-02-02 03:27:31 +00:00

vertex.rb

move assets and models

2008-01-18 07:27:03 +00:00

warehouse_thing.rb

move assets and models

2008-01-18 07:27:03 +00:00

zine.rb

Providing support for :inverse_of as an option to associations.

2009-05-04 15:27:39 -07:00