Changeset [7d32335b607c04b048f21d6f7bcf4cc5af51999c] by Thorsten Böttger
Revision 7d32335b607c04b048f21d6f7bcf4cc5af51999c,
committed by Thorsten Böttger
· November 15th, 2014 @ 06:24 AM
Merge branch 'master' into aasm4
Conflicts:
CHANGELOG.md lib/aasm/event.rb lib/aasm/transition.rb
https://github.com/aasm/aasm/commit/7d32335b607c04b048f21d6f7bcf4cc...
8 changed files
-
M
".gitignore" -
M
CHANGELOG.md -
M
README.md -
M
lib/aasm/event.rb -
M
lib/aasm/transition.rb -
M
spec/models/callback_new_dsl.rb -
M
spec/unit/callbacks_spec.rb -
M
spec/unit/transition_spec.rb