Changeset [0edcc51756cece150c78c6855fc47921aa5c370b] by Thorsten Böttger
Revision 0edcc51756cece150c78c6855fc47921aa5c370b,
committed by Thorsten Böttger
· September 9th, 2014 @ 06:22 PM
Merge branch 'master' of https://github.com/stiff/aasm into merging-stiff-master
Conflicts:
README.md lib/aasm.rb lib/aasm/event.rb lib/aasm/transition.rb
spec/unit/transition_spec.rb
https://github.com/aasm/aasm/commit/0edcc51756cece150c78c6855fc4792...
9 changed files
-
A
lib/aasm/dsl_helper.rb -
M
README.md -
M
lib/aasm.rb -
M
lib/aasm/event.rb -
M
lib/aasm/transition.rb -
M
spec/models/auth_machine.rb -
M
spec/models/parametrised_event.rb -
M
spec/unit/event_spec.rb -
M
spec/unit/transition_spec.rb