Merge pull request #4 from dtaniwaki/support-rails-5

Support Rails 5 official releases
dtaniwaki · Feb 18, 2017 · 201a1cc · 201a1cc
2 parents 1730d26 + 1149b0a
commit 201a1cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,10 @@ rvm:
   - 2.3.0
 env:
   -
-  - ACTIVE_RECORD_VERSION=4.0
-  - ACTIVE_RECORD_VERSION=4.1
-  - ACTIVE_RECORD_VERSION=4.2
-  - ACTIVE_RECORD_VERSION=5.0.0.beta4
+  - ACTIVE_RECORD_VERSION=4.0.0
+  - ACTIVE_RECORD_VERSION=4.1.0
+  - ACTIVE_RECORD_VERSION=4.2.0
+  - ACTIVE_RECORD_VERSION=5.0.0
 cache: bundler
 install:
   - 'gem install bundler'

diff --git a/acts_as_hashids.gemspec b/acts_as_hashids.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'hashids', '~> 1.0'
-  spec.add_dependency 'activerecord', '>= 4.0'
+  spec.add_dependency 'activerecord', '>= 4.0', '< 6.0'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'