Thorsten Böttger 2f5f9cb038 Merge branch 'master' into aasm4 ... Conflicts: lib/aasm/aasm.rb lib/aasm/persistence/active_record_persistence.rb		2014-08-18 21:44:42 +02:00
..
models	Merge branch 'master' into aasm4	2014-08-18 21:44:42 +02:00
unit	Merge branch 'master' into aasm4	2014-08-18 21:44:42 +02:00
database.rb	may configure to not allow direct assignment for persisted AASM models #53	2014-05-18 14:21:35 +02: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	don't load migrations more than once when running all specs (and surpressing migration output to improve readability)	2014-01-11 12:12:29 +01:00