Lighthouse has a new layout. Prefer the old one? Return to the old layout, and switch back any time from the link at the top of each page.

All changesets

Changeset [5e59c5cba52606638a0f515dd458fc5db8966488] by Tsyren Ochirov

Revision 5e59c5cba52606638a0f515dd458fc5db8966488, committed by Tsyren Ochirov · September 11th, 2015 @ 10:08 AM

Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/aasm/instance_base.rb https://github.com/aasm/aasm/commit/5e59c5cba52606638a0f515dd458fc5...

97 changed files

  • A spec/models/active_record/basic_active_record_two_state_machines_example.rb
  • A spec/models/active_record/complex_active_record_example.rb
  • A spec/models/basic_two_state_machines_example.rb
  • A spec/models/callbacks/basic_multiple.rb
  • A spec/models/callbacks/guard_within_block_multiple.rb
  • A spec/models/callbacks/multiple_transitions_transition_guard_multiple.rb
  • A spec/models/callbacks/private_method_multiple.rb
  • A spec/models/callbacks/with_args_multiple.rb
  • A spec/models/callbacks/with_state_arg.rb
  • A spec/models/callbacks/with_state_arg_multiple.rb
  • A spec/models/foo_callback_multiple.rb
  • A spec/models/guardian_multiple.rb
  • A spec/models/mongo_mapper/complex_mongo_mapper_example.rb
  • A spec/models/mongoid/complex_mongoid_example.rb
  • A spec/models/parametrised_event_multiple.rb
  • A spec/models/sequel/complex_sequel_example.rb
  • A spec/models/sequel/sequel_multiple.rb
  • A spec/models/sequel/sequel_simple.rb
  • A spec/models/simple_multiple_example.rb
  • A spec/unit/basic_two_state_machines_example_spec.rb
  • A spec/unit/callback_multiple_spec.rb
  • A spec/unit/complex_multiple_example_spec.rb
  • A spec/unit/edge_cases_spec.rb
  • A spec/unit/event_multiple_spec.rb
  • A spec/unit/guard_multiple_spec.rb
  • A spec/unit/initial_state_multiple_spec.rb
  • A spec/unit/inspection_multiple_spec.rb
  • A spec/unit/persistence/active_record_persistence_multiple_spec.rb
  • A spec/unit/persistence/mongo_mapper_persistence_multiple_spec.rb
  • A spec/unit/persistence/mongo_mapper_persistence_spec.rb
  • A spec/unit/persistence/mongoid_persistence_multiple_spec.rb
  • A spec/unit/persistence/mongoid_persistence_spec.rb
  • A spec/unit/persistence/sequel_persistence_multiple_spec.rb
  • A spec/unit/simple_multiple_example_spec.rb
  • A spec/unit/subclassing_multiple_spec.rb
  • R spec/models/callbacks/with_state_args.rb
  • R spec/unit/persistence/mongo_mapper_persistance_spec.rb
  • R spec/unit/persistence/mongoid_persistance_spec.rb
  • M CHANGELOG.md
  • M Gemfile
  • M PLANNED_CHANGES.md
  • M README.md
  • 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/errors.rb
  • M lib/aasm/instance_base.rb
  • M lib/aasm/localizer.rb
  • M lib/aasm/persistence/active_record_persistence.rb
  • M lib/aasm/persistence/base.rb
  • M lib/aasm/persistence/mongo_mapper_persistence.rb
  • M lib/aasm/persistence/mongoid_persistence.rb
  • M lib/aasm/persistence/plain_persistence.rb
  • M lib/aasm/persistence/sequel_persistence.rb
  • M lib/aasm/state_machine.rb
  • M lib/aasm/version.rb
  • M spec/database.rb
  • M spec/models/active_record/derivate_new_dsl.rb
  • M spec/models/active_record/false_state.rb
  • M spec/models/active_record/gate.rb
  • M spec/models/active_record/no_direct_assignment.rb
  • M spec/models/active_record/no_scope.rb
  • M spec/models/active_record/provided_and_persisted_state.rb
  • M spec/models/active_record/simple_new_dsl.rb
  • M spec/models/active_record/thief.rb
  • M spec/models/active_record/with_enum.rb
  • M spec/models/active_record/with_false_enum.rb
  • M spec/models/active_record/with_true_enum.rb
  • M spec/models/complex_example.rb
  • M spec/models/conversation.rb
  • M spec/models/foo.rb
  • M spec/models/initial_state_proc.rb
  • M spec/models/invalid_persistor.rb
  • M spec/models/mongo_mapper/no_scope_mongo_mapper.rb
  • M spec/models/mongo_mapper/simple_mongo_mapper.rb
  • M spec/models/mongo_mapper/simple_new_dsl_mongo_mapper.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/no_initial_state.rb
  • M spec/models/parametrised_event.rb
  • M spec/models/provided_state.rb
  • M spec/models/sub_class.rb
  • M spec/models/sub_class_with_more_states.rb
  • M spec/models/super_class.rb
  • M spec/models/transactor.rb
  • M spec/models/valid_state_name.rb
  • M spec/models/validator.rb
  • M spec/unit/callbacks_spec.rb
  • M spec/unit/event_spec.rb
  • M spec/unit/persistence/active_record_persistence_spec.rb
  • M spec/unit/persistence/sequel_persistence_spec.rb
  • M spec/unit/reloading_spec.rb
  • M spec/unit/state_spec.rb
  • M spec/unit/transition_spec.rb