Skip to content

Commit 4704336

Browse files
committed
try
1 parent 759fcb6 commit 4704336

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
sudo: false
22
language: ruby
3-
before_install: gem update --system
3+
before_install:
4+
- gem update --system
5+
- gem install bundler -v '< 2'
46
cache: bundler
57
rvm:
68
- 2.2

lib/paranoia.rb

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
require 'active_record' unless defined? ActiveRecord
22

3-
if [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [5, 2]
4-
require 'paranoia/active_record_5_2'
5-
end
3+
require 'paranoia/active_record_5_2'
64

75
module Paranoia
86
@@default_sentinel_value = nil
@@ -305,7 +303,7 @@ def build_relation(klass, *args)
305303
class UniquenessValidator < ActiveModel::EachValidator
306304
prepend UniquenessParanoiaValidator
307305
end
308-
306+
309307
class AssociationNotSoftDestroyedValidator < ActiveModel::EachValidator
310308
def validate_each(record, attribute, value)
311309
# if association is soft destroyed, add an error

paranoia.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
2626

2727
s.add_dependency 'activerecord', '>= 4.0', '< 5.3'
2828

29-
s.add_development_dependency "bundler", ">= 1.0.0"
29+
s.add_development_dependency "bundler", ">= 1.3.0"
3030
s.add_development_dependency "rake"
3131

3232
s.files = `git ls-files`.split("\n")

0 commit comments

Comments
 (0)