Merge pull request #50 from rmm5t/legacy-cleanup

Legacy and deprecation cleanup
rmm5t · Feb 16, 2020 · 7f2a92e · 7f2a92e
2 parents 0d2040d + 9e221eb
commit 7f2a92e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,6 @@ gemfile:
   - Gemfile
   - gemfiles/activemodel-3.2.gemfile
   - gemfiles/activemodel-4.2.gemfile
-  - gemfiles/activemodel-5.1.gemfile
   - gemfiles/activemodel-5.2.gemfile
   - gemfiles/activemodel-6.0.gemfile
   - gemfiles/activemodel-master.gemfile

diff --git a/gemfiles/activemodel-5.1.gemfile b/gemfiles/activemodel-5.1.gemfile
diff --git a/gemfiles/activemodel-6.0.gemfile b/gemfiles/activemodel-6.0.gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activemodel", ">= 6.0.0.beta1", "< 7.0"
+gem "activemodel", "~> 6.0.0"
 
 gemspec path: "../"
diff --git a/lib/strip_attributes.rb b/lib/strip_attributes.rb
@@ -9,13 +9,6 @@ def strip_attributes(options = {})
       StripAttributes.strip(record, options)
     end
   end
-
-  # <b>DEPRECATED:</b> Please use <tt>strip_attributes</tt> (non-bang method)
-  # instead.
-  def strip_attributes!(options = {})
-    warn "[DEPRECATION] `strip_attributes!` is deprecated. Please use `strip_attributes` (non-bang method) instead."
-    strip_attributes(options)
-  end
 end
 
 module StripAttributes