simple_model 1.2.13 → 1.2.15

data/lib/simple_model/attributes.rb

@@ -279,7 +279,7 @@ module SimpleModel
       # hack to keep things working when a class inherits from a super that
       # has ActiveModel::Dirty included
       def inherited(base)
-        base.alias_attributes = base.alias_attributes.merge(self.alias_attributes)
+        base.alias_attributes = self.alias_attributes.merge(base.alias_attributes)
         super
         # Rails 3.0 Hack
         if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.13"
+  VERSION = "1.2.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.13
+  version: 1.2.15
   prerelease: 
 platform: ruby
 authors: