Merge pull request #80 from samvera/rails-6

Support rails 6
samvera-deprecated · Aug 14, 2019 · de7e2e9 · de7e2e9
2 parents 2499432 + 9cb4b24
commit de7e2e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -30,6 +30,10 @@ workflows:
   version: 2
   ci:
     jobs:
+      - test:
+          name: ruby2-6_rails6-0
+          ruby_version: 2.6.3
+          rails_version: 6.0.0.rc2
       - test:
           name: ruby2-6_rails5-2
           ruby_version: 2.6.3

diff --git a/om.gemspec b/om.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version     = '>= 1.9.3'
 
-  s.add_dependency 'activemodel', '~> 5.1'
+  s.add_dependency 'activemodel', '>= 5.1', '< 7'
   s.add_dependency 'activesupport'
   s.add_dependency('nokogiri', ">= 1.4.2")
   s.add_dependency 'solrizer', '~> 3.3'