try

rubysherpas · Jan 9, 2019 · 3a4b295 · 3a4b295
1 parent 759fcb6
commit 3a4b295
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 sudo: false
 language: ruby
-before_install: gem update --system
+before_install:
+  - gem install bundler -v '< 2'
+  - gem update --system
 cache: bundler
 rvm:
   - 2.2

diff --git a/lib/paranoia.rb b/lib/paranoia.rb
@@ -1,8 +1,6 @@
 require 'active_record' unless defined? ActiveRecord
 
-if [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [5, 2]
-  require 'paranoia/active_record_5_2'
-end
+require 'paranoia/active_record_5_2'
 
 module Paranoia
   @@default_sentinel_value = nil
@@ -305,7 +303,7 @@ def build_relation(klass, *args)
     class UniquenessValidator < ActiveModel::EachValidator
       prepend UniquenessParanoiaValidator
     end
-    
+
     class AssociationNotSoftDestroyedValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         # if association is soft destroyed, add an error

diff --git a/paranoia.gemspec b/paranoia.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activerecord', '>= 4.0', '< 5.3'
 
-  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "bundler", ">= 1.3.0"
   s.add_development_dependency "rake"
 
   s.files        = `git ls-files`.split("\n")