Changeset [2f5f9cb03852b3fd47b191024a863026440c17b2] by Thorsten Böttger
Revision 2f5f9cb03852b3fd47b191024a863026440c17b2,
committed by Thorsten Böttger
· August 18th, 2014 @ 03:44 PM
Merge branch 'master' into aasm4
Conflicts:
lib/aasm/aasm.rb lib/aasm/persistence/active_record_persistence.rb
https://github.com/aasm/aasm/commit/2f5f9cb03852b3fd47b191024a86302...
12 changed files
-
A
spec/models/double_definer.rb -
A
spec/unit/event_naming_spec.rb -
A
spec/unit/reloading_spec.rb -
M
CHANGELOG.md -
M
README.md -
M
aasm.gemspec -
M
lib/aasm/aasm.rb -
M
lib/aasm/persistence/active_record_persistence.rb -
M
lib/aasm/persistence/sequel_persistence.rb -
M
lib/aasm/state_machine.rb -
M
lib/aasm/version.rb -
M
spec/unit/persistence/active_record_persistence_spec.rb