1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/activeresource/test
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
..
base Cherry-pick core extensions 2009-05-13 12:00:15 -07:00
fixtures Fixes parsing deep nested resources from XML. [#380 state:resolved] 2008-06-09 23:06:07 -07:00
abstract_unit.rb Cherry pick Active Support dependencies. Autoload. 2009-05-06 00:14:55 -07:00
authorization_test.rb Ruby 1.9 compat: rename deprecated assert_raises to assert_raise. 2009-03-08 13:11:58 -07:00
base_errors_test.rb Deprecate Errors#on_base/add_to_base/invalid?/each_full 2009-03-21 18:34:05 +00:00
base_test.rb Cherry-pick core extensions 2009-05-13 12:00:15 -07:00
connection_test.rb Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha. 2009-02-03 18:40:22 -08:00
format_test.rb Ruby 1.9 compat: don't shadow local var with block arg 2008-11-22 19:19:13 -08:00
setter_trap.rb Prefer tap to returning 2009-02-06 12:18:24 -08:00