Changeset [12bca8774403b9c825614e640dbefc57c6909a32] by Thorsten Böttger
Revision 12bca8774403b9c825614e640dbefc57c6909a32,
committed by Thorsten Böttger
· July 13th, 2014 @ 08:17 AM
Merge branch 'master' into aasm4
Conflicts:
README.md lib/aasm/base.rb
https://github.com/aasm/aasm/commit/12bca8774403b9c825614e640dbefc5...
19 changed files
-
M
.gitignore -
M
CHANGELOG.md -
M
README.md -
M
aasm.gemspec -
M
lib/aasm/aasm.rb -
M
lib/aasm/base.rb -
M
lib/aasm/configuration.rb -
M
lib/aasm/event.rb -
M
lib/aasm/instance_base.rb -
M
lib/aasm/persistence/active_record_persistence.rb -
M
lib/aasm/persistence/base.rb -
M
lib/aasm/state.rb -
M
lib/aasm/state_machine.rb -
M
lib/aasm/version.rb -
M
spec/models/foo.rb -
M
spec/unit/event_spec.rb -
M
spec/unit/inspection_spec.rb -
M
spec/unit/memory_leak_spec.rb -
M
spec/unit/persistence/active_record_persistence_spec.rb