Thorsten Böttger 8f5778f13c Merge branch 'master' into multiple_state_machines_per_class ... Conflicts: lib/aasm/persistence/active_record_persistence.rb		2015-06-25 17:47:48 +12:00
..
models	Merge branch 'master' into multiple_state_machines_per_class	2015-06-25 17:47:48 +12:00
unit	Merge branch 'master' into multiple_state_machines_per_class	2015-06-25 17:47:48 +12:00
database.rb	bugfix: false is treated as uninitialised state (same as nil) #195	2014-12-13 01:21:40 +01:00
database.yml	using real database connections for testing to reduce dependency on Rails version (previously mocked away ActiveRecord connection, which is not used in Rails 3.1 anymore)	2011-08-31 23:49:09 +02:00
en.yml	added support for localized state names (on a class level, like Record.aasm.states.map(&:localized_name))	2012-12-27 10:23:41 +13:00
en_deprecated_style.yml	added support for localized state names (on a class level, like Record.aasm.states.map(&:localized_name))	2012-12-27 10:23:41 +13:00
spec_helper.rb	fix build (missing Logger)	2015-05-16 16:32:58 +12:00