Changeset [8bb01faebd3a1e332b3604cf82e0e9fef00180b5] by Thorsten Böttger

December 16th, 2013 @ 04:21 PM

Merge branch 'master' into aasm4

Conflicts:
CHANGELOG.md lib/aasm/event.rb https://github.com/aasm/aasm/commit/8bb01faebd3a1e332b3604cf82e0e9f...

Committed by Thorsten Böttger

  • R lib/aasm/deprecated/aasm.rb
  • R spec/models/callback_old_dsl.rb
  • M CHANGELOG.md
  • M LICENSE
  • M README.md
  • M lib/aasm.rb
  • M lib/aasm/aasm.rb
  • M lib/aasm/base.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/persistence/mongoid_persistence.rb
  • M spec/models/mongoid/no_scope_mongoid.rb
  • M spec/models/mongoid/simple_mongoid.rb
  • M spec/models/mongoid/simple_new_dsl_mongoid.rb
  • M spec/models/not_auto_loaded/process.rb
  • M spec/models/persistence.rb
  • M spec/unit/callbacks_spec.rb
  • M spec/unit/complex_example_spec.rb
  • M spec/unit/event_spec.rb
  • M spec/unit/initial_state_spec.rb
  • M spec/unit/inspection_spec.rb
  • M spec/unit/localizer_spec.rb
  • M spec/unit/persistence/active_record_persistence_spec.rb
  • M spec/unit/simple_example_spec.rb
  • M spec/unit/subclassing_spec.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

Library for adding state machines to Ruby classes. Includes persistence layers for things like ActiveRecord. Formerly known as acts_as_state_machine.