Changeset [83ee32adffa9016dacef8545e1e3f19c713d6973] by Thorsten Böttger
Revision 83ee32adffa9016dacef8545e1e3f19c713d6973,
committed by Thorsten Böttger
· May 16th, 2015 @ 01:23 AM
Merge branch 'master' into multiple_state_machines_per_class
Conflicts:
spec/models/active_record/api.rb
https://github.com/aasm/aasm/commit/83ee32adffa9016dacef8545e1e3f19...
45 changed files
-
A
spec/models/active_record/derivate_new_dsl.rb -
A
spec/models/active_record/false_state.rb -
A
spec/models/active_record/gate.rb -
A
spec/models/active_record/localizer_test_model.rb -
A
spec/models/active_record/no_direct_assignment.rb -
A
spec/models/active_record/no_scope.rb -
A
spec/models/active_record/persisted_state.rb -
A
spec/models/active_record/provided_and_persisted_state.rb -
A
spec/models/active_record/reader.rb -
A
spec/models/active_record/simple_new_dsl.rb -
A
spec/models/active_record/thief.rb -
A
spec/models/active_record/transient.rb -
A
spec/models/active_record/with_enum.rb -
A
spec/models/active_record/with_false_enum.rb -
A
spec/models/active_record/with_true_enum.rb -
A
spec/models/active_record/writer.rb -
A
spec/models/complex_example.rb -
A
spec/models/default_state.rb -
A
spec/models/initial_state_proc.rb -
A
spec/models/no_initial_state.rb -
A
spec/models/payment.rb -
A
spec/models/provided_state.rb -
A
spec/models/simple_state_machine.rb -
A
spec/models/sub_class.rb -
A
spec/models/sub_class_with_more_states.rb -
A
spec/models/super_class.rb -
A
spec/models/valid_state_name.rb -
R
spec/models/active_record/api.rb -
R
spec/models/argument.rb -
R
spec/models/auth_machine.rb -
R
spec/models/bar.rb -
R
spec/models/father.rb -
R
spec/models/persistence.rb -
R
spec/models/son.rb -
M
LICENSE -
M
spec/spec_helper.rb -
M
spec/unit/api_spec.rb -
M
spec/unit/complex_example_spec.rb -
M
spec/unit/event_naming_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