Changeset [f34d152bc9c9926e591e530d98fd2c4dbefc1547] by Thorsten Böttger
Revision f34d152bc9c9926e591e530d98fd2c4dbefc1547,
committed by Thorsten Böttger
· March 19th, 2016 @ 12:42 AM
Merge branch 'transition_success_callbacks' of https://github.com/brega/aasm into brega-transition_success_callbacks
Conflicts:
lib/aasm/core/transition.rb spec/models/callbacks/basic.rb
spec/unit/transition_spec.rb
https://github.com/aasm/aasm/commit/f34d152bc9c9926e591e530d98fd2c4...
14 changed files
-
M
CHANGELOG.md -
M
README.md -
M
lib/aasm/aasm.rb -
M
lib/aasm/core/event.rb -
M
lib/aasm/core/transition.rb -
M
spec/models/callbacks/basic.rb -
M
spec/models/callbacks/guard_within_block.rb -
M
spec/models/callbacks/multiple_transitions_transition_guard.rb -
M
spec/models/callbacks/with_args.rb -
M
spec/models/callbacks/with_state_arg.rb -
M
spec/models/parametrised_event.rb -
M
spec/unit/callbacks_spec.rb -
M
spec/unit/event_spec.rb -
M
spec/unit/transition_spec.rb