Changeset [fe13954e9337ecc3a4196509c5e27a7c17bad33c] by Jacqui Maher
Revision fe13954e9337ecc3a4196509c5e27a7c17bad33c,
committed by Jacqui Maher
· September 17th, 2009 @ 03:06 PM
Fixed conflicts after merging with rubyist-aasm
http://github.com/rubyist/aasm/commit/fe13954e9337ecc3a4196509c5e27...
27 changed files
-
A
lib/aasm/aasm.rb -
A
lib/aasm/event.rb -
A
lib/aasm/persistence.rb -
A
lib/aasm/persistence/active_record_persistence.rb -
A
lib/aasm/state.rb -
A
lib/aasm/state_machine.rb -
A
lib/aasm/state_transition.rb -
A
spec/unit/before_after_callbacks_spec.rb -
R
aasm.rb -
R
lib/event.rb -
R
lib/persistence.rb -
R
lib/persistence/active_record_persistence.rb -
R
lib/state.rb -
R
lib/state_machine.rb -
R
lib/state_transition.rb -
M
.gitignore -
M
README.rdoc -
M
Rakefile -
M
aasm.gemspec -
M
lib/aasm.rb -
M
spec/functional/conversation_spec.rb -
M
spec/spec_helper.rb -
M
spec/unit/aasm_spec.rb -
M
spec/unit/active_record_persistence_spec.rb -
M
spec/unit/event_spec.rb -
M
spec/unit/state_spec.rb -
M
spec/unit/state_transition_spec.rb