Changeset [80b941f2779cf7d7dd16e6b6abd868c31db00a31] by Chris Woodrich

January 10th, 2016 @ 06:13 PM

Merge upstream/master, fix conflict in transition.rb
https://github.com/aasm/aasm/commit/80b941f2779cf7d7dd16e6b6abd868c...

Committed by Chris Woodrich

  • A gemfiles/rails_3.2_stable.gemfile
  • A gemfiles/rails_4.0_mongo_mapper.gemfile
  • A gemfiles/rails_4.1_mongo_mapper.gemfile
  • A gemfiles/rails_4.2_mongo_mapper.gemfile
  • A gemfiles/rails_4.2_mongoid_5.gemfile
  • A lib/aasm/rspec.rb
  • A lib/aasm/rspec/allow_event.rb
  • A lib/aasm/rspec/allow_transition_to.rb
  • A lib/aasm/rspec/have_state.rb
  • A lib/aasm/rspec/transition_from.rb
  • A lib/generators/aasm/aasm_generator.rb
  • A lib/generators/aasm/orm_helpers.rb
  • A lib/generators/active_record/aasm_generator.rb
  • A lib/generators/active_record/templates/migration.rb
  • A lib/generators/active_record/templates/migration_existing.rb
  • A lib/generators/mongoid/aasm_generator.rb
  • A spec/generators/active_record_generator_spec.rb
  • A spec/generators/mongoid_generator_spec.rb
  • A spec/models/active_record/with_enum_without_column.rb
  • A spec/unit/rspec_matcher_spec.rb
  • R gemfiles/rails_3.2.gemfile
  • R gemfiles/rails_4.0_bson1.gemfile
  • R gemfiles/rails_4.1_bson1.gemfile
  • R gemfiles/rails_4.2_bson1.gemfile
  • M ".gitignore"
  • M ".travis.yml"
  • M CHANGELOG.md
  • M LICENSE
  • M PLANNED_CHANGES.md
  • M README.md
  • M aasm.gemspec
  • M gemfiles/rails_4.1.gemfile
  • M gemfiles/rails_4.2.gemfile
  • M lib/aasm/aasm.rb
  • M lib/aasm/base.rb
  • M lib/aasm/core/event.rb
  • M lib/aasm/core/state.rb
  • M lib/aasm/core/transition.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_machine.rb
  • M lib/aasm/version.rb
  • M spec/database.rb
  • M spec/models/callbacks/basic.rb
  • M spec/models/foo.rb
  • M spec/models/guardian.rb
  • M spec/models/silencer.rb
  • M spec/models/state_machine_with_failed_event.rb
  • M spec/models/validator.rb
  • M spec/spec_helper.rb
  • M spec/unit/callbacks_spec.rb
  • M spec/unit/event_naming_spec.rb
  • M spec/unit/guard_spec.rb
  • M spec/unit/inspection_spec.rb
  • M spec/unit/persistence/active_record_persistence_multiple_spec.rb
  • M spec/unit/persistence/active_record_persistence_spec.rb
  • M spec/unit/transition_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.