simple_model 1.2.13 → 1.2.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -279,7 +279,7 @@ module SimpleModel
279
279
  # hack to keep things working when a class inherits from a super that
280
280
  # has ActiveModel::Dirty included
281
281
  def inherited(base)
282
- base.alias_attributes = base.alias_attributes.merge(self.alias_attributes)
282
+ base.alias_attributes = self.alias_attributes.merge(base.alias_attributes)
283
283
  super
284
284
  # Rails 3.0 Hack
285
285
  if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)
@@ -1,3 +1,3 @@
1
1
  module SimpleModel
2
- VERSION = "1.2.13"
2
+ VERSION = "1.2.15"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simple_model
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.13
4
+ version: 1.2.15
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: