Thorsten Böttger 6b8cca3426 Merge branch 'master' of https://github.com/javajax/aasm into javajax-master ... Conflicts: README.md gemfiles/rails_4.0.gemfile gemfiles/rails_4.1.gemfile gemfiles/rails_4.2_mongo_mapper.gemfile lib/aasm/persistence.rb		2016-03-19 16:53:23 +13:00
..
generators	Add generators to configure active_record and mongoid after install	2015-09-28 13:41:33 +05:30
models	Fix Mongoid has_many association _ids helper issue	2016-02-26 03:06:35 +05:30
unit	Merge branch 'master' of https://github.com/javajax/aasm into javajax-master	2016-03-19 16:53:23 +13:00
database.rb	pessmistic lock work	2016-02-05 15:28:35 -05: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	Merge pull request #325 from lingceng/master	2016-03-18 21:47:31 +13:00