Merge pull request maccman#9 from ncavig/master

class_inheritable_attribute deprecated in rails 3.1 beta
kristianmandrup · Jun 7, 2011 · e68c00c · e68c00c
2 parents c2bab16 + 0673d1c
commit e68c00c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/supermodel/base.rb b/lib/supermodel/base.rb
@@ -1,6 +1,6 @@
 module SuperModel
   class Base    
-    class_inheritable_array :known_attributes
+    class_attribute :known_attributes
     self.known_attributes = []
 
     class << self

diff --git a/supermodel.gemspec b/supermodel.gemspec
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0"])
     else
       s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
     end