Merge pull request #156 from mediafinger/rails6

Add support for Rails 6.0

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: ruby
 cache: bundler
 before_install:
-  - gem update --system
+  - gem i rubygems-update -v '<3' && update_rubygems
   - gem update bundler
 gemfile:
   - Gemfile
@@ -11,12 +11,15 @@ gemfile:
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6_0.gemfile
 rvm:
   - "2.1"
   - "2.2"
   - "2.3.4"
   - "2.4.0"
   - "2.4.1"
+  - "2.5"
+  - "2.6"
 matrix:
   exclude:
     - rvm: "2.1"
@@ -31,3 +34,13 @@ matrix:
       gemfile: gemfiles/rails_5_2.gemfile
     - rvm: "2.2"
       gemfile: gemfiles/rails_5_2.gemfile
+    - rvm: "2.1"
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: "2.2"
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: "2.3.4"
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: "2.4.0"
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: "2.4.1"
+      gemfile: gemfiles/rails_6_0.gemfile

Appraisals

@@ -22,3 +22,8 @@ appraise "rails-5-2" do
   gem 'railties', '~> 5.2'
   gem 'activesupport', '~> 5.2'
 end
+
+appraise "rails-6-0" do
+  gem 'railties', '~> 6.0'
+  gem 'activesupport', '~> 6.0'
+end

devise-two-factor.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'railties',       '< 5.3'
-  s.add_runtime_dependency 'activesupport',  '< 5.3'
+  s.add_runtime_dependency 'railties',       '< 6.1'
+  s.add_runtime_dependency 'activesupport',  '< 6.1'
   s.add_runtime_dependency 'attr_encrypted', '>= 1.3', '< 4', '!= 2'
   s.add_runtime_dependency 'devise',         '~> 4.0'
   s.add_runtime_dependency 'rotp',           '~> 2.0'

gemfiles/rails_6_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "railties", "~> 6.0.0.rc2"
+gem "activesupport", "~> 6.0.0.rc2"
+
+gemspec path: "../"