Changeset [260b77a6433869fd00fa921a556725104fbe2412] by Thorsten Böttger
Revision 260b77a6433869fd00fa921a556725104fbe2412,
committed by Thorsten Böttger
· August 24th, 2016 @ 06:34 AM
Merge branch 'master' into feature/delegate-event-after-commit
Conflicts:
spec/models/validator.rb
https://github.com/aasm/aasm/commit/260b77a6433869fd00fa921a5567251...
21 changed files
-
A
spec/models/guard_with_params.rb -
A
spec/models/guard_with_params_multiple.rb -
A
spec/models/silent_persistor.rb -
A
spec/unit/guard_with_params_multiple_spec.rb -
A
spec/unit/guard_with_params_spec.rb -
M
".travis.yml" -
M
CHANGELOG.md -
M
README.md -
M
aasm.gemspec -
M
gemfiles/rails_4.0_mongo_mapper.gemfile -
M
gemfiles/rails_4.2_mongo_mapper.gemfile -
M
lib/aasm/base.rb -
M
lib/aasm/configuration.rb -
M
lib/aasm/instance_base.rb -
M
lib/aasm/persistence/active_record_persistence.rb -
M
lib/aasm/version.rb -
M
spec/database.rb -
M
spec/models/validator.rb -
M
spec/unit/override_warning_spec.rb -
M
spec/unit/persistence/active_record_persistence_multiple_spec.rb -
M
spec/unit/persistence/active_record_persistence_spec.rb