diff options
| author | José Valim <jose.valim@gmail.com> | 2009-08-07 16:10:17 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-08-07 16:10:17 +0200 |
| commit | dac8927b0576bff89ba3a4fcbf502dffc9b39e89 (patch) | |
| tree | 58c25132a52ef5cc56f406f8e2df416c5f2776a6 /activemodel/lib/active_model/state_machine.rb | |
| parent | 072c87b532a0bfb334787928248863a2561dc849 (diff) | |
| parent | 606e950ccbd02a10f724c73543575a2a4e1ed8cb (diff) | |
| download | rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.tar.gz rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.tar.bz2 rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.zip | |
Merge branch 'master' of git://github.com/rails/rails into old
Diffstat (limited to 'activemodel/lib/active_model/state_machine.rb')
| -rw-r--r-- | activemodel/lib/active_model/state_machine.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/activemodel/lib/active_model/state_machine.rb b/activemodel/lib/active_model/state_machine.rb index 1172d31ea3..527794b34d 100644 --- a/activemodel/lib/active_model/state_machine.rb +++ b/activemodel/lib/active_model/state_machine.rb @@ -5,12 +5,9 @@ module ActiveModel autoload :State, 'active_model/state_machine/state' autoload :StateTransition, 'active_model/state_machine/state_transition' - class InvalidTransition < Exception - end + extend ActiveSupport::Concern - def self.included(base) - require 'active_model/state_machine/machine' - base.extend ClassMethods + class InvalidTransition < Exception end module ClassMethods |