1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/activemodel/lib/active_model
Pratik Naik 8f1c229571 Merge commit 'mainstream/master'
Conflicts:

	actionmailer/lib/action_mailer/base.rb
	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_controller/mime_type.rb
	railties/doc/guides/html/activerecord_validations_callbacks.html
	railties/doc/guides/html/caching_with_rails.html
	railties/doc/guides/html/command_line.html
	railties/doc/guides/html/configuring.html
	railties/doc/guides/html/creating_plugins.html
	railties/doc/guides/html/finders.html
	railties/doc/guides/html/routing_outside_in.html
	railties/doc/guides/source/activerecord_validations_callbacks.txt
	railties/doc/guides/source/caching_with_rails.txt
	railties/doc/guides/source/command_line.txt
	railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt
	railties/doc/guides/source/creating_plugins/controllers.txt
	railties/doc/guides/source/creating_plugins/core_ext.txt
	railties/doc/guides/source/creating_plugins/helpers.txt
	railties/doc/guides/source/creating_plugins/index.txt
	railties/doc/guides/source/creating_plugins/migration_generator.txt
	railties/doc/guides/source/creating_plugins/models.txt
	railties/doc/guides/source/creating_plugins/odds_and_ends.txt
	railties/doc/guides/source/creating_plugins/routes.txt
	railties/doc/guides/source/finders.txt
	railties/doc/guides/source/routing_outside_in.txt
	railties/doc/guides/source/testing_rails_applications.txt
2008-12-07 03:05:03 +01:00
..
state_machine Extract state query method definition and quiet method redefinition warning. 2008-11-22 19:19:13 -08:00
validations Merge docrails 2008-09-03 17:58:47 +01:00
base.rb tweak activemodel load order a bit 2008-06-27 23:29:47 -07:00
callbacks.rb initial statemachine machine and state classes 2008-06-28 00:55:02 -07:00
core.rb tweak activemodel load order a bit 2008-06-27 23:29:47 -07:00
deprecated_error_methods.rb
errors.rb Finishing up RDoc 2.x markup for cattr_accessors 2008-11-18 11:03:31 -06:00
observing.rb tweak activemodel load order a bit 2008-06-27 23:29:47 -07:00
state_machine.rb Extract state query method definition and quiet method redefinition warning. 2008-11-22 19:19:13 -08:00
validations.rb Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, but it has since been removed from 1.9. 2008-08-31 13:20:15 -07:00